Tendaris 4 jaren geleden
bovenliggende
commit
7f259d7ebc
100 gewijzigde bestanden met toevoegingen van 1620 en 3073 verwijderingen
  1. 4 0
      .gitignore
  2. 14 7
      glife.qproj
  3. 35 22
      locations/AlbStars.qsrc
  4. 0 15
      locations/AlbStarsEnd.qsrc
  5. 0 1022
      locations/AlbStarsWhore.qsrc
  6. 4 4
      locations/AleksandraHome.qsrc
  7. 4 4
      locations/AnalPR.qsrc
  8. 2 2
      locations/BDSM.qsrc
  9. 1 1
      locations/BDSM_Club.qsrc
  10. 1 1
      locations/BDSM_training.qsrc
  11. 1 1
      locations/BelSex.qsrc
  12. 9 7
      locations/Cheatmenu_din.qsrc
  13. 8 4
      locations/FedorEv3.qsrc
  14. 50 50
      locations/FedorEv4.qsrc
  15. 16 15
      locations/FedorMisc.qsrc
  16. 11 11
      locations/Gnpc.qsrc
  17. 2 2
      locations/HotelAdmin.qsrc
  18. 25 10
      locations/HotelHole.qsrc
  19. 10 10
      locations/HotelRoom.qsrc
  20. 1 1
      locations/HotelWork.qsrc
  21. 2 2
      locations/IvanEv.qsrc
  22. 1 1
      locations/KatjaHomeTalk.qsrc
  23. 8 8
      locations/Katja_Tanga.qsrc
  24. 7 7
      locations/Katlake.qsrc
  25. 12 7
      locations/Komp.qsrc
  26. 3 3
      locations/Kwlake1.qsrc
  27. 3 3
      locations/Kwlake2.qsrc
  28. 16 0
      locations/LOCA.qsrc
  29. 2 2
      locations/LakeBoyZ.qsrc
  30. 2 2
      locations/MBallroom.qsrc
  31. 1 1
      locations/MBasement.qsrc
  32. 3 3
      locations/MBathrooms.qsrc
  33. 1 1
      locations/MConservatory.qsrc
  34. 1 1
      locations/MDining.qsrc
  35. 5 5
      locations/MDressing.qsrc
  36. 3 3
      locations/MEastbed.qsrc
  37. 1 1
      locations/MGames.qsrc
  38. 3 3
      locations/MHall.qsrc
  39. 3 3
      locations/MKitchen.qsrc
  40. 2 2
      locations/MLanding.qsrc
  41. 1 1
      locations/MLibrary.qsrc
  42. 1 1
      locations/MLiving.qsrc
  43. 2 2
      locations/MRear.qsrc
  44. 2 2
      locations/MWestbed.qsrc
  45. 10 10
      locations/MagEncounterFairy.qsrc
  46. 7 7
      locations/MeynoldHome.qsrc
  47. 1 1
      locations/Military.qsrc
  48. 30 22
      locations/NewCloShop.qsrc
  49. 2 2
      locations/NikoDates.qsrc
  50. 1 0
      locations/NikoEv2.qsrc
  51. 7 7
      locations/NikoMeyHome.qsrc
  52. 17 13
      locations/NikoSlut.qsrc
  53. 2 2
      locations/NormPR.qsrc
  54. 1 1
      locations/Palatka.qsrc
  55. 2 6
      locations/ParChurch.qsrc
  56. 4 5
      locations/ParChurch2.qsrc
  57. 3 3
      locations/ParkKafe.qsrc
  58. 65 76
      locations/Peterroom.qsrc
  59. 3 3
      locations/Prostitute.qsrc
  60. 29 29
      locations/Snpc.qsrc
  61. 5 5
      locations/TV.qsrc
  62. 4 4
      locations/Vika.qsrc
  63. 2 2
      locations/Vnlake2.qsrc
  64. 4 4
      locations/VolkovHome.qsrc
  65. 1 1
      locations/VolleyTrenerSpeak.qsrc
  66. 1 2
      locations/VoltrenerSexShower.qsrc
  67. 1 1
      locations/Voltrenersex.qsrc
  68. 1 1
      locations/WorkHosp.qsrc
  69. 529 519
      locations/_attributes_swimwear.qsrc
  70. 1 1
      locations/_buy_item.qsrc
  71. 1 1
      locations/_buy_single_item.qsrc
  72. 2 0
      locations/_clothing_image.qsrc
  73. 218 98
      locations/_clothing_name.qsrc
  74. 2 0
      locations/_short_description.qsrc
  75. 1 1
      locations/_single_stock_item.qsrc
  76. 1 1
      locations/_stock_item.qsrc
  77. 4 4
      locations/abduction.qsrc
  78. 8 8
      locations/agentned.qsrc
  79. 0 145
      locations/albinaEv.qsrc
  80. 51 44
      locations/albinahome.qsrc
  81. 9 9
      locations/andreihunter.qsrc
  82. 0 114
      locations/anfisa.qsrc
  83. 0 418
      locations/anfisa_events.qsrc
  84. 62 41
      locations/anushapt.qsrc
  85. 7 7
      locations/anushkaev1.qsrc
  86. 31 9
      locations/arousal.qsrc
  87. 20 16
      locations/artemhome.qsrc
  88. 30 30
      locations/autosalonF.qsrc
  89. 2 2
      locations/autoservisF.qsrc
  90. 19 19
      locations/autotraidF.qsrc
  91. 4 13
      locations/backwater.qsrc
  92. 1 1
      locations/bank.qsrc
  93. 2 2
      locations/bass.qsrc
  94. 3 1
      locations/bed.qsrc
  95. 6 3
      locations/bed2.qsrc
  96. 2 2
      locations/bedr.qsrc
  97. 2 2
      locations/bedr2x.qsrc
  98. 100 86
      locations/bedrPar.qsrc
  99. 15 15
      locations/bedrPar2.qsrc
  100. 1 1
      locations/beg.qsrc

+ 4 - 0
.gitignore

@@ -16,3 +16,7 @@ VideoDecodeStats/CURRENT
 VideoDecodeStats/LOCK
 VideoDecodeStats/LOG
 VideoDecodeStats/LOG.old
+
+glmf.code-workspace
+
+Music Life Wiki/

+ 14 - 7
glife.qproj

@@ -21,6 +21,7 @@
 		<Location name="saveposition"/>
 		<Location name="mod_setting"/>
 		<Location name="$difficulty"/>
+		<Location name="UnitAppearance"/>
 	</Folder>
 	<Folder name="Stats">
 		<Location name="DNA"/>
@@ -114,6 +115,7 @@
 		<Location name="$attributes_swimwear"/>
 		<Location name="$attributes_burlesque"/>
 		<Location name="$attributes_alternative"/>
+		<Location name="$attributes_beach"/>
 		<Location name="lost_clothes_here"/>
 		<Location name="portnoi"/>
 		<Location name="portnoi2"/>
@@ -308,8 +310,6 @@
 		<Location name="StasSex"/>
 	</Folder>
 	<Folder name="EfimovRA">
-		<Location name="anfisa"/>
-		<Location name="anfisa_events"/>
 		<Location name="billiard"/>
 		<Location name="billsvid"/>
 		<Location name="bordel"/>
@@ -328,7 +328,7 @@
 		<Location name="lezbsex"/>
 		<Location name="masharoom"/>
 		<Location name="Military"/>
-		<Location name="city_nudelake"/>
+		<Location name="Nudelake"/>
 		<Location name="Palatka"/>
 		<Location name="parksvid"/>
 		<Location name="paysex"/>
@@ -340,6 +340,7 @@
 		<Location name="sexdvanadva"/>
 		<Location name="sexdvoe"/>
 		<Location name="svidboy"/>
+		<Location name="Vnlake1"/>
 		<Location name="Vnlake2"/>
 		<Location name="WorkHosp"/>
 		<Location name="worksalon"/>
@@ -400,6 +401,7 @@
 		<Location name="fathersex"/>
 		<Location name="dinfather"/>
 		<Location name="mother"/>
+		<Location name="mother_sextalk"/>
 		<Location name="dinmother"/>
 		<Location name="sister"/>
 		<Location name="sister_chat"/>
@@ -710,13 +712,10 @@
 		<Location name="NatBelGo"/>
 	</Folder>
 	<Folder name="Albina">
-		<Location name="albinaEv"/>
 		<Location name="albinaRide"/>
 		<Location name="albinahome"/>
 		<Location name="albinaporog"/>
 		<Location name="AlbFatherQW"/>
-		<Location name="AlbStarsEnd"/>
-		<Location name="AlbStarsWhore"/>
 		<Location name="AlbStars"/>
 	</Folder>
 	<Folder name="Lariska">
@@ -771,10 +770,10 @@
 		<Location name="NewCloShop"/>
 		<Location name="office"/>
 		<Location name="restoran"/>
-		<Location name="salon"/>
 		<Location name="hairsalon"/>
 		<Location name="shopdacha"/>
 		<Location name="sportShop"/>
+		<Location name="scandalicious"/>
 		<Location name="torgcentr"/>
 		<Location name="univer"/>
 		<Location name="yarik"/>
@@ -783,11 +782,18 @@
 		<Location name="city_musicstore"/>
 		<Location name="city_musicstore_stock"/>
 	</Folder>
+	<Folder name="Salon">
+		<Location name="salon"/>
+		<Location name="masseuse_work"/>
+		<Location name="masseuse_schedule"/>
+		<Location name="masseuse_break"/>
+	</Folder>
 	<Folder name="Photo studio">
 		<Location name="foto"/>
 		<Location name="foto_shoot"/>
 		<Location name="foto_events"/>
 		<Location name="foto_events2"/>
+		<Location name="foto_model_documentary"/>
 		<Location name="foto_albums"/>
 		<Location name="foto_models"/>
 		<Location name="foto_models2"/>
@@ -882,6 +888,7 @@
  		<Location name="music_gigstarts"/>
    		<Location name="music_guitarlesson"/>   
    		<Location name="music_buskingevents"/>
+		<Location name="music_delparco"/>
 	</Folder>
 	<Folder name="Lover">
 		<Location name="girl"/>

+ 35 - 22
locations/AlbStars.qsrc

@@ -169,13 +169,13 @@ if $ARGS[0] = 'albina4':
 					*clr & cla
 					minut += 5
 					gs 'stat'
-					if (grupTipe=5 or ((grupTipe=4 or grupTipe=3) and (pcs_danc < 50 and hotcat < 7))):
+					if (grupTipe=5 or ((grupTipe=4 or grupTipe=3) and hotcat < 7)):
 						!! If Sveta is an outcast or does not meet the nerd/gopnik requirements
 						'"Well, am I good enough to join?" you ask.'
 						'Albina thinks about it and looks at the other girls; some shake their heads, others shrug in indifference.'
 						'Finally, she answers. "I don''t doubt that you could <i>eventually</i> reach our level, but you''re not exactly, how do I put it, ''socially desirable.''"'
 						'"Try improving your skills and appearance first and then get back to us." She turns and leaves with the rest of the troupe.'
-					elseif 	((grupTipe=1 or ((grupTipe=4 or grupTipe=3) and (pcs_danc >= 50 and hotcat >= 7))) and pcs_vag = 0 and stat['vaginal'] = 0):
+					elseif 	((grupTipe=1 or ((grupTipe=4 or grupTipe=3) and hotcat >= 7)) and pcs_vag = 0 and stat['vaginal'] = 0):
 						!! If Sveta is popular/non dancer or meets the nerd/gopnik requirements and is virgin
 						'"Well, am I good enough to join?" you ask.'
 						'Albina thinks about it and looks at the other girls; some nod, others shrug.'
@@ -264,9 +264,10 @@ if $ARGS[0] = 'starlets':
 	timemult = 0
 	pcs_mood -= 5
 	inhib_exp += rand(2,4)
+	if perform_lvl < 35: perform_exp += 1
 
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dance_studio/fit1.jpg"></center>'
 
 	if pcs_dancero < 15:
 		'Your dancing is terrible and Albina constantly yells at you, calling you a bowlegged cow.'
@@ -311,6 +312,8 @@ if $ARGS[0] = 'starlets':
 				dynamic $showerdin
 				profiDanceTime += 1
 				inhib_exp += rand(3,5)
+				if perform_lvl < 35: perform_exp += rand(1,2)
+				
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/dance.jpg"></center>'
 				'Albina calls for a car. Once the car arrives, you all bundle in. You arrive at a building with a large hall, where people are sitting around a stage.'
@@ -329,11 +332,11 @@ if $ARGS[0] = 'starlets':
 					if AlbinaQW['StarletCustomer'] = 1:
 						AlbinaQW['StarletsCustomerCount'] = 1
 						AlbinaQW['StarletPay'] = rand(3,6)
-						'You see an Armenian man in an expensive suit approach Albina and start talking to her.'
+						'You see a flabby, balding Armenian man in an expensive suit approach Albina and start talking to her.'
 					elseif AlbinaQW['StarletCustomer'] = 2:
 						AlbinaQW['StarletsCustomerCount'] = 2
 						AlbinaQW['StarletPay'] = rand(6,9)
-						'You see two well dressed Armenian men approach Albina and start to talking to her.'
+						'You see two well dressed middle aged Armenian men approach Albina and start to talking to her.'
 					elseif AlbinaQW['StarletCustomer'] = 3:
 						AlbinaQW['StarletsCustomerCount'] = 2
 						AlbinaQW['StarletPay'] = rand(6,9)
@@ -341,7 +344,7 @@ if $ARGS[0] = 'starlets':
 					elseif AlbinaQW['StarletCustomer'] = 4:
 						AlbinaQW['StarletsCustomerCount'] = 1
 						AlbinaQW['StarletPay'] = rand(3,6)
-						'You see a black man approach Albina and start talking to her.'
+						'You see a huge, muscular black man approach Albina and start talking to her.'
 					elseif AlbinaQW['StarletCustomer'] = 5:
 						AlbinaQW['StarletsCustomerCount'] = 2
 						AlbinaQW['StarletPay'] = rand(6,9)
@@ -431,12 +434,12 @@ if $ARGS[0] = 'cab_home':
 	*clr & cla
 	minut += 15
 	gs 'stat'
-	'You get dressed and call a taxi to take you back to town.'
+	'You call a taxi to take you back to town.'
 
 	if $ARGS[1] <> 'no_clean':
 		cumspclnt = 20
 		gs 'cum_cleanup'
-		'Before the taxi arrives, you enter the bathroom and wash.'
+		'Before the taxi arrives, you enter the bathroom and clean yourself up before getting dressed.'
 	end
 
 	act 'Leave': gt 'pav_residential'
@@ -458,7 +461,7 @@ if $ARGS[0] = 'whore1':
 		'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj51.mp4"></video></center>'
 		'He unzips his pants and pulls his cock out. He stares down at you impatiently, so you start licking the length of his shaft and sucking on the head.'
 		'You take his length into your mouth and start sucking, while looking up to seek approval.'
-		'"Oh yes, just like that you little slut!"'
+		'"Oh yes, just like that you little fucking slut!"'
 		gs 'arousal', 'bj', 10, 'sub'
 		gs 'stat'
 		
@@ -518,11 +521,15 @@ if $ARGS[0] = 'whore1':
 			act 'Painal':
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/dog1.mp4"></video></center>'
-				'The man climbs in behind you. He spreads your ass and you feel him spit on your anus before pressing his cock against it'
-                'You let out a pained squeal and grit your teeth as he pushes his entire length deep into your unprepared ass. As he roughly and painfully grinds in and out of your hole, he reaches forward and starts pulling on your mouth with his fingers.'				
-				'Your anus is throbbing in pain when you feel his cock twitching and a warmth floods your ass. He pulls out and his load trickles out of you.'
-				'"Only that cute little head dancer has ever taken it in the ass better than you, whore. All the other bitches just cry." You let out a yelp as he finishes with a stinging smack on your ass.'
+				'The man climbs in behind you. He spreads your ass and you feel him spit on your anus before pressing his cock against it.'
+                'You let out a pained squeal and thrash your legs as he pushes his entire length deep into your unprepared ass. As he roughly and painfully grinds in and out of your hole, he reaches forward and starts pulling on your mouth with his fat fingers. He leans in close to your ear.'
+                '"Yeah, keep squirming like that bitch! It just makes you tighter!" You moan in distress at the pain he is inflicting on you, but he just laughs and fucks you even harder.'
+                *nl				
+				'After what feels like an eternity, you finally feel his cock twitching and a warmth floods your ass. He pulls out and his load trickles from your anus, which throbs in immense pain.'
+				'"Only that cute little head dancer has ever taken it in the ass better than you, whore. All the other bitches just cry." You let out a loud yelp as he finishes with a stinging smack on your ass that echoes into the room.'
+				'To your despair and disgust, he then forces you into his now sweaty embrace, his flabby arm wrapped around your neck as he fondles your breast while bragging on his phone to his friend about "some of the best anal" he''s ever had. This post sex torture finally ends 10 minutes later.'
 				gs 'arousal', 'anal', 30, 'sub', 'humiliation', 'rough'
+				gs 'pain', 2, 'mouth', 'pull' 
 				gs 'pain', 2, 'asshole', 'stretch'
 				gs 'cum_call', 'anus', $AlbinaQW['Cust']
 				gs 'pain', 2, 'asscheeks', 'slap'
@@ -538,10 +545,13 @@ if $ARGS[0] = 'whore1':
 				cls
 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/miss1.mp4"></video></center>'
 				'The man moves in, roughly flips you on your back and spreads your legs. "What a tight and inviting looking pussy you have." You feel the tip of his cock spread your labia apart as he pushes into you.'
-				'He grabs your throat and pins you to the bed as he starts to very roughly pound your pussy. He occasionally uses his other hand to tightly squeeze your nipples, making you squeal. He seems to enjoy treating you this roughly.'
-                'You lay there enduring the rough fucking, but he eventually lets go of you and pulls out. He starts jerking his cock and you feel his cum splattering onto your labia.'
-                'He is relieved to have pulled out. "Last time I was here, I came inside that cute little head dancer and her fath...I mean her boss, almost killed me! You sluts have a ''no pussy creampie'' policy it seems." He leaves you on the bed and heads to the bathroom.'				
-				gs 'pain', 1, 'throat', 'choke'
+				'He grabs your throat and pins you to the bed as he starts to very roughly pound your pussy. He occasionally uses his other hand to tightly squeeze your nipple, making you squeal. He seems to enjoy treating you this roughly.'
+                'You panic when he stops thrusting and tightens his grip around your neck. You thrash your arms and legs in distress, but he just smiles and doesn''t loosen his grip until you are close to blacking out. He then resumes fucking you, faster and seemingly closer to climax.'  
+				*nl
+				'You endure the remainder of the rough sex for what feels like an eternity, but he eventually lets go of you and pulls out. He starts jerking his cock and you feel his cum splattering onto your labia.'
+                'He is relieved to have pulled out. "Last time I was here, I came inside that cute little head dancer and her fath...I mean her boss, almost killed me! You sluts have a ''no pussy creampie'' policy it seems." he comments before climbing off of you.'
+				'To your despair and disgust, he then forces you into his now sweaty embrace, his flabby arm wrapped around your neck as he fondles your breast while bragging on his phone to his friend about "the fine little pussy" he just fucked. This post sex torture finally ends 10 minutes later.'				
+				gs 'pain', 2, 'throat', 'choke'
 				gs 'arousal', 'vaginal', 30, 'sub', 'humiliation', 'rough'
 				gs 'cum_call', 'precum', $AlbinaQW['Cust']
 				gs 'pain', 2, 'nipples', 'pinch'
@@ -566,14 +576,14 @@ if $ARGS[0] = 'whore2':
 	gs 'boyStat', $AlbinaQW['Cust1'], 'a'
 
 	gs 'stat'
-	'Laughing, the two Armenians push you into their hotel room and you fall to the floor. "It''s time to show us what you got little lamb!" one says.' 
+	'Laughing, the two Armenians push you into their hotel room and you fall to the floor. "It''s time to show us what you''ve got little lamb!" one says.' 
 	'The other man replies "I want see what those <<$lip1>> lips of yours can do. They look like they were made to suck cock.'
 	act 'Please them':
 		cls
 		guy += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjd.jpg"></center>'
-		'The two men unbuckle their pants and pull their cocks out before one of them grabs you by the hair and pulls you to your knees.' 
+		'The two men unbuckle their pants and pull their cocks out before one of them grabs you by the hair and pull you to your knees.' 
 		'He maintains a tight grip on your hair as you lick, jerk, and suck the two cocks until they are both rock hard. You look up at the two men, seeking approval.'
 		'"Very good little lamb. Now take my cock. Take it all!" one of the men says.'
 		'The man grabs your head and forces his entire length into your mouth, causing you to choke. The two men laugh at you.'
@@ -669,7 +679,7 @@ if $ARGS[0] = 'whore2':
 						cls
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
 						'He forces you to open your mouth and his cum starts splashing onto your tongue before he makes you suck him. Your mouth is now full of cum and some starts dribbling down your chin.'
-						'One of the men sees this and grabs your throat. "Now now little lamb. Don''t go wasting it. I want you to swallow every last drop!"'
+						'One of the men sees this and grabs your throat. "Now now little lamb. Don''t go wasting it. I want you to swallow every. Last. Drop!"'
 						'You do as you''re told and swallow the loads in your mouth, while using your finger to scoop the cum on your chin back into your mouth. You show the man your clean tongue and he releases you with a pat on the head.'
 						'"This little lamb knows her place. I think we''ll be seeing you again soon!"'
 						gs 'arousal', 'bj', 5, 'dick1', 'group', 'sub'
@@ -886,6 +896,7 @@ if $ARGS[0] = 'whore4':
 						'You almost pass out as the seemingly never ending stream of cum continues to enter your throat. You are feeling quite bloated when he finally pulls out of your mouth.'
 						'You fall to the floor and start frantically coughing, the last of the cum dribbling from your chin and dripping on your breasts as you try to catch your breath. You look up at the guy, who only has a wide satisified grin on his face.'
 						'"Damn girl, I''m sure that quenched your thrist!" he jokes while patting you on the head.'
+						'He gets comfortable on the bed and motions you next to him. You lie down next to him and spend the next 5 minutes sucking his soft but still huge cock.'
 						gs 'cum_call', 'mouth_swallow', $AlbinaQW['Cust'], 0, 0, 0, 120 
 						gs 'cum_call', 'face', $AlbinaQW['Cust']
 						gs 'cum_call', 'breasts', $AlbinaQW['Cust']
@@ -943,9 +954,9 @@ if $ARGS[0] = 'whore4':
 				cls
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackvag.mp4"></video></center>'
 				'A tingle runs through you as he slides inside your wet hole. You moan as he stretches and fills you entirely.'
-				'You let the pleasure take over as he slowly starts thrusting in and out. He then grabs your hips and starts fucking you hard. You are taking his entire length inside you, his balls slapping against your clit with every thrust. You are overwhelmed with pleasure and cum multiple times.'
+				'You let the pleasure take over as he slowly starts thrusting in and out. He then grabs your hips and starts fucking you hard. You are taking his entire length inside you, his balls slapping against your engorged clitoris with every thrust. You are overwhelmed with pleasure and cum multiple times.'
                 'You lose track of time as he pounds you, but he abruptly pulls out and stands next to the sofa. "The white man said I can''t come in your little white pussy." he says disappointingly as he starts jerking his cock.'
-                '"So I''ll cum on your pretty white face instead!" You get on your knees in front of him and a massive load of cum drenches your face. You suck his cock one last time before he collapses on the sofa in satisfaction.' 				
+                '"So I''ll cum on your pretty white face instead!" You get on your knees in front of him and a massive load of cum drenches your face. You suck his cock one last time before he collapses on the sofa next to you, both of you feeling immensely satisfied.' 				
 				$orgasm_or = 'yes'
 				gs 'arousal', 'vaginal', 10, 'sub'
 				gs 'cum_call', 'precum', $AlbinaQW['Cust']
@@ -1034,6 +1045,7 @@ if $ARGS[0] = 'whore5':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/blackfacial.jpg"></center>'
 						'You let out a strangled gurgle and frantically start swallowing it all down until he finally finishes. He slides his cock out of your mouth and you swallow the last of the cum in your mouth.'
 						'You look up at him, seeking approval. He pats you on the head. "I guess you little white girls really do crave it.'
+						'You take the two monster cocks in your hands and finish them off with a final blowjob each, to their immense satisfaction.'
 						gs 'arousal', 'bj', 10, 'dick1', 'sub', 'deepthroat', 'rough', 'humiliation'
 						gs 'pain', 1, 'throat', 'choke'
 						gs 'cum_call', 'mouth_swallow', $AlbinaQW['Cust1'], 0, 0, 0, 120 
@@ -1049,6 +1061,7 @@ if $ARGS[0] = 'whore5':
 						'You close your eyes and stick your tongue out and soon a stream of warm cum is landing on your face and splashing your tongue, drenching you.'
 						'Once he is finally finished, you take his cock back into your mouth and suck him clean. You then wipe the cum from your eyes and look at them.'
 						'"Damn girl, I guess you are a hot mess!" one of the men laughs.'
+						'You take the two monster cocks in your hands and finish them off with a final blowjob each, to their immense satisfaction.'
 						gs 'arousal', 'bj', 10, 'dick2', 'sub', 'deepthroat', 'rough'
 						gs 'cum_call', 'mouth', $AlbinaQW['Cust1']
 						gs 'cum_call', 'face', $AlbinaQW['Cust1'], 0, 0, 0, 120 

+ 0 - 15
locations/AlbStarsEnd.qsrc

@@ -1,15 +0,0 @@
-# AlbStarsEnd
-
-!menu_off = 1
-!AlbinaQW['StarletsShutDown'] = 1
-!AlbinaQW['AlbFatherQW']  = 10
-!AlbinaQW['AlbCopDay'] = daystart
-!npc_rel['A23'] = -10
-!AlbinaQW['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 'pav_residential'
-gt 'pav_residential'
---- AlbStarsEnd ---------------------------------
-

+ 0 - 1022
locations/AlbStarsWhore.qsrc

@@ -1,1022 +0,0 @@
-# AlbStarsWhore
-
-!!needs complete revamp, add willpower during revamp.
-! menu_off = 1
-
-! if $ARGS[0] = 'whore1':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(24,40)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'stat'
-! 	'The man leads you by the hand into the hotel room. When he flips on the lights, you immediately notice that it''s a luxury room. You smile thinking, it looks like you made the right choice.'
-! 	act 'Kneel':
-! 		cls
-! 		guy += 1
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bj.jpg"></center>'
-! 		'Efficiently, you get in his pants and begin working on him with your hand. He is rock hard in no time.'
-! 		'Looking him in the eye, you lick his cock from base to tip, and then give the head a little kiss.'
-! 		'When you finally take his entire length into your mouth, "Oh, God", is his only response.'
-! 		gs 'arousal', 'hj', 10, 'sub'
-! 		gs 'arousal', 'bj', 10, 'sub'
-! 		minut -= 10
-! 		gs 'stat'
-! 		tipdarand = rand(0, 2)
-
-! 		if tipdarand = 0:
-! 			'He puts his hands on your head, and pushes insistently at you mouth.'
-! 			act 'Relax your throat':
-! 				cls
-
-! 				if pcs_throat < dick:pcs_throat += 1
-
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/throat.jpg"></center>'
-
-! 				if pcs_throat < dick / 2:
-! 					pcs_mood = 5
-! 					pcs_horny = 0
-! 					'The man begins to frantically fuck your mouth.'
-! 					'You do you best to take it, while drool drips from your mouth, snot runs from your nose, and tears well up in your eyes.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick / 2 and pcs_throat < dick:
-! 					pcs_mood -= 20
-! 					pcs_horny = pcs_horny/2
-! 					'He begins roughly using your mouth.'
-! 					'You take his cock down your throat as best you, but still gag a little when he goes deep.'
-! 					'You never would have thought gagging on a stranger''s dick could be such a turn-on.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick:
-! 					'Holding you head, the man forcefully guides you up and down his shaft.'
-! 					'You take the full length of his cock with ease. Your lips make it all the way down to the base, and his balls slap against your chin.'
-! 					'The sensation of deep-throating this strange mans dick is getting you all wet.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				end
-
-! 				tipdarand = rand(0, 1)
-! 				if tipdarand = 0:
-! 					'Without warning, the man grabs your hair, and holds your head down on his shaft.'
-! 					'You let out a strangled gurgle, as jets of semen hit the back of your throat.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 					act 'Swallow':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallow.jpg"></center>'
-! 						'You greedily suck down as much of his cum as for can.'
-! 						'By the time the time he is finished your entire face feels like a wet runny mess.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'After a few minutes he takes his cock out of your mouth, and starts jerking himself in front of your face.'
-! 					gs 'arousal', 'bj', 10, 'sub'
-! 					gs 'stat'
-! 					act 'Close your eyes':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facial.jpg"></center>'
-! 						'Warm jets of semen begin to splatter against your face. You make little sounds of encouragement, until with a groan, he finishes with one last spurt that hits you right on the lips.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'After a few minutes he says: "I want your ass, girl."'
-
-! 			act 'Give him your ass':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/anal.jpg"></center>'
-! 				'Yoy present your ass to him, with a little giggle, you give it a wiggle.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'anal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		elseif tipdarand = 2:
-! 			'After a few minutes he says: "I''m ready for that pussy."'
-
-! 			act 'Lie on your back.':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/sex.jpg"></center>'
-! 				'You spread your legs for him, and motion him to you invitingly.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore2':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,23)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,23)
-
-! 	gs 'stat'
-! 	'Shyly, the boys lead you into their hotel room.'
-! 	'You think it''s sweet that they look a little nervous. Deciding to put their minds at ease, you take action.'
-! 	act 'Get their pants off':
-! 		cls
-! 		guy += 2
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjd.jpg"></center>'
-! 		'Squatting down in front of the boys, you give them each a turn. Licking their shafts and giving little sucking kisses to their heads, you have them hard in no time.'
-! 		'By the time you start sucking them in earnest, they both have warm smiles of appreciation on their faces.'
-! 		gs 'arousal', 'bj', 10, 'sub', 'group'
-! 		gs 'stat'
-! 		tipdarand = rand(0, 1)
-
-! 		if tipdarand = 0:
-! 			'No longer nervous, one of the boys moves behind you and works his hand between your cheeks.'
-! 			'"That is one tight little ass you have there baby", he whispers in your ear.'
-! 			'You let out a little moan, when his finger finds your pucker and slowly begins to massage it.'
-! 			'The other boy impatiently taps his dick against your mouth, urging you to get back to work.'
-! 			gs 'arousal', 'bj', 10, 'sub', 'group'
-! 			gs 'arousal', 'anal_finger', 10, 'sub', 'group'
-! 			minut -= 10
-! 			gs 'stat'
-! 			act 'Get spit-roasted':
-! 				cls
-! 				minut += 30
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/d.jpg"></center>'
-! 				'You suckle at the tip of one boys cock, while the other gets ready to enter your ass. You wiggle your hips in anticipation.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'anal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'cum_manage'
-! 				!! {Setup for #2}
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'The man in your mouth groans, and suddenly you mouth is filled with wet warmth.'
-! 					act 'Swallow it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallow.jpg"></center>'
-! 						'Choking slightly, you frantically swallow cum, until his cock finishes pouring his seed into your mouth.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes hold of his cock, and starts to jerk it. It''s pointed right at your face.'
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facial.jpg"></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your chin.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'The boys lay you on the sofa. One of them settles between your legs, while the other dangles his cock near your face.'
-! 			act 'Part your lips':
-! 				cls
-! 				!!stat['vaginal'] += 1
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/d1.jpg"></center>'
-! 				'You begin to suck dick, while the other guy spreads your legs.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'vaginal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				tipdarand = rand(0, 1)
-! 				!! {Setup for #2}
-! 				gs 'boyStat', $npclastgenerated
-
-! 				if tipdarand = 0:
-! 					'The man in your mouth groans, and suddenly you mouth is filled with wet warmth.'
-! 					act 'Swallow it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallow.jpg"></center>'
-! 						'Choking slightly you frantically swallow cum, until his cock finishes pouring his seed into your mouth.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes hold of his cock, and starts to jerk it. It''s pointed right at your face.'
-
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facial.jpg"></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your face.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore3':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-
-! 	gs 'stat'
-! 	'The Armenian guy leads you into his hotel room and announces: "It is time to earn your money whore. Now, get on your knees, and show me how well you can suck.'
-! 	act 'Get on your knees':
-! 		cls
-! 		guy += 1
-! 		gs 'stat'
-! 		'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj50.mp4"></video></center>'
-! 		'Doing your best to show him what a good cock sucker you are, you lick him from base to tip, and then give the head a little kiss. He gives you a little chuckle of appreciation.'
-! 		'When you take him fully into you mouth you looks up seeking approval.'
-! 		'"That''s a good girl", he says stroking your cheek.'
-! 		gs 'arousal', 'bj', 10, 'sub'
-! 		gs 'stat'
-		
-! 		tipdarand = rand(0, 2)
-
-! 		if tipdarand = 0:
-! 			'He firmly takes your head in his hands and says: "Now, open wide girl, here it comes."'
-
-! 			act 'Relax your throat':
-! 				cls
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral4.mp4"></video></center>'
-
-! 				if pcs_throat < dick / 2:
-! 					pcs_mood = 5
-! 					'He begins roughly using your mouth.'
-! 					'You do you best, but soon drool is running from your mouth, and snot is dripping from your nose. Eventually your eyes fill with tears, as you continue to gasp and gag on his cock.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick / 2 and pcs_throat < dick:
-! 					pcs_mood -= 20
-! 					'He begins roughly using your mouth.'
-! 					'You take his cock down your throat as best you, but still gag a little when he goes deep.'
-! 					'You never would have thought gagging on a stranger''s dick could be such a turn-on.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick:
-! 					'Holding you head, the man forcefully guides you up and down his shaft.'
-! 					'You take the full length of his cock with ease. Your lips make it all the way down to the base, and his balls slap against your chin.'
-! 					'The sensation of deep-throating this strange mans dick is getting you all wet.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 				end
-
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'Without warning, the man grabs your hair and holds your head down on his shaft.'
-! 					'You let out a strangled gurgle, as jets of semen hit the back of your throat.'
-
-! 					act 'Swallow':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/shared/sex/cum/cumf60.mp4"></video></center>'
-! 						'You greedily suck down as much of his cum as for can.'
-! 						'By the time the time he is finished your entire face feels like a wet runny mess.'
-! 						gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'After a few minutes he takes his cock out of your mouth, and starts jerking himself in front of your face.'
-! 					'"Open your mouth for me, girl", he orders.'
-! 					act 'Please him':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/shared/sex/cum/cumf10.mp4"></video></center>'
-! 						'You look him in the eye, and softly whisper: "Give it to me."'
-! 						'Warm jets of semen begin to splatter against your face. You make little sounds of encouragement, until with a groan, he finishes with one last spurt that hits you right on the lips.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'He firmly tells you: "On all fours, now girl. I will have your ass."'
-
-! 			act 'Present your ass to him':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/dog12.mp4"></video></center>'
-! 				'You give it a wiggle, and he says smiling: "Ha, now that''s a good girl."' 
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'anal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-				
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		elseif tipdarand = 2:
-! 			'He speaks: "On your back now, girl. Let''s see that pretty little pussy of yours."'
-! 			act 'Spread your legs for him':
-! 				cls
-! 				'<center><video autoplay loop src="images/shared/sex/vag/miss/kotovsexbonus2.mp4"></video></center>'
-! 				'Laying on your back a little thrill runs though your body, as the rough Armenian prepares to enter you.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'sub'
-! 				gs 'arousal', 'end'
-! 				gs 'stat'
-				
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore4':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-
-! 	gs 'stat'
-! 	'Laughing, the two Armenians lead you into their hotel room. "It''s time to show us what you got, little lamb", one says.' 
-! 	'The other man chimes in with: "I want see what those <<$lip1>> lips of yours can do. They look like they were made to suck cock.'
-! 	act 'Show them':
-! 		cls
-! 		guy += 2
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/shared/sex/group/cocksucker6.jpg"></center>'
-! 		'You kneel down in front of the two swarthy men to show them your skills.' 
-! 		'You playfully lick, jerk, and suck until they are both throbbing in your hands.'
-! 		'"Very nice little lamb, now take my cock. Take it all", one of the men says.'
-! 		'You enthusiastically begin to suck the penis of the man who spoke.'
-! 		gs 'arousal', 'hj', 10, 'group', 'sub'
-! 		gs 'arousal', 'bj', 10, 'group', 'sub'
-! 		minut -= 10
-! 		gs 'stat'
-! 		tipdarand = rand(0, 1)
-
-! 		if tipdarand = 0:
-! 			'After sucking for all your worth for a good ten minutes, one of them says: "Get your ass in the air. It''s time to get roasted, little lamb."'
-! 			'You get down on all fours, while the men laugh, and move into position at each end.'
-! 			'"You might be the sweetest thing I''ve ever seen. What do you say to that my little lamb?", one of the men says.'
-! 			'"Bah", you bleat with a laugh.'
-! 			act 'Get spit-roasted':
-! 				cls
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/shared/sex/group/threesomepm8.mp4"></video></center>'
-! 				'You let out another playful bleat as you begin to get filled.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'arousal', 'anal', 30, 'group', 'sub'
-! 				gs 'arousal', 'bj', 30, 'group', 'sub'
-! 				minut -= 30
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				tipdarand = rand(0, 1)
-! 				gs 'boyStat', $npclastgenerated
-				
-! 				if tipdarand = 0:
-! 					'The swarthy man fucking your mouth grabs your hair, and presses you firmly against him.'
-! 					'Unable to move, you gag a little as semen hits the back of your throat.'
-! 					'"Swallow that down for me pet", the man holding your head insists.'
-! 					act 'Suck it down':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow3.jpg"></center>'
-! 						'Choking slightly you frantically swallow cum, until his cock finishes pouring his seed down your throat.'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in his hand and says: "Open wide pet. I''ve got a treat for you."'
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/locations/pavlovsk/park/gop/sex/oral/cum/gif/cumf2.mp4"></video></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your face.'
-! 						'"Well done, little lamb", the man behind you praises, giving you a little smack on the ass.'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'Eventually, one of the men announces: "On your back now lamb, It''s time to see what you have what you have between those legs."'
-! 			'You playfully hop onto the sofa, and spread your legs, presenting your pussy for approval.'
-! 			'The men chuckle as one of them settles between your legs, while the other taps his cock against your mouth.'
-! 			act 'Enjoy':
-! 				cls
-! 				gs 'stat'
-! 				'<center><video autoplay loop src="images/shared/sex/group/threesomepm10.mp4"></video></center>'
-! 				'As you take one man''s cock into your mouth, as the man between your legs chuckles: "Wonderful, it looks like you have already been sheared."'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'group', 'sub'
-! 				gs 'arousal', 'bj', 30, 'group', 'sub'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'The swarthy man fucking your mouth grabs you hair, and presses you firmly against him.'
-! 					'Unable to move, you gag a little as semen hits the back of your throat.'
-! 					'"Swallow that down for me pet", the man holding your head insists.'
-
-! 					act 'Suck it down':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom/event/rought/oral1.mp4"></video></center>'
-! 						'Choking slightly you frantically swallow cum, until his cock finishes pouring his seed down your throat.'
-! 						act 'Drive back': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in his hand and says: "Open wide pet. I''ve got a treat for you."'
-
-! 					act 'Open your mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						'<center><video autoplay loop src="images/locations/pavlovsk/park/gop/sex/oral/cum/gif/cumf2.mp4"></video></center>'
-! 						'Cum splatters into your mouth, and across your face. It doesn''t stop until it''s dripping from your chin.'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore5':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$boy1 = $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-
-! 	gs 'stat'
-! 	'The three Armenians lead you back to a hotel room. When one of them swings the door shut with his foot a little lump forms in your throat. The thought of all that could go wrong in a hotel room with three strange men is unsettling, yet a little exciting at the same time. You take a deep breath, as you turn to face them.'
-
-! 	act 'Squat down':
-! 		cls
-! 		guy += 3
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjt.jpg"></center>'
-! 		'Deciding that eager service is the best way to avoid any problem, you get down in front of the men'
-! 		'A few minutes of licking and stroking later, you are faced by three throbbing cocks ready for more.'
-! 		'One of the swarthy men compliments your skill: "You are very skilled for such a young thing, and eager. I like eager."'
-! 		'As a way of saying thank you, you take his cock fully into your mouth, and slowly start to suck. The moan of pleasure this elicits from the man sends a little thrill running though your body.'
-! 		gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 		gs 'arousal', 'hj', 10, 'sub', 'gangbang'
-! 		minut -= 10
-! 		gs 'stat'
-! 		!!tipdarand = rand(0, 1)
-! 		tipdarand = 0
-
-! 		if tipdarand = 0:
-! 			'After you have serviced each man for several minutes. The begin to talk to each other in their native language. It looks like they are trying to decide something.'
-! 			'One of the men looks at you: "We will have your ass now girl."'
-! 			'That was not a question, but you are in no position to refuse anyway.'
-
-! 			act 'Present your ass':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/f.jpg"></center>'
-! 				'You continue to languidly suck on the two remaining men, while the third man prepares to enter you from behind.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'arousal', 'bj', 30, 'sub', 'gangbang'
-! 				gs 'arousal', 'anal', 30, 'sub', 'gangbang'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'cum_manage'
-! 				gs 'boyStat', $npclastgenerated
-! 				'One of the men near your face says: "Get ready girl."'
-
-! 				act 'Open your mouth':
-! 					cls
-! 					tipdarand = rand(0, 1)
-
-! 					if tipdarand = 0:
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialt.jpg"></center>'
-! 						'The two men you''ve been blowing both finish at the same time. You flinch in surprise, when the first stream hits your face. By the time they finish, long streams of semen are dripping from your face.'
-! 						'The men all begin chatting among themselves, paying you no mind. From their excited tone, it certainly sounds like you did a good job. You smile, licking your lips with satisfaction.'
-! 						gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					elseif tipdarand = 1:
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/swallowt.jpg"></center>'
-! 						'You kneel and eagerly open up for the two remaining men. They are surprisingly accurate, as they empty their loads into you mouth, other than a small drop on your chin they get it all in there.'
-! 						'Smiling up at them, you swallow it down.'
-! 						'The men all begin chatting among themselves, paying you no mind. From their excited tone, it certainly sounds like you did a good job. Smiling with satisfaction, you gather the last drop of cum from your chin with a finger, and lick it clean.'
-! 						gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					end
-
-! 					act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore6':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	gs 'boyStat', $npclastgenerated
-! 	$npc_thdick[$npclastgenerated] = 'massive'
-! 	npc_dick[$npclastgenerated] = 24
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-
-! 	gs 'stat'
-! 	'<center>your thoughts</center>'
-! 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
-! 	'As the big black guy leads you into the room, your mind drifts to what you have seen watching porn.'
-! 	'The thought of actually being one of those little white girls talking big black cock sends a thrill through you.'
-! 	'You hope this guy lives up to the hype.'
-
-! 	act 'Find out':
-! 		cls
-! 		guy += 1
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjn.jpg"></center>'
-! 		'"Oh, my", you whisper softly, as you expose his girth.'
-! 		'"You like that baby? Go on, and give it a kiss. It won''t bite", he chuckles.'
-! 		'Wide eyed, you wrap your lips around his massive length. You relish the taste, as you begin to suck. It doesn''t taste like chocolate, but it tastes pretty damn good.'
-! 		gs 'arousal', 'bj', 10, 'sub'
-! 		gs 'stat'
-! 		tipdarand = rand(0, 2)
-
-! 		if tipdarand = 0:
-! 			'After a few minutes the man takes your head in his hands, and urges you to take more.'
-! 			act 'Relax your throat':
-! 				cls
-
-! 				if pcs_throat < dick:pcs_throat += 1
-
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/throatn.jpg"></center>'
-
-! 				if pcs_throat < dick / 2:
-! 					pcs_mood = 5
-! 					pcs_horny = 0
-! 					'Oh god, he''s way too big for you. The pressure on you head isn''t letting up though.'
-! 					'Holding your head, he settles into a slow rut. After a few minutes of gaging on him, your face is covered in drool, snot, and tears. It feels good to let him take his pleasure like this, but you worry that your face must be a total mess.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick / 2 and pcs_throat < dick:
-! 					pcs_mood -= 20
-! 					pcs_horny = pcs_horny/2
-! 					'Oh god, he''s almost too much for you. He is forcing your head down, so it looks like you only have one option'
-! 					'You do your best to handle his rough thrusts to your face, but before too long your eyes are watering and snot is dripping from your nose. It''s all very exhilarating, you just wish your make-up wasn''t getting smeared'
-! 					gs 'arousal', 'bj', 10, 'sub', 'rough'
-! 					gs 'stat'
-! 				elseif pcs_throat >= dick:
-! 					'You accept the challenge posed by his hands, and take his entire length down your throat'
-! 					'He smiles down at you saying: "Damn, the stories about cock hungry little white girls must be true. You take that thing like a pro, baby."'
-! 					'You smile up at him around his cock, and continue to deep-throat him.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 				end
-
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'When you think you can''t take anymore, he grabs your hair and forces you down even further.'
-! 					'"Oh shit, here it comes baby", he growls.'
-! 					'Warm jets of semen begin to pour down your throat.'
-! 					gs 'arousal', 'bj', 10, 'sub', 'deepthroat'
-! 					gs 'stat'
-! 					act 'Suck it down':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow3.jpg"></center>'
-! 						'To keep from choking, you gulp it down, as quickly as possible.'
-! 						'Mmm, maybe it does taste like chocolate.'
-! 						'"Damn baby, you must''ve been thirsty", he smiles down at you.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'When you think you can''t take anymore, the man takes his cock from your mouth.'
-! 					'"Let me see that tongue baby, I need something to aim for", he says smiling down at you.'
-! 					gs 'arousal', 'bj', 10, 'sub'
-! 					gs 'stat'
-! 					act 'Open up and say ahh':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialn.jpg"></center>'
-! 						'He grunts, and sticky streams of cum rain down around your face and mouth.'
-! 						'"Baby, you look like a fucking masterpiece, so fucking hot. I''m almost ready for another go just from looking at you.", he says panting.'
-! 						'You give him a wink, as you lick your lips'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'He informs you: "Baby, I''m glad you got me nice and lubed-up. When you find out where this is going next, you''ll be glad too." He grabs hold of one of your butt cheeks, and gives it a good squeeze.'
-! 			'You bite your lip, as equal parts of fear and excitement fill your thoughts.'
-
-! 			act 'Take it':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/analn.jpg"></center>'
-! 				'"Please be gentle", you whisper as he prepares to enter you.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'anal', 30, 'sub'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		elseif tipdarand = 2:
-! 			'After some minutes the man takes his cock out of your mouth, and easily lifts you up and lays you on your back.'
-
-! 			act 'Open legs for him':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/sexn.jpg"></center>'
-! 				'A little nervously, you slowly spread your legs for him. The big black guy moves between your legs, and prepares to penetrate you.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'vaginal', 30, 'sub'
-! 				gs 'stat'
-! 				act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore7':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'massive'
-! 	npc_dick[$npclastgenerated] = 24
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'monstrous'
-! 	npc_dick[$npclastgenerated] = 32
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-
-! 	gs 'stat'
-! 	'<center>your thoughts</center>'
-! 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
-! 	'As the two big black guys lead you into the room, your mind drifts to what you have seen watching porn.'
-! 	'The thought of actually being one of those little white girls talking big black cock sends a thrill through you.'
-! 	'Taking care of two at the same time sounds even more delightfully naughty.'
-
-! 	act 'Get them':
-! 		cls
-! 		guy += 2
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjdn.jpg"></center>'
-! 		'Hands on your hips you playfully announce to the men: "OK boys, pants off, let''s see them."'
-! 		'"Now that''s my kind of woman", one of the men smiles as they both start to undress. You tap your foot with feigned impatience, while they get naked.'
-! 		'"I''m impressed boys. How is a sweet young thing like me ever going to manage?", you say smiling, as you kneel at their feet.'
-! 		'You spend the next ten minutes licking and greedily sucking their big black cocks.'
-! 		gs 'arousal', 'bj', 10, 'sub', 'group'
-! 		gs 'stat'
-! 		tipdarand = rand(0, 1)
-
-! 		if tipdarand = 0:
-! 			'One of the men leans over and slides a hand down the crack of you ass, when he his finger finds your sphincter you move your hips to encourage him.'
-! 			'"Damn girl, is that how you want it?", he says.'
-! 			'"Yes", you whisper.'
-! 			gs 'arousal', 'anal_finger', 5, 'sub'
-! 			gs 'stat'
-			
-! 			act 'Give him your ass':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/dn.jpg"></center>'
-! 				'You continue sucking away at the first guy, as the other prepares to enter your backdoor.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'anal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-				
-! 				if tipdarand = 0:
-! 					'The man fucking your mouth lets out a grunt, as his seed spills into your mouth.'
-
-! 					act 'Taste it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow8.jpg"></center>'
-! 						'You swallow it down, looking up at him seeking approval.'
-! 						'He pats you on the head: "I guess you white girls really do crave it.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in hand, and starts to jerk.'
-
-! 					act 'Open you mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialn.jpg"></center>'
-! 						'you make appreciative sounds, as hot streams of semen rain down on your face'
-! 						'After he is finished, you clean him up with licks and gentle kisses.'
-! 						'"Damn girl, I guess you are what they would call a hot mess", one of the men laughs.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		elseif tipdarand = 1:
-! 			'One of the men gently lifts you up, and lays you on the sofa.'
-! 			'He moves to position himself between your legs, while the other guy brings his cock back to your lips.'
-
-! 			act 'Get filled':
-! 				cls
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/d1n.jpg"></center>'
-! 				'You take one man in your mouth, while the other guy spreads your legs.'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinsex','vaginal_sex',10
-! 				gs 'dinsex','sexcum'
-! 				gs 'arousal', 'bj', 30, 'sub', 'group'
-! 				gs 'arousal', 'vaginal', 30, 'sub', 'group'
-! 				minut -= 30
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				tipdarand = rand(0, 1)
-
-! 				if tipdarand = 0:
-! 					'The man fucking your mouth lets out a grunt, as his seed spills into your mouth.'
-
-! 					act 'Taste it':
-! 						cls
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow8.jpg"></center>'
-! 						'You swallow it down, looking up at him seeking approval.'
-! 						'He pats you on the head: "I guess you white girls really do crave it.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				elseif tipdarand = 1:
-! 					'The man at your mouth takes his cock in hand, and starts to jerk.'
-
-! 					act 'Open you mouth':
-! 						cls
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialn.jpg"></center>'
-! 						'you make appreciative sounds, as hot streams of semen rain down on your face'
-! 						'After he is finished, you clean him up with licks and gentle kisses.'
-! 						'"Damn girl, I guess you are what they would call a hot mess", one of the men laughs.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 						act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 					end
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-! if $ARGS[0] = 'whore8':
-! 	minut += 5
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'massive'
-! 	npc_dick[$npclastgenerated] = 24
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-! 	gs 'boyStat', $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'monstrous'
-! 	npc_dick[$npclastgenerated] = 32
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-! 	$boy1 = $npclastgenerated
-! 	gs 'npcgeneratec', 0, 'Albina''s "friend"', rand(18,32)
-! 	$npc_thdick[$npclastgenerated] = 'monstrous'
-! 	npc_dick[$npclastgenerated] = 30
-! 	npc_Malen[$npclastgenerated] = rand(10,15)
-
-! 	gs 'stat'
-! 	'<center>your thoughts</center>'
-! 	'<center><video autoplay loop src="images/shared/home/tv/seeporn.mp4"></video></center>'
-! 	'This is just like one of those movies you''ve seen. Three big black guys leading a young little white girl into a hotel room, oh whatever will you do?'
-! 	'"Let''s get this party started boys", you say smiling, as you take of your top.'
-! 	'"Aren''t you just an eager little minx", one of the men laughs, as they begin to take off their pants.'
-! 	'"Crawl over here and give it a kiss, little kitty. I''m gonna make you purr", another man says.'
-
-! 	act 'Crawl to them':
-! 		cls
-! 		guy += 3
-! 		gs 'stat'
-! 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/bjtn.jpg"></center>'
-! 		'The guys all rush to be first, when you make it over to them.'
-! 		'"One at a time boys. I know what I''m doing, but I can''t fit all three of those things in my mouth", you playfully chastise them.'
-! 		'The men laugh, as you settle into a rhythm of sucking and stroking. The thought of all this hot black meat eager to be serviced is making your thighs ache with hunger.'
-! 		gs 'arousal', 'hj', 10, 'sub', 'gangbang'
-! 		gs 'arousal', 'bj', 10, 'sub', 'gangbang'
-! 		minut -= 10
-! 		gs 'stat'
-! 		!!tipdarand = rand(0, 1)
-! 		tipdarand = 0
-
-! 		if tipdarand = 0:
-! 			'After some minutes one of the men starts to slowly kneed one of your butt cheeks. His fingers are creeping ever closer to your sphincter.'
-! 			'"Oh, you think so do you", you say, looking up at him innocently.'
-! 			'"Oh, I know so, I know", he says with a grin.'
-! 			'Smiling, you slowly get on your hands and crawl toward the sofa. You make sure they get a good look at your white girl ass, as you do.'
-
-! 			act 'Call them over with a purr':
-! 				cls
-! 				spafinloc = 3
-! 				gs 'cum_manage'
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/fn.jpg"></center>'
-! 				'The sight of three big black guys rushing over to you puts a big smile on your face.'
-! 				'Two of the men move to get service from your mouth, while the third prepares to penetrate you.'
-! 				'"That''s one fine ass booty you got there, white girl", he says'
-! 				gs 'dinsex', 'boy_puts_condom'
-! 				gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
-! 				gs 'arousal', 'bj', 30, 'sub', 'gangbang'
-! 				gs 'arousal', 'anal', 30, 'sub', 'gangbang'
-! 				gs 'stat'
-! 				gs 'boyStat', $npclastgenerated
-! 				'The two men at your mouth seem close to finishing too.'
-
-! 				act 'Get some cream':
-! 					cls
-! 					tipdarand = rand(0, 1)
-
-! 					if tipdarand = 0:
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 11
-! 						gs 'cum_manage'
-! 						facial += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/prostitute/facialtn.jpg"></center>'
-! 						'You kneel down, and look up at the two remaining men stroking themselves toward the finish.'
-! 						'"Oh fuck, I''m going to paint that pretty face white for you, baby!", one of them says grunting.'
-! 						'Both men erupt at the same time. So much of it splatters against your face that it almost doesn''t seem real. You giggle wildly at the thrill of it all, after they have finished.'
-! 						'"God damn, this kitty really does love her cream!", one of the men laughs.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					elseif tipdarand = 1:
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						gs 'boyStat', $boy1
-! 						spafinloc = 12
-! 						gs 'cum_manage'
-! 						swallow += 1
-! 						minut += 10
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/pc/body/cum/swallow/swallow8.jpg"></center>'
-! 						'You eagerly suck the two remaining men to finish. It''s not long before both of them have poured their loads down you throat.'
-! 						'"Our little kitty must have been thirsty", one of the men laughs.'
-! 						'You look up and give him a little "meow", and lick your lips.'
-! 						gs 'arousal', 'end'
-! 						gs 'stat'
-! 					end
-
-! 					act 'Call a taxi': gt 'gdksport', 'cab_home'
-! 				end
-! 			end
-! 		end
-! 	end
-! end
-
-gt 'gdksport', 'start'
-
---- AlbStarsWhore ---------------------------------
-

+ 4 - 4
locations/AleksandraHome.qsrc

@@ -56,9 +56,9 @@ if $args[0] = 'library':
 			'You finish checking out the novel and start heading towards the exit. <<$npc_firstname[''A231'']>> mentions that she has to use the bathroom before heading home and you to go as well.'
 			act 'Go to the bathroom':
 				minut += 5
-				$metka = 'womens'
+				$loc_arg = 'womens'
 				$loc = 'gdktoilet'
-				$metkaM = 'womens'
+				$locM_arg = 'womens'
 				$locM = 'gdktoilet'
 				$menu_loc = 'gdktoilet'
 				$menu_arg = 'womens'
@@ -159,9 +159,9 @@ if $args[0] = 'library':
 			'You finish checking out the novel and start heading towards the exit. <<$npc_firstname[''A231'']>> mentions that she has to use the bathroom before heading home and you say that you might as well go as well.'
 			act 'Go to the bathroom':
 				minut += 5
-				$metka = 'womens'
+				$loc_arg = 'womens'
 				$loc = 'gdktoilet'
-				$metkaM = 'womens'
+				$locM_arg = 'womens'
 				$locM = 'gdktoilet'
 				$menu_loc = 'gdktoilet'
 				$menu_arg = 'womens'

+ 4 - 4
locations/AnalPR.qsrc

@@ -1,8 +1,8 @@
 # AnalPR
 
 if $ARGS[0] = '1':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'AnalPR'
     $location_type = 'event'
 	menu_off = 1
 
@@ -40,8 +40,8 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '2':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'AnalPR'
     $location_type = 'event'
 	menu_off = 1
 	

+ 2 - 2
locations/BDSM.qsrc

@@ -1,6 +1,6 @@
 # BDSM
-$metka = $ARGS[0]
-$loc = $CURLOC
+$loc_arg = $ARGS[0]
+$loc = 'BDSM'
 $location_type = 'event'
 menu_off = 1
 *clr & cla

+ 1 - 1
locations/BDSM_Club.qsrc

@@ -13,7 +13,7 @@ if $ARGS[0] = 'Hos':
 end
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'BDSM_Club'
 	$location_type = 'public_outdoors'
 	$menu_loc = 'BDSM_Club'

+ 1 - 1
locations/BDSM_training.qsrc

@@ -521,7 +521,7 @@ if $ARGS[0] = 'd_start':
 				'Elektra helps the sub into a harness and boots then points to the floor. The submissive women kneels down, being careful to position her legs and arms very precisely.'
 				'"This is the "slave" position, it displays your dominance over the sub. A dominant can do anything to a sub, but must not cause lasting harm."'
 				'"You must also stop immediately if they use their safe-word, this is always "red". As soon as they say "red", the session is ended. If their mouth is busy, they can shake their head 3 times and hum "and-and". If they can''t do either they can slam the palm of their hand. Clear?"'
-				gs 'arousal', 'voyeur', 10
+				gs 'arousal', 'erotic', 10
 				gs 'stat'
 				act 'Carry on':
 					*clr & cla

+ 1 - 1
locations/BelSex.qsrc

@@ -418,7 +418,7 @@ if $ARGS[0] = 'shower':
 				end
 			end
 
-			if $clothingworntype = 'swimwear': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+			if $clothingworntype = 'swimwear' or $clothingworntype = 'beach': gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 
 			gs 'arousal', 'end'
 			gs 'stat'

+ 9 - 7
locations/Cheatmenu_din.qsrc

@@ -1115,6 +1115,8 @@ $cheatmenu['stats'] = {
 	*p 'Instruments (<<instrmusic_lvl>>) - Total (<<pcs_instrmusic>>): ' & dynamic $cheatmenu['printStatLinks'], 'instrmusic', 'Instrumental Music'
 	*p 'Photography (<<photoskl_lvl>>) - Total (<<pcs_photoskl>>): ' & dynamic $cheatmenu['printStatLinks'], 'photoskl', 'Photography'
 	*p 'Artistic (<<artskls_lvl>>) - Total (<<pcs_artskls>>): ' & dynamic $cheatmenu['printStatLinks'], 'artskls', 'Artistic Skills'
+	*p 'Performing (<<perform_lvl>>) - Total (<<pcs_perform>>): ' & dynamic $cheatmenu['printStatLinks'], 'perform', 'Performance'
+	*p 'Music Production (<<musicprod_lvl>>) - Total (<<pcs_musicprod>>): ' & dynamic $cheatmenu['printStatLinks'], 'musicprod', 'Music Production'
 	*nl
 	*pl'<b>Dance:</b>'
 	*p 'Modern Dance (<<danc_lvl>>) - Total (<<pcs_danc>>): ' & dynamic $cheatmenu['printStatLinks'], 'danc', 'Modern Dancing'
@@ -1400,10 +1402,10 @@ $cheatmenu['reputation'] = {
 			'Your brother thinks you are a total whore. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 		elseif evgenQW >= 3:
 			'Your brother thinks you are a slut. <a href="exec:evgenQW = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
-		elseif brother['knowslut'] = 1:
-			'Your brother saw semen on your body and thinks you fuck around. <a href="exec:brother['knowslut'] = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
-		elseif brother['knowslut'] >= 2:
-			'Your brother saw you in the park fucking the Gopniks. <a href="exec:brother['knowslut'] = 1 & dynamic $cheatmenu[''reputation'']">Clear</a>'
+		elseif brotherknowslut = 1:
+			'Your brother saw semen on your body and thinks you fuck around. <a href="exec:brotherknowslut = 0 & dynamic $cheatmenu[''reputation'']">Clear</a>'
+		elseif brotherknowslut >= 2:
+			'Your brother saw you in the park fucking the Gopniks. <a href="exec:brotherknowslut = 1 & dynamic $cheatmenu[''reputation'']">Clear</a>'
 		else
 			'Your brother has a good opinion of you.'
 		end
@@ -1447,8 +1449,8 @@ $cheatmenu['documents'] = {
 	if diplom = 1:'You already have a Diploma'
 	if secrdiplom = 0:'<a href="exec:secrdiplom = 1 & dynamic $cheatmenu[''documents'']">Get Secretarial Diploma</a>'
 	if secrdiplom = 1:'You already have a Secretarial Diploma'
-	if masash < 10:'<a href="exec:masash = 10 & dynamic $cheatmenu[''documents'']">Get Masseuse Certificate</a>'
-	if masash >= 10:'You already have a Masseuse Certificate'
+	if masseuse['certification'] < 10:'<a href="exec:masseuse[''certification''] = 10 & dynamic $cheatmenu[''documents'']">Get Masseuse Certificate</a>'
+	if masseuse['certification'] >= 10:'You already have a Masseuse Certificate'
 	if prava = 0:'<a href="exec:prava = 1 & dynamic $cheatmenu[''documents'']">Get Driving Licence</a>'
 	if prava = 1:'You already have Driving Licence'
 	'</td></tr></table></center>'
@@ -2454,7 +2456,7 @@ $cheatmenu['vartracker'] = {
 	'$locM: <<$locM>>'
 	'<font color = red>$CURLOC: <<$CURLOC>></font>'
 	'$location_type: <<$location_type>>'
-	'home_cur: <<home_cur>>'
+	'curr_home: <<curr_home>>'
 	'$home_town: <<$home_town>>'
 	'$home_name: <<$home_name>>'
 	'daystart: <<daystart>>'

+ 8 - 4
locations/FedorEv3.qsrc

@@ -376,6 +376,7 @@ if $ARGS[0] = 'Movies 2':
 	pcs_mood += 20
 	EndMovie = 1
 	minut += 5			
+	killvar '$locclass'
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
@@ -426,11 +427,12 @@ end
 
 if $ARGS[0] = 'Ladies Room':
 	*clr & cla
-	$metka = 'Ladies Room'
+	$loc_arg = 'Ladies Room'
 	$loc = 'FedorEv3'
-	$metkaM = 'Ladies Room'
+	$locM_arg = 'Ladies Room'
 	$locM = 'FedorEv3'
 	$location_type = 'bathroom'	
+	$locclass = 'restroom'
 	$menu_loc = 'FedorEv3'
 	$menu_arg = 'Ladies Room'
 	menu_off = 0
@@ -457,11 +459,12 @@ end
 		
 if $ARGS[0] = 'Mens Room':
 	*clr & cla
-	$metka = 'Mens Room'
+	$loc_arg = 'Mens Room'
 	$loc = 'FedorEv3'
-	$metkaM = 'Mens Room'
+	$locM_arg = 'Mens Room'
 	$locM = 'FedorEv3'	
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	$menu_loc = 'FedorEv3'
 	$menu_arg = 'Mens Room'
 	menu_off = 0	
@@ -1330,6 +1333,7 @@ if $ARGS[0] = 'Movies 3':
 	WithFedor = 0
 	EndMovie = 0
 	FedorRestTimes = 0
+	killvar '$locclass'
 	gs 'stat'
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:

+ 50 - 50
locations/FedorEv4.qsrc

@@ -2299,9 +2299,9 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	*clr & cla
-	$metka = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Bathroom'
+	$locM_arg = 'Bathroom'
 	$locM = 'FedorEv4'
 	killvar '$locclass'
 	$location_type = 'bathroom'
@@ -2434,8 +2434,8 @@ if $ARGS[0] = 'Toilet 3':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="red">Evil Toilet</font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/toilet/vket.jpg"></left>'
+	'<center><b><h4><font color="red">Evil Toilet</font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bathroom/toilet/vket.jpg"></center>'
 	'<h4><b>FEED ME!!!</b></h4>'
 
 	act 'NOO!':gt 'FedorEv4', 'Bathroom'
@@ -2443,7 +2443,7 @@ end
 
 if $ARGS[0] = 'Kitchen':
 	$loc = 'FedorEv4'
-	$metka = 'Kitchen'
+	$loc_arg = 'Kitchen'
 	$locclass = 'kitr'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Kitchen'
@@ -2507,9 +2507,9 @@ if $ARGS[0] = 'Hallway':
 	$menu_arg = 'Hallway'
 	menu_off = 0
 	if hour = 20 and ReginaIntro = 0:gt 'FedorEv4', 'Regina Intro'
-	$metka = 'Hallway'
+	$loc_arg = 'Hallway'
 	$loc = 'FedorEv4'
-	$metkaM = 'Hallway'
+	$locM_arg = 'Hallway'
 	$locM = 'FedorEv4'
 	$location_type = 'private'
 	WithFedor = 0
@@ -2559,9 +2559,9 @@ end
 
 if $ARGS[0] = 'Bedroom':
 	*clr & cla
-	$metka = 'Bedroom'
+	$loc_arg = 'Bedroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Bedroom'
+	$locM_arg = 'Bedroom'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Bedroom'
@@ -2859,8 +2859,8 @@ if $ARGS[0] = 'Regina Chat':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'Fedor''s mother has long blond hair that is well kept and looks really good for her age.'
 	if $clothingworntype = 'nude' and ReginaKozCaught < 5:
@@ -2907,8 +2907,8 @@ if $ARGS[0] = 'Regina Chat 2':
 	ReginaKozlov += 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	VK = rand(1,7)
 	if VK = 1:
@@ -2936,8 +2936,8 @@ if $ARGS[0] = 'Dinner 1':
 	minut += 5
 	ReginaKoz_Daystart = daystart
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'Of course, it''s no problem. Here, have a seat and I''ll make us a nice meal.'
 
@@ -2957,7 +2957,7 @@ if $ARGS[0] = 'Dinner':
 	cumspclnt = 2
 	minut += 20
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	*nl
 	'You and Regina spend a few minutes getting to know each other while eating a well prepared meal.'
 
@@ -2981,17 +2981,17 @@ end
 
 if $ARGS[0] = 'Fedor Livingroom':
 	*clr & cla
-	$metka = 'Fedor Livingroom'
+	$loc_arg = 'Fedor Livingroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Livingroom'
+	$locM_arg = 'Fedor Livingroom'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Livingroom'
 	menu_off = 0
 	minut += 5
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></center>'
 	*nl
 	'Fedor is sitting on the sofa watching tv and when he notices you, he pats the seat next to him, offering you a seat.'
 	
@@ -3014,16 +3014,16 @@ end
 
 if $ARGS[0] = 'Fedor Kitchen':
 	*clr & cla
-	$metka = 'Fedor Kitchen'
+	$loc_arg = 'Fedor Kitchen'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Kitchen'
+	$locM_arg = 'Fedor Kitchen'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Kitchen'
 	menu_off = 0
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></center>'
 	*nl
 	'Fedor is sitting down at the table, waiting for his microwaved lunch to finish.'
 	
@@ -3067,16 +3067,16 @@ end
 
 if $ARGS[0] = 'Fedor Bedroom':
 	*clr & cla
-	$metka = 'Fedor Bedroom'
+	$loc_arg = 'Fedor Bedroom'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Bedroom'
+	$locM_arg = 'Fedor Bedroom'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Bedroom'
 	menu_off = 0
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></center>'
 	*nl
 	'Fedor is laying on his bed, relaxing.'
 	if FedorLove = 0:
@@ -3126,20 +3126,20 @@ end
 
 if $ARGS[0] = 'Fedor Bedroom 2':
 	*clr & cla
-	$metka = 'Fedor Bedroom 2'
+	$loc_arg = 'Fedor Bedroom 2'
 	$loc = 'FedorEv4'
-	$metkaM = 'Fedor Bedroom 2'
+	$locM_arg = 'Fedor Bedroom 2'
 	$locM = 'FedorEv4'
 	$menu_loc = 'FedorEv4'
 	$menu_arg = 'Fedor Bedroom 2'
 	menu_off = 0
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	*nl
 	'Fedor is watching videos on his computer. As you approach, Fedor turns to you and asks "Hey <<$pcs_nickname>>, wanna check out some videos?"'
@@ -3226,7 +3226,7 @@ if $ARGS[0] = 'Future':
 	act 'Marriage':
 		*clr & cla
 		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/sitting.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/sitting.jpg"></center>'
 		'<b><h4><font color=#FF00FF>To be continued... Love Violet Kitten.</font></h4></b>'
 
 		act 'Awwww':gt 'FedorEv4', 'Fedor Bedroom'
@@ -3271,8 +3271,8 @@ if $ARGS[0] = 'Fedor Livingroom Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/livingroom/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you discuss your favorite TV shows.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Livingroom'
@@ -3283,8 +3283,8 @@ if $ARGS[0] = 'Fedor Kitchen Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/kitchen/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you discuss your favorite foods.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Kitchen'
@@ -3295,8 +3295,8 @@ if $ARGS[0] = 'Fedor Bedroom Chat':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/fedor.jpg"></center>'
 	'You sit down next to Fedor and both of you share stories about your classmates.'
 
 	act 'Finish chatting':gt 'FedorEv4', 'Bedroom'
@@ -3307,7 +3307,7 @@ if $ARGS[0] = 'Fedor Bedroom Chat 2':
 	menu_off = 1
 	minut += 10
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
 	'Fedor gets up and offers you his seat then stands behind you as he shows you his playlist of favorite online videos as you share with him, your favorites.'
 
@@ -3323,7 +3323,7 @@ if $ARGS[0] = 'Private Chat':
 	*clr & cla
 	menu_off = 1
 	gs 'stat'
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 	'You sit down next to Fedor then ask, "Can we talk for a moment...In private?" Fedor turns to you with a concerned look on his face. "Of course <<$pcs_firstname>>. Let''s head to my room where we can talk in private." Fedor takes your hand then leads you to the bedroom.'
 
@@ -3350,8 +3350,8 @@ if $ARGS[0] = 'Fedor Shelter 2':
 	FedorShelter = 2
 	npc_rel['A5'] += 20
 	gs 'stat'
-	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+	'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 	'You can see Fedor and Regina sitting down together chatting then Regina notices you. Regina looks up to you with a sad face then says, "Fyodor told me about what happened. You''re mother threw you out? Why?" you lower your head, trying to figure out where to start when Regina says, "It''s ok, you don''t have to tell me. I can''t believe that she would throw out her own daughter. Fyodor and I have been discussing, and I decided that it would be best if you to stay for while, but promise me that you will try to find a place to live when you graduate, okay?" you happily nod, and can feel tears gathering in your eyes, as you reply, "Yes I will. Thank you so much. I thought that I would be living on the street. Thank you." Regina approaches you then wipes away your tears. "I will get you a key." Regina then reaches inside of a drawer then pulls out a set of keys then give you one. Fedor gives you a hug then says, "You will always be welcome here." You return the hug, as you reply, "Thank you for everything Fyodor. You are the best boyfriend ever."'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/console1.jpg"></center>'
 
@@ -3411,7 +3411,7 @@ if $ARGS[0] = 'Home Entrance':
 	$menu_arg = 'Home Entrance'
 	menu_off = 0
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></left>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></center>'
 	'Fedor''s house is a bit weathered but still looks quite lovely. This house is but a short walk away from my parents apartment.'
 	
 	act 'Walk away': minut += 5 & gt 'pav_residential'
@@ -3431,8 +3431,8 @@ if $ARGS[0] = 'Home Entrance 2':
 	elseif week <= 5 and hour >= 19:
 		gt 'FedorEv4', 'Home Entrance 3'
 	elseif week > 5 and hour > 10:
-		'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></left>'
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></left>'
+		'<center><b><h4><font color="#FF00FF"><<"Regina Kozlov">></font></h4></b></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/regina.jpg"></center>'
 		'You knock on the door until Regina opens it and invites you inside.'
 		act 'Enter house':gt 'FedorEv4', 'Hallway'
 	else
@@ -3444,11 +3444,11 @@ end
 if $ARGS[0] = 'Home Entrance 3':
 	*clr & cla
 	menu_off = 1
-	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
+	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	if fedorKozlovQW = -15:
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 	end
 	'You knock on the door until Fedor opens it and invites you inside.'
 

+ 16 - 15
locations/FedorMisc.qsrc

@@ -23,7 +23,7 @@ end
 if $ARGS[0] = 'Fedor Chat':
 	*clr & cla
 	menu_off = 1
-	$metka = 'Fedor Chat'
+	$loc_arg = 'Fedor Chat'
 	$loc = 'FedorMisc'
 	numnpc = 5
 	minut += 5
@@ -68,7 +68,7 @@ if $ARGS[0] = 'Fedor Chat':
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 	
 	act 'Chat':
@@ -78,14 +78,14 @@ if $ARGS[0] = 'Fedor Chat':
 		if $loc = 'gdkin':minut += 5
 		gs 'stat'
 		if fedorKozlovQW = -10:
-			'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast1.jpg"></left>'
+			'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast1.jpg"></center>'
 		elseif fedorKozlovQW < -10:
-			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></left>'
+			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedormisc/outcast/outcast2.jpg"></center>'
 		else
-			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></left>'
-			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></left>'
+			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
+			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big5.jpg"></center>'
 		end
 
 		*nl
@@ -101,7 +101,7 @@ if $ARGS[0] = 'Fedor Chat':
 		if $loc ! 'gdkin':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
-			act 'Move away': gt $loc, $metka
+			act 'Move away': gt $loc, $loc_arg
 		end
 	end
 
@@ -132,14 +132,14 @@ if $ARGS[0] = 'Fedor Hate':
 	menu_off = 1
 	minut += 5
 	gs 'stat'
-	'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></left>'
-	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></left>'
+	'<center><b><h4><font color=#FF00FF><<"Fyodor [Masha] Kozlov">></font></h4></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
 	'Fedor looks at you with hatred as he says, "I have nothing to say to you. Go away!"'
 
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 end
 
@@ -160,7 +160,7 @@ if $ARGS[0] = 'Comb':
 	'<center><b><h4><font color=#ff00cc><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 
-	act 'Move away':gt $loc, $metka
+	act 'Move away':gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'Locker Room':
@@ -465,11 +465,12 @@ end
 
 if $ARGS[0] = 'Restroom':
 	*clr & cla
-	$metka = 'Restroom'
+	$loc_arg = 'Restroom'
 	$loc = 'FedorMisc'
-	$metkaM = 'Restroom'
+	$locM_arg = 'Restroom'
 	$locM = 'FedorMisc'
 	$location_type = 'bathroom'
+	$locclass = 'school_bathroom'
 	$menu_loc = 'FedorMisc'
 	$menu_arg = 'Restroom'
 	menu_off = 0

+ 11 - 11
locations/Gnpc.qsrc

@@ -131,7 +131,7 @@ if boytimes[numnpc] > 0 and otnBoyFrend[numnpc] > 40:
 end
 'You approach <<$nameBoyfrend[numnpc]>> and greet him<<$bfGreeting>>.'
 
-act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $loc_arg
 
 act 'Take a walk through the park':
 	cla
@@ -168,7 +168,7 @@ act 'Take a walk through the park':
 		'<<$nameBoyfrend[numnpc]>> stammers something and nods his head fearfully while crawling backwards. Then he jumps back on his feet und runs as fast as he can.'
 		'You doubt that you will ever see him again...'
 
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 
 		exit
 	end
@@ -178,12 +178,12 @@ act 'Take a walk through the park':
 	if gboyrand = 0:
 		'<<$nameBoyfrend[numnpc]>> offers to go to the movies.'
 
-		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $loc_arg
 		act 'Go to the cinema':gt 'Gnpc_cinema'
 	elseif gboyrand = 1:
 		'<<$nameBoyfrend[numnpc]>> suggests to drink some beers in the park.'
 
-		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $metka
+		act 'Apologize and leave': otnBoyFrend[numnpc] -= 5 & gt $loc, $loc_arg
 
 		act 'Go for a beer':
 			cla
@@ -234,7 +234,7 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again. Then you snatch the bills from his hand and leave.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 
 			act 'Dump him and throw the money in his face':
@@ -244,7 +244,7 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and throw the money in his face before storming off.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 
 		else
@@ -257,7 +257,7 @@ if preg = 1 and pregchem <= 1920 and npc_pregtalk[numnpc] = 0 and gnpcSex[numnpc
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and storm off.'
 
-				act 'Leave':gt $loc, $metka
+				act 'Leave':gt $loc, $loc_arg
 			end
 		end
 	end
@@ -288,7 +288,7 @@ if GboyBalabol[numnpc] = 1:
 				gs 'stat'
 				'You furiously scream at him that you never want to see him again and storm off.'
 
-				act 'Leave': gt $loc, $metka
+				act 'Leave': gt $loc, $loc_arg
 			end
 		else
 			act 'Break up with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -300,7 +300,7 @@ if GboyBalabol[numnpc] = 1:
 			gs 'stat'
 			'You think about what he said. Because of the rumours, a lot of people have already a bad opinion about you and you don''t want to lose your <<$bfTitle[numnpc]>>, too. So you reluctantly decide to forgive him.'
 
-			act 'Leave':gt $loc, $metka
+			act 'Leave':gt $loc, $loc_arg
 		end
 	end
 end
@@ -330,7 +330,7 @@ if (boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] >
 				gs 'stat'
 				'You tell <<$nameBoyfrend[numnpc]>> that it would be better if you don''t see each other again and that he should''t call you anymore. He just stares at you, so you decide to quickly leave before he overcomes his state of shock.'
 
-				act 'Leave': gt $loc, $metka
+				act 'Leave': gt $loc, $loc_arg
 			end
 		else
 			act 'Break up with him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -364,7 +364,7 @@ if (boytimes[numnpc] <= 4 and otnBoyFrend[numnpc] < 100) or (boytimes[numnpc] >
 						'"You know what? You can stuff your friendship! I''m outta here!", with these words he storms off.'
 					end
 
-					act 'Leave':gt $loc, $metka
+					act 'Leave':gt $loc, $loc_arg
 				end
 			else
 				act 'Just be friends (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 2 - 2
locations/HotelAdmin.qsrc

@@ -1,6 +1,6 @@
 # HotelAdmin
-$metka = $ARGS[0]
-$loc = $CURLOC
+$loc_arg = $ARGS[0]
+$loc = 'HotelAdmin'
 $location_type = 'event'
 menu_off = 1
 

+ 25 - 10
locations/HotelHole.qsrc

@@ -1,8 +1,7 @@
 # HotelHole
 
 CLOSE ALL
-$metka = $ARGS[0]
-$prevloc = $loc
+$loc_arg = $ARGS[0]
 $loc = $CURLOC
 $menu_loc = 'HotelHole'
 $menu_arg = ''
@@ -16,7 +15,7 @@ gs'stat'
 if $ARGS[0] = 'skip_resepevent': jump 'skipresepevent'
 
 if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3 and rand(1,10) = 10)):
-	if $prevloc ! 'HotelRoom':
+	if hotelroom = 0:
 		*clr
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
@@ -43,7 +42,12 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 			*clr & cla
 			observ_exp += 3
 			gs 'stat'
-			'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
+			if $prevloc = 'HotelRoom': 
+				'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
+			else 
+				'You find the door closed, and you realise that the receptionist and the manager are probably fooling around again. You carefully open the door with your key, and enter as quietly as you can.'
+				'Moving to the corner carefully, you sneak a glimpse.'
+			end
 			'You spy <<$receptionName>>. Yep, you nod, she''s already showing herself off to the cameras.'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event1.jpg"></center>'
 			'She flashes her breasts beneath a devilish smile.'
@@ -101,22 +105,29 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 			end
 			exit
 		elseif resepseen = 0:
+			temp = 1
 			observ_exp += rand(0,1)
+			'<center><H4>Pavlovsk hotel</H4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/sex/resep_event2.jpg"></center>'
 			'You enter the lobby and you can see the desk girl and the manager talking to each other.'
 			'When they notice you they both give you a very disappointing look.'
 			'You get the feeling you interrupted something here.'
+			*nl
 		end
 	end
 end
 
 :skipresepevent
-'<center><H4>Pavlovsk hotel</H4></center>'
-'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
-if pavHotelMaid = 0:
-	'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+if temp = 1:
+	killvar 'temp'
 else
-	'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where <<$receptionName>> is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	'<center><H4>Pavlovsk hotel</H4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
+	if pavHotelMaid = 0:
+		'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	else
+		'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where <<$receptionName>> is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+	end
 end
 
 if hour >= 12 and hour < 20 and proshotelopen = 1: '<a href="exec:gt ''HotelHole'',''Pavlin''">Pavlin</a> is sitting in the lobby looking around for fresh prey.'
@@ -125,7 +136,11 @@ if hour >= 12 and hour <= 13 and GermanQW > 0: 'Next to the reception desk, you
 
 if hotwait = 1: 'You go sit in one of the comfortable chairs in the lobby and watch the guests checking in an out.' & hotwait = 0
 
-act 'Leave the hotel':minut += 3 & gt'pav_train'
+act 'Leave the hotel':
+	minut += 3
+	killvar 'prevloc'
+	gt'pav_train'
+end
 
 if maidqw >= 1 and hour >= 16 and hour < 17:
 	act'<b>Work as a maid</b>':

+ 10 - 10
locations/HotelRoom.qsrc

@@ -3,9 +3,9 @@
 CLOSE ALL
 if $ARGS[0] = 'normal':
 	*clr & cla
-	$metkaM = 'normal'
+	$locM_arg = 'normal'
 	$locM = 'HotelRoom'
-	$metka = 'normal'
+	$loc_arg = 'normal'
 	$loc = 'HotelRoom'
 	$prevloc = $loc
 	$location_type = 'private'
@@ -40,9 +40,9 @@ end
 
 if $ARGS[0] = 'better':
 	*clr & cla
-	$metkaM = 'better'
+	$locM_arg = 'better'
 	$locM = 'HotelRoom'
-	$metka = 'better'
+	$loc_arg = 'better'
 	$loc = 'HotelRoom'
 	$prevloc = $loc
 	$menu_loc = 'HotelRoom'
@@ -78,9 +78,9 @@ end
 
 if $ARGS[0] = 'best':
 	*clr & cla	
-	$metkaM = 'best'
+	$locM_arg = 'best'
 	$locM = 'HotelRoom'
-	$metka = 'best'
+	$loc_arg = 'best'
 	$loc = 'HotelRoom'
 	$prevloc = $loc
 	$menu_loc = 'HotelRoom'
@@ -119,9 +119,9 @@ if $ARGS[0] = 'shower1':
 	*clr & cla
 	minut += 1
 	hotelShampoo = 1
-	$metkaM = 'shower1'
+	$locM_arg = 'shower1'
 	$locM = 'HotelRoom'
-	$metka = 'shower1'
+	$loc_arg = 'shower1'
 	$loc = 'HotelRoom'	
 	$location_type = 'bathroom'
 	gs 'themes', 'indoors'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'tv':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/tv<<hotelroom>>.jpg"></center>'
 	'You turn on the TV and make yourself comfortable on the bed.'
 
-	act 'Get up from the bed':gt $locM, $metkaM
+	act 'Get up from the bed':gt $loc, $loc_arg
 	act 'Watch TV (1:00)': gt 'hotelroom', 'watch_tv'
 end
 
@@ -169,7 +169,7 @@ if $ARGS[0] = 'watch_tv':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/tv0,'+rand(0,4)+'.jpg"></center>'
 	'You are watching the country''s main television channel. None of their programs are really worth watching, but the distraction is welcome anyway.'
 
-	act 'Get up from the bed':gt $locM, $metkaM
+	act 'Get up from the bed':gt $loc, $loc_arg
 	act 'Watch TV (1:00)': gt 'hotelroom', 'watch_tv'
 end
 

+ 1 - 1
locations/HotelWork.qsrc

@@ -237,7 +237,7 @@ if $ARGS[0] = 'firsthotelprosevent':
 end
 
 if $ARGS[0] = 'maid':
-	$metka = 'maid'
+	$loc_arg = 'maid'
 	$loc = 'HotelWork'
 	$menu_loc = 'HotelWork'
 	$menu_arg = 'maid'

+ 2 - 2
locations/IvanEv.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = 'School Chat':
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 	
 	if npc_rel['A3'] >= 80 and NikoPayback > 1 and IvanVsNiko = 0:act 'Ask for help with Niko': gt 'NikoPayback', 'Ivan Help'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'School Chat':
 			gs 'nogorslut'
 			gs 'yesgorslut'
 
-			act 'Move away':gt $loc, $metka
+			act 'Move away':gt $loc, $loc_arg
 		end
 	end
 end

+ 1 - 1
locations/KatjaHomeTalk.qsrc

@@ -191,7 +191,7 @@ if $ARGS[0] = '':
 				act 'Further':gt 'KatjaHomeTalk'
 			end
 
-			if npc_sex['A14'] = 1:
+			if npc_sex['A14'] > 0:
 				act 'Offer to take a walk in the Park':
 					minut += 15
 					KatjaHorny += 5

+ 8 - 8
locations/Katja_Tanga.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'school3':
 	'You give a slightly disappointed frown. "So still wearing panties huh.", Katja blushes and whispers to you. "Yes but I''m not wearing a bra."'
 	act 'Share':
 		*clr & cla
-		gs 'arousal', 'voyeur', -5
+		gs 'arousal', 'erotic', -5
 		gs 'arousal', 'foreplay', -5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -182,7 +182,7 @@ if $ARGS[0] = 'school4':
 		'Dejected at her reaction. "Fine, whatever.", You said as you turned to go. Katja afraid that she had offended you, grabs your hand and pulls you into a passionate kiss. "Don''t pout sweetie, I''m sorry. Let me make it up to you." she says.'
 		act 'Watch':
 			*clr & cla
-			gs 'arousal', 'voyeur', -5
+			gs 'arousal', 'erotic', -5
 			if n_tanga = 1:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_2.jpg"></center>'
 				'Katja sits down on the floor and parts her legs as she pulls aside her panties.'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'school4':
 				'Turning away from you and bending over Katja lifts up her skirt and pulls down her panties, showing you her lovely ass and pussy. She starts to pull up her panties as you say pouting. "Is that it?"'
 				act '"What that''s all?"':
 					*clr & cla
-					gs 'arousal', 'voyeur', -5
+					gs 'arousal', 'erotic', -5
 					gs 'arousal', 'end'
 					Katja_tanga = 1 & ! 1 = Katja without panties 0 = in panties
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tanga5_5.jpg"></center>'
@@ -212,7 +212,7 @@ end
 
 if $ARGS[0] = 'school5':
 	*clr & cla
-	gs 'arousal', 'voyeur', -5
+	gs 'arousal', 'erotic', -5
 	gs 'arousal', 'end'
 	KatjaSlut += 1
 	Katja_tanga = 1 & ! 1 = Katya without panties 0 = in panties
@@ -239,13 +239,13 @@ if $ARGS[0] = 'dance':
 			'But Katja only blushed in embarrassment, clasping her hands. "I''m not as brave as you to go to a dance without my panties on."'
 			gs 'arousal', 'end'
 		elseif KatjaSlut <= 40:
-			gs 'arousal', 'voyeur', -5
+			gs 'arousal', 'erotic', -5
 			gs 'arousal', 'end'
 			KatjaHorny += 10
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco4.jpg"></center>'
 			'Katja looked around to make sure no one was watch and then turns away and partially bends over lifting her skirt. Showing you she was wearing a thong and giving you a nice view of her ass.'
 		elseif KatjaSlut <= 60:
-			gs 'arousal', 'voyeur', -5
+			gs 'arousal', 'erotic', -5
 			gs 'arousal', 'end'
 			KatjaHorny += 10
 			KatjaSlut += 1
@@ -259,7 +259,7 @@ if $ARGS[0] = 'dance':
 			end
 		elseif KatjaSlut <= 80:
 			if	KatjaHorny > 70:
-				gs 'arousal', 'voyeur', -5
+				gs 'arousal', 'erotic', -5
 				KatjaHorny += 10
 				KatjaSlut += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_disco6_1.jpg"></center>'
@@ -288,7 +288,7 @@ if $ARGS[0] = 'dance':
 				'You began to look on with anticipation, but Katja just pulls down her top showing a little extra cleavage before stopping. After seeing your disappointed look,  she sticks out her tongue and turns away. That redheaded bitch you think and nearly say it, but you hold your tongue.'
 			end
 		else
-			gs 'arousal', 'voyeur', -10
+			gs 'arousal', 'erotic', -10
 			gs 'arousal', 'end'
 			KatjaHorny += 10
 			KatjaSlut += 1

+ 7 - 7
locations/Katlake.qsrc

@@ -6,7 +6,7 @@ gs 'stat'
 'The warm rays of sun on your naked body feel nice, but at the same time... you have nothing to do! You get bored just lying there and kill the time by looking around you, examining the other beach-goers.'
 'After a few minutes, a beautiful girl lies down near you. She''s truly gorgeous, and you can''t help but stare in her direction every once in a while.'
 
-act 'Ignore her':gt 'city_nudelake'
+act 'Ignore her':gt 'Nudelake'
 
 gs 'willpower', 'misc', 'self', 'easy'
 if will_cost <= pcs_willpwr:
@@ -32,7 +32,7 @@ if $ARGS[0] = 'znakomstvo':
 		'The girl wrinkles her nose when she sees you, but says nothing. She keeps giving you a cold stare that indicates that she wants nothing to do with you.'
 		'"Damn, that didn''t go well", you think to yourself while you walk away, a bit disheartened. You look at her again from a distance, and notice how perfect she looks. She must spend a lot of time on trying to look good every day... maybe that''s why she didn''t like you?'
 
-		act 'Continue sunbathing until the hour is over':gt 'city_nudelake'
+		act 'Continue sunbathing until the hour is over':gt 'Nudelake'
 	else
 		cla
 		clr
@@ -50,7 +50,7 @@ if $ARGS[0] = 'znakomstvo':
 		'"<<$pcs_nickname>>", you exhale with relief. Feeling a lot more at ease, you have a nice conversation with her for another half hour while you enjoy the warmth of the sun together.'
 		'Then she has to go, and says: "This was nice! Maybe I''ll see you around here more often?"'
 
-		act 'Finish':gt 'city_nudelake'
+		act 'Finish':gt 'Nudelake'
 	end
 end
 
@@ -64,7 +64,7 @@ if $ARGS[0] = 'kat':
 	'Kat already noticed you walking towards her, and gives you a little wave as you approach her.'
 	'She smiles: "Hi <<$pcs_nickname>>, how''s it going?"'
 
-	act 'Leave':gt 'city_nudelake'
+	act 'Leave':gt 'Nudelake'
 	act 'Suggest playing volleyball':gt 'Katlake', 'voleybol'
 	act 'Suggest going for a walk':gt 'Katlake', 'walk'
 
@@ -77,7 +77,7 @@ if $ARGS[0] = 'kat':
 		pcs_mood += 20
 		'Time flies when you lie on the beach with Kat, exchanging stories with her. She is an excellent conversationalist, and you enjoy talking with her.'
 
-		act 'Leave':gt 'city_nudelake'
+		act 'Leave':gt 'Nudelake'
 	end
 end
 
@@ -97,7 +97,7 @@ if $ARGS[0] = 'voleybol':
 	'You spend the next half hour in a fierce competition, and have a lot of fun playing volleyball with Kat on your team.'
 	'At one point when you fumble and miss the ball, Kat slaps your ass playfully. Her hand stays on your buttocks for way longer than you expected, and she squeezes gently before finally letting go. She gives you a goofy smile and focuses on the game again, but for the rest of the game you can''t help but keep thinking of her hand on your ass, and how nice it felt...'
 
-	act 'Finish':gt 'city_nudelake'
+	act 'Finish':gt 'Nudelake'
 end
 
 if $ARGS[0] = 'walk':
@@ -112,7 +112,7 @@ if $ARGS[0] = 'walk':
 	if kwalrand >= 80 and kwalrand < 90 and npc_rel['A219'] > 20:gt 'Kwlake1'
 	if kwalrand >= 90 and npc_rel['A219'] > 20:gt 'Kwlake2'
 
-	act 'Finish':gt 'city_nudelake'
+	act 'Finish':gt 'Nudelake'
 end
 
 

+ 12 - 7
locations/Komp.qsrc

@@ -22,14 +22,16 @@ if $ARGS[0] = 'start':
 		internet = 100000
 		act 'Browse the internet':gt 'komp', 'brows'
 	elseif $loc = 'dachain':
+		internet_store = internet
 		internet = 0
 	else	
 		'You have <<internet>> hours of prepaid internet access remaining.'
 		if internet > 0: act 'Browse the internet':gt 'komp', 'brows'
 	end
 
-	act 'Shut your computer down': gt 'komp', 'fin'
-
+	act 'Shut your computer down': 
+		gt 'komp', 'fin'
+	end
 end
 
 if $ARGS[0] = 'brows':
@@ -37,7 +39,7 @@ if $ARGS[0] = 'brows':
 	gs 'stat'
 	
 	act 'Close the browser':
-		if $loc = 'shulga_room' or $loc = 'anushapt':
+		if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome' or $loc = 'dachain':
 			internet = internet_store
 			killvar 'internet_store'
 		end
@@ -155,7 +157,7 @@ if $ARGS[0] = 'porno':
 			'<center><img <<$set_imgh>> src="images/shared/accessories/computer/porno.jpg"></center>'
 			'You find a video you think you''d enjoy, and spend some time watching it. Wow, that girl is so lucky...'
 
-			gs 'arousal', 'voyeur_sex', 60
+			gs 'arousal', 'porn', 60
 			gs 'stat'
 
 			act 'The video ends...':gt 'komp', 'porno'
@@ -237,7 +239,7 @@ if $ARGS[0] = 'znak':
 
 			act 'Leave this website':gt 'komp', 'brows'
 		end
-	elseif home_cur ! 1 and home_cur ! 2 and home_cur ! 3 and home_cur ! 4 and home_cur ! 5:
+	elseif curr_home ! 1 and curr_home ! 2 and curr_home ! 3 and curr_home ! 4 and curr_home ! 5:
 		pcs_mood += rand(5, 10)
 		'You spend time looking at the various profiles, but it won''t let you register unless you have your own home and it is set as your current home.'
 		'Still, some of the pictures were quite raunchy and the more desperate profiles were really funny.'
@@ -1846,8 +1848,11 @@ if $ARGS[0] = 'hotornot':
 end
 
 if $ARGS[0] = 'fin': 
-	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'dachain': internet = internetS
-	gt $loc, $metka
+	if $loc = 'shulga_room' or $loc = 'anushapt' or $loc = 'artemhome' or $loc = 'dachain': 
+		internet = internet_store
+		killvar 'internet_store'
+	end
+	gt $loc, $loc_arg
 end
 
 

+ 3 - 3
locations/Kwlake1.qsrc

@@ -41,7 +41,7 @@ act 'Fondle her':
 			act 'Break it off (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'city_nudelake'
+				gt 'Nudelake'
 			end
 		else
 			act 'Break it off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -92,7 +92,7 @@ act 'Fondle her':
 						gs 'arousal', 'end'
 						gs 'stat'
 						
-						act 'Continue':gt 'city_nudelake'
+						act 'Continue':gt 'Nudelake'
 					end
 				end
 			end
@@ -106,7 +106,7 @@ if $ARGS[0] = 'end':
 	'Kat laughs with you, and says: "Hey! I know how to make a man want me, so I can then make him do whatever I want..."'
 	'She tosses the rock to the side carelessly, and you continue on your walk.'
 
-	act 'Continue':gt 'city_nudelake'
+	act 'Continue':gt 'Nudelake'
 end
 
 --- Kwlake1 ---------------------------------

+ 3 - 3
locations/Kwlake2.qsrc

@@ -7,7 +7,7 @@ gs 'stat'
 'While you''re walking along the beach, Kat notices a man sitting by himself.'
 '"Let''s tease him for a while!" Kat suggests, pointing at the guy.'
 
-act '"Nah, let''s keep walking"':gt 'city_nudelake'
+act '"Nah, let''s keep walking"':gt 'Nudelake'
 
 act '"Alright!"':
 	cla
@@ -28,7 +28,7 @@ act '"Alright!"':
 		act 'That''s enough! Leave before this gets out of hand (<<will_cost>> Willpower)':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'city_nudelake'
+			gt 'Nudelake'
 		end
 	else
 		act 'That''s enough! Leave before this gets out of hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -82,7 +82,7 @@ act '"Alright!"':
 				gs 'arousal', 'end'
 				gs 'stat'
 		
-				act 'Finish your walk':gt 'city_nudelake'
+				act 'Finish your walk':gt 'Nudelake'
 			end
 		end
 	end

+ 16 - 0
locations/LOCA.qsrc

@@ -2,6 +2,22 @@
 
 if settingmode!0: killvar '$cheatmenu'
 
+!{
+msg "Changed Location 
+	$menu_loc		<<$menu_loc>> 
+	$menu_arg		<<$menu_arg>> 
+	$loc_arg			<<$loc_arg>> 
+	$loc			<<$loc>> 
+	$location_type	<<$location_type>> 
+	$locM			<<$locM>>
+	$locclass		<<$locclass>>"
+
+msg "Changed Location 
+	$loc			<<$loc>> 
+	$location_type	<<$location_type>> 
+	$locclass		<<$locclass>>"
+}
+
 if mod_list > 0:
 	mod_i=1
 	:mod_exec

+ 2 - 2
locations/LakeBoyZ.qsrc

@@ -95,7 +95,7 @@ $gL_boy_z = {
 							act 'Follow him to his house':
 								if $clothingworntype = 'nude':
 									gs 'clothing', 'wear_last_worn'
-									if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+									if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 									gt 'LBZhouse'
 								else
 									gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
@@ -112,7 +112,7 @@ $gL_boy_z = {
 							if $clothingworntype = 'nude':
 								gs 'clothing', 'wear_last_worn'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changenude.jpg"></center>'
-								if $clothingworntype = 'swimwear':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
+								if $clothingworntype = 'swimwear' or $clothingworntype = 'beach':gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 							else
 								gs 'clothing', 'wear', $normalclothingworntype, normalclothingwornno
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/changebikini.jpg"></center>'

+ 2 - 2
locations/MBallroom.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'ballroom':
     $location_type = 'private'
 	$loc = 'MBallroom'
-	$metka = 'ballroom'
+	$loc_arg = 'ballroom'
 	$menu_loc = 'MBallroom'
 	$menu_arg = 'ballroom'
 	menu_off = 0
@@ -19,7 +19,7 @@ end
 if $ARGS[0] = 'atrium':
     $location_type = 'private'
 	$loc = 'MBallroom'
-	$metka = 'atrium'
+	$loc_arg = 'atrium'
 	$menu_loc = 'MBallroom'
 	$menu_arg = 'atrium'
 	menu_off = 0

+ 1 - 1
locations/MBasement.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'start':
 	$location_type = 'private'
 	$loc = 'MBasement'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'MBasement'
 	$menu_arg = 'start'
 

+ 3 - 3
locations/MBathrooms.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'bath':
     $location_type = 'bathroom'
 	$loc = 'MBathrooms'
-	$metka = 'bath'
+	$loc_arg = 'bath'
 	$menu_loc = 'MBathrooms'
 	$menu_arg = 'bath'
 	menu_off = 0
@@ -16,7 +16,7 @@ end
 if $ARGS[0] = 'ensuite':
     $location_type = 'bathroom'
 	$loc = 'MBathrooms'
-	$metka = 'ensuite'
+	$loc_arg = 'ensuite'
 	$menu_loc = 'MBathrooms'
 	$menu_arg = 'ensuite'
 	menu_off = 0
@@ -28,7 +28,7 @@ end
 if $ARGS[0] = 'restroom':
     $location_type = 'bathroom'
 	$loc = 'MBathrooms'
-	$metka = 'restroom'
+	$loc_arg = 'restroom'
 	$menu_loc = 'MBathrooms'
 	$menu_arg = 'restroom'
 	menu_off = 0

+ 1 - 1
locations/MConservatory.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MConservatory'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MConservatory'
 $menu_arg = ''
 menu_off = 0

+ 1 - 1
locations/MDining.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MDining'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MDining'
 $menu_arg = ''
 menu_off = 0

+ 5 - 5
locations/MDressing.qsrc

@@ -1,11 +1,11 @@
 # MDressing
-$metka = $ARGS[0]
-$loc = $CURLOC
-$metkaM = $ARGS[0]
-$locM = $CURLOC
+$loc_arg = $ARGS[0]
+$loc = 'MDressing'
+$locM_arg = $ARGS[0]
+$locM = 'MDressing'
 $location_type = 'private'
 $loc = 'MDressing'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MDressing'
 $menu_arg = ''
 menu_off = 0

+ 3 - 3
locations/MEastbed.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'guestB':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MEastbed'
-	$metka = 'guestB'
+	$loc_arg = 'guestB'
 	$menu_loc = 'MEastbed'
 	$menu_arg = 'guestB'
 	menu_off = 0
@@ -74,7 +74,7 @@ if $ARGS[0] = 'guestC':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MEastbed'
-	$metka = 'guestC'
+	$loc_arg = 'guestC'
 	$menu_loc = 'MEastbed'
 	$menu_arg = 'guestC'
 	menu_off = 0
@@ -142,7 +142,7 @@ if $ARGS[0] = 'guestD':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MEastbed'
-	$metka = 'guestD'
+	$loc_arg = 'guestD'
 	$menu_loc = 'MEastbed'
 	$menu_arg = 'guestD'
 	menu_off = 0

+ 1 - 1
locations/MGames.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MGames'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MGames'
 $menu_arg = ''
 menu_off = 0

+ 3 - 3
locations/MHall.qsrc

@@ -4,7 +4,7 @@ CLOSE ALL
 if $ARGS[0] = 'foyer':
     $location_type = 'private'
 	$loc = 'MHall'
-	$metka = 'foyer'
+	$loc_arg = 'foyer'
 	$menu_loc = 'MHall'
 	$menu_arg = 'foyer'
 	menu_off = 0
@@ -36,7 +36,7 @@ end
 if $ARGS[0] = 'west':
     $location_type = 'private'
 	$loc = 'MHall'
-	$metka = 'west'
+	$loc_arg = 'west'
 	$menu_loc = 'MHall'
 	$menu_arg = 'west'
 	menu_off = 0
@@ -54,7 +54,7 @@ end
 if $ARGS[0] = 'east':
     $location_type = 'private'
 	$loc = 'MHall'
-	$metka = 'east'
+	$loc_arg = 'east'
 	$menu_loc = 'MHall'
 	$menu_arg = 'east'
 	menu_off = 0

+ 3 - 3
locations/MKitchen.qsrc

@@ -4,7 +4,7 @@ $location_type = 'private'
 if $ARGS[0] = 'kitchen':
 	$locclass = 'kitr'
 	$loc = 'MKitchen'
-	$metka = 'kitchen'
+	$loc_arg = 'kitchen'
 	$menu_loc = 'MKitchen'
 	$menu_arg = 'kitchen'
 	menu_off = 0
@@ -16,7 +16,7 @@ end
 
 if $ARGS[0] = 'laundry':
 	$loc = 'MKitchen'
-	$metka = 'laundry'
+	$loc_arg = 'laundry'
 	$menu_loc = 'MKitchen'
 	$menu_arg = 'laundry'
 	menu_off = 0
@@ -28,7 +28,7 @@ end
 
 if $ARGS[0] = 'pantry':
 	$loc = 'MKitchen'
-	$metka = 'pantry'
+	$loc_arg = 'pantry'
 	$menu_loc = 'MKitchen'
 	$menu_arg = 'pantry'
 	menu_off = 0

+ 2 - 2
locations/MLanding.qsrc

@@ -5,7 +5,7 @@ killvar '$locclass'
 if $ARGS[0] = 'west':
 	*clr & cla
 	$loc = 'MLanding'
-	$metka = 'west'
+	$loc_arg = 'west'
 	$menu_loc = 'MLanding'
 	$menu_arg = 'west'
 	menu_off = 0
@@ -36,7 +36,7 @@ if $ARGS[0] = 'east':
 	*clr & cla
 	killvar '$locclass'
 	$loc = 'MLanding'
-	$metka = 'east'
+	$loc_arg = 'east'
 	$menu_loc = 'MLanding'
 	$menu_arg = 'east'
 	menu_off = 0

+ 1 - 1
locations/MLibrary.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'private'
 $loc = 'MLibrary'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MLibrary'
 $menu_arg = ''
 menu_off = 0

+ 1 - 1
locations/MLiving.qsrc

@@ -3,7 +3,7 @@
 $location_type = 'private'
 $locclass = 'livingr'
 $loc = 'MLiving'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'MLiving'
 $menu_arg = ''
 menu_off = 0

+ 2 - 2
locations/MRear.qsrc

@@ -3,7 +3,7 @@ $location_type = 'private'
 
 if $ARGS[0] = 'garden':
 	$loc = 'MRear'
-	$metka = 'garden'
+	$loc_arg = 'garden'
 	$menu_loc = 'MRear'
 	$menu_arg = 'garden'
 	menu_off = 0
@@ -223,7 +223,7 @@ end
 if $ARGS[0] = 'garage':
 	*clr & cla
 	$loc = 'MRear'
-	$metka = 'garage'
+	$loc_arg = 'garage'
 	$menu_loc = 'MRear'
 	$menu_arg = 'garage'
 	menu_off = 0

+ 2 - 2
locations/MWestbed.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'master':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MWestbed'
-	$metka = 'master'
+	$loc_arg = 'master'
 	$menu_loc = 'MWestbed'
 	$menu_arg = 'master'
 	menu_off = 0
@@ -70,7 +70,7 @@ if $ARGS[0] = 'guest':
     $location_type = 'private'
 	$locclass = 'bedr'
 	$loc = 'MWestbed'
-	$metka = 'guest'
+	$loc_arg = 'guest'
 	$menu_loc = 'MWestbed'
 	$menu_arg = 'guest'
 	menu_off = 0

+ 10 - 10
locations/MagEncounterFairy.qsrc

@@ -6,20 +6,20 @@ if $ARGS[0] = '':
 	if knowsfairy = 1:
 		if fairyshoo = 0:
 			act 'Look for the fairy to chat': gt 'MagEncounterFairy', 'fairy_chat'
-			act 'Just be on your way': gt $loc, $metka
+			act 'Just be on your way': gt $loc, $loc_arg
 		else
 			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 2): act 'Be nice and chat with the fairy': gt 'MagEncounterFairy', 'fairy_chat'
-			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $metka
+			if pcs_mana >= ((pcs_intel * pcs_magik + pcs_magik * 100 + pcs_vital * 10 + rikudo) / 4): act 'Just ignore the fairy': gt $loc, $loc_arg
 			act 'Shoo the pesky fairy away': gt 'MagEncounterFairy', 'fairy_shoo'
 		end
 	elseif pcs_magik + rand (1,10) >= 8:
 		act 'Investigate the strange glow': gt 'MagEncounterFairy', 'fairy_chat_no1'
 		act 'Shoo the pesky firefly away': gt 'MagEncounterFairy', 'fairy_shoo'
-		act 'Ignore the firefly': fairyskip = 1 & gt $loc, $metka
+		act 'Ignore the firefly': fairyskip = 1 & gt $loc, $loc_arg
 	else
 		gs 'stat'
 		'You have the strange feeling of being watched, but looking around you don''t see anybody.'
-		act 'Shake off the feeling and move on': fairyskip = 1 & gt $loc, $metka
+		act 'Shake off the feeling and move on': fairyskip = 1 & gt $loc, $loc_arg
 	end
 end
 
@@ -51,7 +51,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 		else
 			'The fairy waves goodbye to you and flies away.'
 		end
-		act 'Wave goodbye':gt $loc, $metka
+		act 'Wave goodbye':gt $loc, $loc_arg
 	end
 end
 
@@ -68,14 +68,14 @@ if $ARGS[0] = 'fairy_shoo':
 		'Stunned by surprise you take a closer look at what you thought was a firefly. In the glow you can see a small woman with fluttering wings on her back. It''s a fairy! Taking advantage of your bewilderment she blows something sparkling in your face. Flabbergasted as you are you inhale the substance.'
 		'Instantly you become completely horny and your face flushes with arousal.'
 		'"Maybe this will teach you." she says with a pout and flies off.'
-		act 'Move along':gt $loc, $metka
+		act 'Move along':gt $loc, $loc_arg
 	else
 		fairyshoo += 1
 		pcs_horny = 90
 		fairycurse = daystart + (fairyshoo - 1) * 2
 		gs 'stat'
 		'"Still a meanie, I see!", squeals the fairy "Well, have it your way."'
-		act 'Get away from the fairy': gt $loc, $metka
+		act 'Get away from the fairy': gt $loc, $loc_arg
 	end
 end
 
@@ -125,7 +125,7 @@ if $ARGS[0] = 'fairy_chat':
 				cla
 				*nl
 				'You look at her, puzzled, wondering if you heard her right.  She just shrugs her shoulders and says "Okay, if you''re not interested"'
-				act 'Go on your way': gt $loc, $metka
+				act 'Go on your way': gt $loc, $loc_arg
 			end
 			act 'Sure':
 				cla
@@ -184,7 +184,7 @@ if $ARGS[0] = 'fairy_chat':
 					'You hear a giggle, then sparkles surround your body and you get all tingly.'
 					'You suddenly feel colder and less aroused then before.'
 				end
-				act 'Go on your way': gt $loc, $metka
+				act 'Go on your way': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -266,7 +266,7 @@ if $ARGS[0] = 'fairychattopic':
 		end
 	end
 
-	act 'Go on your way': killvar 'frandchat' & gt $loc, $metka
+	act 'Go on your way': killvar 'frandchat' & gt $loc, $loc_arg
 
 end
 

+ 7 - 7
locations/MeynoldHome.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'Aftermath 2':
 end	
 
 if $ARGS[0] = 'Hallway':
-	$metka = 'Hallway'
+	$loc_arg = 'Hallway'
 	$loc = 'NikoMeyHome'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Hallway'
@@ -174,7 +174,7 @@ end
 if $ARGS[0] = 'Kitchen':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Kitchen'
+	$loc_arg = 'Kitchen'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Kitchen'
 	menu_off = 0
@@ -202,7 +202,7 @@ end
 if $ARGS[0] = 'Lounge':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Lounge'
+	$loc_arg = 'Lounge'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Lounge'
 	menu_off = 0
@@ -247,7 +247,7 @@ end
 if $ARGS[0] = 'Katja Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Katja Room'
+	$loc_arg = 'Katja Room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Katja Room'
 	menu_off = 0
@@ -287,7 +287,7 @@ end
 if $ARGS[0] = 'Vicky Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Vicky room'
+	$loc_arg = 'Vicky room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Vicky room'
 	menu_off = 0
@@ -812,8 +812,8 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	$locM = 'NikoMeyHome'
-	$metkaM = 'Bathroom'
-	$metka = 'Bathroom'
+	$locM_arg = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Bathroom'
 	menu_off = 0

+ 1 - 1
locations/Military.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	$metka = $ARGS[0]
+	$loc_arg = $ARGS[0]
 	$loc = 'Military'
 	$sexloc = 'Military'
 	$menu_loc = 'Military'

+ 30 - 22
locations/NewCloShop.qsrc

@@ -2,10 +2,11 @@
 $location_type = 'event'
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'NewCloShop'
 	$menu_loc = 'NewCloShop'
 	$menu_arg = 'start'
+	killvar '$locclass'
 	menu_off = 0
 	!!Variable for buying underwear for Natasha so it only procs once per changingroom event
 	NatbelQW['underwearShop'] = 0
@@ -36,7 +37,7 @@ end
 
 if $ARGS[0] = 'changingroom':
 	$locclass = 'changingroom'
-	$metka = 'changingroom'
+	$loc_arg = 'changingroom'
 	$loc = 'NewCloShop'
 	$menu_loc = 'NewCloShop'
 	$menu_arg = 'changingroom'
@@ -131,7 +132,7 @@ end
 
 if $ARGS[0] = 'dressingclothes':
 	*clr & cla
-	$metka = 'dressingclothes'
+	$loc_arg = 'dressingclothes'
 	$loc = 'NewCloShop'
 	!clorand = rand(1,ARRSIZE('expensive'))
 	!gt 'clothing', 'view_clothing_item', 'shop', 'expensive', clorand, 8000
@@ -148,18 +149,25 @@ if $ARGS[0] = 'dressingclothes':
 		gt 'NewCloShop', 'changingroom'
 	end
 
-	i = Clothingstock +1
+	clothingfilter['qualitycheck'] = 7
+	:loopquality
+		i = Clothingstock +1
 
-	if Clothingstock - 12 > 0:i -= 12
+		if Clothingstock - 12 > 0:i -= 12
 
-	:loopexpensive2
-		if expensive[i] = 0:
-			gs 'clothing_attributes', 'expensive', i
-			gs 'clothing_QV', 'shop_filter'
-			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingshmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>  '
-		end
-		i += 12
-	if i <= 433:jump 'loopexpensive2'
+		:loopexpensive2
+			if expensive[i] = 0:
+				gs 'clothing_attributes', 'expensive', i
+				gs 'clothing_QV', 'shop_filter'
+
+				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
+
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingshmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>  '
+				end
+			end
+			i += 12
+		if i <= 433:jump 'loopexpensive2'
+	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality'
 end
 
 if $ARGS[0] = 'dressingshmotmag':
@@ -174,7 +182,7 @@ if $ARGS[0] = 'dressingshmotmag':
 end
 
 if $ARGS[0] = 'dressingbra':
-	$metka = 'dressingbra'
+	$loc_arg = 'dressingbra'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla
@@ -191,7 +199,7 @@ if $ARGS[0] = 'dressingbra':
 	:loopfashionista_bras2
 		if fashionista_bras[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingbras2''"><img src="images/pc/bras/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 38:jump 'loopfashionista_bras2'
+	if i <= 42:jump 'loopfashionista_bras2'
 end
 
 if $ARGS[0] = 'dressingbras2':
@@ -215,7 +223,7 @@ if $ARGS[0] = 'changingend':
 end
 
 if $ARGS[0] = 'dressingpanties':
-	$metka = 'dressingpanties'
+	$loc_arg = 'dressingpanties'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla
@@ -232,7 +240,7 @@ if $ARGS[0] = 'dressingpanties':
 	:loopfashionista_panties2
 		if fashionista_panties[i] = 0:*p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''dressingpanties2''"><img src="images/pc/panties/fashionista/<<i>>.jpg" 	height="150" /></a> '
 		i += 1
-	if i <= 75:jump 'loopfashionista_panties2'
+	if i <= 79:jump 'loopfashionista_panties2'
 end
 
 if $ARGS[0] = 'dressingpanties2':
@@ -249,7 +257,7 @@ end
 
 !! Old code
 if $ARGS[0] = 'clothes':
-	$metka = 'clothes'
+	$loc_arg = 'clothes'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla
@@ -277,7 +285,7 @@ if $ARGS[0] = 'clothes':
 			if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''NewCloShop'', ''shmotmag''"><img src="images/pc/clothing/3expensive/<<i>>.jpg" 	height="250" /></a>'
 		end
 		i += 12
-	if i <= 425:jump 'loopexpensive'
+	if i <= 442:jump 'loopexpensive'
 end
 
 if $ARGS[0] = 'shmotmag':
@@ -292,7 +300,7 @@ if $ARGS[0] = 'shmotmag':
 end
 
 if $ARGS[0] = 'panties':
-	$metka = 'panties'
+	$loc_arg = 'panties'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla
@@ -325,7 +333,7 @@ if $ARGS[0] = 'panties2':
 end
 
 if $ARGS[0] = 'bras':
-	$metka = 'bras'
+	$loc_arg = 'bras'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla
@@ -357,7 +365,7 @@ if $ARGS[0] = 'bras2':
 end
 
 if $ARGS[0] = 'purses':
-	$metka = 'purses'
+	$loc_arg = 'purses'
 	$loc = 'NewCloShop'
 	menu_off = 1
 	*clr & cla

+ 2 - 2
locations/NikoDates.qsrc

@@ -848,9 +848,9 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	*clr & cla
-	$metka = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$loc = 'NikoDates'
-	$metkaM = 'Bathroom'
+	$locM_arg = 'Bathroom'
 	$locM = 'NikoDates'
 	$location_type = 'bathroom'
 	minut += 5

+ 1 - 0
locations/NikoEv2.qsrc

@@ -89,6 +89,7 @@ if $ARGS[0] = 'Home Date':
 end
 
 if $ARGS[0] = 'Reward':
+	killvar '$locclass'
 	*clr & cla
 	gs 'boyStat', 'A190'
 	if pav_sex < 230:pav_sex = 250 

+ 7 - 7
locations/NikoMeyHome.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'Aftermath 2':
 end	
 
 if $ARGS[0] = 'Hallway':
-	$metka = 'Hallway'
+	$loc_arg = 'Hallway'
 	$loc = 'NikoMeyHome'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Hallway'
@@ -174,7 +174,7 @@ end
 if $ARGS[0] = 'Kitchen':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Kitchen'
+	$loc_arg = 'Kitchen'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Kitchen'
 	menu_off = 0
@@ -202,7 +202,7 @@ end
 if $ARGS[0] = 'Lounge':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Lounge'
+	$loc_arg = 'Lounge'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Lounge'
 	menu_off = 0
@@ -247,7 +247,7 @@ end
 if $ARGS[0] = 'Katja Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Katja Room'
+	$loc_arg = 'Katja Room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Katja Room'
 	menu_off = 0
@@ -287,7 +287,7 @@ end
 if $ARGS[0] = 'Vicky Room':
 	*clr & cla
 	$loc = 'NikoMeyHome'
-	$metka = 'Vicky room'
+	$loc_arg = 'Vicky room'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Vicky room'
 	menu_off = 0
@@ -814,8 +814,8 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	$locM = 'NikoMeyHome'
-	$metkaM = 'Bathroom'
-	$metka = 'Bathroom'
+	$locM_arg = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$menu_loc = 'NikoMeyHome'
 	$menu_arg = 'Bathroom'
 	menu_off = 0

+ 17 - 13
locations/NikoSlut.qsrc

@@ -3,6 +3,7 @@
 menu_off = 1
 
 if $ARGS[0] = 'Customers':
+	killvar '$locclass'
 	if NikoSlut = 2 and NikoDiner > 0:
 		NikoCust = rand(1,16)
 		if NikoDinerSlut >= 18 and VKBikerAttack = 0 and VKWip = 100:
@@ -1301,6 +1302,7 @@ if $ARGS[0] = 'Diner Exterior':
 end
 
 if $ARGS[0] = 'Diner Interior':
+	killvar '$locclass'
 	*clr & cla
 	if $YurikEv['Name'] = '':$YurikEv['Name'] = 'a burly bearded man'
 	gs'stat'
@@ -1404,11 +1406,12 @@ end
 
 if $ARGS[0] = 'Mens Restroom':
 	*clr & cla
-	$metka = 'Mens Restroom'
+	$loc_arg = 'Mens Restroom'
 	$loc = 'NikoSlut'
-	$metkaM = 'Mens Restroom'
+	$locM_arg = 'Mens Restroom'
 	$locM = 'NikoSlut'
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/m_restroom.jpg"></center>'
@@ -1423,11 +1426,12 @@ end
 
 if $ARGS[0] = 'Ladies Restroom':
 	*clr & cla
-	$metka = 'Ladies Restroom'
+	$loc_arg = 'Ladies Restroom'
 	$loc = 'NikoSlut'
-	$metkaM = 'Ladies Restroom'
+	$locM_arg = 'Ladies Restroom'
 	$locM = 'NikoSlut'
 	$location_type = 'bathroom'
+	$locclass = 'restroom'
 	minut += 5
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/l_restroom.jpg"></center>'
@@ -1459,7 +1463,7 @@ if $ARGS[0] = 'Wash':
 	if NikoSlut > 1:
 		act 'Dry off':gt 'NikoSlut', 'Customers'
 	else
-		act 'Dry off':gt $loc, $metka
+		act 'Dry off':gt $loc, $loc_arg
 	end
 end
 
@@ -1471,42 +1475,42 @@ if $ARGS[0] = 'Truckers':
 	VK = rand (1,6)
 	if VK = 1:
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/2.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'You approach the trucker and he immediately notices you then gives you a warm smile as he says, "Hey there missy. How are you doing this fine day?" You reply, "I''m doing well." He then says, "Hey why don''t you sit down with me and have a meal? On me."'
 		else
 			'You approach the trucker and he immediately notices you then gives you a warm smile as he says, "<<$NikoSlutName>>! It''s great to see you again. How are you doing this fine day?" You reply, "I''m doing well." He then says, "Hey why don''t you sit down with me and have a meal? On me."'
 		end
 	elseif VK = 2:
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/5.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'As you approach the trucker, he gives you a very friendly smile as he pulls up a stool for you to sit on. You decide to take him up on his offer and sit next to him before he says, "Hey there pretty lady. You seem new here. Let me treat you to a meal."'
 		else
 			'As you approach the trucker, he gives you a very friendly smile as he pulls up a stool for you to sit on. You decide to take him up on his offer and sit next to him before he says, "Hey there pretty lady. I don''t see your boyfriend here. I assume you are here for a meal. Let me treat you."'
 		end
 	elseif VK = 3:
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/6.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'You take a seat next to the trucker and he takes a look at you then says, "Hey baby, what is a little thing like you doing here. Shouldn''t you be at school or at home or something?" You try to ignore him, realizing that he has nothing interesting to say.'
 		else
 			'You take a seat next to the trucker and he takes a look at you then says, "Hey baby, I remember you. You are that slut that was here before. I would ask you to suck my dick but I have work to do right now. Maybe later eh?" You then shrug before walking away.'
 		end
 	elseif VK = 4:
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/7.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'You approach the trucker who doesn''t seem to notice you at first then slightly recoils when he see you. He then adjust his cap before saying, "Oh hey there. Have we met? Oh where are my manners? My name is Daniel and I am here visiting an old friend of mine, he owns this fine establishment. Anyway I need to get going now. Take care of yourself missy."'
 		else
 			'You approach the trucker who doesn''t seem to notice you at first then slightly recoils when he see you. He then adjust his cap before saying, "Oh hey, it''s you. Your boyfriend is not with you. I assume that means you are not here on business huh? It''s okay, I am just here visiting an old friend of mine, he owns this fine establishment. Anyway I need to get going now. Take care of yourself missy."'
 		end
 	elseif VK = 5:
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/8.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'You walk up to the trucker as he looks you over before saying, "What brings a cute girl like yourself out here? Shouldn''t you be in the town instead of with a bunch of old truckers?" He chuckles a bit before adding, "I''m just kidding. Make yourself at home comfortable and steer clear of the bikers that come around here at night. A young girl like you don''t want to get tangled with them."'
 		else
 			'You walk up to the trucker as he looks you over before saying, "So if it isn''t <<$NikoSlutName>>. What brings you out here without your boyfriend? Are you here on business or just to get yourself a good meal before heading back to town?" You reply, "I''m was just passing through." The trucker nods then says, "Well order yourself a good meal and steer clear of the bikers that come around here at night. A young girl like you don''t want to get tangled with them."'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/9.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'See one of the truckers checking you out as you approach he then says, "Whoa what is suck a pretty thing like yourself doing here? Should you be playing with your friends?" You shake your head and walk away, feeling a bit annoyed at his comments.'
 		else
 			'See one of the truckers checking you out as you approach he then says, "Whoa it''s <<$NikoSlutName>>. Didn''t think I''d see you here without that boy you travel with. If you are here for business then I''m afraid I can''t stay long. I need to get back on the road and make a few deliveries. Maybe another time sweetheart." He waves at you then goes back to eating his food.'
@@ -1526,7 +1530,7 @@ if $ARGS[0] = 'Bikers':
 	VK = rand (1,4)
 	if VK = 1:
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/1.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'As you approach the biker, his eyes light up and he says, "Hello miss. You look great today. Here take a seat." He then moves his duffel bag off the seat next to him then gives you a warm smile. You sit next to him and he says, "Hey do you hear that?" You listen for a second before you hear a funny voice saying, "Hey there pretty lady, I would ask you to bone but that would be a total bone head decision." You look over your shoulder to see a little skeleton figure that the biker was holding. You giggle as he says, "I knew that would make you laugh and I alway like to see a pretty girl laugh. Here let me treat you to a meal. I''ll get you a big burger."'
 		else
 			'As you approach the biker, his eyes light up and he says, "<<$NikoSlutName>>, it''s good to see you again. Here take a seat." He then moves his duffel bag off the seat next to him then gives you a warm smile. You sit next to him and he says, "Hey do you hear that?" You listen for a second before you hear a funny voice saying, "Hey there pretty lady, I would ask you to bone but that would be a total bone head decision." You look over your shoulder to see a little skeleton figure that the biker was holding. You giggle as he says, "I knew that would make you laugh and I alway like to see a pretty girl laugh. Here let me treat you to a meal. I''ll get you a big burger."'
@@ -1536,7 +1540,7 @@ if $ARGS[0] = 'Bikers':
 		'You walk up to the biker and he looks up at you and says, "What do you want? If you are here to tell me about how I am the father of your kid then you can go fuck off right now. I don''t give a shit about any kid of mine." He then turns away from you, so you walk away feeling confused and annoyed.'
 	elseif VK = 3:	
 		'<center><img <<$set_imgh>> src="images/locations/highway/borisdiner/npc/4.jpg"></center>'
-		if $NikoSlutName ! '':
+		if $NikoSlutName = '':
 			'You approach one of the bikers and he barely turns to face you before saying, "You seem to be in the wrong place. You should probably get going." Sensing his hostility, you decide not to push your luck and walk away.'
 		else
 			'You approach one of the bikers and he barely turns to face you before saying, "Oh hey, it''s the dirty slut. I don''t need my dick sucked right now so why don''t you get lost?" Sensing his hostility, you decide not to push your luck and walk away.'

+ 2 - 2
locations/NormPR.qsrc

@@ -2,7 +2,7 @@
 $location_type = 'event'
 
 if $ARGS[0] = '1':
-	$metka = ''
+	$loc_arg = ''
 	$loc = 'NormPR'
 	menu_off = 1
 
@@ -32,7 +32,7 @@ if $ARGS[0] = '1':
 end
 
 if $ARGS[0] = '2':
-	$metka = ''
+	$loc_arg = ''
 	$loc = 'NormPR'
 	menu_off = 1
 

+ 1 - 1
locations/Palatka.qsrc

@@ -3,7 +3,7 @@ $location_type = 'event'
 
 if $ARGS[0] = 'start':
 	$sexloc = 'Palatka'
-	$metkaM = 'start'
+	$locM_arg = 'start'
 	$locM = 'Palatka'
 	$menu_loc = 'Palatka'
 	$menu_arg = 'start'

+ 2 - 6
locations/ParChurch.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 	$loc = 'ParChurch'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'ParChurch'
 	$menu_arg = 'start'
 	$location_type = 'public_indoors'
@@ -275,11 +275,7 @@ if $ARGS[0] = 'liturgy':
     vokal_exp += rand(0,3)
     gs 'stat'
 
-	if $args[1] = 'mom':
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex_mom'
-	else
-		act 'Return to Narthex': gt 'ParChurch', 'Narthex'
-	end
+	act 'Leave the church': gt 'ParChurch' , 'start'
 end
 
 if $ARGS[0] = 'reducepavrep':

+ 4 - 5
locations/ParChurch2.qsrc

@@ -722,7 +722,7 @@ if $ARGS[0] = 'secrets':
 								act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 							end
 						end
-						if brother['SexQW'] ! 0:
+						if brothersex ! 0:
 							act 'Tell him about your brother':
 								*clr & cla
 								Kirill_Crpt += 1
@@ -786,9 +786,9 @@ if $ARGS[0] = 'secrets':
 			'"Well we certainly haven''t been fighting ever since..." The last part of the sentence gets caught in your throat, and you''re suddenly all too aware of what you''re about to confess to.'
 			'"Ever since what?" the priest asks gently, "What happened between your brother and you?"'
 			'You blush fiercely, and then start telling the priest about how you caught your brother watching you shower and started showing off your naked body to him every chance you got.'
-			if brother['showertalk'] ! 0: 'How that soon wasn''t enough for you, and you started inviting him in under the pretense of wanting to talk to him, but in reality you just wanted to give him a better view.'
-			if brother['shower_times'] ! 0: 'Eventually you wanted to feel more than just his eyes on your skin, and invited him to shower together with you, which of course he jumped at the chance to do.'
-			'You continue describing your fall into incestual deviancy' + iif(brother['homework'] > 0, ', how you let him feel you up while you help him with his homework', '') + iif(npc_QW['A34'] => 4, ', how you''ve used your naked body to show him the secrets of the female anatomy', '') + iif(brotherMorningSex > 0 or brotherNightSex > 0 or brotherEvSex > 0, ', how you regularly help each other with your sexual urges', '') + iif(brotherMorningSex = daystart or brotherNightSex = daystart or brotherEvSex = daystart, ', and that one of those times was just earlier today', '') + ', all the while Father Kirill sits there calmly and waits for you to finish.'
+			if brothershowertalk ! 0: 'How that soon wasn''t enough for you, and you started inviting him in under the pretense of wanting to talk to him, but in reality you just wanted to give him a better view.'
+			if brother_shower_times ! 0: 'Eventually you wanted to feel more than just his eyes on your skin, and invited him to shower together with you, which of course he jumped at the chance to do.'
+			'You continue describing your fall into incestual deviancy' + iif(brother_homework > 0, ', how you let him feel you up while you help him with his homework', '') + iif(npc_QW['A34'] => 4, ', how you''ve used your naked body to show him the secrets of the female anatomy', '') + iif(brotherMorningSex > 0 or brotherNightSex > 0 or brotherEvSex > 0, ', how you regularly help each other with your sexual urges', '') + iif(brotherMorningSex = daystart or brotherNightSex = daystart or brotherEvSex = daystart, ', and that one of those times was just earlier today', '') + ', all the while Father Kirill sits there calmly and waits for you to finish.'
 			if Kirill_Crpt <= 60:
 				'When you''re finally done he speaks up "Hmmm. This is quite disturbing. Incest is a sure path to hell, but on the other hand it is natural for two young people who have grown close to want to explore their sexuality together."'
 				'"I fear that your soul could become stained by your actions, however you must be sure to inform me of such acts lest they lead to greater sins in the future." the priest scolded you as he draped his stole over your head and began the Prayer of Absolution.'
@@ -1079,6 +1079,5 @@ if $ARGS[0] = 'anal':
 	end
 end
 
-
 --- ParChurch2 ---------------------------------
 

+ 3 - 3
locations/ParkKafe.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'start':
 	$loc = 'ParkKafe'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'ParkKafe'
 	$menu_arg = 'start'
 	menu_off = 0
@@ -26,7 +26,7 @@ end
 if $ARGS[0] = 'table':
 	*clr & cla
 	$loc = 'ParkKafe'
-	$metka = 'table'
+	$loc_arg = 'table'
 	$menu_loc = 'ParkKafe'
 	$menu_arg = 'table'
 	menu_off = 0
@@ -636,7 +636,7 @@ if $ARGS[0] = 'woman':
 		'You meet her eyes and she subtlety signals with her eyes that you should take a look farther down as she slyly smiles.'
 		'Picking up the hint, your eyes slowly scan down her body, stopping by her legs. All of a sudden, she spreads her legs, and to your surprise she''s not wearing any panties, fully showing you her pussy.'
 		'You automatically turn red out of embarrassment, but she just laughs it off then goes back to playing with her food.'
-		gs 'arousal', 'voyeur', 5, 'lesbian'
+		gs 'arousal', 'erotic_nudity', 5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'parkKafe', 'end', 'cafe'

+ 65 - 76
locations/Peterroom.qsrc

@@ -25,12 +25,12 @@ if $ARGS[0] = 'start_door':
 
 		if petersexday < 1:
 			petersexday += 1
-			'You called, Peter opened the door.'
-			'- Come on, get changed. I am now.'
+			'Peter opens the door.'
+			'"Come in and get changed."'
 
-			act 'Take the apartment':gt 'peterroom', 'start'
+			act 'Enter the apartment':gt 'peterroom', 'start'
 		else
-			'You rang the doorbell but no one answers.'
+			'You ring the doorbell, but no one answers.'
 
 			act 'Leave':
 				cla
@@ -50,9 +50,9 @@ if $ARGS[0] = 'start':
 	if peter > 0 :
 		peterrand = rand(1, 2)
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/9.jpg"></center>'
-		'You get undressed, pinned collar and prepared. From the next room came the voice of Peter Vlasnyi:"Who is my whore?"'
+		'You get undressed and lock a collar around your neck. You hear Peter in the next room. "Who''s my whore?"'
 
-		act 'I, my lord ...':
+		act 'I am, Master.':
 			petersex = petersex + 1
 
 			if analplugin = 1 :gt 'peterroom', 'klap'
@@ -63,66 +63,63 @@ if $ARGS[0] = 'start':
 		petersexday += 1
 		minut += 10
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/1.jpg"></center>'
-		'undressing and dressing it. He put a collar in front of you picked up this narrow strip of skin with rivets and thinking.'
+		'As you start to undress, he puts a collar down in front of you. It''s a narrow strip of leather with space for a leash to be attached.'
 
-		act 'Wear' :
+		act 'Put it on' :
 			*clr
 			cla
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/2.jpg"></center>'
-			'You put the collar. Peter stroked whip you on the cheek:'
-			'- Lustful girl! Stand up, turn around, hands behind your back!'
-			'You execute the command and hands snap handcuffs.'
+			'You put the collar on and Peter strokes you gently on the cheek. Then, without warning, pulls his hand back and slaps you hard. "Lustful girl! Stand up and turn around - hands behind your back!"'
+			'You quickly do as he says, feeling cold metal closing around your wrists.'
 
 			if analplugin = 1 :
 				analplugin = 0
-				'"And what have we here?" Peter grips the tip of the butt plug sticking out of your ass, and eases it out.'
+				'"What do we have here?" Peter grips the end of the butt plug sticking out of your ass, and eases it out.'
 			end
 
-			act 'Smile':
+			act 'Submit yourself':
 				cla
 				*clr
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/3.jpg"></center>'
-				'Peter pulled you by the collar, pushed you on your knees in front of him and ordered: "Come on bitch, open your mouth."'
+				'Peter pulls you by the collar, then shoves you to your knees in front of him. "Come on bitch, open your mouth." he orders.'
 
-				act 'Submit':
+				act 'Please him':
 					cla
 					*clr
 					'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/4.jpg"></center>'
-					'Peter unbuttoned his pants and pulled out his 25cm dick. He grabbed you by the hair and shoved in your mouth the head of his penis. You obediently wrap your lips around it, sucking and caressing with your tongue, feeling as it grows and strains in your mouth.'
+					'Peter unbuttons his pants and pulls out his 25cm cock. He grabs you by the hair and shoves the head in your mouth. You obediently wrap your lips around it, then begin to suck and caress it with your tongue, feeling it grow and strain inside your mouth.'
 
 					gs 'arousal', 'bj', 5, 'sub'
 					gs 'stat'
 					
-					act 'Continue Composition' :
+					act 'Continue':
 						cla
 						*clr
 						'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/5.jpg"></center>'
-						'And then Peter pushed you over and rudely and impatiently thrust member in your pussy and started to fuck you like a blow-up doll. A few minutes later, he stopped, pulled his cock out, pushed you to the floor and ordered:'
-						'"Crawl to me, bitch!"'
-
-						gs 'arousal', 'vaginal', 5, 'sub'
+						'Peter pushes you onto the bed and pushes your legs up to your chest before tightly binding them and your hands together. He then inserts his member into your pussy and starts fucking you hard. After a few minutes, he stops and pulls his cock out of you, unties you and then shoves you to the floor. He walks across the room, turns and says "Crawl to me, bitch!"'
+                        gs 'arousal', 'vaginal', 5, 'sub'
 						gs 'stat'
 					
-						act 'crawl' :gt 'peterroom', 'klap'
+						act 'Crawl' :gt 'peterroom', 'klap'
 					end
 				end
 				
 				gs 'willpower', 'sex', 'resist', 'hard'
 				if will_cost <= pcs_willpwr:
-					act 'Does not comply (<<will_cost>> Willpower)':
+					act 'Refuse (<<will_cost>> Willpower)':
 						cla & *clr
 						gs 'pain', 8, 'asscheeks', 'spank'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/peter/4_1.jpg"></center>'
-						'"Have to punish you" with these words Peter crossed over the table and shoved a plug in your ass. - Pop up earlier than end flogging, will receive the same amount:- Peter became the side of you, spread the whip and started whipping. counting aloud strikes interspersed with your shouts and sobs ...'
-						'"Ask me to fuck you, nine docile litter?"'
-
-						act 'Yes! I''ll be your whore!' :gt 'peterroom', 'klap'
+						'"You need to be punished!" He rounds the table and forces you on your knees with your ass high in the air. You squeal when he shoves a butt plug deep into your ass before he starts delivering several stinging smacks to your ass cheeks, alternating cheeks with each strike. He counts the strikes aloud, ignoring your pained sobs.'
+						'"Beg me to fuck you, whore!"'
+                        'Please fuck me, Master! Please! Fuck me like the dirty little whore I am!'
+						act 'Continue' :gt 'peterroom', 'klap'
 					end
 				else
-					act 'Does not comply (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end	
 			end
 		end
@@ -136,35 +133,32 @@ if $ARGS[0] = 'klap':
 	*clr
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/6.jpg"></center>'
-	'Peter on a leash led you into the bedroom. Knocked on the huge bed and tied his hands and feet.'
-	'Then deftly put into your mouth gag:- ball on the strap and fastened it at the back.'
-	'"I love, <<$pcs_nickname>>," as you moan, but when you''re talking about, you start talking nonsense. So it is better groan, honey ...'
+	'Peter puts you on a leash and leads you into the bedroom. He pushes you onto the huge bed and securely ties your hands and feet before fastening a ball gag into your mouth.'
+	'"I love you <<$pcs_nickname>>, especially when you moan, but when you''re allowed to talk, you start spouting nonsense. So I think you''re better off gagged.'
 
 	gs 'arousal', 'foreplay', 5, 'sub', 'bound'
 	gs 'stat'
 					
-	act 'Moo':
+	act 'Moan':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/7.jpg"></center>'
-		'Peter bore down on you from above. "Check how much you sweet ass?" Said Peter'
+		'Peter spreads your legs and bears down on you from above. "Let''s see how well your sweet ass opens for me." he says'
 
 		if analplugin = 1 :
 			analplugin = 0
-			', Pulled a butt plug'
+			', pulls out your butt plug'
 		end
 
-		' and put his huge erection to your anus half-entering it. You gasped in pain, and mooed into gag. You can''t wait for him to get in your ass completely. Peter saw your reaction and began to fuck your ass with every stroke penetrating deeper and deeper until his penis completely sinks into you, and his balls slap you hard on the buttocks. He fucks you so hard that your knees start to shake, and from you pussy juices leak on buttocks.'
-
-		gs 'arousal', 'anal', 10, 'sub'
+		', and positions his huge erection against your asshole, half-entering with the first thrust. You gasp in pain, moaning into the gag. You can''t wait for him to bury himself in your ass completely. Peter sees your reaction and begins to fuck your ass, penetrating deeper with each stroke, until his dick is completely buried inside you and his balls slap hard against your buttocks. He fucks you so hard that your knees start to shake, and pussy juices trickle down your ass.'
+        gs 'arousal', 'anal', 10, 'sub'
 		gs 'stat'
 					
-		act 'Moo':
+		act 'Moan again':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/8.jpg"></center>'
-			'He continues to penetrate you faster, then slows the rhythm, makes several deep movements and finishes by filling your insides with hot stream of sperm ....'
-
-			gs 'arousal', 'anal', 10, 'sub'
+			'He continues to fuck you hard and fast, then slows the rhythm, finishing with several sharp uneven thrusts that fill your insides with a hot stream of cum.'
+            gs 'arousal', 'anal', 10, 'sub'
 			gs 'stat'
 		
 			if pcs_ass < 25:pcs_ass += 1
@@ -172,10 +166,10 @@ if $ARGS[0] = 'klap':
 			if pcs_horny >= 100:
 				analorgasm += 1
 				$orgasm_or = 'yes'
-				$orgasm_txt = 'heat surges in your ass and orgasm washes over you.'
+				$orgasm_txt = 'A pleasant sensation surges within you and an orgasm washes over you, juices spraying from your pussy as you moan loudly into the gag.'
 			end
 
-			'Your ass makes squelching noise when freed from his penis. Peter sat on the bed, breathing heavily, and you remained lying bound, feeling sperm slowly leaking from your fucked ass.'
+			'Your ass makes a loud squelching noise when he pulls his dick out. Peter sits on the bed, breathing heavily while you remain bound, his cum slowly leaking from your ruined asshole.'
 			
 			act 'Relax' :gt 'peterroom', 'end'
 		end
@@ -188,22 +182,21 @@ if $ARGS[0] = 'end':
 	minut += 30
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/vanroom.jpg"></center>'
-	'- You were great - said Peter and smacking you on the cheek, picked up and carried you to the bathroom where you showered together.'
+	'"You were great." Peter says, smacking you on the ass. After a few minutes, he picks you up and carries you to the bathroom, where you shower together.'
 
-	act 'Get out' :
+	act 'Leave' :
 		cla
 		*clr
 		peter += 1
 		minut += 20
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/mash.jpg"></center>'
-		'You walked down to the yard, and Peter started the car. He kissed you on the lips and said:'
-		'"<<$pcs_nickname>>, you really brighten up my lonely and gray existence. Your appearance is as the light in the dark, or a breath of fresh air ... I hope to see you again. But I need to leave for now. Want a lift?"'
+		'You walk down to the front yard together, and Peter starts the car. He kisses you on the lips and says "<<$pcs_nickname>>, you really brighten up my lonely, dull existence. For me, your presence is like a light in the darkness, or a breath of fresh air. I need to leave for now, but I truly hope to see you against soon." He starts the car. "Oh, do you need a lift?" he suddenly asks.'
 			
-		act 'To the center':
+		act 'To the city center':
 			gs 'arousal', 'end'
 			gt 'city_center'
 		end
-		act 'The house':
+		act 'To your apartment':
 			gs 'arousal', 'end'
 			gt 'city_residential'
 		end
@@ -215,44 +208,45 @@ if $ARGS[0] = 'd1':
 	*clr
 	if pcs_ass < 25:pcs_ass += 1
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/d1-1.jpg"></center>'
-	'Peter connects your hands behind your back. His hands take you by the hips and lifted your ass, placing you cancer. You dutifully lean and Peter catches the rope to the hook.'
+	'Peter ties your hands behind your back, then lifts you up by the hips, placing you on a hook.'
 
-	act 'Sucking her fingers':
+	act 'Suck his fingers':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d1-2.jpg"></center>'
-		'Peter pushes your hands halves drives his cock in the ass. You gasped in pain, and mooing in gag. - And I see you can not wait to get his ass completely - Peter saw your reaction and began to fuck your ass with every stroke penetrating deeper and deeper until his penis did not completely sink into you, and the balls hard slap on the buttocks.'
+		'Peter grabs your head and shoves all of his fingers into your mouth, forcing you to suck on them.'
+		'After a few seconds of you sucking and gagging on his fingers, he withdraws them and moves around behind you.'
 
 		gs 'arousal', 'anal', 10, 'sub'
 		gs 'stat'
 		
-		act 'Moan':
+		act 'Penetration':
 			cla
 			*clr
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d1-3.jpg"></center>'
-			'He fucks you so intense that you feel like my knees start to shake, and the legs from the pussy juices flow down your.'
-
+			'You think he is about to finger your ass, but squeal in surprise when he shoves his dick into you instead.'
+            'You moan in a mix of pleasure and pain as he starts thrusting, quickly picking up the pace.'
 			gs 'arousal', 'anal', 10, 'sub'
 			gs 'stat'
 		
-			act 'Moan':
+			act 'Submit yourself':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d1-4.jpg"></center>'
-				'He continues to stick you faster'
+				'He continues to fuck you hard and you submit yourself to the pleasure of your ass being hammered, your pussy juices running down your legs.'
 
 				if pcs_horny >= 100:
 					analorgasm += 1
 					$orgasm_or = 'yes'
-					'You are very excited that grew in the ass sweet languor, and then suddenly become a hot orgasm washing over you. Simultaneously with you ends Peter pounding dick deeper and filling your insides hot stream of sperm ....'
+					'He continues to fuck you hard and fast and you soon feel an intense orgasm washing over you, juices spraying from your pussy as his warm cum fills your ass.'
 					
 				elseif pcs_horny < 100:
 					$orgasm_or = 'no'
-					' and then slows the rhythm, makes several deep movements and finishes filling your insides hot stream of sperm ....'
+					'He suddenly slows the rhythm, finishing with several sharp uneven thrusts that fill your ass with a hot load of cum.'
 					
 				end
 
-				'Ass to squelch freed from his penis. Peter sat on the bed, breathing heavily, and you remained kneeling with protruding upward booty fucked from which the legs dripping sperm.'
+				'Your ass makes a loud squelching noise when he pulls his dick out. Peter sits on the bed, breathing heavily while you remain kneeling with your ass in the air, his cum trickling down your leg.'
 
 				act 'Further' :gt 'peterroom', 'end'
 			end
@@ -264,8 +258,7 @@ if $ARGS[0] = 'd2':
 	cla
 	*clr
 	'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-1.jpg"></center>'
-	'Peter put you on your knees, then lifted your head and holding her hands to force your mouth planted its piston. His head slipped down his throat, but he did not rest on this, continuing to press. And its 25 centimeter count began to enter into you further.'
-
+	'Peter forces you on your knees, then lifts your head and thrusts his cock into your mouth. The head of his cock goes down your throat, but he continues to thrust, forcing more of its 25cm length inside.'
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
 		
@@ -273,32 +266,29 @@ if $ARGS[0] = 'd2':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-2.jpg"></center>'
-		'- Cosi better whore! Inch by inch, pushing relentlessly pounding him deeper and deeper. After another push me you felt that your lips into something rested. And in a moment you realize that it is all inside.'
-
-		gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
+		'He thrusts mercilessly, fucking deeper into your mouth. Eventually, you feel his balls slap your chin, and realize that he''s bottomed out.'
+        gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 		gs 'stat'
 	
-		act 'Moan':
+		act 'Deepthroat':
 			cla
 			*clr
 			'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-3.jpg"></center>'
-			'Tears streamed from your eyes, and Peter began slowly began to move. He took his hands away from your head, and now you hands grabbed his buttocks and continued to sit down on his spear. You trembling, you are lost in sensation between the legs fire raged in the chest ached pleasantly shamelessness and sense of awareness of their depravity.'
-
-			gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
+			'Tears stream from your eyes as he begins moving slowly. He takes his hands away from your head, and you desperately grab onto him while you let him use your throat. Trembling, you are lost in sensations - caught between the fire raging between your legs and your shameless awareness of the depravity of the situation.'
+            gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 			gs 'stat'
 		
-			act 'Moo':
+			act 'Continue':
 				cla
 				*clr
 				'<center><img <<$set_imgh>> src="images/characters/city/peter/sex/d2-4.jpg"></center>'
-				'Peter began to finish and stopped drove a member as far as possible, you feel like you are somewhere deep pours his sperm., And on his balls your saliva flowing ...'
-
-				gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
+				'Peter is nearing climax, his thrusts becoming ragged, when he suddenly stops and pushes in deep. His balls draw up, coated with your saliva, and you feel his sperm shooting down your throat.'
+                gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 				gs 'stat'
 		
 				if pcs_horny >= 100:
 					$orgasm_or = 'yes'
-					'Suddenly you start you finish yourself. Between the legs blazing fire and waves of pleasure covered body, you moaned and shuddered with orgasm, but Peter gripped you do not allow members to slip out of his mouth ...'
+					'Your orgasm suddenly hits you. Waves of pleasure ripple through your body, and you moan and shudder with release, but Peter holds you in place and refuses to allow his cock to slip out of your mouth.'
 				end
 
 				act 'Swallow' :gt 'peterroom', 'end'
@@ -307,5 +297,4 @@ if $ARGS[0] = 'd2':
 	end
 end
 
---- Peterroom ---------------------------------
-
+--- Peterroom ---------------------------------

+ 3 - 3
locations/Prostitute.qsrc

@@ -2,10 +2,10 @@
 $location_type = 'public_outdoors'
 
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'Prostitute'
 	$metkaSex = $ARGS[0]
-	$locSex = $CURLOC
+	$locSex = 'Prostitute'
 	menu_off = 1
 	cls
 	minut += 5

+ 29 - 29
locations/Snpc.qsrc

@@ -30,7 +30,7 @@ end
 ''
 ''
 
-!!act 'Move away':gt $loc, $metka
+!!act 'Move away':gt $loc, $loc_arg
 
 gs 'cumreaction'
 
@@ -48,7 +48,7 @@ if grupTipe[numnpc] = 5 and grupTipe ! 5:
 				'You mocked the school outcast, as the other students laugh at them.'
 
 				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
-				if $loc = 'gdkin':act 'Move away':gt $loc, $metka
+				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
 			end
 		else
 			act 'Mock (<<will_cost>> Willpower)':
@@ -58,7 +58,7 @@ if grupTipe[numnpc] = 5 and grupTipe ! 5:
 				'You began to mock them, but <<$npc_firstname[$static_num]>> answered you. "You''re one to talk cocksucker, everyone knows your the easiest fuck in town." Everyone started laughing at you. You were shocked and confused by everyone turning on you, you hurry away as the others start to talk about you.'
 
 				if $loc ! 'gdkin':gt 'gschool_lessons', 'short_break'
-				if $loc = 'gdkin':act 'Move away':gt $loc, $metka
+				if $loc = 'gdkin':act 'Move away':gt $loc, $loc_arg
 			end
 		end
 	else
@@ -103,7 +103,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					'<<$npc_firstname[''A<<numnpc>>'']>> offers you a beer and says: "Hey <<$pcs_nickname>>! Let''s drink some beer and have some fun!"'
 				end
 
-				act 'Decline':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
+				act 'Decline':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $loc_arg
 				
 				act 'Drink the beer':
 					*clr & cla
@@ -113,7 +113,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 					gs 'stat'
 					'You happily take the beer, and drink it in <<$npc_firstname[''A<<numnpc>>'']>>''s company.'
 
-					act 'Move away':gt $loc, $metka
+					act 'Move away':gt $loc, $loc_arg
 				end
 			end
 		elseif pav_slut >= 300:
@@ -123,7 +123,7 @@ if npc_grupTipe['A<<numnpc>>'] = 4:
 				'<<$npc_firstname[''A<<numnpc>>'']>> wrinkles her nose as she looks at you: "Hey cocksucker, get away from me! I don''t want to be seen talking to you."'
 			end
 
-			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $metka
+			act 'Move away':npc_rel['A<<numnpc>>'] -= 5 & gt $loc, $loc_arg
 		end
 
 		exit
@@ -218,7 +218,7 @@ if numnpc = 23:
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -247,7 +247,7 @@ end
 if $loc ! 'gdkin':
 	act 'Leave': gt 'gschool_lessons', 'short_break'
 else
-	act 'Move away': gt $loc, $metka
+	act 'Move away': gt $loc, $loc_arg
 end
 
 !!Chat
@@ -267,7 +267,7 @@ act 'Chat':
 		if $loc ! 'gdkin':
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
-			act 'Move away': gt $loc, $metka
+			act 'Move away': gt $loc, $loc_arg
 		end
 
 		exit
@@ -282,7 +282,7 @@ act 'Chat':
 		gs 'nogorslut'
 		gs 'yesgorslut'
 		
-		act 'Move away':gt $loc, $metka
+		act 'Move away':gt $loc, $loc_arg
 	end
 end
 
@@ -293,7 +293,7 @@ if numnpc = 13 and lariskaHelp = -1:
 	if $loc ! 'gdkin':
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	else
-		act 'Move away': gt $loc, $metka
+		act 'Move away': gt $loc, $loc_arg
 	end
 end
 
@@ -319,7 +319,7 @@ if numnpc = 2:
 			if $loc ! 'gdkin':
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -357,7 +357,7 @@ if numnpc = 12:
 			if $loc ! 'gdkin':
 				act' Leave': xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -365,7 +365,7 @@ end
 
 !!Katja MEYNOLD
 if numnpc = 14:
-	if meynoldQW = 1:
+	if meynoldQW = 3:
 		act 'Thank Katja for taking you home from the disco':
 			*clr & cla
 
@@ -381,7 +381,7 @@ if numnpc = 14:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -422,7 +422,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 
@@ -435,7 +435,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 
@@ -448,7 +448,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 		end
@@ -471,7 +471,7 @@ if numnpc = 14:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			else
 				*clr & cla
@@ -499,7 +499,7 @@ if numnpc = 14:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -521,7 +521,7 @@ end
 
 !!Natasha Belova Botha
 if numnpc = 16:
-	if npc_rel['A16'] >= 50 and NatbelQW['QWstage'] = 0 and npc_rel['A<<numnpc>>'] >= 80:
+	if npc_rel['A16'] >= 50 and NatbelQW['QWstage'] = 0:
 		act '"Could you help me out a bit in school?"':
 			*clr & cla
 
@@ -538,7 +538,7 @@ if numnpc = 16:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end
@@ -569,7 +569,7 @@ if numnpc = 16:
 				if $loc ! 'gdkin':
 					xgt 'gschool_lessons', 'short_break', 'nopict'
 				else
-					act 'Move away': gt $loc, $metka
+					act 'Move away': gt $loc, $loc_arg
 				end
 			end
 		end
@@ -589,7 +589,7 @@ if numnpc = 31:
 		if $loc ! 'gdkin':
 			xgt 'gschool_lessons', 'short_break', 'nopict'
 		else
-			act 'Move away': gt $loc, $metka
+			act 'Move away': gt $loc, $loc_arg
 		end
 	end
 end
@@ -611,7 +611,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	elseif npc_rel['A<<numnpc>>'] >= 100 and grupTipe = 3 and npc_QW['A<<numnpc>>'] = 2 and schoolprogul > 0:
@@ -629,7 +629,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	elseif npc_rel['A<<numnpc>>'] >= 100 and npc_QW['A<<numnpc>>'] = 4:
@@ -651,7 +651,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 		act 'Chicken Out':
@@ -664,7 +664,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	elseif npc_QW['A<<numnpc>>'] > 5:
@@ -684,7 +684,7 @@ if numnpc = 231:
 			if $loc ! 'gdkin':
 				xgt 'gschool_lessons', 'short_break', 'nopict'
 			else
-				act 'Move away': gt $loc, $metka
+				act 'Move away': gt $loc, $loc_arg
 			end
 		end
 	end

+ 5 - 5
locations/TV.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = 'start':
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 	act 'Turn off the TV and get off the couch':
 		cla
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -37,7 +37,7 @@ if $ARGS[0] = 'nokable':
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'nokable'
-	act 'Turn off the TV and get off the couch': gt $loc, $metka
+	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'kable':
@@ -51,7 +51,7 @@ if $ARGS[0] = 'kable':
 	if daystart < 10 and StoryLine = 0 and ntstart = 0:'Sometimes while watching TV you catch a glimpse of your legs or chest, and every time it''s a bit shocking for you to see that your body is now that of a woman.'
 
 	act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'kable'
-	act 'Turn off the TV and get off the couch': gt $loc, $metka
+	act 'Turn off the TV and get off the couch': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'pav':
@@ -75,7 +75,7 @@ if $ARGS[0] = 'pav':
 			tvtime = 0 
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
-			act 'Continue': gt $loc, $metka
+			act 'Continue': gt $loc, $loc_arg
 		end
 	end
 end
@@ -101,7 +101,7 @@ if $ARGS[0] = 'gad':
 			tvtime = 0 
 			'<center><video autoplay src="images/locations/gadukino/grandparents/tv/tv_turn_off_effect.mp4"></video></center>'
 			'You turn off the TV and the image folds in on itself to form a bright line across the screen which then shrinks into a tiny white dot that slowly fades. The speakers emit a high pitched squalk in protest.'
-			act 'Continue': gt $loc, $metka
+			act 'Continue': gt $loc, $loc_arg
 		end
 	end
 end

+ 4 - 4
locations/Vika.qsrc

@@ -3,7 +3,7 @@
 vikaAge = age + 1
 gs'stat'
 '<center><B><font color=maroon>Vika Kirilova</font></B></center>'
-'<center><img <<$set_imgh>> src="images/pc/npc_headshots/vika.jpg" ></center>'
+'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big220.jpg" ></center>'
 'Your university roommate is Vika Kirilova. She is <<vikaAge>> years old. She came to from a town much further away than you did, like you Vika comes from a poor family. You don''t really know much more about her yet.'
 if vikaslut = 1: 'You know Vika works as a whore in a brothel in the city central area.'
 
@@ -19,14 +19,14 @@ else
 	'The two of you are best friends.'
 end
 ''
-act '<B>Move away</B>':gt $loc, $metka
+act '<B>Move away</B>':gt $loc, $loc_arg
 
 if vika_sleep = 1 and vikaslut = 0:
 	cls
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep.jpg" ></center>'
 	'Vika is sleeping in her bed, after a night of adventures. While watching her, you wonder what all she got up to tonight.'
-	act '<B>Move away</B>':gt $loc, $metka
+	act '<B>Move away</B>':gt $loc, $loc_arg
 	exit
 end
 
@@ -35,7 +35,7 @@ if vika_sleep = 1 and vikaslut = 1:
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/city/university/girl/vika/vika_sleep_b.jpg" ></center>'
 	'Vika is sleeping in her bed, naked. You wonder if she worked in the brothel tonight, to pay for her tuition.'
-	act '<B>Move away</B>':gt $loc, $metka
+	act '<B>Move away</B>':gt $loc, $loc_arg
 	exit
 end
 

+ 2 - 2
locations/Vnlake2.qsrc

@@ -6,7 +6,7 @@ gs 'willpower', 'sex', 'resist'
 if will_cost <= pcs_willpwr:		
 	act 'Push them away (<<will_cost>> Willpower)':
 		gs 'willpower', 'pay', 'resist'
-		gt 'city_nudelake'
+		gt 'Nudelake'
 	end
 else
     act 'Push them away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -70,7 +70,7 @@ act 'Touch member':
 					gs 'arousal', 'end'
 					gs 'stat'
 
-					act 'Stay on the beach':gt 'city_nudelake'
+					act 'Stay on the beach':gt 'Nudelake'
 				end
 			end
 		end

+ 4 - 4
locations/VolkovHome.qsrc

@@ -2,7 +2,7 @@
 
 if $ARGS[0] = 'Niko Bedroom':
 	cls
-	$metka = 'Niko Bedroom'
+	$loc_arg = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
 	$location_type = 'private'
@@ -19,7 +19,7 @@ end
 
 if $ARGS[0] = 'Hallway 2':
 	cls
-	$metka = 'Niko Bedroom'
+	$loc_arg = 'Niko Bedroom'
 	$loc = 'VolkovHome'
 	minut += 5
 	$location_type = 'private'
@@ -40,9 +40,9 @@ end
 
 if $ARGS[0] = 'Bathroom':
 	cls
-	$metka = 'Bathroom'
+	$loc_arg = 'Bathroom'
 	$loc = 'NikoDates'
-	$metkaM = 'Bathroom'
+	$locM_arg = 'Bathroom'
 	$locM = 'NikoDates'
 	$location_type = 'bathroom'
 	minut += 5

+ 1 - 1
locations/VolleyTrenerSpeak.qsrc

@@ -67,6 +67,6 @@ else
 end
 !------------------------------------------Included in the line--------------------------------------
 
-act 'Move away':gt $loc, $metka
+act 'Move away':gt $loc, $loc_arg
 --- VolleyTrenerSpeak ---------------------------------
 

+ 1 - 2
locations/VoltrenerSexShower.qsrc

@@ -87,9 +87,8 @@ if $ARGS[0] = '2':
 				pcs_mood = 100
 				'<center><video autoplay loop src="images/locations/pavlovsk/community/gym/volley/sex/voltrenersexshower9.mp4"></video></center>'
 				'You look at his cock as if spellbound... At the same time caressing your Clit, and struggling to suppressing a groan. You see his hand stroking his member, the head appearing, and disappearing. Shaking his balls... The coach groans, and his dick squirts straight at you. Sperm splashes on your body, destroying your resolve, you shake in a powerful orgasm. Through the waves of orgasm you hardly hear what the coach is saying, "That was fun, we should do it again sometime."'
-				gs 'arousal', 'voyeur', -10
 				$orgasm_or = 'yes'
-				gs 'arousal', 'masturbate', 10
+				gs 'arousal', 'masturbate', 10, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Finish shower': gt 'gdksport', 'start'

+ 1 - 1
locations/Voltrenersex.qsrc

@@ -572,7 +572,7 @@ if $ARGS[0] = 'discoSex':
 					end
 				end
 			else
-			  '<center><img <<$set_imgh>> src="images/pc/fatherim34.jpg"></center>'
+			  '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/fatherim34.jpg"></center>'
 				'Having brought you to the girls bathroom, you stop and say to him, "Not the most secluded place Mikhail," turning away, you walk off. He sighs but smiles, as he watches your tight little ass as you walk away. "Ok we can go home if this isn''t good enough."'
 				act 'Go with coach':
 					Discoclose = 1

+ 1 - 1
locations/WorkHosp.qsrc

@@ -1,7 +1,7 @@
 # WorkHosp
 
 if $ARGS[0] = 'start':
-	$metka = 'start'
+	$loc_arg = 'start'
 	$loc = 'WorkHosp'
 	$sexloc = 'WorkHosp'
     $location_type = 'event'

+ 529 - 519
locations/_attributes_swimwear.qsrc

@@ -58,11 +58,11 @@ elseif ARGS[1] = 9:
 	CloSkirtShortness = 5
 	CloInhibit = 15
 elseif ARGS[1] = 10:
-	CloQuality = 6
-	CloThinness = 6
 	CloBra = 1
 	CloPanties = 1
-	CloInhibit = 40
+	CloInhibit = 35
+	CloQuality = 2
+	CloThinness = 5
 elseif ARGS[1] = 11:
 	CloQuality = 2
 	CloThinness = 5
@@ -88,90 +88,90 @@ elseif ARGS[1] = 14:
 	CloPanties = 1
 	CloInhibit = 15
 elseif ARGS[1] = 15:
-	CloQuality = 5
-	CloThinness = 6
-	CloTopCut = 4
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 30
 elseif ARGS[1] = 16:
-	CloQuality = 4
-	CloThinness = 6
-	CloBra = 2
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 35
 elseif ARGS[1] = 17:
-	CloQuality = 5
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 30
 elseif ARGS[1] = 18:
-	CloQuality = 6
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 35
 elseif ARGS[1] = 19:
-	CloQuality = 5
-	CloThinness = 6
-	CloBra = 2
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 35
 elseif ARGS[1] = 20:
-	CloQuality = 6
-	CloThinness = 6
-	CloBra = 2
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 35
 elseif ARGS[1] = 21:
-	CloQuality = 5
-	CloThinness = 6
-	CloBra = 2
-	CloPanties = 1
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
 	CloBimbo = 1
-	CloInhibit = 35
-elseif ARGS[1] = 22:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
 	CloPanties = 1
+elseif ARGS[1] = 22:
 	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
 	CloBimbo = 1
-	CloInhibit = 25
+	CloPanties = 1
 elseif ARGS[1] = 23:
-	CloQuality = 6
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 25
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 4
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 50
 elseif ARGS[1] = 24:
-	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 50
 elseif ARGS[1] = 25:
-	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 20
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 50
 elseif ARGS[1] = 26:
+	CloOnePiece = 1
+	CloInhibit = 0
 	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
-	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 50
+	CloThinness = 1
+	CloTopCut = 1
 elseif ARGS[1] = 27:
 	CloQuality = 3
 	CloThinness = 5
@@ -179,26 +179,27 @@ elseif ARGS[1] = 27:
 	CloPanties = 1
 	CloInhibit = 20
 elseif ARGS[1] = 28:
-	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 50
 elseif ARGS[1] = 29:
-	CloQuality = 5
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 35
 elseif ARGS[1] = 30:
-	CloQuality = 6
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloBimbo = 1
+	CloOnePiece = 1
 	CloInhibit = 30
+	CloQuality = 1
+	CloThinness = 3
+	CloTopCut = 4
+	CloBimbo = 1
+	CloPanties = 1
 elseif ARGS[1] = 31:
 	CloQuality = 6
 	CloThinness = 4
@@ -267,12 +268,12 @@ elseif ARGS[1] = 40:
 	CloPanties = 1
 	CloInhibit = 25
 elseif ARGS[1] = 41:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 30
 elseif ARGS[1] = 42:
 	CloQuality = 6
 	CloThinness = 4
@@ -280,11 +281,12 @@ elseif ARGS[1] = 42:
 	CloPanties = 1
 	CloInhibit = 20
 elseif ARGS[1] = 43:
-	CloQuality = 5
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloInhibit = 30
 elseif ARGS[1] = 44:
 	CloQuality = 6
 	CloThinness = 4
@@ -299,24 +301,26 @@ elseif ARGS[1] = 45:
 	CloOnePiece = 1
 	CloInhibit = 0
 elseif ARGS[1] = 46:
-	CloQuality = 5
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloBimbo = 1
-	CloInhibit = 25
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
+	CloTopCut = 3
 elseif ARGS[1] = 47:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 20
 elseif ARGS[1] = 48:
-	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 4
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloInhibit = 25
 elseif ARGS[1] = 49:
 	CloQuality = 6
 	CloThinness = 5
@@ -337,13 +341,12 @@ elseif ARGS[1] = 51:
 	CloOnePiece = 1
 	CloInhibit = 15
 elseif ARGS[1] = 52:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 4
-	CloPanties = 1
 	CloOnePiece = 1
-	CloBimbo = 1
-	CloInhibit = 25
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
+	CloPantsShortness = 5
 elseif ARGS[1] = 53:
 	CloQuality = 5
 	CloThinness = 4
@@ -351,11 +354,12 @@ elseif ARGS[1] = 53:
 	CloPanties = 1
 	CloInhibit = 20
 elseif ARGS[1] = 54:
-	CloQuality = 3
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloInhibit = 50
 elseif ARGS[1] = 55:
 	CloQuality = 5
 	CloThinness = 4
@@ -395,11 +399,12 @@ elseif ARGS[1] = 60:
 	CloPanties = 1
 	CloInhibit = 20
 elseif ARGS[1] = 61:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
+	CloOnePiece = 1
 	CloInhibit = 25
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
 elseif ARGS[1] = 62:
 	CloQuality = 6
 	CloThinness = 4
@@ -433,68 +438,68 @@ elseif ARGS[1] = 66:
 	CloPanties = 1
 	CloInhibit = 20
 elseif ARGS[1] = 67:
-	CloQuality = 3
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloInhibit = 25
-	CloBimbo = 1
 elseif ARGS[1] = 68:
-	CloQuality = 5
-	CloThinness = 4
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 25
-	CloBimbo = 1
 elseif ARGS[1] = 69:
 	CloQuality = 5
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 0
 	CloTopCut = 1
 	CloPantsShortness = 5
 elseif ARGS[1] = 70:
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
+	CloPanties = 1
+elseif ARGS[1] = 71:
+	CloOnePiece = 1
+	CloInhibit = 20
 	CloQuality = 3
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 35
-elseif ARGS[1] = 71:
-	CloQuality = 3
-	CloThinness = 6
-	CloBra = 1
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloInhibit = 40
-	CloBimbo = 1
 elseif ARGS[1] = 72:
-	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 50
-	CloBimbo = 1
 elseif ARGS[1] = 73:
-	CloQuality = 6
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 2
 	CloPanties = 1
-	CloInhibit = 35
-	CloBimbo = 1
 elseif ARGS[1] = 74:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloInhibit = 35
-	CloBimbo = 1
 elseif ARGS[1] = 75:
-	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 10
+	CloQuality = 3
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloInhibit = 45
-	CloBimbo = 1
 elseif ARGS[1] = 76:
 	CloQuality = 6
 	CloThinness = 4
@@ -509,26 +514,26 @@ elseif ARGS[1] = 77:
 	CloPanties = 1
 	CloInhibit = 20
 elseif ARGS[1] = 78:
-	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 35
-	CloBimbo = 1
 elseif ARGS[1] = 79:
-	CloQuality = 5
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 15
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 3
 	CloPanties = 1
-	CloInhibit = 50
-	CloBimbo = 1
 elseif ARGS[1] = 80:
-	CloQuality = 3
-	CloThinness = 6
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 50
-	CloBimbo = 1
 elseif ARGS[1] = 81:
 	CloQuality = 5
 	CloThinness = 6
@@ -537,12 +542,12 @@ elseif ARGS[1] = 81:
 	CloInhibit = 50
 	CloBimbo = 1
 elseif ARGS[1] = 82:
-	CloQuality = 6
-	CloThinness = 4
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 4
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 30
-	CloBimbo = 1
 elseif ARGS[1] = 83:
 	CloQuality = 4
 	CloThinness = 3
@@ -562,17 +567,19 @@ elseif ARGS[1] = 85:
 	CloPanties = 1
 	CloInhibit = 25
 elseif ARGS[1] = 86:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 0
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 25
 elseif ARGS[1] = 87:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
+	CloOnePiece = 1
+	CloInhibit = 5
+	CloQuality = 2
+	CloThinness = 3
+	CloTopCut = 1
 	CloPanties = 1
-	CloInhibit = 25
 elseif ARGS[1] = 88:
 	CloQuality = 6
 	CloThinness = 4
@@ -594,7 +601,6 @@ elseif ARGS[1] = 90:
 elseif ARGS[1] = 91:
 	CloQuality = 4
 	CloThinness = 5
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 2
@@ -602,7 +608,6 @@ elseif ARGS[1] = 91:
 elseif ARGS[1] = 92:
 	CloQuality = 4
 	CloThinness = 5
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 25
 	CloBimbo = 1
@@ -619,8 +624,7 @@ elseif ARGS[1] = 94:
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
-	CloInhibit = 30
-	CloBimbo = 1
+	CloInhibit = 20
 elseif ARGS[1] = 95:
 	CloQuality = 4
 	CloThinness = 4
@@ -636,7 +640,6 @@ elseif ARGS[1] = 96:
 elseif ARGS[1] = 97:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 2
@@ -650,7 +653,6 @@ elseif ARGS[1] = 98:
 elseif ARGS[1] = 99:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 2
@@ -658,7 +660,6 @@ elseif ARGS[1] = 99:
 elseif ARGS[1] = 100:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 2
@@ -666,14 +667,12 @@ elseif ARGS[1] = 100:
 elseif ARGS[1] = 101:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 0
 	CloTopCut = 2
 elseif ARGS[1] = 102:
 	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 15
 	CloTopCut = 3
@@ -705,18 +704,18 @@ elseif ARGS[1] = 106:
 elseif ARGS[1] = 107:
 	CloQuality = 4
 	CloThinness = 5
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 15
 	CloBimbo = 1
 	CloTopCut = 3
 	CloOnePiece = 1
 elseif ARGS[1] = 108:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
-	CloInhibit = 25
+	CloInhibit = 5
+	CloTopCut = 3
 elseif ARGS[1] = 109:
 	CloQuality = 3
 	CloThinness = 4
@@ -724,16 +723,15 @@ elseif ARGS[1] = 109:
 	CloPanties = 1
 	CloInhibit = 20
 elseif ARGS[1] = 110:
-	CloQuality = 5
-	CloThinness = 5
+	CloQuality = 4
+	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
-	CloInhibit = 25
-	CloBimbo = 1
+	CloInhibit = 20
+	CloTopCut = 3
 elseif ARGS[1] = 111:
 	CloQuality = 6
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 2
@@ -751,18 +749,19 @@ elseif ARGS[1] = 113:
 	CloPanties = 1
 	CloInhibit = 25
 elseif ARGS[1] = 114:
-	CloQuality = 5
+	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
-	CloInhibit = 25
+	CloInhibit = 5
+	CloTopCut = 3
+	CloOnePiece = 1
 elseif ARGS[1] = 115:
 	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
+	CloThinness = 5
 	CloPanties = 1
-	CloInhibit = 30
-	CloBimbo = 1
+	CloInhibit = 15
+	CloTopCut = 4
+	CloOnePiece = 1
 elseif ARGS[1] = 116:
 	CloQuality = 4
 	CloThinness = 5
@@ -776,12 +775,11 @@ elseif ARGS[1] = 117:
 	CloPanties = 1
 	CloInhibit = 25
 elseif ARGS[1] = 118:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
-	CloInhibit = 20
-	CloTopCut = 4
+	CloInhibit = 10
+	CloTopCut = 3
 	CloOnePiece = 1
 elseif ARGS[1] = 119:
 	CloQuality = 6
@@ -804,7 +802,6 @@ elseif ARGS[1] = 121:
 elseif ARGS[1] = 122:
 	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 10
 	CloTopCut = 3
@@ -831,7 +828,6 @@ elseif ARGS[1] = 125:
 elseif ARGS[1] = 126:
 	CloQuality = 5
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 2
@@ -857,7 +853,6 @@ elseif ARGS[1] = 129:
 elseif ARGS[1] = 130:
 	CloQuality = 5
 	CloThinness = 5
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 15
 	CloBimbo = 1
@@ -873,7 +868,6 @@ elseif ARGS[1] = 131:
 elseif ARGS[1] = 132:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 3
@@ -881,7 +875,6 @@ elseif ARGS[1] = 132:
 elseif ARGS[1] = 133:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 2
@@ -895,7 +888,6 @@ elseif ARGS[1] = 134:
 elseif ARGS[1] = 135:
 	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 3
@@ -903,7 +895,6 @@ elseif ARGS[1] = 135:
 elseif ARGS[1] = 136:
 	CloQuality = 5
 	CloThinness = 3
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 15
 	CloTopCut = 3
@@ -911,7 +902,6 @@ elseif ARGS[1] = 136:
 elseif ARGS[1] = 137:
 	CloQuality = 5
 	CloThinness = 3
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 15
 	CloTopCut = 3
@@ -919,7 +909,6 @@ elseif ARGS[1] = 137:
 elseif ARGS[1] = 138:
 	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 10
 	CloTopCut = 2
@@ -930,11 +919,9 @@ elseif ARGS[1] = 139:
 	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 20
-	CloTopCut = 4
 elseif ARGS[1] = 140:
 	CloQuality = 5
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 3
@@ -942,7 +929,6 @@ elseif ARGS[1] = 140:
 elseif ARGS[1] = 141:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 10
 	CloTopCut = 1
@@ -953,18 +939,16 @@ elseif ARGS[1] = 142:
 	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 20
-	CloTopCut = 4
 elseif ARGS[1] = 143:
-	CloQuality = 3
-	CloThinness = 6
-	CloBra = 1
+	CloQuality = 5
+	CloThinness = 4
 	CloPanties = 1
-	CloInhibit = 50
-	CloTopCut = 4
+	CloInhibit = 0
+	CloTopCut = 1
+	CloOnePiece = 1
 elseif ARGS[1] = 144:
 	CloQuality = 5
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 5
 	CloTopCut = 3
@@ -975,394 +959,420 @@ elseif ARGS[1] = 145:
 	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 20
-	CloTopCut = 4
 elseif ARGS[1] = 146:
 	CloQuality = 5
 	CloThinness = 4
-	CloBra = 1
 	CloPanties = 1
 	CloInhibit = 15
 	CloTopCut = 3
 elseif ARGS[1] = 147:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
+	CloQuality = 3
+	CloThinness = 4
 	CloPanties = 1
-	CloInhibit = 25
+	CloInhibit = 15
 	CloTopCut = 4
 elseif ARGS[1] = 148:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 4
 	CloBra = 1
 	CloPanties = 1
-	CloInhibit = 10
-	CloTopCut = 3
-	CloOnePiece = 1
+	CloInhibit = 20
+elseif ARGS[1] = 148:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 149:
-	CloQuality = 3
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 4
+	CloInhibit = 25
 elseif ARGS[1] = 150:
-	CloQuality = 4
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloTopCut = 4
+	CloInhibit = 25
 elseif ARGS[1] = 151:
-	CloQuality = 5
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloTopCut = 4
+	CloInhibit = 25
 elseif ARGS[1] = 152:
-	CloQuality = 5
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 0
-	CloTopCut = 1
-	CloOnePiece = 1
+	CloInhibit = 25
 elseif ARGS[1] = 153:
-	CloQuality = 4
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 10
-	CloTopCut = 3
-	CloOnePiece = 1
+	CloInhibit = 30
 elseif ARGS[1] = 154:
-	CloQuality = 4
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-	CloOnePiece = 1
+	CloInhibit = 30
 elseif ARGS[1] = 155:
-	CloQuality = 4
-	CloThinness = 5
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 15
-	CloTopCut = 4
-	CloOnePiece = 1
-elseif ARGS[1] = 156:
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 5
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 5
-	CloTopCut = 3
-elseif ARGS[1] = 157:
-	CloQuality = 4
+	CloInhibit = 30
+elseif ARGS[1] = 156:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloTopCut = 3
+	CloInhibit = 30
+elseif ARGS[1] = 157:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 5
+	CloInhibit = 30
 elseif ARGS[1] = 158:
-	CloQuality = 3
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
 	CloThinness = 4
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 20
-	CloTopCut = 3
+	CloInhibit = 30
 elseif ARGS[1] = 159:
-	CloOnePiece = 1
-	CloInhibit = 0
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 160:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 30
 elseif ARGS[1] = 161:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 162:
-	CloOnePiece = 1
-	CloInhibit = 0
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 30
 elseif ARGS[1] = 163:
-	CloOnePiece = 1
-	CloInhibit = 15
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 164:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3	
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 165:
-	CloOnePiece = 1
-	CloInhibit = 0
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
 	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+	CloInhibit = 25
+elseif ARGS[1] = 165:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 4
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 166:
-	CloOnePiece = 1
-	CloInhibit = 20
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 30
 elseif ARGS[1] = 167:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 4
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 168:
-	CloOnePiece = 1
-	CloInhibit = 10
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 35
 elseif ARGS[1] = 169:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 170:
-	CloOnePiece = 1
-	CloInhibit = 10
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 171:
-	CloOnePiece = 1
-	CloInhibit = 10
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 172:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
-elseif ARGS[1] = 173:
-	CloOnePiece = 1
+	CloThinness = 4
 	CloInhibit = 25
-	CloQuality = 2
-	CloThinness = 3	
-	CloTopCut = 3
-	CloPanties = 1
+elseif ARGS[1] = 172:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 4
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 173:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
+	CloThinness = 4
+	CloInhibit = 30
 elseif ARGS[1] = 174:
-	CloOnePiece = 1
-	CloInhibit = 0
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloPantsShortness = 5
+	CloThinness = 2
+	CloInhibit = 20
 elseif ARGS[1] = 175:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 2
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloInhibit = 25
 elseif ARGS[1] = 176:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloTopCut = 3
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 4
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 177:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
 	CloThinness = 3
-	CloTopCut = 1
-	CloPanties = 1
+	CloInhibit = 30
 elseif ARGS[1] = 178:
-	CloOnePiece = 1
-	CloInhibit = 15
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 179:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 180:
-	CloOnePiece = 1
-	CloInhibit = 30
-	CloQuality = 2
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 1
 	CloThinness = 4
-	CloTopCut = 1
-	CloBimbo = 1
-	CloPanties = 1
+	CloInhibit = 30
 elseif ARGS[1] = 181:
-	CloOnePiece = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 1
+	CloThinness = 4
 	CloInhibit = 30
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloBimbo = 1
-	CloPanties = 1
 elseif ARGS[1] = 182:
-	CloOnePiece = 1
-	CloInhibit = 30
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloBimbo = 1
-	CloPanties = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 35
 elseif ARGS[1] = 183:
-	CloOnePiece = 1
-	CloInhibit = 15
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 184:
-	CloOnePiece = 1
-	CloInhibit = 10	
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloThinness = 2
+	CloInhibit = 20
 elseif ARGS[1] = 185:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 186:
-	CloOnePiece = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
+	CloThinness = 5
 	CloInhibit = 30
-	CloQuality = 1
-	CloThinness = 3
-	CloTopCut = 4
-	CloBimbo = 1
-	CloPanties = 1
 elseif ARGS[1] = 187:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3	
-	CloTopCut = 1
-	CloPanties = 1
+	CloThinness = 3
+	CloInhibit = 25
 elseif ARGS[1] = 188:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 2
-	CloThinness = 3	
-	CloTopCut = 2
-	CloPanties = 1
-elseif ARGS[1] = 189:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 189:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 190:
-	CloOnePiece = 1
-	CloInhibit = 5
-	CloQuality = 3
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
 	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloInhibit = 25
 elseif ARGS[1] = 191:
-	CloOnePiece = 1	
-	CloInhibit = 5
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 192:
-	CloOnePiece = 1
-	CloInhibit = 5
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 2
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 193:
-	CloOnePiece = 1
-	CloInhibit = 15
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloBimbo = 1
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 194:
-	CloOnePiece = 1
-	CloInhibit = 20
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 3
-	CloTopCut = 3
-	CloBimbo = 1
-	CloPanties = 1
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 195:
-	CloOnePiece = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
 	CloInhibit = 25
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 4
-	CloPanties = 1
 elseif ARGS[1] = 196:
-	CloOnePiece = 1
-	CloInhibit = 15
-	CloQuality = 3
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
 	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
-elseif ARGS[1] = 197:
-	CloOnePiece = 1
 	CloInhibit = 20
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 3
-	CloPanties = 1
+elseif ARGS[1] = 197:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 198:
-	CloOnePiece = 1
-	CloInhibit = 0
-	CloQuality = 4
-	CloThinness = 1	
-	CloTopCut = 1
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
 elseif ARGS[1] = 199:
-	CloBra = 1
-	CloPanties = 1
-	CloInhibit = 35
+	cloBra = 1
+	cloPanties = 1
 	CloQuality = 2
-	CloThinness = 5
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 200:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 30
+elseif ARGS[1] = 201:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 30
+elseif ARGS[1] = 202:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 30
+elseif ARGS[1] = 203:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 204:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
+	CloThinness = 4
+	CloInhibit = 30
+elseif ARGS[1] = 205:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 3
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 206:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 207:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 3
+	CloInhibit = 25
+elseif ARGS[1] = 208:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 30
+elseif ARGS[1] = 209:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 210:
+	cloBra = 1
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 211:
+	CloTopCut = 2
+	cloPanties = 1
+	CloQuality = 3
+	CloThinness = 4
+	CloInhibit = 25
+elseif ARGS[1] = 212:
+	CloTopCut = 2
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 3
+	CloInhibit = 30
+elseif ARGS[1] = 213:
+	CloTopCut = 2
+	cloPanties = 1
+	CloQuality = 2
+	CloThinness = 3
+	CloInhibit = 25
 end
 
 --- $attributes_swimwear ---------------------------------

+ 1 - 1
locations/_buy_item.qsrc

@@ -6,7 +6,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 
 count = ARGS[0]
 $item = $ARGS[1]

+ 1 - 1
locations/_buy_single_item.qsrc

@@ -7,7 +7,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 
 dynamic "set <<$ARGS[3]>> = <<ARGS[0]>>"
 set money -= ARGS[2]

+ 2 - 0
locations/_clothing_image.qsrc

@@ -31,6 +31,8 @@ elseif $ARGS[0] = 'burlesque':
 	$RESULT = 'images/pc/clothing/13burlesque/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'alternative':
 	$RESULT = 'images/pc/clothing/14alternative/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'beach':
+	$RESULT = 'images/pc/clothing/15beachbabe/<<ARGS[1]>>.jpg'
 end
 
 --- $clothing_image ---------------------------------

+ 218 - 98
locations/_clothing_name.qsrc

@@ -13,27 +13,27 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 7:$RESULT = 'A black one-piece with highlighted cups for extra support and more emphasis on the chest area.'
 	if ARGS[1] = 8:$RESULT = 'A small floral design bikini, with tiny straps that barely cover everything and show plenty of skin, perfect for a tan.'
 	if ARGS[1] = 9:$RESULT = 'A unique two-piece with a simple knot-top and a tiny miniskirt, all in red.'
-	if ARGS[1] = 10:$RESULT = 'A crimson bikini with white lace, the bottom is designed in a grid pattern to seductively show off your pubic area.'
+	if ARGS[1] = 10:$RESULT = 'A bikini in the color of the Russian flag, it has a deep v plunge, who says patriotism cannot be sexy?'
 	if ARGS[1] = 11:$RESULT = 'A classic two-piece bikini in pink white polka dots covering it.'
 	if ARGS[1] = 12:$RESULT = 'A vibrant yellow bikini with a halter top design.'
 	if ARGS[1] = 13:$RESULT = 'A sexily-designed swimming suit with adjustments made to accent the backside of any girl.'
 	if ARGS[1] = 14:$RESULT = 'A fashionable one-piece connected on one side to show off a large swath of stomach.'
-	if ARGS[1] = 15:$RESULT = 'A slutty bikini designed off of a sling bikini, connected with tiny pieces of fabric and covering only the minimal needed.'
-	if ARGS[1] = 16:$RESULT = 'A silver bikini bottom designed to highlight everything apart from the important thing.'
-	if ARGS[1] = 17:$RESULT = 'A tiny red and black bikini dotted with diamonds, made for the girl who loves to show off her body.'
-	if ARGS[1] = 18:$RESULT = 'Made for a whore, with tiny shiny red triangles of fabric covering the important parts.'
-	if ARGS[1] = 19:$RESULT = 'A black bikini bottom seductively connected by chains.'
-	if ARGS[1] = 20:$RESULT = 'A small white bikini bottom held by a knot.'
-	if ARGS[1] = 21:$RESULT = 'A tiny white bikini bottom held by a knot, with frilly designs on it.'
-	if ARGS[1] = 22:$RESULT = 'An incredibly slutty one-piece, with fabric covering only the bare minimum needed.'
-	if ARGS[1] = 23:$RESULT = 'A lime-green slutty fishnet bikini made for sexual encounters, openly showing off the nude form.'
-	if ARGS[1] = 24:$RESULT = 'A semi-transparent slutty white bikini, the top designed as a tube top.'
-	if ARGS[1] = 25:$RESULT = 'A slutty pink fishnet bikini outlined in black, the top designed as at tube top.'
-	if ARGS[1] = 26:$RESULT = 'A whorish two-piece that can barely be called clothes, with tiny little pink bows covering the nipples and a little triangle covering the entrance.'
+	if ARGS[1] = 15:$RESULT = 'One-piece black swimsuit that looks like 2 pieces, the middle is crochet together, highly showy and not practical at all.'
+	if ARGS[1] = 16:$RESULT = 'One-piece swimsuit with boat-neck cut and paradise print, it is fashionable despite its rather conservative.'
+	if ARGS[1] = 17:$RESULT = 'A coffee coloured one-piece swimsuit'
+	if ARGS[1] = 18:$RESULT = 'One-piece ruffled swimsuit with a scoop cut in cream, it has some innocent appeal to them...'
+	if ARGS[1] = 19:$RESULT = 'one-piece swimsuit with tasselled halter neckline and lace up front in taupe, it''s stylish and fashionable.'
+	if ARGS[1] = 20:$RESULT = 'A white one-piece swimsuit, it has colorful side-stripes that gives a retro feel to it.'
+	if ARGS[1] = 21:$RESULT = 'A strapless monokini with side-strings in fuscia, it''s very flirty and conspicuous.'
+	if ARGS[1] = 22:$RESULT = 'A crepe coloured, crocheted one-piece swimsuit, its deep plunge shows off your body like you mean business!.'
+	if ARGS[1] = 23:$RESULT = 'A black monokini, it has a very fun and flirty design, it emphasizes your curves a deal.'
+	if ARGS[1] = 24:$RESULT = 'One-piece swimsuit in black, it has scoop neckline and thin shoulder straps to create a curve hugging silhouette.'
+	if ARGS[1] = 25:$RESULT = 'Backless one-piece swimsuit with a deep v plunge, eggplant in color, it''s both practical and fashionable.'
+	if ARGS[1] = 26:$RESULT = 'A chlorine-resistant, training swimsuit, high-leg-height and still manage to look somewhat fashionable!'
 	if ARGS[1] = 27:$RESULT = 'A two-piece black leather design, the top made as a halter top with a mesh design.'
-	if ARGS[1] = 28:$RESULT = 'A slutty striped bikini, switching in between cyan blue and a semi transparent mesh.'
-	if ARGS[1] = 29:$RESULT = 'A sexual bikini covering the made minimum assets in hot pink and neon black.'
-	if ARGS[1] = 30:$RESULT = 'A bikini made for a whore, with a silver triangular design where the top of the triangle barely covers the nipple of the breast.'
+	if ARGS[1] = 28:$RESULT = 'A navy one-piece swimsuit, it has a light and flirty plunge and looks pretty good despite its price tag.'
+	if ARGS[1] = 29:$RESULT = 'A white one-piece swimsuit, it has very simple design and practical. Solid white never goes out of style!'
+	if ARGS[1] = 30:$RESULT = 'A black monokini with deep v plunge, the hallow cuts help to emphasize your body, it''s a conspicuous swimsuit!'
 	if ARGS[1] = 31:$RESULT = 'A sporty and backless one-piece, with a high leg'
 	if ARGS[1] = 32:$RESULT = 'A bikini with string straps and using the minimum material to still pass as decent. Classic sexy in red.'
 	if ARGS[1] = 33:$RESULT = 'A posh and slutty one-piece, perfect for a trophy wife or mistress. Purple with gold beads'
@@ -44,60 +44,60 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 38:$RESULT = 'A floral design bikini with bows and ruffles just perfect for the beach but not so good for swimming in.'
 	if ARGS[1] = 39:$RESULT = 'A one-piece with so many cut-outs its could pass for a bikini, has a bit of a spider web vibe and might just be the perfect thing for a sexy Goth.'
 	if ARGS[1] = 40:$RESULT = 'A leatherette bikini with scale detail to look like crocodile skin but in a glossy black. A little skimpy with string details.'
-	if ARGS[1] = 41:$RESULT = 'A tiny pink bikini leaving little to the imagination.'
+	if ARGS[1] = 41:$RESULT = 'A fashionable one-piece swimsuit in Egyptian blue, it teases yet remain some what functional.'
 	if ARGS[1] = 42:$RESULT = 'A classic black bikini white trim and florescent yellow detail, very chic.'
-	if ARGS[1] = 43:$RESULT = 'The kind of bikini you''d wear if you were about to jump out of a giant birthday cake.'
+	if ARGS[1] = 43:$RESULT = 'A belted, one-piece, denim colored swimsuit, it looks pretty good despite its price tag.'
 	if ARGS[1] = 44:$RESULT = 'A modern black and white bikini with tie string briefs.'
 	if ARGS[1] = 45:$RESULT = 'A sleek white one-piece with blue go faster stripes.'
-	if ARGS[1] = 46:$RESULT = 'A sparking golden bikini, with silver straps. You will get noticed in this'
-	if ARGS[1] = 47:$RESULT = 'A shiny red bikini with sparkling sliver straps, whorish and gaudy.'
-	if ARGS[1] = 48:$RESULT = 'The skimpiest sliver one-piece held together with transparent straps.'
+	if ARGS[1] = 46:$RESULT = 'An one-piece swimsuit in light blue, it has a very simplistic, practical design.'
+	if ARGS[1] = 47:$RESULT = 'A modest one-piece swimsuit with white floral prints.'
+	if ARGS[1] = 48:$RESULT = 'An one-piece swimsuit in iris color, it has a plunge that shows off your cleavage quite nicely.'
 	if ARGS[1] = 49:$RESULT = 'A classy blue bikini with bling links. You''ll look a million rubles in this'
 	if ARGS[1] = 50:$RESULT = 'A floral bikini with a deep v neck top to show some cleavage but still conservative.'
 	if ARGS[1] = 51:$RESULT = 'A black one-piece with a patterned circular cut out over the stomach.'
-	if ARGS[1] = 52:$RESULT = 'A slutty pink one-piece with a very high leg and low neck-line.'
+	if ARGS[1] = 52:$RESULT = 'An one-piece sporty swimsuit with boyleg-cut, unassuming and highly practical.'
 	if ARGS[1] = 53:$RESULT = 'A fresh black and pink pattern on white bikini make this fashionable and stylish choice.'
-	if ARGS[1] = 54:$RESULT = 'A bikini made for a whore, the pink fabric is so revealing it only serves to draw attention to completely exposed breasts and pussy.'
+	if ARGS[1] = 54:$RESULT = 'A peanut coloured one-piece swimsuit, it has a very simplistic, practical design.'
 	if ARGS[1] = 55:$RESULT = 'A bright patterned bikini with thin straps on a tube top.'
 	if ARGS[1] = 56:$RESULT = 'A multi-colour striped bikini with tie string briefs.'
 	if ARGS[1] = 57:$RESULT = 'A black polka-doted bikini with tie string briefs.'
 	if ARGS[1] = 58:$RESULT = 'A patterned one-piece with a very low v cut neck-line.'
 	if ARGS[1] = 59:$RESULT = 'A magenta one-piece with a patterned cut out from the neck-line to the belly button.'
 	if ARGS[1] = 60:$RESULT = 'A red bikini with ruffles and tie string briefs.'
-	if ARGS[1] = 61:$RESULT = 'A pink bikini with bright coloured straps. Its fairly small and shows some side boob.'
+	if ARGS[1] = 61:$RESULT = 'A black bikini with cross strap that resemble one-piece swimsuit, it''s more for show than being practical.'
 	if ARGS[1] = 62:$RESULT = 'A black one-piece with not too much breast coverage and string straps.'
 	if ARGS[1] = 63:$RESULT = 'A bikini made for a bimbo, pink with multi-coloured hearts, string ties and plastic hoops.'
 	if ARGS[1] = 64:$RESULT = 'A blue bikini with small gold circles on it and gold chain straps.'
 	if ARGS[1] = 65:$RESULT = 'A black bikini with a colourful trim. It balances exposure and dignity very well.'
 	if ARGS[1] = 66:$RESULT = 'A pink bikini with tie string briefs.'
-	if ARGS[1] = 67:$RESULT = 'A pink-black leopard-patterned bikini.'
-	if ARGS[1] = 68:$RESULT = 'A pink patterned bikini with white strings.'
+	if ARGS[1] = 67:$RESULT = 'A blue one-piece lacy swimsuit, it''s more for showy display than practical usage.'
+	if ARGS[1] = 68:$RESULT = 'One-piece swimsuit in black, it''s very simple except the modest spacing that tastefully shows your skin.'
 	if ARGS[1] = 69:$RESULT = 'A modest black-blue one-piece swimsuit, cut so the fabric shows off nearly all of the thighs in a seductive manner.'
-	if ARGS[1] = 70:$RESULT = 'A very daring light-blue bikini, which fabric is too thin or revealing to cover any private parts.'
-	if ARGS[1] = 71:$RESULT = 'This blue bikini is perfect for any slut and whore out there. Zippers are conveniently placed over the private parts to allow easy access.'
-	if ARGS[1] = 72:$RESULT = 'Made for all the unashamed whores out there, this bikini is nothing more than a few purple straps and doesn''t even try to cover the private parts.'
-	if ARGS[1] = 73:$RESULT = 'This slutty pink and black monokini just about covers your private parts.'
-	if ARGS[1] = 74:$RESULT = 'Made from a shiny blue material, this monokini barely covers your private parts. Somehow it''s always a tad too small, forcing the fabric, which should cover your vagina, between your labia.'
-	if ARGS[1] = 75:$RESULT = 'This slutty bikini is made from a few straps and barely covers your privates parts'
+	if ARGS[1] = 70:$RESULT = 'A pink one-piece swimsuit, it shows modest amount of your cleavage.'
+	if ARGS[1] = 71:$RESULT = 'A black one-piece high cut swimsuit with an inviting deep plunge, the design is quite flirty .'
+	if ARGS[1] = 72:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the strap side, it''s a rather showy swimsuit.'
+	if ARGS[1] = 73:$RESULT = 'A black one-piece swimsuit with jagged-cut and decorated with little gold tubes.'
+	if ARGS[1] = 74:$RESULT = 'An orange one-piece swimsuit, it has a plunge but still overs you very modestly.'
+	if ARGS[1] = 75:$RESULT = 'A blue one-piece swimsuit with a plunge, it shows decent amount of your cleavage.'
 	if ARGS[1] = 76:$RESULT = 'This bright pink bikini-monokini hybrid has two thin straps connecting the top and briefs and is held together by heart-shaped plastic hoops. Perfect for any bimbo.'
 	if ARGS[1] = 77:$RESULT = 'An orange-black patterned bikini, with tie string briefs.'
-	if ARGS[1] = 78:$RESULT = 'Made for all the beach sluts out there, this blue monokini is cross shaped and held together by collar.'
-	if ARGS[1] = 79:$RESULT = 'A bikini perfect for all the bimbo sluts that love pink bikinis, but don''t want to waste time when having sex by undressing. These pieces of clothes are nothing more than a few pink straps.'
-	if ARGS[1] = 80:$RESULT = 'What is this? Is this even a monokini? Who knows. It''s extremely slutty, doesn''t cover your breast at all and a white collar holds a very small blue vagina cover in place.'
+	if ARGS[1] = 78:$RESULT = 'A classic, one-piece black swimsuit, it might not be flirty enough for some.'
+	if ARGS[1] = 79:$RESULT = 'A deep V one-piece black swimsuit with floral print, it shows and entices.'
+	if ARGS[1] = 80:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the opposite side of the shoulder strap, it''s a rather showy swimsuit.'
 	if ARGS[1] = 81:$RESULT = 'A light blue bikini made for the exhibitionists out there. The fabric is quite revealing and doesn''t cover your private parts at all.'
-	if ARGS[1] = 82:$RESULT = 'A slutty, green-black patterned monokini, which top and bottom part are connected by very thin, black straps. '
+	if ARGS[1] = 82:$RESULT = 'One-piece, sporty swimsuit with two yellow stripes that emphasize your figure a little.'
 	if ARGS[1] = 83:$RESULT = 'A classic, light-blue and white bikini with tie string briefs.'
 	if ARGS[1] = 84:$RESULT = 'A classic, red-white bikini, with light-blue strings and a tie string thong.'
 	if ARGS[1] = 85:$RESULT = 'An all black bikini.'
-	if ARGS[1] = 86:$RESULT = 'A white bikini, with a halterless top.'
-	if ARGS[1] = 87:$RESULT = 'A black bikini, with a halterless top.'
+	if ARGS[1] = 86:$RESULT = 'A Maillot style, one-piece swimsuit, its simplistic design is balanced out by fashionable print patterns.'
+	if ARGS[1] = 87:$RESULT = 'A blue one-piece swimsuit, it mixes one-shoulder design with transparent meshes on various parts of the body.'
 	if ARGS[1] = 88:$RESULT = 'A classic patterned bikini, with thick black strings.'
 	if ARGS[1] = 89:$RESULT = 'A light pink bikini held together by metal rings.'
 	if ARGS[1] = 90:$RESULT = 'A bright-purple bikini with a tie string thong.'
 	if ARGS[1] = 91:$RESULT = 'A blue leaf-patterned swimsuits, cut so that the fabric shows off the thighs in a seductive manner.'
 	if ARGS[1] = 92:$RESULT = 'A slutty black swimsuit with a very deep cleavage and black straps running over the hips.'
 	if ARGS[1] = 93:$RESULT = 'A mostly-pink two-piece swimsuit. While the briefs are comparable to those of a bikini, the top ends just above the belly button, is very modest and has long sleeves.'
-	if ARGS[1] = 94:$RESULT = 'Made for a whore, this black bikini is nothing more than a few pieces of fabric, that just cover up intimate areas. The straps are super thin and the thong is really small.'
+	if ARGS[1] = 94:$RESULT = 'A pale turquoise bikini with an almost tube top and tie string bottoms.'
 	if ARGS[1] = 95:$RESULT = 'A classic red and polka-dot-patterned bikini with tie string briefs.'
 	if ARGS[1] = 96:$RESULT = 'A classic blue bikini.'
 	if ARGS[1] = 97:$RESULT = 'A bright pink swimsuit, which does show some cleavage, if the wearers breasts are large enough.'
@@ -111,17 +111,17 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 105:$RESULT = 'A classic blue polka-dot patterned bikini, with a tie between the breasts and frilly briefs.'
 	if ARGS[1] = 106:$RESULT = 'A classic light-pink bikini, with tie pink briefs.'
 	if ARGS[1] = 107:$RESULT = 'A sexy light-pink and black one-piece swimsuit, showing off a good amount of cleavage. It lower part is held to gether by tie strings and the swimsuit does not cover the hips.'
-	if ARGS[1] = 108:$RESULT = 'An orange bikini, with yellow straps and a tie strapped thong.'
+	if ARGS[1] = 108:$RESULT = 'A well made choral and black tankini.'
 	if ARGS[1] = 109:$RESULT = 'A classic light-blue bikini.'
-	if ARGS[1] = 110:$RESULT = 'Made from a shiny pink fabric, this daring bikini is perfect for any aspiring bimbo.'
+	if ARGS[1] = 110:$RESULT = 'A basic white bikini.'
 	if ARGS[1] = 111:$RESULT = 'A strapless dark blue swimsuit, with white décor around the fabric covering the breast.'
 	if ARGS[1] = 112:$RESULT = 'This classic gold-black bikini is made from a shiny fabric, which briefs are held together by two metal rings.'
 	if ARGS[1] = 113:$RESULT = 'A classic black-white patterned bikini, with light green straps. Its thong is held together by tie strings.'
-	if ARGS[1] = 114:$RESULT = 'A silver bikini made from a shiny material, has its thong held together by tie straps.'
-	if ARGS[1] = 115:$RESULT = 'While this may look like a classic pink bikini, with black frills covering the top, it''s much more indecent, as the thong is made from a very thing fabric and can be easily seen through.'
+	if ARGS[1] = 114:$RESULT = 'A blue and white striped swimsuit which looks a bit mumsy.'
+	if ARGS[1] = 115:$RESULT = 'A very thin white swimsuit which looks like it''ll go see through if wet, like on an Asian porn site.'
 	if ARGS[1] = 116:$RESULT = 'A shiny blue-silver patterned bikini, with a tie strapped thong.'
 	if ARGS[1] = 117:$RESULT = 'A black-blue patterned bikini, which is held together by tie straps and silver plastic rings.'
-	if ARGS[1] = 118:$RESULT = 'A blue swimsuit-bikini hybrid, with a very revealing cleavage and a mostly open midsection, showing of the wearers waist and hips. The top and bottom part are connected on the front with blue strap.'
+	if ARGS[1] = 118:$RESULT = 'A bright orange swimsuit with front lace up for better cleavage.'
 	if ARGS[1] = 119:$RESULT = 'A classic blue bikini, with golden straps.'
 	if ARGS[1] = 120:$RESULT = 'A classic colourful bikini, with tie strapped briefs.'
 	if ARGS[1] = 121:$RESULT = 'A classic colourful bikini.'
@@ -146,63 +146,183 @@ if $ARGS[0] = 'swimwear':
 	if ARGS[1] = 140:$RESULT = 'A black swimsuit in leather look material with mesh sides.'
 	if ARGS[1] = 141:$RESULT = 'A very shiny azur swimsuit with high leg and high neckline.'
 	if ARGS[1] = 142:$RESULT = 'A dark green bikini with multiple string sides to the bottoms.'
-	if ARGS[1] = 143:$RESULT = 'A pink string outline of a bikini that shows everything and is pretty much pointless.'
+	if ARGS[1] = 143:$RESULT = 'A black swimsuit with high neckline and tight fit, made for speed.'
 	if ARGS[1] = 144:$RESULT = 'A blue and white hooped one piece, very nautical.'
 	if ARGS[1] = 145:$RESULT = 'A cyan, melon and fuschia tie string bikini.'
 	if ARGS[1] = 146:$RESULT = 'A blue and white short tankini with red detail on the bottoms.'
-	if ARGS[1] = 147:$RESULT = 'A very minimal black bikini that just about covers your dignity.'
-	if ARGS[1] = 148:$RESULT = 'A shiny gold swimsuit with zipper on the front so you can show off your cleavage.'
-	if ARGS[1] = 149:$RESULT = 'A designer bikini with halter top, does look a bit like underwear though.'
-	if ARGS[1] = 150:$RESULT = 'A skimpy black bikini with cleavage zip.'
-	if ARGS[1] = 151:$RESULT = 'A tidy black bikini with cut out detail on the bottoms.'
-	if ARGS[1] = 152:$RESULT = 'A black swimsuit with high neckline and tight fit, made for speed.'
-	if ARGS[1] = 153:$RESULT = 'A bright orange swimsuit with front lace up for better cleavage.'
-	if ARGS[1] = 154:$RESULT = 'A blue and white striped swimsuit which looks a bit mumsy.'
-	if ARGS[1] = 155:$RESULT = 'A very thin white swimsuit which looks like it''ll go see through if wet, like on an Asian porn site.'
-	if ARGS[1] = 156:$RESULT = 'A well made choral and black tankini.'
-	if ARGS[1] = 157:$RESULT = 'A basic white bikini.'
-	if ARGS[1] = 158:$RESULT = 'A pale turquoise bikini with an almost tube top and tie string bottoms.'
-	if ARGS[1] = 159:$RESULT = 'A Maillot style, one-piece swimsuit, its simplistic design is balanced out by fashionable print patterns.'
-	if ARGS[1] = 160:$RESULT = 'A blue one-piece swimsuit, it mixes one-shoulder design with transparent meshes on various parts of the body.'
-	if ARGS[1] = 161:$RESULT = 'One-piece, sporty swimsuit with two yellow stripes that emphasize your figure a little.'
-	if ARGS[1] = 162:$RESULT = 'A classic, one-piece black swimsuit, it might not be flirty enough for some.'
-	if ARGS[1] = 163:$RESULT = 'A deep V one-piece black swimsuit with floral print, it shows and entices.'
-	if ARGS[1] = 164:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the opposite side of the shoulder strap, it''s a rather showy swimsuit.'
-	if ARGS[1] = 165:$RESULT = 'A pink one-piece swimsuit, it shows modest amount of your cleavage.'
-	if ARGS[1] = 166:$RESULT = 'A black one-piece high cut swimsuit with an inviting deep plunge, the design is quite flirty .'
-	if ARGS[1] = 167:$RESULT = 'A one-piece, cold asymmetrical black swimsuit with cut on the strap side, it''s a rather showy swimsuit.'
-	if ARGS[1] = 168:$RESULT = 'A black one-piece swimsuit with jagged-cut and decorated with little gold tubes.'
-	if ARGS[1] = 169:$RESULT = 'An orange one-piece swimsuit, it has a plunge but still overs you very modestly.'
-	if ARGS[1] = 170:$RESULT = 'A blue one-piece swimsuit with a plunge, it shows decent amount of your cleavage.'
-	if ARGS[1] = 171:$RESULT = 'A blue one-piece lacy swimsuit, it''s more for showy display than practical usage.'
-	if ARGS[1] = 172:$RESULT = 'One-piece swimsuit in black, it''s very simple except the modest spacing that tastefully shows your skin.'
-	if ARGS[1] = 173:$RESULT = 'A black bikini with cross strap that resemble one-piece swimsuit, it''s more for show than being practical.'
-	if ARGS[1] = 174:$RESULT = 'An one-piece sporty swimsuit with boyleg-cut, unassuming and highly practical.'
-	if ARGS[1] = 175:$RESULT = 'A peanut coloured one-piece swimsuit, it has a very simplistic, practical design.'
-	if ARGS[1] = 176:$RESULT = 'An one-piece swimsuit in light blue, it has a very simplistic, practical design.'
-	if ARGS[1] = 177:$RESULT = 'A modest one-piece swimsuit with white floral prints.'
-	if ARGS[1] = 178:$RESULT = 'An one-piece swimsuit in iris color, it has a plunge that shows off your cleavage quite nicely.'
-	if ARGS[1] = 179:$RESULT = 'A fashionable one-piece swimsuit in Egyptian blue, it teases yet remain some what functional.'
-	if ARGS[1] = 180:$RESULT = 'Open-piece swimsuit that is actually just lacy & crochet lingerie that can be worn underwater, it shows off your body quite nicely.'
-	if ARGS[1] = 181:$RESULT = 'A high-neck monokini in midnight blue and it is connected tastefully by a strap. More for show, less for actual swimming.'
-	if ARGS[1] = 182:$RESULT = 'A pink cross-strap monokini, it is rather showy and highly impractical, might just be the perfect thing for you?'
-	if ARGS[1] = 183:$RESULT = 'A belted, one-piece, denim colored swimsuit, it looks pretty good despite its price tag.'
-	if ARGS[1] = 184:$RESULT = 'A navy one-piece swimsuit, it has a light and flirty plunge and looks pretty good despite its price tag.'
-	if ARGS[1] = 185:$RESULT = 'A white one-piece swimsuit, it has very simple design and practical. Solid white never goes out of style!'
-	if ARGS[1] = 186:$RESULT = 'A black monokini with deep v plunge, the hallow cuts help to emphasize your body, it''s a conspicuous swimsuit!'
-	if ARGS[1] = 187:$RESULT = 'One-piece swimsuit with boat-neck cut and paradise print, it is fashionable despite its rather conservative.'
-	if ARGS[1] = 188:$RESULT = 'One-piece black swimsuit that looks like 2 pieces, the middle is crochet together, highly showy and not practical at all.'
-	if ARGS[1] = 189:$RESULT = 'A coffee coloured one-piece swimsuit'
-	if ARGS[1] = 190:$RESULT = 'One-piece ruffled swimsuit with a scoop cut in cream, it has some innocent appeal to them...'
-	if ARGS[1] = 191:$RESULT = 'one-piece swimsuit with tasselled halter neckline and lace up front in taupe, it''s stylish and fashionable.'
-	if ARGS[1] = 192:$RESULT = 'A white one-piece swimsuit, it has colorful side-stripes that gives a retro feel to it.'
-	if ARGS[1] = 193:$RESULT = 'A strapless monokini with side-strings in fuscia, it''s very flirty and conspicuous.'
-	if ARGS[1] = 194:$RESULT = 'A crepe coloured, crocheted one-piece swimsuit, its deep plunge shows off your body like you mean business!.'
-	if ARGS[1] = 195:$RESULT = 'A black monokini, it has a very fun and flirty design, it emphasizes your curves a deal.'
-	if ARGS[1] = 196:$RESULT = 'One-piece swimsuit in black, it has scoop neckline and thin shoulder straps to create a curve hugging silhouette.'
-	if ARGS[1] = 197:$RESULT = 'Backless one-piece swimsuit with a deep v plunge, eggplant in color, it''s both practical and fashionable.'
-	if ARGS[1] = 198:$RESULT = 'A chlorine-resistant, training swimsuit, high-leg-height and still manage to look somewhat fashionable!'
-	if ARGS[1] = 199:$RESULT = 'A bikini in the color of the Russian flag, it has a deep v plunge, who says patriotism cannot be sexy?'
+	if ARGS[1] = 147:$RESULT = 'A designer bikini with halter top, does look a bit like underwear though.'
+	if ARGS[1] = 148:$RESULT = 'A tidy black bikini with cut out detail on the bottoms.'
+	if ARGS[1] = 149:$RESULT = 'A bikini set witth actual zebras printed on them, you feel both silly and cute in the same time.'
+	if ARGS[1] = 150:$RESULT = 'A black bikini set, it has a triangle top with a side-string bottom that offers full coverage.'
+	if ARGS[1] = 151:$RESULT = 'A bikini set with a triangle top and side-tie bottom in the color mineral alloy, it has crochet print.'
+	if ARGS[1] = 152:$RESULT = 'A bikini set in the color sangria, it has a tie-back top and a cheeky bottom, its both flirty and functional.'
+	if ARGS[1] = 153:$RESULT = 'A bikini in dark periwinkle, it has a triangle top with tie-back and a classic bikini bottom.'
+	if ARGS[1] = 154:$RESULT = 'A bikini set with a triangle top and a Brazillian bottom, its traditional Japanese art print makes look exotic.'
+	if ARGS[1] = 155:$RESULT = 'A bikini set with a tie-back top and a Brazillian bottom, the strings draws attention to your breasts.' 
+	if ARGS[1] = 156:$RESULT = 'A bikini set witth a bralette top and a cheeky Brazillian bottom, its blue but also can reverse to black bikini.'
+	if ARGS[1] = 157:$RESULT = 'A bikini set witth a twist Bandeau top and a string bikini bottom, it has decorative gold stripes.'
+	if ARGS[1] = 158:$RESULT = 'A bikini set witth a small triangle top and a g-string bottom that leave very little to the imagination.' 
+	if ARGS[1] = 160:$RESULT = 'A black bikini set with a triangle top and a little thong bottom that shows off your booty quite nicely.'
+	if ARGS[1] = 161:$RESULT = 'A bikini set in black, it has a cross-string top and a Brazillian bottom, it hug your curves quite nicely.' 
+	if ARGS[1] = 162:$RESULT = 'A bikini set in purple, it has a v plunge bralette top and a thong bottom it shows your booty nicely.'
+	if ARGS[1] = 163:$RESULT = 'A bikini set in Azure, it has a Bandeau top and a string bikini bottom.'
+	if ARGS[1] = 164:$RESULT = 'A bikini set in the color fuscia, it has a triangle top and a tiny thong bottom that provide little back coverage.'
+	if ARGS[1] = 165:$RESULT = 'A bikini set with a triangle tops and a thong bottom in color fuscia and floral prints.' 
+	if ARGS[1] = 166:$RESULT = 'A blue bikini set with a triangle top and a thong bottom, it has white floral print and looks fun and flirty.' 
+	if ARGS[1] = 167:$RESULT = 'A bikini set with a triangle top and a Brazillian bottom in Tiffany Blue, it''s both functional and fashionalbe.'
+	if ARGS[1] = 168:$RESULT = 'A red bikini set with a triangle top and a Brazillian bottom that gives plenty of coverage yet remaining flirty!'
+	if ARGS[1] = 169:$RESULT = 'A bikini set witth a triangle tie-back top and a Brazillian bottom in the color Taffy, it looks fun and flirty.'
+	if ARGS[1] = 170:$RESULT = 'A bikini set that has a rather revealing halter top anda  small string bottom in the color Thunder.'
+	if ARGS[1] = 171:$RESULT = 'A bikini set in the color scarlet, it has a triangle tie-back top and a side-string bottom, classy and flirty.'
+	if ARGS[1] = 172:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has supportive-cup, highly comfortable yet remain classy.'
+	if ARGS[1] = 173:$RESULT = 'A black bikini set with a bralette top and a full bottom, it has the classy vibe to it.' 
+	if ARGS[1] = 174:$RESULT = 'A bikini set in the Cerulean color, it has a classic bottom as well as a tie-back top that reveal part of the cleavage.' 
+	if ARGS[1] = 175:$RESULT = 'A bikini in Sky blue color, it has a fashionable halter-top top and a classic bikini bottom.' 
+	if ARGS[1] = 176:$RESULT = 'A black bikini set with a strapless Bandeau top and a Brazillian bottom, its fun and flirty.'
+	if ARGS[1] = 177:$RESULT = 'A bikini in the color Laure, it has a  front-tie top and a multi-string bikini bottom.'
+	if ARGS[1] = 178:$RESULT = 'A Triangle grey bikini top with rings and a scrunch Brazillian bottom, its both fahionalbe and functional.'
+	if ARGS[1] = 179:$RESULT = 'A Triangle bikini top with a Brazillian bottom in multi-floral print.'
+	if ARGS[1] = 180:$RESULT = 'A pink ruffled bikini with a triangle top and a thong bottom, its both playful and flirty'
+	if ARGS[1] = 181:$RESULT = 'A black bikini set with a triangle top and a g-string bottom.' 
+	if ARGS[1] = 182:$RESULT = 'A red bikini set witth a triangle top and a sexy thong bottom.'
+	if ARGS[1] = 183:$RESULT = 'A bikini set with a triangle top and a g-string bottom, its design reveal much of your body.'
+	if ARGS[1] = 184:$RESULT = 'A red bikini with a tie-back top and a cheeky bottom, its sassy with class.'
+	if ARGS[1] = 185:$RESULT = 'A black bikini with a a multi-colored top and a classic bikini bottom.'
+	if ARGS[1] = 186:$RESULT = 'A red bikini top with a deep plunge that shows off your cleavage and a small classic bottom.' 
+	if ARGS[1] = 187:$RESULT = 'A black bikini with a deep-plunge top and a thong that shows your body off with minimum decency.'
+	if ARGS[1] = 188:$RESULT = 'A Navy blue bikini with a tie-back top and a classic bikini bottom.' 
+	if ARGS[1] = 189:$RESULT = 'A bikini with a banded halter-top and a classic bikini bottom, it has stripes of shimmery gold.' 
+	if ARGS[1] = 190:$RESULT = 'A blue bikini with a medium-size triangle top and a string bikini bottom that provides coverage.'
+	if ARGS[1] = 191:$RESULT = 'A green bikini with snake-skin print, with a triangle top and a classic g-string.' 
+	if ARGS[1] = 192:$RESULT = 'A red bikini set with a deep-plunge top and a thong bottom, it has two Navy blue stripes.' 
+	if ARGS[1] = 193:$RESULT = 'A white bikini with blue hen, it has a bralette top and a Brazillian bottom.'
+	if ARGS[1] = 194:$RESULT = 'A black bikini with a tie-back triangle top and a classic bikini bottom.'
+	if ARGS[1] = 195:$RESULT = 'A bikini with a tie-back triangle top and a side-tie classic bikini bottom, it has floral print.'
+	if ARGS[1] = 196:$RESULT = 'A two-piece swimsuit in Indian red, it has a wrap front-tie top and a classic full bottom.'
+	if ARGS[1] = 197:$RESULT = 'A bikini set in assorted pink color, it has a fashionable halter top and a g-string bottom.'
+	if ARGS[1] = 198:$RESULT = 'A red bikini with a triangle top and g-string bottom.'
+	if ARGS[1] = 199:$RESULT = 'A coral bikini set with a fashionable small triangle top and a thong bottom.' 
+	if ARGS[1] = 200:$RESULT = 'A red ruffled bikini with a small triangle top and a thong bikini bottom.' 
+	if ARGS[1] = 201:$RESULT = 'A yellow bikini with white polka dots, it has small triangle top with a deep plunge and a side-string thong bottom.'
+	if ARGS[1] = 202:$RESULT = 'A blue bikini set with decorative black flourishing, it has a triangle top and a side-string bottom.' 
+	if ARGS[1] = 203:$RESULT = 'A pink bikini set with white polka dots, it has a plunged triangle top and a side-tie bikini bottom.'
+	if ARGS[1] = 204:$RESULT = 'A  micro monochrome stripes bikini with a bralette top and a thong bottom.'
+	if ARGS[1] = 205:$RESULT = 'A coral bikini set with a deep-plunge bralette top and a thong bottom.'
+	if ARGS[1] = 206:$RESULT = 'A bikini set in medium Pearwood color, it has a scoop plunge top and a classic full bikini bottom.'
+	if ARGS[1] = 207:$RESULT = 'A bikini set with blush tone print, it has a bralette top and a classic full bikini bottom.'
+	if ARGS[1] = 208:$RESULT = 'A bikini set witth a smocked triangle top and a cheeky bikini bottom.'
+	if ARGS[1] = 209:$RESULT = 'A string bikini set with red palette print, it has a small triangle top and a cheeky string bikini.' 
+	if ARGS[1] = 210:$RESULT = 'A bikini in baby blue color, it has a wrap top and a classic bikini bottom.'
+	if ARGS[1] = 211:$RESULT = 'A bikini set with floral print, it has a triangle top and a Brazillian bottom.'
+	if ARGS[1] = 212:$RESULT = 'A two-piece swimsuit in the color pine green, it has a full coverage top and a thong bikini bottom.'
+	if ARGS[1] = 213:$RESULT = 'A two-piece swimsuit in the color black, it has a halter top with transparent mesh and a double-strap thong bottom.'
+	if ARGS[1] = 214:$RESULT = 'A two-piece swimsuit that looks like one-piece. it has a tankini top and a classic full bikini bottom.' 
+
+
+elseif $ARGS[0] = 'beach':
+	if ARGS[1] = 1:$RESULT = 'A crimson bikini with white lace, the bottom is designed in a grid pattern to seductively show off your pubic area.'
+	if ARGS[1] = 2:$RESULT = 'A slutty bikini designed off of a sling bikini, connected with tiny pieces of fabric and covering only the minimal needed.'
+	if ARGS[1] = 3:$RESULT = 'A silver bikini bottom designed to highlight everything apart from the important thing.'
+	if ARGS[1] = 4:$RESULT = 'A tiny red and black bikini dotted with diamonds, made for the girl who loves to show off her body.'
+	if ARGS[1] = 5:$RESULT = 'Made for a whore, with tiny shiny red triangles of fabric covering the important parts.'
+	if ARGS[1] = 6:$RESULT = 'A black bikini bottom seductively connected by chains.'
+	if ARGS[1] = 7:$RESULT = 'A small white bikini bottom held by a knot.'
+	if ARGS[1] = 8:$RESULT = 'A tiny white bikini bottom held by a knot, with frilly designs on it.'
+	if ARGS[1] = 9:$RESULT = 'An incredibly slutty one-piece, with fabric covering only the bare minimum needed.'
+	if ARGS[1] = 10:$RESULT = 'A lime-green slutty fishnet bikini made for sexual encounters, openly showing off the nude form.'
+	if ARGS[1] = 11:$RESULT = 'A semi-transparent slutty white bikini, the top designed as a tube top.'
+	if ARGS[1] = 12:$RESULT = 'A slutty pink fishnet bikini outlined in black, the top designed as at tube top.'
+	if ARGS[1] = 13:$RESULT = 'A whorish two-piece that can barely be called clothes, with tiny little pink bows covering the nipples and a little triangle covering the entrance.'
+	if ARGS[1] = 14:$RESULT = 'A slutty striped bikini, switching in between cyan blue and a semi transparent mesh.'
+	if ARGS[1] = 15:$RESULT = 'A sexual bikini covering the made minimum assets in hot pink and neon black.'
+	if ARGS[1] = 16:$RESULT = 'A bikini made for a whore, with a silver triangular design where the top of the triangle barely covers the nipple of the breast.'
+	if ARGS[1] = 17:$RESULT = 'A tiny pink bikini leaving little to the imagination.'
+	if ARGS[1] = 18:$RESULT = 'The kind of bikini you''d wear if you were about to jump out of a giant birthday cake.'
+	if ARGS[1] = 19:$RESULT = 'A sparking golden bikini, with silver straps. You will get noticed in this'
+	if ARGS[1] = 20:$RESULT = 'A shiny red bikini with sparkling sliver straps, whorish and gaudy.'
+	if ARGS[1] = 21:$RESULT = 'The skimpiest sliver one-piece held together with transparent straps.'
+	if ARGS[1] = 22:$RESULT = 'A slutty pink one-piece with a very high leg and low neck-line.'
+	if ARGS[1] = 23:$RESULT = 'A bikini made for a whore, the pink fabric is so revealing it only serves to draw attention to completely exposed breasts and pussy.'
+	if ARGS[1] = 24:$RESULT = 'A pink bikini with bright coloured straps. Its fairly small and shows some side boob.'
+	if ARGS[1] = 25:$RESULT = 'A pink-black leopard-patterned bikini.'
+	if ARGS[1] = 26:$RESULT = 'A pink patterned bikini with white strings.'
+	if ARGS[1] = 27:$RESULT = 'A very daring light-blue bikini, which fabric is too thin or revealing to cover any private parts.'
+	if ARGS[1] = 28:$RESULT = 'This blue bikini is perfect for any slut and whore out there. Zippers are conveniently placed over the private parts to allow easy access.'
+	if ARGS[1] = 29:$RESULT = 'Made for all the unashamed whores out there, this bikini is nothing more than a few purple straps and doesn''t even try to cover the private parts.'
+	if ARGS[1] = 30:$RESULT = 'This slutty pink and black monokini just about covers your private parts.'
+	if ARGS[1] = 31:$RESULT = 'Made from a shiny blue material, this monokini barely covers your private parts. Somehow it''s always a tad too small, forcing the fabric, which should cover your vagina, between your labia.'
+	if ARGS[1] = 32:$RESULT = 'This slutty bikini is made from a few straps and barely covers your privates parts'
+	if ARGS[1] = 33:$RESULT = 'Made for all the beach sluts out there, this blue monokini is cross shaped and held together by collar.'
+	if ARGS[1] = 34:$RESULT = 'A bikini perfect for all the bimbo sluts that love pink bikinis, but don''t want to waste time when having sex by undressing. These pieces of clothes are nothing more than a few pink straps.'
+	if ARGS[1] = 35:$RESULT = 'What is this? Is this even a monokini? Who knows. It''s extremely slutty, doesn''t cover your breast at all and a white collar holds a very small blue vagina cover in place.'
+	if ARGS[1] = 36:$RESULT = 'A slutty, green-black patterned monokini, which top and bottom part are connected by very thin, black straps. '
+	if ARGS[1] = 37:$RESULT = 'A white bikini, with a halterless top.'
+	if ARGS[1] = 38:$RESULT = 'A black bikini, with a halterless top.'
+	if ARGS[1] = 39:$RESULT = 'Made for a whore, this black bikini is nothing more than a few pieces of fabric, that just cover up intimate areas. The straps are super thin and the thong is really small.'
+	if ARGS[1] = 40:$RESULT = 'An orange bikini, with yellow straps and a tie strapped thong.'
+	if ARGS[1] = 41:$RESULT = 'Made from a shiny pink fabric, this daring bikini is perfect for any aspiring bimbo.'
+	if ARGS[1] = 42:$RESULT = 'A silver bikini made from a shiny material, has its thong held together by tie straps.'
+	if ARGS[1] = 43:$RESULT = 'While this may look like a classic pink bikini, with black frills covering the top, it''s much more indecent, as the thong is made from a very thing fabric and can be easily seen through.'
+	if ARGS[1] = 44:$RESULT = 'A blue swimsuit-bikini hybrid, with a very revealing cleavage and a mostly open midsection, showing of the wearers waist and hips. The top and bottom part are connected on the front with blue strap.'
+	if ARGS[1] = 45:$RESULT = 'A pink string outline of a bikini that shows everything and is pretty much pointless.'
+	if ARGS[1] = 46:$RESULT = 'A very minimal black bikini that just about covers your dignity.'
+	if ARGS[1] = 47:$RESULT = 'A shiny gold swimsuit with zipper on the front so you can show off your cleavage.'
+	if ARGS[1] = 48:$RESULT = 'A skimpy black bikini with cleavage zip.'
+	if ARGS[1] = 49:$RESULT = 'Open-piece swimsuit that is actually just lacy & crochet lingerie that can be worn underwater, it shows off your body quite nicely.'
+	if ARGS[1] = 50:$RESULT = 'A high-neck monokini in midnight blue and it is connected tastefully by a strap. More for show, less for actual swimming.'
+	if ARGS[1] = 51:$RESULT = 'A pink cross-strap monokini, it is rather showy and highly impractical, might just be the perfect thing for you?'
+	if ARGS[1] = 52:$RESULT = 'A gold bikini set with a tie-back top and a g-string bottom that showcases your physique.'
+	if ARGS[1] = 53:$RESULT = 'A wipe bikini set in white with a Brazillian bottom, its hallow cut shows off your cleavage quite enticingly.'
+	if ARGS[1] = 54:$RESULT = 'A bikini set in orange and yellow string, it has a triangle top and a little g-string bottom.'
+	if ARGS[1] = 55:$RESULT = 'A rather cheap looking bikini in the color taffy, it has a thin triangle top and a thin thong bottom.'
+	if ARGS[1] = 56:$RESULT = 'A bikini set with a triangle top and a Brazillian bottom. It has camouflage print but with more sensual colors.' 
+	if ARGS[1] = 57:$RESULT = 'A violet bikini set with a small triangle top and a g-string bottom, any less coverage would be indecent!'
+	if ARGS[1] = 58:$RESULT = 'A bikini set with a small triangle top and a small sexy g-string, any less coverage would be indecent!'
+	if ARGS[1] = 59:$RESULT = 'A bikini set with a small triangle top and a small sexy g-string in Midnight Blue, any less coverage would be indecent!'
+	if ARGS[1] = 60:$RESULT = 'A black bikini set witth a triangle top and a string bikini bottom, black bikini never goes out of style!' 
+	if ARGS[1] = 61:$RESULT = 'A bikini set with a medium triangle tops and a g-string bottom in camouflage colors, it has flirty and fun vibe.'
+	if ARGS[1] = 62:$RESULT = 'A bikini set in the color chocalate, it has a small triangle top and a small g-string.'
+	if ARGS[1] = 63:$RESULT = 'A black bikini set with decorative gold stripes, it has a triangle top and a thong bottom.'
+	if ARGS[1] = 64:$RESULT = 'A Mint bikini set witth a tie-back top and a g-string bottom, its classy.'
+	if ARGS[1] = 65:$RESULT = 'A gold bikini with a thin halter-top and a small Brazillian bottom.' 
+	if ARGS[1] = 66:$RESULT = 'A gold bikini with a Bandeau top and a side-tie Brazillian bottom.' 
+	if ARGS[1] = 67:$RESULT = 'A blue bikini with a strapless Bandeau top and a side-string bikini bottom.' 
+	if ARGS[1] = 68:$RESULT = 'A black bikini with a halter-top and a classic string bikini bottom.' 
+	if ARGS[1] = 69:$RESULT = 'A blue bikini with a triangle top and a Brazillian bottom.' 
+	if ARGS[1] = 70:$RESULT = 'A gold bikini with a deep plunge and a g-string bottom, it''s rahter risque.'
+	if ARGS[1] = 71:$RESULT = 'A black bikini with light-blue dot print, it has a small triangle top and a pair of little thong bikini bottom.'
+	if ARGS[1] = 72:$RESULT = 'A red sequin two-piece, it has a tube strapless top and a side-tie bikini bottom.'
+	if ARGS[1] = 73:$RESULT = 'A pink crocheted bikini with white under layer, it has a small triangle top and a Brazillian bottom.'
+	if ARGS[1] = 74:$RESULT = 'A black bikini set with a small triangle top and a g-string bottom.' 
+	if ARGS[1] = 75:$RESULT = 'A red ruffle two-piece swimsuit with a padded Bandeau top and a classic brief bottom.'
+	if ARGS[1] = 76:$RESULT = 'A micro-bikini set in Amethst, it has a tiny triangle top and a thong bottom that bearly covers anything.'
+	if ARGS[1] = 77:$RESULT = 'A micro-bikini set in black, it has a tiny triangle top and a thong bottom that bearly covers anything.'
+	if ARGS[1] = 78:$RESULT = 'A micro-bikini set in neon green, it has a tiny triangle top and a thong bottom that bearly covers anything.'
+	if ARGS[1] = 79:$RESULT = 'A red sequin micro-bikini that has a tiny triangle top and a thong bottom that bearly covers anything.' 
+	if ARGS[1] = 80:$RESULT = 'A black bikini that has a tiny triangle top that bearly covers your nipples and a g-string that covers nothing!' 
+	if ARGS[1] = 81:$RESULT = 'A grey bikini with green hem that has a tiny triangle top that bearly covers your nipples and a g-string that covers almost nothing!'
+	if ARGS[1] = 82:$RESULT = 'A pink bikini set that has a tiny triangle top that bearly cover your nipples and a g-string that reveals everything!'
+	if ARGS[1] = 83:$RESULT = 'A blue bikini set that has a tiny triangle top that bearly cover your nipples and a g-string that only cover your pussy minimally!' 
+	if ARGS[1] = 84:$RESULT = 'A blue bikini set that has a tiny triangle top that bearly cover your nipples and a g-string that covers nothing!'
+	if ARGS[1] = 85:$RESULT = 'A bikini that has a top that consist of two stripes and a g-string thong that leave nothing to the imagination!' 
+	if ARGS[1] = 86:$RESULT = 'A bikini that covers nothing and it screams for attention, only a horny-whorey whore would wear something like this!'
+	if ARGS[1] = 87:$RESULT = 'A bikini that covers nothing and it screams for attention, only a horny-whorey whore would wear something like this!'
+	if ARGS[1] = 88:$RESULT = 'A bikini that covers nothing and it screams for attention, only a horny-whorey whore would wear something like this!'
+	if ARGS[1] = 89:$RESULT = 'A bikini that covers nothing and it screams for attention, only a horny-whorey whore would wear something like this!'
+	if ARGS[1] = 90:$RESULT = 'A bikini that covers nothing and it screams for attention, only a horny-whorey whore would wear something like this!' 
+	if ARGS[1] = 91:$RESULT = 'A transparent white bikini that''s wholly see-through when wet, perfect for an attention-seeking slut.' 
+	if ARGS[1] = 92:$RESULT = 'A transparent neon green bikini that''s wholly see-through when wet, perfect for an attention-seeking slut.' 
+	if ARGS[1] = 93:$RESULT = 'A transparent neon green bikini that''s wholly see-through when wet, perfect for an attention-seeking floozy.' 
+	if ARGS[1] = 94:$RESULT = 'A transparent violet bikini that''s wholly see-through when wet, perfect for an attention-seeking floozy.' 
+	if ARGS[1] = 95:$RESULT = 'A two-piece set that''s totally see-through when wet, ideal for an attention-needing tramp!'
+	if ARGS[1] = 96:$RESULT = 'A two-piece set that''s totally see-through when wet, ideal for an attention-needing tramp!'
+	if ARGS[1] = 97:$RESULT = 'A transparent sky blue bikini that''s wholly see-through when wet, perfect for an attention-seeking bimbo.'
+	if ARGS[1] = 98:$RESULT = 'A transparent white bikini that''s wholly see-through when wet, it is classy, in a bimbo kind of way.'
+	if ARGS[1] = 99:$RESULT = 'A transparent white bikini that''s totally see-through even when its dry, it is perfect for an attention-needing bimbette!'
+	if ARGS[1] = 100:$RESULT = 'A transparent white bikini that''s wholly see-through when wet, perfect for an attention-wanting floozy.' 
+	if ARGS[1] = 101:$RESULT = 'A monokini that almost covers nothing, its perfect to show off your body, if that is your thing...' 
+	if ARGS[1] = 102:$RESULT = 'A monokini that almost covers nothing, its perfect for an attention-seeking bimbette!' 
+	if ARGS[1] = 103:$RESULT = 'A monokini that covers nothing, it signals people that you are desparate for attention and will do anything for it!' 
 
 elseif $ARGS[0] = 'coat':
 	if ARGS[1] = 1:$RESULT = 'A light jacket offering very little protection from the weather.'

+ 2 - 0
locations/_short_description.qsrc

@@ -32,6 +32,8 @@ elseif $ARGS[0] = 'coat':
 	$RESULT = 'Coat number '
 elseif $ARGS[0] = 'swimwear':
 	$RESULT = 'Swimwear number '
+elseif $ARGS[0] = 'beach':
+	$RESULT = 'Slutty swimwear number '
 elseif $ARGS[0] = 'burlesque':
 	$RESULT = 'Burlesque outfit number '
 end

+ 1 - 1
locations/_single_stock_item.qsrc

@@ -8,7 +8,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 !! ARGS 6 > 0 to  force-disable buy link
 !! ARGS 7 is replacement text for 6
 !! ARGS 8 is custom buy link when ARGS 6 > 0

+ 1 - 1
locations/_stock_item.qsrc

@@ -8,7 +8,7 @@
 !! ARGS 2 is the price
 !! ARGS 3 is the variable name for the item
 !! ARGS 4 is the location to go back to
-!! ARGS 5 is $metka
+!! ARGS 5 is $loc_arg
 !! ARGS 6 > 0 to  force-disable buy link
 !! ARGS 7 is replacement text for 6
 !! ARGS 8 is custom buy link when ARGS 6 > 0

+ 4 - 4
locations/abduction.qsrc

@@ -1,7 +1,7 @@
 # abduction
 
 $location_type = 'private'
-$metka = 'start'
+$loc_arg = 'start'
 $loc = 'abduction'
 
 if $ARGS[0] = 'start':
@@ -81,7 +81,7 @@ end
 
 if $ARGS[0] = 'abdRoom':
 	$loc = 'abduction'
-	$metka = 'abdRoom'
+	$loc_arg = 'abdRoom'
 	$menu_loc = 'abduction'
 	$menu_arg = 'abdRoom'
 	menu_off = 0
@@ -572,8 +572,8 @@ end
 if $ARGS[0] = 'abdFood':
 	$loc = 'abduction'
 	$locM = 'abduction'
-	$metka = 'abdFood'
-	$metkaM = 'abdFood'
+	$loc_arg = 'abdFood'
+	$locM_arg = 'abdFood'
 	$menu_loc = 'abduction'
 	$menu_arg = 'abdFood'
 	menu_off = 0

+ 8 - 8
locations/agentned.qsrc

@@ -4,8 +4,8 @@ if $ARGS[0] = 'start':
 	CLOSE ALL
 	
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'start'
@@ -69,8 +69,8 @@ end
 
 if $ARGS[0] = 'buy':
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'buy'
@@ -113,8 +113,8 @@ end
 
 if $ARGS[0] = 'sell':
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'sell'
@@ -248,8 +248,8 @@ end
 
 if $ARGS[0] = 'rent':
 	*clr & cla
-	$loc = $curloc
-	$metka = $ARGS[0]
+	$loc = 'agentned'
+	$loc_arg = $ARGS[0]
 	$location_type = 'indoors'
 	$menu_loc = 'agentned'
 	$menu_arg = 'rent'

+ 0 - 145
locations/albinaEv.qsrc

@@ -1,145 +0,0 @@
-# albinaEv
-! $din_albina_get_over_car = {
-! 	'A pair of strong hands grab you and pull you out of the car.'
-
-! 	act 'Further':
-! 		*clr & cla
-! 		menu_off = 1
-! 		AlbinaQW['Car'] = 1
-! 		gs 'stat'
-! 		$ImageNeededPlacholder
-! 		! WD: IMAGE NEEDED ~ '<center><img <<$set_imgh>> src="images/qwest/alter/grab.jpg"></center>'
-! 	end
-! }
-
-! frost = 0
-! AlbinaQW['CarDay'] = daystart
-! gs 'stat'
-! '<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 'You went out to the car and see Albina sitting in it, nervously looking every which direction. As you approach, she starts the engine.'
-
-! if AlbinaQW['Car'] = 0:
-! 	act 'Ask her if the car is hers':
-! 		*clr & cla
-! 		menu_off = 1
-! 		AlbinaQW['Car'] = 1
-! 		gs 'stat'
-
-! 		'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
-! 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
-! 		'You ask Albina "Is this your car?"'
-! 		'Albina squirms, grimacing and answers in a contemptuous tone "What? Of course not, this is my fathers car, I would never have bought this thing. The X5 is a car for those newly rich and not for decent people."'
-! 		'You shake your head, "Do you even have a drivers license?"'
-! 		'Albina laughs, saying "License? Why would I need one, do you know who my father is? He used to be the police chief of our town, although he''s retired now. He still has all his connections, and I''ve never been stopped in his car."'
-! 		'Albina goes quiet for a few seconds, seemingly thinking about something, then suddenly says "Let''s go for a ride."'
-
-! 		act 'Go with Albina':
-! 			*clr & cla
-! 			minut += 5
-! 			gs 'stat'
-! 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 			'You sit down on the seat next to Albina and she starts driving around town.'
-! 			'Soon enough, you find yourself on the outskirts of town. Glancing in your direction with a mysterious smile, Albina says "I have a surprise for you.".'
-! 			'Before you get a chance to ask her what the surprise is, the car slows down and turns on to a small side road, almost hidden from view by the dense vegetation.'
-! 			'As the car pushes further into the forest, you see an old building made of brick, with large chimneys jutting out of its saw-tooth roof.'
-
-! 			act 'Look around':
-! 				*clr & cla
-! 				minut += 5
-! 				gs 'stat'
-! 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/abandoned/factory/castle.jpg"></center>'
-! 				'Looking around you realize that you''re in front of an abandoned factory building.'
-! 				'As you turn to look at Albina, she grins and points a manicured finger to a sign a few meters in front of the car, that says "Property of The Snow Queen Ltd." Still grinning, Albina says "This is the castle of the Snow Queen, my territory."'
-! 				'The car stops and two men suddenly materialize out of the shadows, walking slowly towards you. They both seem to be over 30 years of age, one tall and athletic, the other slightly shorter and rounder but with broad shoulders and powerful hands.'
-! 				'Albina opens the door and turns to the two men: "Hi guys, how are you doing?"'
-! 				'With a frown, the two men look at you for a few seconds before answering with a booming voice "Everything is fine."'
-
-! 				if AlbinaQW['StarletsLastChance'] > 0 or AlbinaQW['StarletsBlocked'] > 0:
-! 					'Leaving the engine running, Albina gets out of the car.'
-! 					'"I''ve brought you an disobedient girl who knows too much about my dancing business."'
-! 					'Grinning, the tall one says "I see.", as the short one starts walking slowly towards you.'
-! 					'A chill runs up your spine as you realize you''ve been tricked. You need to get out of here right now!'
-					
-! 					gs 'willpower', 'misc', 'self'
-! 					if will_cost <= pcs_willpwr:
-! 						act 'Jump behind the wheel (<<will_cost>> Willpower)':
-! 							*clr & cla
-! 							gs 'willpower', 'pay', 'self'
-! 							minut += 5
-! 							gs 'stat'
-! 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-
-! 							if pcs_agil >= 80:
-! 								'With a deft movement, you manage to get behind the wheel of the car.'
-! 								'Looking out the windows, you see the short one standing right in front of the car, touching the hood as if to stop you from driving forwards, while the tall one runs towards the driver side door.'
-
-! 								act 'Switch into reverse gear':
-! 									*clr & cla
-! 									minut += 1
-! 									gs 'stat'
-! 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 									'Not knowing exactly what you''re doing, it takes you a second or two to realize the stick needs to be in the ''R'' position.'
-! 									'After finding the right gear, you slam down on the accelerator just as you notice the tall one is very close and has started running towards you'
-! 									'The engine revs, and the car shoots backwards as if slung from a ballista. In your panic to escape the clutches of Short and Tall however, you fail to notice the sturdy concrete wall creeping up on you from behind at an alarming speed.'
-! 									'You notice the wall just before slamming into it, and step on the brakes. While it does lower your speed quite a bit, the car is still going fast as it hits the wall.'
-! 									'You hear the sound of metal and glass cracking and popping as the rear of your car is crushed against the concrete wall. The force of the impact throws your head back, hitting the headrest with a soft ''Foomp''.'
-! 									'After regaining your senses, you look out the window and see Short and Tall running towards you.'
-! 								end
-
-! 								act 'Put the pedal to the metal':
-! 									*clr & cla
-! 									minut += 1
-! 									gs 'stat'
-! 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 									'Taking a wild guess, you quickly jank the stick to the ''D'' position, grit your teeth and slam down the accelerator.'
-! 									'Short does not have time to react, and as the car jumps forward he is slung on top of the hood, slamming his head into the windshield leaving a crack in the glass, and then rolls of to the left.'
-! 									'Your knuckles whiten as you tighten your grip on the steering wheel and look out the windshield, trying to find a way out of here.'
-! 									'Straight ahead you see bushes and small trees, the forest slowly reclaiming the land it once lost to whatever kind of factory this once was.'
-! 									'To the right you recognize the gateway Albina drove through when she took you here.'
-! 									'To the left you see a brick wall, part of the abandoned factory building.'
-! 								end
-! 							else
-! 								'You try your best to wriggle your way over to the drivers seat, but only manage to get stuck with one of your legs between the gear shift and the seat.'
-! 								'Suddenly, the driver side door is violently thrust open.'
-
-! 								dynamic $din_albina_get_over_car
-! 							end
-! 						end
-! 					else
-! 						act 'Jump behind the wheel (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-! 					end
-
-! 					act 'Get out of the car':
-! 						*clr & cla
-! 						minut += 5
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/abandoned/factory/castle.jpg"></center>'
-! 						'Thinking you can easily outrun them, you quickly jump out of the car.'
-! 						'As you get out, Short starts moving towards you from the hood, and Tall moves behind you to block your path.'
-! 						'Looking around desperately for a second way out, you suddenly notice a small building close by with an open door.'
-! 					end
-
-! 					act 'Sit in the car':
-! 						*clr & cla
-! 						minut += 5
-! 						gs 'stat'
-! 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/bmw.jpg"></center>'
-! 						'Panicking and not knowing what to do, you freeze.'
-! 						'As you sit in your seat watching Short and Tall slowly make their way towards you, grim thoughts pop up in your head.'
-! 						'Is this the end? Will they kill me? Will I ever see my family again?'
-! 						dynamic $din_albina_get_over_car
-! 					end
-
-! 					exit
-! 				end
-
-! 				if AlbinaQW['StarletsWhore'] > 0:'Leaving the engine running, Albina gets out of the car. "Relax guys. <<$pcs_firstname>> is one of my stars. She''s a newcomer, but shows a lot of promise."'
-! 			end
-! 		end
-! 	end
-! end
-
-! act 'Move away':gt $loc, $metka
-gt $loc, $metka
---- albinaEv ---------------------------------
-

+ 51 - 44
locations/albinahome.qsrc

@@ -13,18 +13,16 @@ if $ARGS[0] = 'start':
 	''
 	if AlbinaQW['albride'] = 1:
 		AlbinaQW['albride'] = 2
-		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		''
-		'Albina takes you to her room and you sit down together.'
-		'Albina''s mother pops her head in, telling you that she heading out to do some errands and voicing her worry. Albina reassures her, saying that she has you for company as she walks her mother to the door.'
-		'Albina turns back to you and smiles affably. "<<$pcs_firstname>>! I have a bottle of fine wine for us to drink!"'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
+		'Albina leads you to the sitting room and disappears into the kitchen. While she is gone, her phone vibrates on the table. You look and see that "Mother" is trying to call her. "Strange. She''s never mentioned her mother." you think to yourself.'
+		'The phone rings out as Albina returns with a bottle of wine and two glasses. She places them on the table and notices her missed call. She frantically picks her phone up and types a message before stuffing it in her pocket, giving you a weak smile. "Don''t worry about who that was <<$pcs_firstname>>. I have a bottle of fine wine for us to drink!"'
 		act 'Drink':
 			*clr & cla
 			minut += 15
 			gs 'drugs', 'alcohol', 'wine'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinahome1.jpg"></center>'
-			'Albina directs you to take a seat in the sitting room. She returns with a bottle of wine and two glasses. She pours wine into the glasses and hands you one, sitting down next to you.'
+			'She pours wine into the glasses and hands you one, sitting down next to you.'
 			'You drink together with Albina. A smile beams across her face. "He''s gone! He''s finally gone!"'
 			'She swiftly drinks all of her wine. "He was going down hard. I''ve been gathering evidence for years. All his emails, text messages, phone calls and witnesses all proving what a scumbag he is. I finally gathered enough to take him down!"'
 			act 'Ask how her father reacted':
@@ -37,8 +35,8 @@ if $ARGS[0] = 'start':
 				'Albina scoffs and tops up her glass with more wine. "Why does it matter? He''s gone and will be gone for a long time."'
 				'"Hate him that much?" you ask as you take a sip from your glass.'
 				'Albina just glares at you. "Let''s just drink." she scorns.'
-				'You sit quietly for a while, sipping your wine while Albina again gulps down the contents of her glass. She sits in silence before suddenly throwing the glass in frustration, shattering it as it hits the wall.'
-				'"My father is a fucking bastard. If there is a hell, there is a special place reserved for him to suffer for what he''s done."'
+				'You sit quietly for a while, sipping your wine while Albina again gulps down the contents of her glass. She sits in silence before suddenly screaming and throwing the glass in frustration, shattering it as it hits the wall.'
+				'"Fucking bastard!! If there is a hell, there is a special place reserved just for you to suffer for what you done you fucking creep!!"'
 				act 'Ask what she''s talking about':
 					*clr & cla
 					minut += 15
@@ -47,21 +45,26 @@ if $ARGS[0] = 'start':
 					'"What are you talking about?" you ask, startled by her outburst. Albina looks at you meekly as tears well up in her eyes.'
 					'"<<$pcs_nickname>>, my father has raped and abused me from such an early age, I don''t even remember when it all began. I''ve spent my entire life being his plaything." she tearfully admits.'
 					'"When my mother found out, he used his connections to stop her taking me with her when she left him."'
-					'But now that he''s going down, my mother came back here to live with and look after me. Get me counselling if I need it, you know? You have to excuse her caution earlier. She''s on edge about what my father can do, even in prison."'
 					*nl
+					'But now that he''s going down, she came back here to live with and look after me. Get me counselling if I need it, you know? That''s why she''s always checking up on me. She''s on edge about what my father can do, even in prison."'
 					'She continues. "The truth is his political campaign never took off. He loved abusing his position as a cop to bully others, including me, but when he retired, he didn''t have that power anymore. A political career was his chance to get that back."'
 					'"Nobody was willing to back him however." She stops talking for a few seconds and you can clearly see her hands shaking. "That''s when...that''s when he decided to...whore me out to his friends. For ''a bit of fun'' with me, they would ''donate'' to his campaign fund.". She is on the verge of bursting into tears in front of you.'
 
-					act 'Your father done what?':
+					act 'Your father did what?':
 						*clr & cla
 						minut += 15
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/comfort.jpg"></center>'
 						'"Your own father sold your body to fund his election? That''s horrible!" you exclaim in shock.'
 						'Albina nods. "That''s right, but I wasn''t earning enough for him. That''s when he discovered my dance troupe and forced me to start selling my friends instead. I had to <<$pcs_nickname>>! I had to!" she tearfully exclaims.'
-						'"I was forced to let those creeps do whatever they pleased with my friends <<$pcs_nickname>>! All for some fucking rubles! Rubles that the fucking bastard spent on his own whores that he mistreated instead of his campaign! But what he did to me..." Tears are streaming down her cheeks at this point.'
-                        !! if virgin
-						if pcs_vag = 0 and stat['vaginal'] = 0: '"That''s why I didn''t get you involved. Too many girls have to hide the fact that those bastards were their first time. I wasn''t going to let it happen again."'
+						'"I was forced to let those fucking perverts do whatever they pleased with my friends <<$pcs_nickname>>! They were humiliated and abused for some fucking rubles! Rubles that the fucking bastard spent on his own whores that he mistreated instead of his campaign!"'
+                        !! if virgin or not
+						if pcs_vag = 0 and stat['vaginal'] = 0: 
+						'"That''s why I didn''t get you involved. Too many girls have to hide the fact that those bastards were their first time. I wasn''t going to let it happen again. But what he did to me..." Tears are streaming down her cheeks at this point.'
+						else 
+						'"Then you joined and my father forced me to put you to work as well. Of course, all those nasty creeps jumped at the chance to try out the ''new girl'' once they found out about you. But what he did to me..." Tears are streaming down her cheeks at this point.'
+						end
+						
 						act 'What did he do?':
 							*clr & cla
 							minut += 15
@@ -70,8 +73,8 @@ if $ARGS[0] = 'start':
 							'"What did he do?" you ask.'
 							'"It was bad enough being forced to whore out my friends to abusive creeps who almost choked them to death, but......but....."'
 							'"But what?" you ask softly. She steels herself before answering you. "If I didn''t get the girl the guys wanted, my father said it was perfectly fine for them to take me and do what they wanted, even rape me." she cries.'
-							'"They would take their anger at not getting the girl they wanted out on me. I would be choked, slapped, even spat on! Some nights, I''d come home and he would berate me for not ''helping his donors'' and I would be subjected to his abuse."'
-							'"My dad being a pimp for underage girls who''s abused me my entire life, my friends being subjected to abusive sexual exploitation.....and I....I couldn''t do a thing about it!" The words barely make it out of her mouth before she bursts into a flood of tears.'
+							'"They would take their anger at not getting the girl they wanted out on me. I would be choked, slapped, even spat on! Some nights, I''d come home and he would berate me for not ''helping his donors'' and I would be subjected to his abuse as well."'
+							'"My dad being a pimp for underage girls who''s abused me my entire life, my friends being subjected to abusive sexual exploitation...and I...I couldn''t anything about it!" The words barely make it out of her mouth before she bursts into a flood of tears.'
 
 							act 'Comfort her':
 								*clr & cla
@@ -79,8 +82,8 @@ if $ARGS[0] = 'start':
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissingattempt.jpg"></center>'
 								'You cradle her head against your chest as she sobs away, her tears soaking into your top. "Hey, hey. But you did do something about it. You went to the police and now he''s going to prison!" you reassure her while softly stroking her hair.'
-								'She sits up, her eyes puffy from crying and wipes away her tears. "Yeah, yeah you''re right <<$pcs_nickname>>. I did. I guess I just got tired of feeling helpless as my friends suffered when they didn''t deserve any of this. So I exposed him for what he is!"'
-								'"I just want to live my life without having to fear my own father, or any other man for that matter. For the longest time, I was just too fucking submissive"'
+								'She sits up, her eyes puffy from crying and wipes away her tears. "Yeah, yeah you''re right <<$pcs_nickname>>. I did. I guess I just got tired of feeling helpless as my friends suffered when they didn''t deserve any of this. So I exposed him as what he is. A vile fucking creep!"'
+								'"I just want to live my life without having to fear my own father, or any other man for that matter. For the longest time, I was just too fucking submissive."'
 								'You smile at her and are about to reply when Albina closes her eyes and tilts her head towards you.'
 								gs 'willpower', 'cuni', 'resist', 'medium'
 								if will_cost <= pcs_willpwr:
@@ -106,7 +109,7 @@ if $ARGS[0] = 'start':
 									*clr & cla
 									npc_rel['A23'] += 2
 									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kissing.jpg"></center>'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
 									'You''re not sure if it''s just the alcohol or if something else is compelling you, but you lean towards Albina and lock lips with her.'
 									'You feel your excitement growing as you and Albina start passionately making out with each other.'
 									gs 'arousal', 'kiss', 2
@@ -114,7 +117,7 @@ if $ARGS[0] = 'start':
 									act 'Kiss':
 										*clr & cla
 										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/kissing.jpg"></center>'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/kissing.jpg"></center>'
 										'As you continue kissing Albina, you feel her hand slowly working its way up your inner thigh.'
 										'Reaching your crotch, her hand slowly slides into your panties and starts gently fondling your clitoris.'
 										'You moan into her mouth. Someone must have shown her a few things on pleasing a girl.'
@@ -146,7 +149,7 @@ if $ARGS[0] = 'start':
 												'You moan softly at the pleasure and grab Albina by the hips, pulling her crotch down to your face. Her legs quiver as you gently trace her labia with your tongue before you spread them and start swirling your tongue around her engorged clitoris.'
 												'You are passionately eating each other out when you hear Albina''s breathing become faster and her legs start shaking as you feel your own orgasm building within you.'
 												*nl
-												'Albina lets out a pleasured scream as her pussy twitches and sprays liquid across your face. You buckle as your own orgasm overwhelms you and you scream loudly. You both collapse in ecstasy.'
+												'Albina lets out a pleasured scream as her pussy twitches and sprays her juices across your face. You buckle as your own orgasm overwhelms you and you scream loudly. You both collapse in ecstasy.'
 												'Albina pulls her herself up and turns back around, cuddling into you. "I didn''t take you for a squirter!" you laugh. She smirks. "I''ve been with a few girls <<$pcs_nickname>>, but you gave me the greatest orgasm I''ve ever had! I think that was actually my first squirt!"'
 												'She leans over and grabs some tissues from a box on a nearby table, handing you some to clean your face. She runs her hand over her still twitching pussy. "I think I''m still cumming!" she says. You both lie on the sofa, your powerful orgasms pulsing through the both of you. You eventually recover and manage to get dressed.'
                                                 'Albina remains on the sofa, pussy juices still trickling from her. "Thanks <<$pcs_nickname>>. It was nice to let it all out and just talk about it...among other things." she smirks. "Thanks for being a good friend." You smile at her and start leaving when she suddenly embraces you in a tight hug, her breasts squeezing against you, before walking you to the door.' 
@@ -169,25 +172,22 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-	elseif hour >= 20 and week >= 5 and week < 7:
-		'Albina says that she wants to go to the disco.'
-
-		act 'Say goodbye and go home':gt 'pav_residential'
-		if money >= 25: act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
 	elseif AlbinaQW['Room']  = 1:
 		if AlbinaQW['SportHome']  = 0:
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/train.jpg"></center>'
 			'Albina is training in her room, doing some stretching exercises.'
+			'She is wearing a pair of skin tight yoga pants that show off her toned body quite well.'
 			act 'Ask why she doesn''t train at the gym':
 				*clr & cla
 				AlbinaQW['SportHome']  = 1
 				minut += 15
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big23.jpg"></center>'
-				'Albina smiles at you and says "I don''t like the sweaty perverts at the gym staring at my ass, so I prefer training at home instead."'
-				'By the way, I could teach you about stripping and poledancing if you want."'
+				'"I don''t like the sweaty perverts at the gym staring at my ass, so I prefer training at home instead." she replies.'
+				'You can''t help but stare at her firm, shapely rear as she says that and she grins at you.'
+				'Eyes up here <<$pcs_nickname>>! Anyways, I could teach you about stripping and poledancing if you want."'
 				act 'No thanks': AlbinaQW['SportDay'] = daystart & gt 'albinahome', 'start'
 				act 'Teach me stripping': gt 'albinahome', 'stripping'
 				act 'Teach me poledancing': gt 'albinahome', 'poledancing'
@@ -267,13 +267,15 @@ if $ARGS[0] = 'poledancing':
 		killvar 'loopcount'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/poledance.jpg"></center>'
-		'Albina teaches you various acrobatic moves on the pole.'
+		'Albina teaches you various acrobatic moves on the pole and the two of you greatly enjoy yourselves.'
 		if pcs_dancpol >= 100: 'You didn''t learn anything new since you already know everything she can teach you.'
 
 		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Rest':gt 'albinahome', 'start'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
-		'Albina grins "You''re still too weak for poledancing. We can practice developing your strength instead."'
+		'You try your best to follow Albina''s instructions, but you end up smacking your head on the pole instead and fall to the floor.'
+		'You are flat on your back and see Albina kneeling over you. "Are you okay <<$pcs_nickname>>? It looks like you''re still too weak for poledancing. We can practice developing your strength instead."'
+		'You nod at her and she pulls you to your feet, checking your head. "It might bruise, but otherwise you look fine." she says.'
 		act 'Develop strength (2:00)':
 			*clr & cla
 			loopcount = 1
@@ -284,6 +286,7 @@ if $ARGS[0] = 'poledancing':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
+			'You silently wonder if these exercises are how she has such a great looking ass.'
 			act 'Rest':gt 'albinahome', 'start'
 			act 'Say goodbye and go home':gt 'pav_residential'
 		end
@@ -300,7 +303,7 @@ if $ARGS[0] = 'poledancing':
 			dancero_exp += rand(2, 10)
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
-			if pcs_dancero >= 100:'But you didn''t learn anything new since you already know everything she can teach you.'
+			if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
 		else
 			danc_exp += rand(5, 15)
 			'A striptease is too complex for you. You''re not able to dance and strip at the same time.'
@@ -381,7 +384,7 @@ if $ARGS[0] = 'game':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
 		if AlbinaQW['gamebet'] = 1:
-			'You and Albina lay down in front of the TV after picking one of the games. She turns towards you and gives you a grin. "Feel like putting your ass on the line and betting again?"'
+			'You and Albina lie down in front of the TV after picking one of the games. She turns towards you and gives you a grin. "Feel like putting your ass on the line and betting again?"'
 			act 'Accept the bet': gt 'albinahome', 'game_bet'
 			gs 'willpower', 'sex', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -404,7 +407,7 @@ if $ARGS[0] = 'game':
 				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
-			'You and Albina lay down in front of the TV after picking one of the games. You play while chatting about various things and trash talking each other, although neither of you are giving your full attention to the game. Instead, you are just having fun together.'
+			'You and Albina lie down in front of the TV after picking one of the games. You play while chatting about various things and trash talking each other, although neither of you are giving your full attention to the game. Instead, you are just having fun together.'
 			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Keep playing video games': gt 'albinahome', 'playgame'
 			act 'Just chat': gt 'albinahome', 'chat'
@@ -423,7 +426,7 @@ if $ARGS[0] = 'playgame':
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/game.jpg"></center>'
-	'The two of you keep playing video games and trash talking each other, even bumping each other to try and screw the other one up, but neither of you are still taking it seriously. You mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
+	'The two of you keep playing video games and trash talking each other, even bumping each other to try and screw each other up, but neither of you are taking it seriously. You mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
 	if hotcat >= 5:
 		'Once you finish the game, Albina turns towards you instead of starting another one. "How about we see who is actually the better gamer?" she asks with a confident smile.'
 		'You laugh and nod. "Sure, but you are so going down."'
@@ -527,12 +530,12 @@ if $ARGS[0] = 'wear_strapon':
 		'You pull away until the dildo slides out of her mouth and then lay on your back. "Come and ride it cowgirl!" you laugh. She crawls up and straddles you, lowering herself down until the <<dick>>cm <<$dick_girth>> dildo slides easily inside of her wet pussy, causing her to moan in pleasure. She starts riding you slowly, but picks up speed, moaning louder and louder.'
 		gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
 		gs 'stat'
-		act 'Fuck her ass': gt 'albinahome', 'fuck_ablina_ass'
+		act 'Fuck her ass': gt 'albinahome', 'fuck_albina_ass'
 		act 'Ride it like you mean it':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag2.jpg"></center>'
-			'You slap her on the ass. "Come on Albina! Ride it like you mean it." you tell her. With your encouragement, she starts really riding you hard and fast, taking the whole length inside her until several minutes later, she cries out in ecstasy. She slides off the dildo, which glistens with her juices, and collapses on the bed as an intense orgasm rocks her body.'
+			'You slap her on the ass. "Come on Albina! Ride it like you mean it." With your encouragement, she starts really riding you hard and fast, her huge ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes until she cries out in ecstasy. She slams down on the dildo and her body shudders as an intense orgasm passes through her. She slides off the dildo, which glistens with her juices, and collapses on the bed next to you.'
 			'Once her orgasm has passed, she looks at you with an appreciative smile on her face.'
 			gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
 			gs 'stat'
@@ -551,8 +554,9 @@ if $ARGS[0] = 'fuck_albina_ass':
 	gs 'boyStat', 'D3'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/giveanal1.jpg"></center>'
-	'You slap her on the ass. "Get up, I''m not finished with you yet." She arches a brow, but does as you command and gets on all fours. You grab the bottle of lube and squirt some onto the dildo, rubbing it up and down the shaft until it is very slick and rub the excess onto her asshole.'
-	'You kneel down behind her and line the head of the dildo up with her asshole and slowly push forward. There is a bit of resistance, but with a little more pressure the <<dick>>cm <<$dick_girth>> dildo pops into her ass. She moans in a mixture of pain and pleasure as you start off with slow shallow strokes, but as her groans of pain turn into moans of pleasure, you take deeper and faster strokes. After a few minutes, you pull out of her ass and she looks back over her shoulder, obviously wondering why you stopped.'
+	'Albina then leans over and whispers in your ear. "I want you to fuck my ass <<$pcs_nickname>>..." You grin as she giggles and gets on all fours. You grab the bottle of lube and squirt some onto the dildo, rubbing it up and down the shaft until it is very slick. You then spread her huge ass cheeks and rub the excess onto her asshole. You grab her ass in your hand and appreciate how firms it feels in your grip.'
+	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is a bit of resistance, but with a little more pressure the <<dick>>cm <<$dick_girth>> dildo pops into her ass. She moans in a mixture of pain and pleasure as you start off with slow shallow strokes, but as her groans of pain turn into moans of pleasure, you take deeper and faster strokes. You look down and admit that her ass is amazing, the dildo being enveloped by her huge, firm cheeks as you thrust in and out of her hole.' 
+	'You wonder how the guys in your class would feel knowing you''re actually fucking the best ass in school while they can only dream of it. After a few minutes, you pull out of her and she looks back over her shoulder, obviously wondering why you stopped.'
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 	gs 'stat'
 	act 'Finish': gt 'albinahome', 'strapon_finish'
@@ -560,7 +564,9 @@ if $ARGS[0] = 'fuck_albina_ass':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/giveanal2.jpg"></center>'
-		'You can tell that she wants you to keep fucking her ass. You slide the dildo back into her hole with ease, making her moan in pleasure. You grab onto her hips and start fucking her balls deep, filling her ass with the entire dildo. After several minutes, you feel her ass tighten around your fake cock and she crys out as her body is rocked by an intense orgasm, her pussy spraying liquid onto the bed. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
+		'"Come on <<$pcs_nickname>>. Put it back in and fuck me....hard." she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. You grab onto her hips and start fucking her balls deep, filling her ass with the entire dildo. After several minutes, you feel her ass tighten around your fake cock and she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
+		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices continue leaking from her pussy. "Oh fuck yes <<$pcs_nickname>>! That was fucking amazing!"'
+		'"Fucking such a nice looking ass was amazing!" you reply and you both laugh.'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 		gs 'stat'
 		act 'Finish': gt 'albinahome', 'strapon_finish'
@@ -580,6 +586,7 @@ if $ARGS[0] = 'receive_strapon':
 	gs 'stat'
 	if pcs_vag = 0:
 		act 'You''re a virgin':
+			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/straponsuck.jpg"></center>'
 			'You blush deeply and she looks at you. "Oh, right. You haven''t done this before." she says, remembering that you''re still pure.'
@@ -595,7 +602,7 @@ if $ARGS[0] = 'receive_strapon':
 				'It is both painful and pleasurable at the same time and you moan a bit as she slowly starts to fuck your pussy. After a few minutes, it starts to hurt less but she stops. "OK that''s enough. I don''t want to wear it out the first time, but I''m not finished with you. Roll over so I can fuck that tight little ass of yours."'
 				gs 'arousal', 'vaginal_strap', 5, 'lesbian'
 				gs 'stat'
-				act 'Take it up the ass': gt 'albinahome', 'ablbina_ass_fucks_you'
+				act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
 			end
 		end
 	else
@@ -604,14 +611,14 @@ if $ARGS[0] = 'receive_strapon':
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-			'"Lay on your back and spread your legs." You do as she commands and she scoots up between your legs. She rubs your pussy with her fingers a bit to make sure it is wet enough. She slowly slides the <<dick>>cm <<$dick_girth>> dildo into your pussy. You moan a bit as she slowly starts to fuck your pussy. As you start to moan louder, she starts fucking you a little faster.'
+			'"Lay on your back and spread your legs." You do as she commands and she scoots up between your legs. She rubs your pussy with her fingers a bit to make sure it is wet enough and then slowly slides the <<dick>>cm <<$dick_girth>> dildo inside you. You moan a bit as she slowly starts to fuck your pussy. As you start to moan louder, she starts fucking you a little faster.'
 			gs 'arousal', 'vaginal_strap', 8, 'lesbian'
 			gs 'stat'
 			act 'Keep getting your pussy fucked':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
-				'She reads your body well. She fucks you harder and faster the more you moan, but when it starts to get a little too rough she backs off a bit. She eventually finds near perfect rhythm and you can feel youself getting wet. She is enjoying it as much as you, moaning softly and squeezing her breast as she fucks you. She stops and pulls out. "OK that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
+				'She reads your body well. She fucks you harder and faster the more you moan, but when it starts to get a little too rough she backs off a bit. She eventually finds a near perfect rhythm and you can feel youself getting wet. She is enjoying it as much as you, moaning softly and squeezing her breast as she fucks you. She stops and pulls out. "OK that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
 				gs 'arousal', 'vaginal_strap', 7, 'lesbian'
 				gs 'stat'
 				act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -628,15 +635,15 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 	gs 'boyStat', 'D3'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getanal1.jpg"></center>'
-	'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts plenty on the dildo and strokes the shaft with it, getting it nice and lubed up. She then rubs the excess lube onto your asshole. You and the dildo now lubed up, she moves behind you and you feel the tip of the dildo press against your asshole. The pressure builds up until the tip pops into your ass, causing you to groan slightly in pain. She slowly starts to slide the <<dick>>cm <<$dick_girth>> dildo up your ass, steadily working it deeper.'
+	'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts plenty on the dildo and strokes the shaft with it, getting it nice and lubed up. She then rubs the excess lube onto your asshole. You and the dildo now lubed up, she moves behind you and you feel the dildo press against your asshole. The pressure builds up until the tip pops into your ass, causing you to groan slightly in pain. She slowly starts to slide the <<dick>>cm <<$dick_girth>> dildo up your ass, steadily working it deeper.'
 	gs 'arousal', 'anal_strap', 5, 'lesbian'
 	gs 'stat'
-	act 'Get your ass ploughed':
+	act 'Get your ass hammered':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getanal2.jpg"></center>'
 		'After you seem to be used to her in your ass, she stands up over you and starts getting harder and faster with the ass fucking she is giving you. When it starts getting a little too rough, she seems to notice and backs off just a little before getting into a nice rhythm of slamming the dildo in and out of your ass. She enjoys fucking you hard, growing more aroused over time.' 
-		'Just as it is starting to hurt, she stops and lets out a pleasured moan before pulling out of you. You feel a rush of cold air around your gaping asshole. "You were such a good little butt slut <<$pcs_nickname>>." she says. You turn and see her sliding the harness off, apparently finished with you. You notice the wet patch on the bed. She obviously greatly enjoyed ploughing your ass.'
+		'Just as it is starting to hurt, she stops and lets out a pleasured moan before pulling out of you. You feel a rush of cold air around your gaping asshole. "You were such a good little butt slut <<$pcs_nickname>>." she says. You turn and see her sliding the harness off, apparently finished with you. You notice the wet patch on the bed. She obviously greatly enjoyed hammering your ass.'
 		gs 'arousal', 'anal_strap', 10, 'lesbian'
 		gs 'stat'
 		act 'Finish': gt 'albinahome', 'strapon_finish'

+ 9 - 9
locations/andreihunter.qsrc

@@ -28,7 +28,7 @@ act 'Chat (0:30)':
 	if huntersAndreiQw >= 0:'You chat with Andrei. You learn interesting tidbits about hunting from him.'
 	if huntersAndreiQw < 0:'You talk to Andrei. He makes it clear he''d rather not talk to you, but takes part in the conversation anyway.'
 
-	act'Continue':gt $loc, $metka
+	act'Continue':gt $loc, $loc_arg
 end
 
 if huntersAndreiQw >= 10:
@@ -91,7 +91,7 @@ if huntersAndreiQw >= 10:
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
 							'"Maybe next time we won''t stop there, <<$pcs_nickname>>", Andrei says when your lips finally part. "For now though, let''s go back."'
 
-							act'Continue':gt $loc, $metka
+							act'Continue':gt $loc, $loc_arg
 						end
 					end
 				end
@@ -105,10 +105,10 @@ if huntersAndreiQw >= 10:
 					'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 					'"Sorry... Andrei... I can''t right now", you tell him. He leaves with an angry look on his face.'
 
-					act'Leave':gt $loc, $metka
+					act'Leave':gt $loc, $loc_arg
 				end
 			else
-				act'Leave':gt $loc, $metka
+				act'Leave':gt $loc, $loc_arg
 			end
 		end
 	else
@@ -128,7 +128,7 @@ if huntersAndreiQw >= 10:
 
 			gs 'stat'
 
-			act'Leave':gt $loc, $metka
+			act'Leave':gt $loc, $loc_arg
 		end
 	end
 end
@@ -182,7 +182,7 @@ if huntersAndreiLove > 0 and pcs_horny <= 60 and huntersAndreiQw >= 10 and temp
 
 		'<center><img <<$set_imgh>> src="images/pc/speak_to_the_hand.jpg"></center>'
 		'"No, Andrei not now." You quickly leave back the way you came.'
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 	end
 end
 
@@ -197,11 +197,11 @@ if huntersAndreiLove > 0:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosila.jpg"></center>'
 		'"Andrei, I feel that our relationship has no future. I''m breaking up with you", you say. You leave while trying not to look back at him.'
 
-		act 'Leave':gt $loc, $metka
+		act 'Leave':gt $loc, $loc_arg
 	end
 end
 
-act'Leave':gt $loc, $metka
+act'Leave':gt $loc, $loc_arg
 
 if huntersAndreiQw < 10 and huntersAndreiLove > 0:
 	*clr & cla
@@ -214,7 +214,7 @@ if huntersAndreiQw < 10 and huntersAndreiLove > 0:
 	'"<<$pcs_nickname>>, It''s over between us," he says firmly and walks away.'
 	'"Well , maybe it''s for the best," you think as you leave in the other direction.'
 
-	act 'Leave':gt $loc, $metka
+	act 'Leave':gt $loc, $loc_arg
 end
 
 --- andreihunter ---------------------------------

+ 0 - 114
locations/anfisa.qsrc

@@ -1,114 +0,0 @@
-# anfisa
-
-$boy = 'Anfisa'
-dick = 10
-anfisaday = daystart
-if anfisa['horny'] < 70:
-	'<center><b><font color="maroon">Anfisa</font></b></center>'
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\anfisa'+rand(1,3)+'.jpg"></center>'
-	'You approached Anfisa, sunbathing on the shore of the lake.'
-	'"Oh, hello <<$pcs_nickname>>", she says, delighted to see you.'
-	'"Hello Anfisa", you reply with a smile.'
-else
-	'<center><b><font color="maroon">Anfisa</font></b></center>'
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\anfisa'+rand(4,6)+'.jpg"></center>'
-	'You chance upon drunken Anfisa, wandering along the beach in search of adventure.'
-	'"Oh, hello <<$pcs_nickname>>", she says, delighted to see you.'
-	'"Hello Anfisa", you answer with a smile.'
-end
-
-if cumface > 0:
-	if exhibitionist_lvl < 2:
-		'"I see you had fun without me", - Anfisa says mockingly, examining the sperm on your face.'
-		'"Yeah", you answer blushing.'
-	elseif exhibitionist_lvl < 1:
-		'"I see you had fun without me", - Anfisa utters derisively, examining the sperm on your face.'
-		'You immediately turn red and run away without saying a word.'
-	else
-		'"I see you had fun without me", - Anfisa mockingly says, looking at the sperm on your face.'
-		'"Yes, it was the case...", You answer laughing.'
-	end
-	if exhibitionist_lvl < 1: act 'Run away': gt 'city_nudelake'
-end
-
-act 'Further':
-	*clr & cla
-	if anfisa['horny'] < 70:
-		'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk7.jpg"></center>'
-		'You sit down on the shore next to her.'
-		'"Oh, oh, my friend, you have problems...", she says with a laugh, looking at your oozing pussy '
-		if pcs_horny >= 50 and (anfisa['sex'] > 0 or exhibitionist_lvl > 2):
-			act 'Flirt':
-				*clr & cla
-				minut += 10
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\kiss'+rand(4,5)+'.jpg"></center>'
-				'Sitting on the shore next to Anfisa, you try to keep the conversation going, but the itch in your puss contributes little to this. Finally, unable to bear it, you bring your face close to hers, and dig into her lips with a passionate kiss, literally breaking off in half a word. Judging by the reaction, Anfisa was not at all against such a development of events and began to respond just as passionately to you. '
-				act 'Further': gt 'anfisa_events', 'kiss2'
-			end
-		end
-		act 'Chat': gt 'anfisa_events', 'talk'
-	else
-		if pcs_horny < 50:
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk7.jpg"></center>'
-			'You and Anfisa walk away from prying eyes and sit down on the shore.'
-		elseif pcs_horny < 70:
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk7.jpg"></center>'
-			'You and Anfisa walk away from prying eyes and sit down on the shore.'
-			'"Someone here clearly does not want to be disturbed.", she says slyly, looking at your oozing pussy.'
-		elseif pcs_horny < 90:
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk7.jpg"></center>'
-			'You and Anfisa walk away from prying eyes and sit down on the shore.'
-			'"How lovely...", she says dreamily, looking at your excited nipples.'
-			'"Houston, we have a problem...", she says with a laugh, trandferring the look from your excited, oozing pussy to hers.'
-		end
-		if pcs_horny < 90:
-			act 'Drink wine':
-				*clr & cla
-				minut += 30
-				gs 'drugs', 'alcohol', 'wine'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk'+rand(10,12)+'.jpg"></center>'
-				'You are sitting on the shore, leaning relaxed on Anfisa, and drinking wine, chatting merrily amongst yourself. She, as if by chance, then gently pat your back, then touch your chest or run your hand over the pope, hinting you to continue. '
-				if pcs_horny < 70 or exhibitionist_lvl < 1:
-					act 'Remove hand':
-						*clr & cla
-						if lesbian = 0:
-							If pcs_horny < 70:
-								'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk2.jpg"></center>'
-								'"Anfisa", you say to her, "please don''t be offended, but I''m not like that, I like the boys,"'
-								'"Well, no, no, not so", Anfisa smiles, giving you a wink. " Maybe another time..."'
-							else
-								'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk2.jpg"></center>'
-								'"Anfisa", you say to her, "don''t be offended, but I like the boys." and you continue the interrupted conversation.'
-							end
-						else
-							'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk2.jpg"></center>'
-							'Anfisa", you say to her, "not be offend, but I''m not feeling it right now."'
-							'Oh, what a liar", Anfisa laughs, looking at your excited nipples."'
-							'But you don’t want, so I’m not going to force ... '
-						end
-					end
-				end
-				act 'Kiss':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\kiss'+rand(1,3)+'.jpg"></center>'
-					'Finally, unable to bear it, she brings her face close to yours, literally cutting off your words with a passionate kiss. You are not against such a development and began to respond to the kiss as passionately. '
-					act 'Further': gt 'anfisa_events', 'kiss'
-				end
-			end
-		else
-			act 'Embrace':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\tits5.jpg"></center>'
-				'Forgetting about the bottle of wine, you literally fell into each other''s arms. Anfisa''s hands freely roam your body, gently stroking and caressing it. You try to keep up and caress, gently squeezing her breasts, delivering a lot of pleasure with these touches. '
-				act 'Further':gt 'anfisa_events', 'kiss'+iif(pcs_horny < anfisa['horny'],'',2)
-			end
-		end
-	end
-end
-
---- anfisa ---------------------------------
-

+ 0 - 418
locations/anfisa_events.qsrc

@@ -1,418 +0,0 @@
-# anfisa_events
-
-anfisaday = daystart
-if $ARGS[0] = 'start':
-	*clr & cla
-	minut += 5
-	npc_QW['Anfisa'] = 1
-	anfisa['horny'] = 70
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\walk'+iif(hotcat >= 6,1,2)+'.jpg"></center>'
-	'Tanning, you'+iif(npc_QW['Anfisa'] = 1,' again notice', ' notice')+' a drunken girl wandering along the beach with a bottle of wine in her hand, idly inspecting the beach, as if looking for someone among holidaymakers. **'+iif(hotcat < 6,'She slowly walked past, without even looking at you. Apparently you are not the one whom she looks out for, ”Noticing your look, she, smiles back, comes up to you: ** <do>- Hi! Do you mind if I sit here?</do>','')
-	if hotcat <= 5:
-		act 'Further': gt 'city_nudelake'
-	else
-		act 'Of course not, Sit':
-			npc_QW['Anfisa'] = 2
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk1.jpg"></center>'
-			'The girl sinks into the sand next to you:"Hi, I''m Anfisa, what''s yours?" - she smiles broadly.'
-			'"<<$pcs_firstname>>," but my friends calls me "<<$pcs_nickname>>" you respond.'
-			'"<<$pcs_firstname>>..." she pauses, as if tasting and savoring the name,"So do I get to call you <<$pcs_nickname>>?"'
-			act 'Sure':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk2.jpg"></center>'
-				'"Of course it''s possible" you smile back.'
-				'"That''s great," brightens your newest acquaintance. "Shall we celebrate our new acquaintance?", She nods towards the bottle of wine at her feet.'
-				act 'Why not':
-					*clr & cla
-					minut += 60
-					gs 'drugs', 'alcohol', 'wine'
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk3.jpg"></center>'
-					'You both go find a quieter spot, away from prying eyes, and uncork the bottle. There are no cups - so you take turns drinking from the bottle, passing it back and forth, chatting merrily.'
-					'After finishing the bottle, you relax, leaning against your new girlfriend. Suddenly you feel her hand gently stroking your back. And it is very nice!'
-					act 'No reaction':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\kiss1.jpg"></center>'
-						'Seeing that you do not mind, Anfisa slowly brings her face to yours, your eyes meet. Another moment - and your lips merge in a hot kiss.'
-						act 'Kiss': gt 'anfisa_events', 'kiss'
-					end
-					if pcs_horny < 70 and exhibitionist_lvl < 2:
-						act 'I can''t':
-							*clr & cla
-							'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk4.jpg"></center>'
-							'"Anfisa, no offense, but '+iif(lesbian = 0,' it''s not like that, I like boys')+'."'
-							'"Okay, none taken," smiles Anfisa, winking at you." Maybe another time then, if you change your mind, you''ll find me here."'
-							'She stands, waves goodbye and leaves.'
-							act 'Watch her go': gt 'city_nudelake'
-						end
-					end
-				end
-				act 'Reluctantly no':
-					*clr & cla
-					minut += 10
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk1.jpg"></center>'
-					'"Reluctantly no." you answer her, "Just don''t be offended."'
-					'"Oh well no so no", Anfisa smiles. "Maybe another time then, if you change your mind, you''ll find me here."'
-					'Chating with you for another ten minutes or so, she stands, waves her hand in farewell, and wanders towards the exit'
-					act 'Walk away': gt 'city_nudelake'
-				end
-			end
-			act 'Not possible':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk5.jpg"></center>'
-				'"Well, you and the beech tree," Anfisa grins drunkly. "If you ever thaw, come find me."'
-				'The girl rises, swaying, and waving her hand in farewell, wanders off'
-				act 'Watch her go': gt 'city_nudelake'
-			end
-		end
-		act 'No':
-			*clr & cla
-			npc_QW['Anfisa'] = 3
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk6.jpg"></center>'
-			'"Well, We got one here." she sticks out her tongue and wanders off in search of adventure, leaving you alone.'
-			act 'Further': gt 'city_nudelake'
-		end
-	end
-end
-
-if $ARGS[0] = 'alko':
-	*clr & cla
-	minut += 5
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\walk2.jpg"></center>'
-	'While sunbathing, you notice Anfisa, drunk, walking lazily along the beach, a bottle of wine in her hand. Seeing you, she''s delighted'
-	'"Oh, hi, <<$pcs_nickname>>, you miss me?" and without waiting for an invitation, flops on the sand next to you.'
-	act 'Smile':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk2.jpg"></center>'
-		'"Another boring day", Anfisa sighs and glances at you.'
-		'"So, <<$pcs_nickname>>, can you keep me company?" she nods at the bottle of wine at her feet..'
-		act 'Join her':
-			*clr & cla
-			minut += 60
-			gs 'drugs', 'alcohol', 'wine'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk3.jpg"></center>'
-			'You both go find a quieter spot, away from prying eyes, and uncork the bottle. There are no cups - so you take turns drinking from the bottle, passing it back and forth, chatting merrily.**After finishing the bottle, you relax, leaning against your new girlfriend. Suddenly you feel her hand gently stroking your back and it felt nice!'
-			act 'Relax':
-				*clr & cla
-				'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\kiss1.jpg"></center>'
-				'Seeing that you do not mind, Anfisa brings her face to yours, your eyes meet. Another moment - and your lips merge in a hot kiss.'
-				act 'Kiss': gt 'anfisa_events', 'kiss'
-			end
-			if pcs_horny < 70 and exhibitionist_lvl < 2:
-				act 'Move away':
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk4.jpg"></center>'
-					'" Anfisa, no offense, but '+iif(lesbian = 0,' it''s not like that, I like boys')+'."'
-					'"Okay, none taken," smiles Anfisa, winking at you.'
-					'"Maybe another time then, if you change your mind, you''ll find me here."'
-					'She stands, waves goodbye and leaves.'
-					act 'Watch her go': gt 'city_nudelake'
-				end
-			end
-		end
-		act 'Not today':
-			*clr & cla
-			minut += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk1.jpg"></center>'
-			'"No offense, but today, I''m just not feeling it" you tell her.'
-			'"Oh well no so no" Anfisa smiles.'
-			'"Maybe another time then, if you change your mind, you''l find me here."'
-			'Chatting with you for a few more minuted, she stands, waves her hand in farewell, and wanders towards the exit'
-			act 'Watch her leave': gt 'city_nudelake'
-		end
-	end
-end
-
-if $ARGS[0] = 'talk':
-	*clr & cla
-	minut += 60
-	pcs_mood += 20
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\talk'+rand(8,9)+'.jpg"></center>'
-	'For an hour, you and Anfisa sit, hugging, on the beach, just talking about all sorts of nonsence.'
-	'"Oh, <<$pcs_nickname>>, look at the time," glancing at her watch, Anfisa catches herself.'
-	'"I have to go." Quickly dressing and waving goodbye, she heads for the exit.'
-	act 'Back to the beach': gt 'city_nudelake'
-end
-
-if $ARGS[0] = 'kiss':
-	*clr & cla
-	minut -= 5
-	if anfisa['sex'] = 0: girl += 1
-	anfisa['sex'] += 1
-!	lesbian += 1
-	protect = 1
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\tits'+iif(pcs_horny < 50,1,2)+'.jpg"></center>'
-	'You and Anfisa passionately kiss, forgetting everything in the world. Her hands wander your '+iif(pcs_horny < 50,'','excited ')+'body, bringing pleasure. Tearing away from your lips, she drops below and puts her lips into your chest, caressing and teasing your nipple, '+iif(pcs_horny < 50,'and at the same time running your hand to your pussy, rubbing you in earnest','tearing from your lips a voluptuous moan')+'.'
-	gs 'arousal', 'give_kiss', 5, 'lesbian'
-	gs 'arousal', 'foreplay', 5, 'lesbian'
-	gs 'stat'
-	act 'Enjoy': gt 'anfisa_events', 'kuni'
-end
-
-if $ARGS[0] = 'kiss2':
-	*clr & cla
-	minut += 5
-	if anfisa['sex'] = 0: girl += 1
-	anfisa['sex'] += 1
-!	lesbian += 1
-	anfisa['horny'] += 5
-	protect = 1
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\tits'+iif(pcs_horny < 90,3,4)+'.jpg"></center>'
-	'You break away from Anya''s lips and move down to her chest.'+iif(pcs_horny < 90,' licking a nipple by chance, you start playing with it, teasing it with the tip of your tongue, then gently licking in circular motions',' You literally bite her nipple, clasping your lips, and passionately caress them, then sucking hard, pulling the nipple ') +', enticing  moans of pleasure from deep within her.'
-	act 'Go lower': gt 'anfisa_events', 'ukuni'
-end
-
-if $ARGS[0] = 'variant':
-	cla
-	$boy = 'Anfisa'
-	dick = 10
-	minut += 5
-	protect = 1
-	gs 'stat'
-	if orgasm['you'] = 0 or orgasm['anfisa'] = 0:
-		if pcs_horny > anfisa['horny'] and orgasm['anfisa'] = 0 or pcs_horny < anfisa['horny'] and orgasm['you'] = 1:
-			act 'Lick her': gt 'anfisa_events', 'ukuni'
-			act 'Fuck her with the bottle': gt 'anfisa_events', 'bvag'
-			act 'Insert the bottle in her ass': gt 'anfisa_events', 'banal'
-		elseif pcs_horny < anfisa['horny'] and orgasm['you'] = 0 or pcs_horny > anfisa['horny'] and orgasm['anfisa'] = 1:
-			act 'Get licked': gt 'anfisa_events', 'kuni'
-			act 'Get rimmed': gt 'anfisa_events', 'anuli'
-			if pcs_vag >= 10:act 'Beg to be bottle-fucked': gt 'anfisa_events', 'ubvag'
-			if pcs_ass >= 10 and rand(0,1) = 1:
-				act 'Nod towards the bottle while spreading your asscheeks': gt 'anfisa_events', 'ubanal'
-			else
-				act 'Sit down on the bottle': gt 'anfisa_events', 'ubsit'
-			end
-		else
-			act 'Trib': gt 'anfisa_events', 'sex'
-		end
-	else
-		act 'Finish': gt 'anfisa_events', 'end'
-	end
-end
-
-$text = ''
-$text[1] = 'Burying your face between her legs, you'+iif(lesbian<20,' ineptly',' skillfully')+' lick her pussy by dragging your'+iif(lesbian<20,' inexperienced','') +' tongue along the entire length her slit'+iif(lesbian<20,'',', not forgetting the clitoris')+','
-$text[2] = 'You'+iif(lesbian<20,' timidly','')+'kiss her pussy, sucking her labia, sometimes'+iif(lesbian <20,' your inexperienced tongue hits the clitoris ',' penetrating between them to lick the clitoris')+','
-$text[3] = 'You'+iif(lesbian <20,' cautiously',' quickly')+' drive your'+iif(lesbian <20,' inexperienced',' skillful') + 'tongue from top to bottom, sliding'+iif(lesbian<20,' along the entire length of her pussy',' along her entire crotch')+','+iif(lesbian<20,' sometimes gently touching the clitoris', ' penetrating the vagina and caressing her clitoris')+','
-$text[4] = 'With her fingers spreading your lips, she skillfully licks, running her tongue along the entire length of your pussy and tickling your clit,'
-$text[5] = 'She kisses your pussy, sucking your lips, sometimes trying to insert a playful tongue into your <<$vaginatipe2>> vagina,'
-$text[6] = 'She clearly is skillful as she licks your pussy, randomly making circular motions and gently teasing your clitoris,'
-$text[7] = 'Spreading your ass cheeks with her fingers, she skillfully licks your <<$anustipe>> anus,'
-$text[8] = 'She licks your anus, sometimes her playful tongue'+iif(anus <= 10,' trys to penetrate ',iif(anus <= 15,' penetrates',' easily penetrates '))+' your <<$anustipe3>> asshole, '
-$text[9] = 'She takes energetic flicks at your ass with her tongue, sometimes pausing to give it a quick swirl'
-$text[10] = 'You take the bottle and slide the neck into her pussy, she kisses you while with one hand controling the bottle the other caresses her breast,'
-$text[11] = 'Using one hand to play with her nipples, you give her a passionate kiss while your free hand picks up the bottle, sticks it in her cunt and you start to bottle fuck her,'
-$text[12] = 'You take the narrow end of the bottle and stick it in her well-excited cunt, moving it in and out, while caressing her breast with your other hand,'
-$text[13] = 'You take the bottle,'+iif(lubri> 0,'apply some lube ', 'lick the neck, slobbering ') + 'on it, and gently insert it into her ass, fucking her with it, '
-$text[14] = 'Taking a bottle in your hand, you'+iif(lubri> 0, 'squirt some lube on it', 'diligently lick its neck, trying to leave the maximum amount of saliva on it')+', and gently slide it into her ass, starting to fuck her with it, '
-$text[15] = 'You take the bottle,'+iif(lubri> 0, 'apply some lube', 'spit on it good')+', and gently push it into her ass, starting to fuck her ass with it, '
-$text[16] = iif(pcs_horny <60,' causing a storm of sensations in your belly.',iif(pcs_horny <80,' causing you to moan in pleasure.',' tearing groans of pleasure from your lips as you thrust your hips towards her.'))
-$text[17] = iif(anfisa['horny'] <60, 'making her whole body shudder with every touch.',iif(anfisa['horny'] <80, ' bringing moans of pleasure from her lips.',' causing her to arch her body and moan passionately.'))
-$text[18] = 'Gradually, a pleasant pulsating warmth builds up then ripples out from your sex, then these feelings overwhelm you, and your body is rocked with hot waves of orgasm. You involuntarily shout with pleasure, shaking and shuddering all over.'
-$text[19] = 'After a while, her body trembling <<$boy>> archs up in orgasm, moaning loudly, no longer able to constrain herself.'
-$text[20] = 'Gradually, pleasant warmth and pulsation increase in the lower abdomen, then sensations fall on you and your entire body is covered with hot waves of orgasm. At the same time, you notice that <<$boy>> trembled with all her body and her pussy began to throb rhythmically. She arches in orgasm and no longer containing herself groans in a high voice. '
-
-if $ARGS[0] = 'ukuni':
-	*clr & cla
-	anfisa['horny'] += iif(lesbian < 20,10,20)
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\ukuni'+iif(anfisa['horny'] < 100,rand(1,3),4)+'.jpg"></center>'
-	'You kiss her breasts, gradually descending lower and lower, until you reach her '+iif(anfisa['horny'] < 50,'',iif(anfisa['horny'] < 70,' excited',' inflamed'))+' pussy. '+$text[rand(1,3)] + $text[17] + $text[iif(anfisa['horny'] < 100,'',19)]
-	gs 'arousal', 'cuni_give', 10, 'lesbian'
-	gs 'stat'
-	if anfisa['horny'] >= 100: orgasm['anfisa'] = 1 & anfisa['horny'] = 0
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'kuni':
-	*clr & cla
-	pcs_horny += rand(15,25)
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\kuni'+iif(pcs_horny < 100,rand(1,2),3)+'.jpg"></center>'
-	'<<$boy>> holds her tongue over your thighs, kisses your mound and slides down to your vagina. '+$text[rand(4,6)] + $text[16] + $text[iif(pcs_horny < 100,'',18)]
-	gs 'arousal', 'cuni', 10, 'lesbian'
-	gs 'stat'
-	if pcs_horny >= 100: pcs_horny = 0 & orgasm += 1 & orgasm['you'] = 1
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'anuli':
-	*clr & cla
-	pcs_horny += rand(10,20)
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\anuli'+iif(pcs_horny < 100,rand(1,3),rand(4,5))+'.jpg"></center>'
-	$text[rand(7,9)] + $text[16] + $text[iif(pcs_horny < 100,'',18)]
-	gs 'arousal', 'cuni', 10, 'lesbian'
-	gs 'stat'
-	if pcs_horny >= 100: pcs_horny = 0 & orgasm += 1 & orgasm['you'] = 1
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'bvag':
-	*clr & cla
-	anfisa['horny'] += 20
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\bvag'+iif(anfisa['horny'] < 100,rand(1,2),3)+'.jpg"></center>'
-	$text[rand(10,12)] + $text[17] + $text[iif(anfisa['horny'] < 100,'',19)]
-	if anfisa['horny'] >= 100: orgasm['anfisa'] = 1 & anfisa['horny'] = 0
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'banal':
-	*clr & cla
-	dick = 10
-	i = rand(1,2)
-	anfisa['horny'] += 10
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\banal'+iif(i = 1,iif(anfisa['horny'] < 100,1,2),iif(anfisa['horny'] < 100,rand(4,5),6))+'.jpg"></center>'
-	$text[rand(13,15)] + $text[17] + $text[iif(anfisa['horny'] < 100,'',19)]
-	if anfisa['horny'] >= 100: orgasm['anfisa'] = 1 & anfisa['horny'] = 0
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'ubvag':
-	*clr & cla
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\ubvag'+iif(pcs_horny < 60,1,iif(pcs_horny < 80,2,iif(pcs_horny < 100,3,4)))+'.jpg"></center>'
-	frost = 0
-	orgasm['you'] = orgasm
-
-	if vibratorIN = 1:vibratorIN = 0 & 'You remove your vibrator.'
-
-	if pcs_horny/10 + vagina + alko < dick and lubri > 0:
-		lubri -= 1
-		lubonus += 5
-		iif(rand(1,2) = 1,'You squeezed some lubricant into your hand and started rubbing your vagina with it.','Having squeezed out some lube, you began to carefully massage it into your pussy.')
-	end
-
-	if pcs_vag > 0:
-		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		if (vgrdif + vltdif) >= 30: 'You groan in pain when the <<$dick_girth>> bottle enters your pussy. Tears flow from your eyes and between your legs feels as if you drove in a red-hot rod<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= 20 and (vgrdif + vltdif) < 30: 'You bite your lip in pain when the <<$dick_girth>> bottle enters your pussy.  You feel pain between your legs<<$temp_mens>>.'
-		if cycle <= 0: $temp_mens = ', even though' + $temp_mens
-		if (vgrdif + vltdif) >= 12 and (vgrdif + vltdif) < 20: 'You flinch at the sudden pain when the <<dick>>cm dildo enters your pussy, but the pain between your legs slowly calms down and becomes quite tolerable. You are trying to be excited while moving the <<$dick_girth>> bottle inside your pussy <<$temp_mens>>, you don''t want it to go out.'
-		if (vgrdif + vltdif) >= 7 and (vgrdif + vltdif) < 12: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<$dick_girth>> bottle. Between your legs feels a little nice, when you fuck yourself with the bottle<<$temp_mens>>.'
-		if (vgrdif + vltdif) >=  2 and (vgrdif + vltdif) < 7: 'You flinch, from feeling your pussy being stretched, with a thrust from a <<$dick_girth>> bottle. Between your legs feels a little nice, when you fuck yourself with the bottle. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling subsides and feels nice until the end of<<$temp_mens>>.'
-		if (vgrdif + vltdif) >= -3 and (vgrdif + vltdif) < 2: 'You''re startled by a pleasant sensation, when your pussy ravishly starts taking the bottle. Between your legs becomes very warm, and you feel a pleasant sensation, when a strong <<$dick_girth>> bottle moves back and forth in your wet pussy<<$temp_mens>>. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling descends on you and your entire body is covered in hot waves of orgasm. You start giving out involuntarily shouts of pleasure while ravishing the bottle.'
-		if (vgrdif + vltdif) <  -3: 'You feel the bottle penetrating your pussy. Between your legs feels nice, but the <<$dick_girth>> bottle is a bit too small for your pussy. Gradually, a warm and throbbing feeling grows in your lower abdomen, then the feeling slightly subsides and remains steady until the end of<<$temp_mens>>.'
-		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
-	else
-		$temp_mens = iif(cycle <= 0,' and menstruation blood leaks from your vagina','')
-		pcs_horny = 0
-		pcs_mood -= 15
-		'You bite your lip in pain while tears stream from your eyes when the bottle enters you, breaking your hymen. You cry out in pain and afterwards reveals a bloody bottle<<$temp_mens>>.'
-		gs 'arousal','vaginal_dildo',ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
-	end
-	killvar '$temp_mens'
-
-	gs 'arousal', 'vaginal_dildo', 10, 'lesbian'
-	gs 'stat'
-	orgasm['you'] = iif(orgasm['you'] > orgasm,1,0)
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'ubanal':
-	*clr & cla
-	frost = 0
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\ubanal'+iif(pcs_horny < 100,rand(1,4),5)+'.jpg"></center>'
-	if analplugin = 1:
-		if pcs_ass < 16:
-			'Anfisa pulls the plug out of your narrow and tight ass.'
-			analplugout = 1 & analplugin = 0
-		else
-			'Anfisa pulls the plug out of your ass.'
-			analplugout = 1 & analplugin = 0
-		end
-	end
-
-	if lubri = 0:
-		'Nobody has lube, so Anfisa drops a gob of spit onto your ass and rubs it around.'
-		gs 'arousal', 'anal_finger', 1,'lube'
-	else
-		'Anfisa borrows your lube, squeezes some out and works it into your ass.'
-		gs 'arousal', 'anal_finger', 1,'lube'
-	end
-	'Anfisa massages your anus with her fingers.'
-
-	if pcs_ass < 10:'You groan in pain as she inserts three fingers into your ass.'
-	if pcs_ass >= 10:'She start to stretch your asshole using three fingers.'
-
-	'She pulls her fingers from your ass and replaces them with the bottle neck.'
-
-	'She stops for a moment, giving your ass time to adjust, and then starts to slowly work it in, stretching you.'
-
-	if (agrdif + altdif) >= 20:'You scream and bite your lip from a sharp pain when the bottle enters your ass.'
-	if (agrdif + altdif) <  20:'You moan when the bottle enters your ass.'
-
-	if (agrdif + altdif) >= 30:
-		if pcs_makeup > 1:pcs_makeup = 0
-		'You feel like your anus is stretching when the bottle enters you. You start to moan rhythmically in unison with the bottle''s movements inside of you.'
-	elseif (agrdif + altdif) >= 20 and (agrdif + altdif) < 30:
-		pcs_horny += 10
-		'You moan in pleasure when the bottle moves inside your ass.'
-	end
-	gs 'arousal','anal_dildo', ARGS[1],$ARGS[2],$ARGS[3],$ARGS[4],$ARGS[5],$ARGS[6],$ARGS[7],$ARGS[8]
-
-	gs 'arousal', 'anal_dildo', 10, 'lesbian'
-	gs 'stat'
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'ubsit':
-	*clr & cla
-	dick = 10
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\ubsit'+iif(pcs_horny < 100,rand(1,2),3)+'.jpg"></center>'
-	gs 'dinsex2', 'd_analsex_bottle'
-	gs 'arousal', 'anal_dildo', 10, 'lesbian'
-	gs 'stat'
-	
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'sex':
-	*clr & cla
-	pcs_horny += rand(5,15)
-	anfisa['horny'] += iif(lesbian < 20,5,15)
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\sex'+iif(pcs_horny < 100,1,2)+'.jpg"></center>'
-	'You sit opposite each other, intertwining your legs until pussies are touching, and then start moving your hips caressing each other, ' + $text[16] + $text[iif(pcs_horny < 100,'',20)]
-	if pcs_horny >= 100: pcs_horny = 0 & orgasm += 1 & orgasm['anfisa'] = 1 & orgasm['you'] = 1 & anfisa['horny'] = 0
-	if anfisa['horny'] >= 100: orgasm['anfisa'] = 1 & anfisa['horny'] = 0
-	gs'anfisa_events', 'variant'
-end
-
-if $ARGS[0] = 'end':
-	*clr & cla
-	minut += 15
-	orgasm['you'] = 0
-	orgasm['anfisa'] = 0
-	protect = 0
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images\locations\city\residential\lake\sex\anfisa\end.jpg"></center>'
-	if analplugout = 1:
-		rand(1,3)
-		if rand = 1:
-			analplugin = 1
-			'"One minute, hold still. Don''t forget this," Anfisa says as she inserts the plug back up your ass.'
-			'She grins: "There that looks much better", as she gives your ass a playful slap' 
-		end
-		if rand = 2:
-			analplugin = 1
-			'You take your butt plug and put it back into your anus. You grin: "I just love how this looks...and feels"' 
-		end
-		if rand = 3:
-			analplugin = 0
-			'You take your butt plug and put it into your purse. Your anus has to rest for a while now.' 
-		end
-		killvar 'analplugout'
-	end
-	'You and Anfisa, tired but very satisfied, sit side by side for some time, resting and idly talking about all sorts of trivia. Finally, Anfisa, glancing at her watch, says that it''s time for her to go and begins to dress.
- '+iif(anfisa['sex'] = 1,'I''m usually here on the beach in good weather, come sometime','See you soon, <<$pcs_nickname>>')+', she tells you and smiles as she leaves.'
-	act 'Watch her go': gt 'city_nudelake'
-end
-
-
---- anfisa_events ---------------------------------
-

+ 62 - 41
locations/anushapt.qsrc

@@ -19,10 +19,10 @@ if $ARGS[0] = 'home':
 	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$metkaM = $ARGS[0]
-	$locM = $CURLOC
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$locM_arg = $ARGS[0]
+	$locM = 'anushapt'
+	$loc_arg = $ARGS[0]
+	$loc = 'anushapt'
 	$location_type = 'private'
 	clr
 	popolaini = 0
@@ -314,9 +314,9 @@ if $ARGS[0] = 'bathroom':
 	CLOSE ALL
 	$menu_loc = 'anushapt'
 	$menu_arg = 'bathroom'
-	$metka = 'bathroom'
+	$loc_arg = 'bathroom'
 	$loc = 'anushapt'
-	$metkaM = 'bathroom'
+	$locM_arg = 'bathroom'
 	$locM = 'anushapt'
 	menu_off = 0
 	*clr & cla
@@ -404,9 +404,9 @@ if $ARGS[0] = 'nushshower':
 	menu_off = 1
 	CLOSE ALL
 	*clr & cla
-	$metka = 'bathroom'
+	$loc_arg = 'bathroom'
 	$loc = 'anushapt'
-	$metkaM = 'bathroom'
+	$locM_arg = 'bathroom'
 	$locM = 'anushapt'
 	gs 'stat'
 	$location_type = 'bathroom'
@@ -459,47 +459,47 @@ if $ARGS[0] = 'nushshower':
 						'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/2.jpg"></center>'
 						'You move around to get in a better spot. "Don''t be like that. Show me a little skin. Come on, you know you want to," you say in a teasing tone.'
 						'She smiles a bit that quickly turns into a smirk as she turns her back to you. The towel drops to show off her back.'
-						gs 'arousal', 'voyeur', 1
+						gs 'arousal', 'erotic', 1
 						gs 'stat'
 						act 'That''s better':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/3.jpg"></center>'
 							'"Oh yeah, that''s it... work it girl. Now show me a little more." You do your best to sound like a professional photographer getting a model to work the camera even if all you have is your smart phone.'
-							gs 'arousal', 'voyeur', 2
+							gs 'arousal', 'erotic_nudity', 2
 							gs 'stat'
 							act 'More':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/4.jpg"></center>'
 								'She giggles a bit at that and turns her side to you. The towel is slowly opened to tease you a bit with her nudity while striking a sexy pose.'
 								'"Yeah that''s it. Give me a little more. Let''s see that hot little body of yours"'
-								gs 'arousal', 'voyeur', 2
+								gs 'arousal', 'erotic_nudity', 2
 								gs 'stat'
 								act 'Perfect':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/5.jpg"></center>'
 									'She turns towards you and fully opens the towel. Striking another sexy pose she gives you a full frontal view while you keep taking her picture.'
 									'You say to her with a little encouragement, "Woo... that''s it... perfect. Work that camera girl. Now lets see that cute little ass of yours."'
-									gs 'arousal', 'voyeur', 2
+									gs 'arousal', 'erotic_nudity', 2
 									gs 'stat'
 									act 'Cute little ass':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/pc/pictures/anushka/6.jpg"></center>'
 										'She lets the towel complete drop away and turns to put one foot on the edge of the tub. This gives you a nice view of her backside.'
 										'"Yeah, show me that cute little ass," you tell her as you take a couple of more pictures until she throws the towel at you.'
-										gs 'arousal', 'voyeur', 2
+										gs 'arousal', 'erotic_nudity', 2
 										gs 'stat'
 										act 'Continue':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/selfie1.jpg"></center>'
 											'She steps out of the tub and looks in the mirror. "Damn, I do look hot" She picks up her own phone and takes a nude selfie of herself. She looks over at you and waves for you to come over. "Come on, lets take a selfie together."'
-											gs 'arousal', 'voyeur', 1
+											gs 'arousal', 'erotic_nudity', 1
 											gs 'stat'
 											act 'Selfie':
 												*clr & cla
 												showerphotos = 2
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/selfie2.jpg"></center>'
 												'You move over to stand next to her, while she holds up her phone and takes a couple of selfies of the two of you together. It has to look a little odd considering that she''s completely naked while you are fully dressed. However, who are you to judge?'
-												gs 'arousal', 'voyeur', 1
+												gs 'arousal', 'erotic_nudity', 1
 												gs 'stat'
 												act 'Go to her room': gt 'anushapt', 'shower_wait'
 											end
@@ -531,7 +531,7 @@ if $ARGS[0] = 'shower_wait':
 	elseif showerphotos = 2:
 		'With the impromptu photo shoot and selfies done the two of you head to her room. She walks from the bathroom to her room, completely naked. Once inside she quickly gets dressed, while you take a seat on her bed as she does. Once she is fully dressed she flops down on the bed next to you.'
 	end
-	gs 'arousal', 'voyeur', 2
+	gs 'arousal', 'erotic_nudity', 2
 	gs 'arousal', 'end'
 	act 'Get out of the bed': gt 'anushapt','anushroom'
 	act 'Chat': gt 'anushkachat', 'chat'
@@ -800,7 +800,7 @@ if $ARGS[0] = 'computer':
 			'You start the computer up. It loads quickly, much faster than what you are used to, so it must be a pretty high end laptop. Once it''s done loading you click on the internet browser and look through her browsing history plus bookmarks.'
 			*nl
 			'You see that there are all kinds of porn sites and videos she''s watched. There are a lot of public exhibitionist porn that recorded a variety of different sex acts. There are some boy-girl stuff, a lot of it rough sex and/or anal, there is a fair bit of interracial porn as well, and a lot of lesbian sex that especially feature with strap-ons. You feel yourself getting aroused as you keep browsing.'
-			gs 'arousal', 'voyeur', 10
+			gs 'arousal', 'porn', 10
 			act 'Turn the computer off':gt 'anushapt','anushroom'
 			if AnushkaLoc = 0:
 				act 'Masturbate':
@@ -808,7 +808,7 @@ if $ARGS[0] = 'computer':
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><video autoplay loop src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushcmast.mp4"></video></center>'
 					'While browsing her huge list of pornos you find one that you like and lean back in the chair and start masturbating. Before long you completely forget that you are in Anushka''s bedroom masturbating to her porn on her laptop.'
-					gs 'arousal', 'voyeur', 10
+					gs 'arousal', 'porn', 10
 					act 'Continue':
 						*clr & cla
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -882,7 +882,7 @@ if $ARGS[0] = 'agreeporn':
 	'She grins then connects the TV to the laptop to start playing some lesbian porn. You can''t help, but notice the porno is about two teenage girls having a sleepover in one of their bedrooms. They talk for a bit then as the conversation continues it quickly leads to them having sex.'
 	*nl
 	'You feel yourself getting really aroused from watching the porno. You glance over and notice Anushka has her hand in her panties, while her pants are around her knees, masturbating with you sitting right next to her. You are stunned at her apparent easiness in the situation, so quickly look away. At first, you try to pretend that she isn''t playing with herself, but you can''t help yourself from sneaking the occasional peek at her. It looks like she''s having fun. If she doesn''t think there is anything wrong with it then it''s probably not a big deal to her.'
-	gs 'arousal', 'voyeur', 10
+	gs 'arousal', 'porn', 10
 	gs 'stat'
 	act 'Leave Anushka''s room': gt 'anushapt','hallway'
 	act 'Just watch':
@@ -890,7 +890,7 @@ if $ARGS[0] = 'agreeporn':
 		'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/watchporn.jpg"></center>'
 		'You do your best to ignore the fact that Anushka is laying right next to you with her hand between her legs and masturbating for all she''s worth. This happens as the two of you continue to watch the porno. Long before the video is over Anushka''s breathing gets faster and she starts moaning, softly at first, then louder and louder until finally she arches her back to have a shuddering orgasm. After giving herself a few moments to come down from her little pleasure high, she pulls her pants back up to get off the bed then turns the porno off. She turns to look you in your eyes. "I don''t know about you, but I could use a snack. Come on let''s go raid the kitchen." She heads out of her room waving for you to follow her. You''re not sure of what else to do, so you get up to follow along behind her.'
-		gs 'arousal', 'voyeur', 10
+		gs 'arousal', 'porn', 10, 'lesbian'
 		gs 'stat'
 		gs 'arousal', 'end'
 		act 'Follow her': gt 'anushapt','snack'
@@ -907,9 +907,8 @@ if $ARGS[0] = 'agreeporn':
 			'You think, "Well, fuck it." The video has really turned you on and she obviously doesn''t think it''s big deal to masturbate in front of you. With that thought you begin to masturbate as well. Though, you find it a little hard to get into it properly knowing that she is right next to you. After a while, you start to relax and get more comfortable with the situation as you begin to give in to the sensations. Your arousal grows more and more. You glance over at Anushka to see her looking at you with a huge grin on her face. She is clearly enjoying the fact that the two of you are playing with yourselves together. At this point, neither of you is really watching the porno anymore, instead you just lay back on the bed side by side while looking at each other as you both masturbate.'
 			*nl
 			'Some time later you feel Anushka speed up a bit next to you. Her soft moans suddenly get louder then she starts shuddering in orgasm. This is just enough to get you right to the edge and you quicken your own pace as a result. Within moments a huge orgasm rocks your body that complete overwhelms your senses. By the time you have fully recovered, Anushka has already turned off the porno and is standing there with her pants back up smiling at you. She nods towards the door. "I don''t know about you, but I could really use a snack. Come on lets go raid the kitchen." She heads out of her room waving for you to follow. She is acting like everything is completely normal. Who knows, maybe for her, it is. You get up to follow her out.'
-			gs 'arousal', 'voyeur', 10
 			$orgasm_or = 'yes'
-			gs 'arousal', 'masturbate', 10, 'exhibitionism'
+			gs 'arousal', 'masturbate', 10, 'lesbian'
 			gs 'arousal', 'end'
 			gs 'stat'
 			minut -= 15
@@ -990,27 +989,49 @@ if $ARGS[0] = 'guitar':
 		'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
 		'You check out the two guitars. One of them is an acoustic guitar that looks fairly old, but well cared for. The other is a electric guitar that looks a lot newer and more expensive.'
 		act 'Look at something else':gt 'anushapt','anushroom'
-		act 'Pretend to play':
-			minut += 10
-			pcs_mood += 10
-			instrmusic_exp += rand(0,1) 
-			gs 'stat'
-			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
-			'You decide to live out one of your fantasies. You''ve always wanted to play the guitar. You grab hold of the guitar then you begin to pretend to play. You putg on a show as if you were a real rock star. After a while, you need to catch your breath. Playing was a lot harder than you thought.'
-			act 'Put the guitar back':gt 'anushapt','anushroom'
+		if instrmusic_lvl < 5:
+			act 'Pretend to play':
+				*clr & cla
+				minut += 10
+				pcs_mood += 10
+				instrmusic_exp += rand(0,1) 
+				gs 'stat'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
+				'You decide to live out one of your fantasies. You''ve always wanted to play the guitar. You grab hold of the guitar then you begin to pretend to play. You putg on a show as if you were a real rock star. After a while, you need to catch your breath. Playing was a lot harder than you thought.'
+				act 'Put the guitar back':gt 'anushapt','anushroom'
+			end
 		end
 		act 'Try to play it':
 			*clr & cla
-			instrmusic_exp += rand(0,2)
-			pcs_mood += 5
-			minut += 20
-			gs 'pain', 1, 'fingers', 'ache'
-			gs 'stat'
-			'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
-			'You gently brush your fingers over the strings. The feeling of the course strings against them is exhilarating. You come up with a song you want to try and play and start to work your magic...'
-			'Unfortunately, playing the guitar is a lot harder than it looks. It takes you several minutes to hit the right notes and several more to play even the tiny first fraction of the song without making a mistake. The strings cut into your tender, uncalloused fingertips and after about 20 minutes you decide to stop for now.'
-			'Learning how to play the guitar can be a frustrating, painful, and frustrating experience you realize... Yet, you cannot help, but to gently stroke the guitar once more before putting it back in its stand. You look forward to trying to play again.'
-			act 'Put the guitar back':gt 'anushapt','anushroom'
+			if instrmusic_lvl < 10:
+				instrmusic_exp += rand(0,2)
+				pcs_mood += 5
+				minut += 20
+				gs 'pain', 1, 'fingers', 'ache'
+				gs 'stat'
+				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
+				'You gently brush your fingers over the strings. The feeling of the coarse strings against them is exhilarating. You come up with a song you want to try and play and start to work your magic...'
+				'Unfortunately, playing the guitar is a lot harder than it looks. It takes you several minutes to hit the right notes and several more to play even the tiny first fraction of the song without making a mistake. The strings cut into your tender, uncalloused fingertips and after about 20 minutes you decide to stop for now.'
+				'Learning how to play the guitar can be a frustrating, painful, and frustrating experience you realize... Yet, you cannot help, but to gently stroke the guitar once more before putting it back on its stand. You look forward to trying to play again.'
+				act 'Put the guitar back':gt 'anushapt','anushroom'
+			elseif instmusic_lvl < 20:
+				instrmusic_exp += rand(0,20)
+				pcs_mood += 5
+				minut += 20
+				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
+				'You gently brush your fingers over the strings then slowly start to pick at them, playing a few tunes and strumming some chords, then you try to play some songs that you started to learn.'
+				'Finally you put the guitar back on its stand.'
+				act 'Put the guitar back':gt 'anushapt','anushroom'
+			else
+				instrmusic_exp += rand(0,20)
+				pcs_mood += 5
+				minut += 20
+				'<center><img src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/guitar.jpg"></center>'
+				'You pick up the guitar, running your hand along the neck, picking a few chords, then flick your hair back and start to play the latest song you''ve learned,, quietly singing along, before switching to another one.'
+				'Your fingers dance gracefully over the strings, and you spend a long time just having fun with Anushka''s guitar.'
+				'<<$OpenInnerThought>>"Maybe I should come over with mine and see what we could play together"<<$CloseInnerThought>> you muse as you place the instrument back on its stand.'
+				act 'Put the guitar back':gt 'anushapt','anushroom'
+			end
 		end
 	end
 end
@@ -1503,7 +1524,7 @@ end
 
 if $ARGS[0] = 'kitchen':
 	$loc = 'anushapt'
-	$metka = 'kitchen'
+	$loc_arg = 'kitchen'
 	$menu_loc = 'anushapt'
 	$menu_arg = 'kitchen'
 	menu_off = 0

+ 7 - 7
locations/anushkaev1.qsrc

@@ -326,14 +326,14 @@ if $ARGS[0] = 'watch_nushrad':
 		*clr & cla
 		'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad2.jpg"></center>'
 		'"Fuck I am so hard, come on and suck my dick." He says after giving her bare butt a slap hard enough to leave a red outline of his hand on her ass. She yelps a little and then turns around on the bed. While lying on the bed, she starts sucking his dick, before to long he grabs her by the sides of the head and starts just fucking her mouth with his dick, often gagging her, as he shoves his dick balls deep down her throat. Then he forces his dick balls deep into her mouth and holds her there as she gags for several moments. He finally pulls his dick out of her mouth leaving her choking and gasping for breath.'
-		gs 'arousal', 'voyeur', 5, 'rough'
+		gs 'arousal', 'voyeur_sex', 5, 'rough'
 		gs 'stat'
 		act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 		act 'Keep watching':
 			*clr & cla
 			'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad3.jpg"></center>'
 			'While she is catching her breath, he reaches past her and grabs her by the leg, then spins her around on the bed, and drags her towards him until her butt is almost hanging off the edge of the bed. He pushes her legs apart just as she seems to have finally caught her breath, and then he just shoves his dick in her pussy. She winces a little biting her lower lip. Obviously not as wet and ready as she would have liked to be before starting sex. He doesn''t seem to notice or doesn''t care, as he just starts hammering away at her pussy, balls deep. Each thrust making her grunt, though her grunts slowly turn into moans of pleasure.'
-			gs 'arousal', 'voyeur', 5
+			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 			act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 			act 'Walk in and join them': gt 'anushkaev1', 'rad3some'
@@ -344,7 +344,7 @@ if $ARGS[0] = 'watch_nushrad':
 				'Just as she is starting to moan in pleasure even louder than him, he pulls out of her and flips her over, grabbing her butt and giving her butt cheek a hard squeeze, followed by another hard slap that leaves a red outline of his hand on her bare ass, causing her to yelp again. "Fuck you have such a nice ass Nush." He tells her, she apparently knows what that means, as she quickly grabs the bottle of lube out of her night stand. But before she can use it, he grabs it from her. "Give me that, you always use to much." He growls, then he squirts just a little onto the head of his dick, rubbing it down the shaft of his dick. Once done with that he briefly rubs his fingers between her butt cheeks. It doesn''t look like he used much lube to you, nor hardly applied any to her.'
 				*nl
 				'He pushes her down until she is laying on her stomach, as he tosses the bottle aside and then leans forward, pushing his dick between her butt cheeks as she struggles a bit. "Rad you didn''t use enough lube." She says as she winces as he keeps struggling to push his dick between her butt cheeks. "Shut up Nush, this feels better, you feel really tight." He says just as shoves his hips forward hard, which causes her to jump a little and cry out in pain. "Ow fuck Rad, that hurt, you need to use more lube." She says in a obviously pain stressed voice. He pushes her head against the mattress. You can see her wincing in pain and white knuckling her grip on the bed sheets. "See I knew you didn''t need much lube, fuck your ass is tight." He says as he struggles to force his <<dick>>cm <<$dick_girth>> cock balls deep into her ass, moaning in pleasure as he does.'
-				gs 'arousal', 'voyeur', 5
+				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 				act 'Keep watching':
@@ -352,21 +352,21 @@ if $ARGS[0] = 'watch_nushrad':
 					'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad5.jpg"></center>'
 					'He pulls his dick almost all the way out of her asshole and then slams it back in balls deep, moaning with pleasure as he does. Meanwhile she cries out a little, wincing in pain, she tries to pull away a little, but he just pulls her back. "Oh fuck! Not so hard Rad."'
 					'"Oh please all you bitches love being roughly fucked by a man, like the sluts you are. So just shut up and enjoy it." He says as he starts hammering her ass, with long full length hard strokes. She grunts in pain a lot more than she moans in pleasure, but you don''t think Rad can tell the difference or maybe he just doesn''t care.'
-					gs 'arousal', 'voyeur', 5
+					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 					act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 					act 'Keep watching':
 						*clr & cla
 						'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad6.jpg"></center>'
 						'He grabs ahold of her hips and pulls her hips up until she is on her knees. Then he shoves her face back into the mattress, before he goes back to hammering away at her ass. She places a hand on his hip in a effort to slow him down a little and keep him from going balls deep in her butthole, he just roughly shoves her hand away and slaps her hard on the ass. She tries several more times to reach back and slow him down and keep him from going so deep, each time he roughly shoves her hands away. "Please Rad not so rough or use more lube." She pleads with him. "Fucking take it bitch, take it!" He growls, as redoubles his efforts and just seems to fuck her ass even harder'
-						gs 'arousal', 'voyeur', 5
+						gs 'arousal', 'voyeur_sex', 5
 						gs 'stat'
 						act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 						act 'Keep watching':
 							*clr & cla
 							'<center><img src="images/characters/pavlovsk/school/girl/anushka/sex/spy/spyrad7.jpg"></center>'
 							'She starts pulling away, even the hand on her hip doesn''t completely stop her from pulling away. He leans forward as she does, putting more weight on her, slowly her hips move down more than away until she is laying flat on her stomach again. He clamps his hands on hips, pinning her in place between him and the mattress, to keep her from pulling away more. Her bed sheets are tightly balled up in her clenched fists as she white knuckle grips the sheets. "Please Rad just slow down a little, please!" She pleads with him. He ignores her pleas and continues to hammer her ass with full hard strokes. He starts moaning louder, "Fuck yes, god damn your ass is so fucking tight, I''m about to bust a nut." If you had to guess she is more than ready for him to finish.'
-							gs 'arousal', 'voyeur', 5
+							gs 'arousal', 'voyeur_sex', 5
 							gs 'stat'
 							act 'Leave apartment': gs 'arousal', 'end' & gt 'pav_complex','start'
 							act 'The cum prize':
@@ -375,7 +375,7 @@ if $ARGS[0] = 'watch_nushrad':
 								'He suddenly pulls his dick out of her asshole and starts cumming all over her butt cheeks, moaning loudly as he does. While she lets out a relieved sigh, as a relieved look washes over her face, obviously glad he is finally finished. When he finishes cumming on her ass, he lets go of her and steps away. "Fuck Nush you are the best fucking slut, I have ever fucked. I''ll never get tired of fucking your tight little ass."'
 								*nl
 								'Despite how he treated her, she looks back to him with a smile and seems to be basking in the praise he is now giving her. He barely even looks back at her as he starts getting dressed, as she start to wipe the cum from her ass and get dressed as well. "Well I got to go, got things to do." He pauses a moment when he notices how gingerly she is moving. "You good Nush?" She gives him are you kidding me look, followed by a fairly dirty look. "No my fucking asshole feels like it''s on fire now!" He laughs loudly at that, apparently finding it pretty funny. "What can I say? Sucks to be a hoe! Aching holes is your lot in life." Then with out another glance or word he strides for the door, she flips him off behind his back and mutters. "Asshole."'
-								gs 'arousal', 'voyeur', 5
+								gs 'arousal', 'voyeur_sex', 5
 								gs 'stat'
 								gs 'arousal', 'end'
 								act 'Leave apartment': gt 'pav_complex','start'

+ 31 - 9
locations/arousal.qsrc

@@ -7,8 +7,10 @@ All acts are from Sveta''s perspective and in cases of both giving and receiving
 It can be when receiving any of the following
 'masturbate' - self stimulation
 'porn' - viewing pornographic material
-'voyeur_sex' - watching people have sex
-'voyeur' - observing erotic acts or nudity
+'voyeur_sex' - watching, usually as in spying on, other people have sex
+'voyeur' - watching, usually as in spying on, erotic acts of others
+'erotic' - being aroused by eroticism
+'erotic_nudity' - being aroused by nudity of others
 'trib' - rubbing pussy against another pussy
 'massage' - rubbing your body, back, feet, etc. with their hands/arms
 'cuni' - stimulation of your pussy by someones toungue
@@ -53,6 +55,7 @@ The lubrication is binded with anal or vaginal action. I think that the best com
 Only call one at a time, if more required, use multiple calls
 
 Unaware - if one of the arguments $ARGS[2] - [8] is set to 'unaware', Sveta is not aware of this Sexact. Sveta will never know she had Sex!
+no_orgasm_msg - if one of the arguments $ARGS[2] - [8] is set to 'no_orgasm_msg', the system will not generate a generic arousal message
 
 You can override the orgasm to force or prevent, to do so use:
 $orgasm_or = 'yes' to force orgasm, it will reset in orgasm call so if you want to force it again, you have to enter it again
@@ -65,6 +68,8 @@ $orgasm_txt is used to add custom text that will be called if Sveta orgasms in t
 
 temp_anal = 0
 temp_unaware = 0
+!!turns orgasm text off, there will be no confirmation that Sveta has orgasmed
+temp_text = 0
 !!orgasms restricted to direct stimulation using this flag
 orgasm_flag = 0
 
@@ -74,6 +79,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		temp_unaware = 1
 	end
 
+	if strpos($ARGS[2]+$ARGS[3]+$ARGS[4]+$ARGS[5]+$ARGS[6]+ $ARGS[7]+ $ARGS[8],'no_orgasm_msg') > 0:
+		temp_text = 1
+	end
+	
 	if mid($ARGS[2],1,4) = 'dick':
 		temp_dick = dyneval('result='+$ARGS[2])
 		temp_silavag = dyneval('result=silavag'+mid($ARGS[2],5,len($ARGS[2])-4))
@@ -134,6 +143,11 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 	elseif $ARGS[0] = 'voyeur_sex':
 		count['voyeur_sex'] = 1
 		stim['act'] = 35
+	elseif $ARGS[0] = 'erotic':
+	    stim['act'] = 5
+	elseif $ARGS[0] = 'erotic_nudity':
+        stim['act'] = 5
+        count['erotic_nudity'] = 1
 	elseif $ARGS[0] = 'kiss':
 		count['kiss'] = 1
 		stim['act'] = 10
@@ -170,8 +184,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		else
 			count['anal'] = 1
 		end
-		if pcs_ass < dick:pcs_ass += 1
-		if pcs_ass*2 < dick:pcs_ass += 1
+		if pcs_ass < temp_dick:pcs_ass += 1
+		if pcs_ass*2 < temp_dick:pcs_ass += 1
 		!! length and girth abilities of anus are not also separated , but I suppose that they are related although it is not propable
 		!! we can estimate difference in girth and length anal_girth_difference and anal_lenght_difference - names are shortened
 		altdif = temp_dick - pcs_ass
@@ -315,6 +329,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['vaginal_dildo'] = 1
 		stim['mag'] += 1
 		!! the same as for 'vaginal'
+		if pcs_vag < temp_dick:pcs_vag += 1
+		if pcs_vag*2 < temp_dick:pcs_vag += 1
 		vgrdif = grange - pcs_vag
 		vltdif = temp_dick - pcs_vag
 		vltdif = vltdif / (temp_silavag+1)
@@ -333,8 +349,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['vaginal_strap'] = 1
 		stim['mag'] += 1
 		!! virginal capacity increase
-		if pcs_vag < dick:pcs_vag += 1
-		if pcs_vag*2 < dick:pcs_vag += 1
+		if pcs_vag < temp_dick:pcs_vag += 1
+		if pcs_vag*2 < temp_dick:pcs_vag += 1
 		!! the same as for 'vaginal'
 		vgrdif = grange - pcs_vag
 		vltdif = temp_dick - pcs_vag
@@ -482,7 +498,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		stim['feet'] = 1
 	end
 
-	if $ARGS[1] ! 'porn' and $ARGS[1] ! 'voyeur':
+	if $ARGS[1] ! 'porn' and $ARGS[1] ! 'voyeur' and $ARGS[1] ! 'erotic':
 		i = 2
 		:stimloop
 		if $ARGS[i] ! '':
@@ -675,6 +691,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 
 	orgasm_buildup += stim['total']
 
+!! This is determining if Sveta will orgasm
 	if $orgasm_or ! 'no' and $ARGS[0] ! 'flashlite' and $ARGS[0] ! 'flash' and orgasm_flag ! 0:
 		if $orgasm_or = 'yes' or $orgasm_or = 'custom':
 			gs 'orgasm', $ARGS[0]
@@ -687,10 +704,13 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		end
 	end
 
+!!This is release is Sveta is so horny and pent up that she can cum with minimal stimulation
 	if $orgasm_or ! 'no' and orgasm_buildup >= 300 and pcs_horny >= 60: gs 'orgasm', $ARGS[0]
 
+!!Clearing temporary variables with orgasm as a gs this will catch anything there too
 	killvar 'temp_dick'
 	killvar 'temp_unaware'
+	killvar 'temp_text'
 	killvar '$orgasm_txt'
 	killvar '$stim_les'
 	killvar '$stim_foot'
@@ -701,6 +721,7 @@ end
 
 !!-----------------------------------------------
 
+!!This calculates the various sex stats and includes a small cooldown of stimulation so only use it once per event
 if $ARGS[0] = 'end':
 	if orgasm_buildup > 350: orgasm_buildup = 350
 	if orgasm_buildup > 300: orgasm_buildup -= 10
@@ -721,7 +742,7 @@ if $ARGS[0] = 'end':
 	
 	killvar 'anal_slip'
 	killvar 'ar_anal_lube'
-	killvar 'vagi_slip'
+	killvar 'vaginal_slip'
 	killvar 'ar_vag_lube'
 	killvar '$orgasm_or'
 
@@ -809,6 +830,7 @@ if $ARGS[0] = 'end':
 	gs 'arousal', 'count2', 'flash'
 	gs 'arousal', 'count2', 'voyeur'
 	gs 'arousal', 'count2', 'voyeur_sex'
+	gs 'arousal', 'count2', 'erotic_nudity'
 	
 	!! Thats here because there is currently a variable zoo.
 		if zoo > beast['exp']: beast['exp'] = zoo
@@ -867,7 +889,7 @@ if $ARGS[0] = 'auto_lube':
 				$lube_txt
 			end
 			gs 'arousal', 'vaginal_finger', 1
-			vagi_slip = 8
+			vaginal_slip = 8
 			ar_vag_lube = 1
 			lubri -= 1
 		elseif $ARGS[2] ! 'custom' or ($ARGS[2] = 'custom' and $lube_txt ! ''):

+ 20 - 16
locations/artemhome.qsrc

@@ -36,9 +36,9 @@ if $ARGS[0] = 'home':
 	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$metkaM = 'home'
+	$locM_arg = 'home'
 	$locM = 'artemhome'
-	$metka = 'home'
+	$loc_arg = 'home'
 	$loc = 'artemhome'
 	$location_type = 'private'
 	clr
@@ -173,9 +173,9 @@ if $ARGS[0] = 'hallway':
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
 	$location_type = 'indoors'
-	$metkaM = 'hallway'
+	$locM_arg = 'hallway'
 	$locM = 'artemhome'
-	$metka = 'hallway'
+	$loc_arg = 'hallway'
 	$loc = 'artemhome'
 	*clr & cla
 	minut += 1
@@ -207,9 +207,9 @@ if $ARGS[0] = 'bathroom':
 	CLOSE ALL
 	$menu_loc = 'artemhome'
 	$menu_arg = 'bathroom'
-	$metka = 'bathroom'
+	$loc_arg = 'bathroom'
 	$loc = 'artemhome'
-	$metkaM = 'bathroom'
+	$locM_arg = 'bathroom'
 	$locM = 'artemhome'
 	if ArtemLoc ! 3:
 		menu_off = 0
@@ -265,9 +265,9 @@ end
 if $ARGS[0] = 'artemroom':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'artemroom'
-	$metkaM = 'artemroom'
+	$locM_arg = 'artemroom'
 	$locM = 'artemhome'
-	$metka = 'artemroom'
+	$loc_arg = 'artemroom'
 	$loc = 'artemhome'
 	menu_off = 0
 	$locclass = 'bedr'
@@ -485,7 +485,8 @@ if $ARGS[0] = 'bookshelf':
 			gs 'stat'
 			artfall += 1
 			artem_borrowed_book = 1
-!!need code to add a book for Sveta to read other than the ones she can buy.
+			artembook = 5
+!!need code to add a book for Sveta to read other than the ones she can buy.			
 			gs 'stat'
 			'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'You look through the books till you find one you like and then you turn towards Artem. "Hey do you mind if I borrow this to read?"'
@@ -500,23 +501,26 @@ if $ARGS[0] = 'bookshelf':
 			*clr & cla
 			minut += 2
 			artem_borrowed_book = 0
+			artembook = 0
 			gs 'stat'
 			'<center><img src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom/bookshelf.jpg"></center>'
 			'"I brought your book back." You tell him as you take it out of your purse and put it back in place on the shelf, right where you got it from.'
 			'"Did you like it?"'
 			act 'I did':
+				cla
 				'"Yeah, it was good."'
 				'Artem''s face lights and he joins you at the bookshelf. "Yeah, I really liked that one too."'
 				act 'Look at more books':gt 'artemhome','bookshelf'
 				act 'Find something else to look at':gt 'artemhome','artemroom'
 			end
 			act 'Not really':
+				cla
 				if pcs_int <= 40:
 					'"It was a bit too complicated." You admit, embarrassed.'
 				else
 					'"It was a bit too bland for me. In the end it just bored me. I could guess at the outcome right at the start, and it turned out I was right."'
 				end
-				'Artem looks a bit crushed as you tell him this. He had clearly hoped you''d like the book.'
+				'Artem looks a bit crushed as you tell him this. He had clearly hoped you''d like the book.'				
 				act 'Look at more books':gt 'artemhome','bookshelf'
 				act 'Find something else to look at':gt 'artemhome','artemroom'
 			end
@@ -584,9 +588,9 @@ end
 if $ARGS[0] = 'livingroom':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'livingroom'
-	$metkaM = 'livingroom'
+	$locM_arg = 'livingroom'
 	$locM = 'artemhome'
-	$metka = 'livingroom'
+	$loc_arg = 'livingroom'
 	$loc = 'artemhome'
 	menu_off = 0
 	CLOSE ALL
@@ -862,9 +866,9 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
-	$metkaM = 'kitchen'
+	$locM_arg = 'kitchen'
 	$locM = 'artemhome'
-	$metka = 'kitchen'
+	$loc_arg = 'kitchen'
 	$loc = 'artemhome'
 	$menu_loc = 'artemhome'
 	$menu_arg = 'kitchen'
@@ -1126,9 +1130,9 @@ end
 if $ARGS[0] = 'artemparents':
 	$menu_loc = 'artemhome'
 	$menu_arg = 'artemparents'
-	$metkaM = 'artemparents'
+	$locM_arg = 'artemparents'
 	$locM = 'artemhome'
-	$metka = 'artemparents'
+	$loc_arg = 'artemparents'
 	$loc = 'artemhome'
 	menu_off = 0
 	CLOSE ALL

+ 30 - 30
locations/autosalonF.qsrc

@@ -1,7 +1,7 @@
 # autosalonF
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autosalonF'
     $location_type = 'event'
 	menu_off = 1
 	cla
@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 	'<center><b>Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
 	nl
-	'<b><center>List of Vehicles for Sale</center></b>'
+	'<b><center>List of vehicles for sale</center></b>'
 	nl
 	'<center><table border=0><TR>'
 	'<TR><TD><a href="exec:GS ''carF1'',''car6''">Kalina VAZ</a>.</TD><TD> - </TD><TD> New. Price: 400 th.RUB</TD></TR>'
@@ -46,8 +46,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'manager1':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autosalonF'
 	$menu_arg = 'manager1'
 	$menu_loc = 'autosalonF'
 	menu_off = 0
@@ -59,7 +59,7 @@ if $ARGS[0] = 'manager1':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/cardealer/manager.jpg"></center>'
 	'You have <<karta>> <b>₽</b> on your bank account.'
 	'The manager smiles affably and explains routinely what is required to purchase a car: A driver''s license and the sum, in full, on your bank account.' 
-	'"With how the economy is right now, we can''t accept payment by installments at this time, I''m afraid", he apologizes, "and a few new laws have been passed, too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
+	'"With how the economy is right now, we can''t accept payment by installments at this time I''m afraid." he apologizes. "A few new laws have also been passed too: We cannot accept cash payment - the Duma believes that will help fight crime - and it is currently not possible to own more than one car, according to the Oblast''s new anti-corruption law.'
 
 	act 'Leave':gt 'city_industrial'
 
@@ -78,7 +78,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -99,7 +99,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -120,7 +120,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -141,7 +141,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -162,7 +162,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -183,7 +183,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -204,7 +204,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -225,7 +225,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -246,7 +246,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -267,7 +267,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -288,7 +288,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." she says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -309,7 +309,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -330,7 +330,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -351,7 +351,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -372,7 +372,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -393,7 +393,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -414,7 +414,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -435,7 +435,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -456,7 +456,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -477,7 +477,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -498,7 +498,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -519,7 +519,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -540,7 +540,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end
@@ -561,7 +561,7 @@ if $ARGS[0] = 'manager1':
 			wrek = 0
 
 			'The manager draws up a purchasing contract and you inform the bank of the impending transaction. Once the bank has confirmed the write-off, the manager hands you the key to your new car.' 
-			'"It''s waiting for you outside", she says. "The fuel tank is almost empty, though, so you should stop by the gas station right away."'
+			'"It''s waiting for you outside." he says. "The fuel tank is almost empty though, so you should stop by the gas station right away."'
 
 			act 'Leave':gt'city_industrial'
 		end

+ 2 - 2
locations/autoservisF.qsrc

@@ -1,7 +1,7 @@
 # autoservisF
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autoservisF'
     $location_type = 'event'
 	$menu_arg = 'start'
 	$menu_loc = 'autoservisF'

+ 19 - 19
locations/autotraidF.qsrc

@@ -1,7 +1,7 @@
 # autotraidF
 if $ARGS[0] = 'start':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autotraidF'
     $location_type = 'event'
 	$menu_arg = 'start'
 	$menu_loc = 'autotraidF'
@@ -26,8 +26,8 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'manager1':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autotraidF'
 	$menu_arg = 'manager1'
 	$menu_loc = 'autotraidF'
 	menu_off = 0
@@ -50,14 +50,14 @@ if $ARGS[0] = 'manager1':
 			minut += 60
 			money += bupay
 			car = 0
-			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re gonna find somebody who''s gonna offer you more for it and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
+			'While you are almost certain that he''s offering less than the car is actually worth, you doubt that you''re going find somebody who''s going to offer you more for it and your attempts at haggling with the fence fall flat - he''s just too experienced at this.'
 			'So, as much as you hate it, you give your car one last look before you shake hands with him and follow him into the tiny shed he calls his "office" to sign the papers. He hands you the money in cash and, with a nasty grin, suggests that you look around the yard.' 
-			'"Maybe you see something you like."'
+			'"Maybe you''ll see something you like?"'
 
 			act 'Leave': killvar 'bupay' & minut += 5 & gt 'city_industrial'
 		end
 	elseif cardrive ! 9:
-		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at you car before he can tell you how much it''s worth. "But if you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
+		'The salesman tells you, his smile sneering rather than friendly, that he needs to look at your car before he can tell you how much it''s worth. "If you want, I can have somebody tow it here. It only costs 3000 <b>₽</b>. Very cheap!"'
 
 		if money >= 3000:
 			act 'Pay for towing service to the car market (3,000 <b>₽</b>) (1:00)':
@@ -66,7 +66,7 @@ if $ARGS[0] = 'manager1':
 				minut += 60
 				cardrive = 9
 				money -= 3000
-				'You give him the money - certain that he''s ripping you off - and wait for an hour until the tow truck finally drives into the yard and your car.'
+				'You give him the money - certain that he''s ripping you off - and wait for an hour until the tow truck finally drives into the yard, your car hooked up to the rear of it.'
 
 				act 'Talk to the car salesman again': killvar 'bupay' & gt 'autotraidF', 'manager1'
 			end
@@ -75,8 +75,8 @@ if $ARGS[0] = 'manager1':
 end
 
 if $ARGS[0] = 'car':
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'autotraidF'
 	$menu_arg = 'car'
 	$menu_loc = 'autotraidF'
 	menu_off = 0
@@ -86,7 +86,7 @@ if $ARGS[0] = 'car':
 	gs 'stat'
 	'<center><b>Used Car Dealership</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/usedcar/autotraid.jpg"></center>'
-	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. And according to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on, though: Several of the cars are visibly damaged or make awful sounds when they are started.' 
+	'There are so many cars on the parking lot that you could spend a lifetime looking around without ever seeing all of them. According to the salesman, several cars are currently being test-driven or maintained. You doubt that there''s actually any maintenance going on though: Several of the cars are visibly damaged or make awful sounds when they are started.' 
 	*nl
 	'It''s obvious that most, if not all of them have sustained some visible or invisible damage. Buying a car here could be a fantastic bargain... or a complete waste of money. If you are to buy any of them, you know that the first place to visit should be a service center.'
 
@@ -117,7 +117,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 200
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'city_industrial'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'car':
 					tehcar = 200
 					teh = rand(10, tehcar)
 					wrek = 1
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you... and that''s it.' 
 					'If you want to get the car to a garage, you''ll have to go there and have it towed.'
 					killvar 'bupay'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 300
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 290
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -241,7 +241,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 300
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -272,7 +272,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 350
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt'city_industrial'
@@ -304,7 +304,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 1000
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'city_industrial'
@@ -336,7 +336,7 @@ if $ARGS[0] = 'car':
 					teh = tehT
 					tehcar = 800
 					wrek = 0
-					'You agree. Before you know it, the car salesman and you have signed all the necessary documents, you hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
+					'You agree and before you know it, the car salesman and you have signed all the necessary documents. You hand over the <<bupay>> <b>₽</b> in cash and the car is yours.' 
 					'Since it''s crammed in between about a million other vehicles, the car salesman moves it outside near the yard''s entrance for you and warns you that there is very little gas in the tank.'
 					killvar 'bupay' & killvar 'tehT'
 					act 'Leave': minut += 5 & gt 'city_industrial'

+ 4 - 13
locations/backwater.qsrc

@@ -2,7 +2,7 @@
 
 $location_type = 'secluded'
 $loc = 'backwater'
-$metka = ''
+$loc_arg = ''
 $menu_loc = 'backwater'
 $menu_arg = ''
 menu_off = 0
@@ -13,20 +13,11 @@ clothesAtLocation = FUNC('lost_clothes_here',$CURLOC)
 
 if $ARGS[0] = '':
 	act 'Go back to the hut':
-	if $clothingworntype = 'nude' and ((hunterknowday ! daystart and hunters_outside = 1 and hunters_available = 1) or (inhibitioncheck !  daystart and pcs_inhib >= 25) or exhibitionist_lvl < 1):
-		$loc = 'swamp_yard'
-		$metka = 'start'
-		hunter_refuse = 0
-		inhibitionbackwater = daystart
-		gs 'stat'
-		gt 'swamphouse', 'get_dressed'
-	else
 		minut += 5
 		hunter_refuse = 0
 		gs 'stat'
 		gt 'swamp_yard', 'start'
 	end
-end
 
 	'<center><B>Backwater</B></center>'
 
@@ -110,7 +101,7 @@ end
 			*nl
 			'You wash off the indecent inscriptions on your body.'
 
-			act 'Finish':menu_off = 0 & gt $loc, $metka
+			act 'Finish':menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
 	if cumloc[6] = 1 or cumloc[7] = 1:
@@ -192,7 +183,7 @@ end
 				menu_off = 1
 				gs 'clothing', 'recover_lost_clothes', 'backwater'
 				'You pick up your clothes laying on the ground.'
-				gt $loc, $metka
+				gt $loc, $loc_arg
 			end
 		elseif forced_naked_day < daystart:
 			act 'Get dressed':
@@ -202,7 +193,7 @@ end
 				gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 				gs 'underwear', 'wear'
 				'You pick up your clothes laying on the ground and get dressed.'
-				gt $loc, $metka
+				gt $loc, $loc_arg
 			end
 		end
 	end

+ 1 - 1
locations/bank.qsrc

@@ -3,7 +3,7 @@
 if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'bank'
-	$metka = 'start'
+	$loc_arg = 'start'
 	$menu_loc = 'bank'
 	$menu_arg = 'start'
 	menu_off = 0

+ 2 - 2
locations/bass.qsrc

@@ -2,8 +2,8 @@
 
 if $ARGS[0] = 'start':
 	CLOSE ALL
-	$metka = $ARGS[0]
-	$loc = $CURLOC
+	$loc_arg = $ARGS[0]
+	$loc = 'bass'
     $location_type = 'public_indoors'
 	$menu_loc = 'bass'
 	$menu_arg = 'start'

+ 3 - 1
locations/bed.qsrc

@@ -5,7 +5,9 @@ if $ARGS[0] = 'start':
 	menu_off = 1
 	shour = 24 - hour
 	gs 'stat'
-
+	ml_guitar['carried'] = 0
+	ml_guitarAtHome = 1
+	
 	if hour > 22 and rand(0, 100) < 2 and houserab = 1 and houserabday ! daystart and pcs_sleep < 50 and tanhouse1 = 1:gt 'bed', 'rab'
 	if hour > 22 and rand(0, 200) = 0 and housrA = 1 and husband = 0:gt 'bed', 'vor'
 

+ 6 - 3
locations/bed2.qsrc

@@ -93,7 +93,7 @@ if $ARGS[0] = '':
 			killvar '$sleep_txt'
 		end
 	end
-	act 'Get out of bed': killvar '$sleep_txt' & gt $loc, $metka
+	act 'Get out of bed': killvar '$sleep_txt' & gt $loc, $loc_arg
 	act 'Take a nap (1:00)':
 		menu_off = 1
 		if pcs_sleep >= 10 and pcs_sleep <= 90:
@@ -112,6 +112,7 @@ if $ARGS[0] = '':
 			'You are not tired enough to sleep, even for a short nap.'
 		end
 	end
+	gs 'events', 'read'
 
 	if sisterHere = 0 or (sisterHere = 1 and hour < 7):
 		if (pcs_horny > 75 and pcs_inhib >= 60) or (pcs_horny > 50 and pav_slut >= 150) or (pcs_horny > 50 and pav_slut >= 50 and pcs_inhib >= 60):
@@ -319,6 +320,7 @@ if $ARGS[0] = 'dream':
 	elseif alarm_set >= 1440:
 		alarm_set -= 1440
 	end
+	
 
 	if slept_in = 1:
 		gs 'stat'
@@ -438,6 +440,7 @@ if $ARGS[0] = 'wake_horny':
 end
 
 if $ARGS[0] = 'wake':
+	if StoryLine = 1 and indorf = 0 and motherQW['bathroom_dildos'] > 0:gt'mother_sextalk','dildo_wakeup1'
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
@@ -530,7 +533,7 @@ if $ARGS[0] = 'end':
 	elseif fullmorrout = 1 and $loc = 'bedr':
 		gt 'vanr'
 	else
-		gt $loc, $metka
+		gt $loc, $loc_arg
 	end
 end
 
@@ -644,7 +647,7 @@ if $ARGS[0] = 'succubinit':
 		RecovH = 0		
 	end
 
-	act 'Finish': gt $loc, $metka
+	act 'Finish': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'magbstchoice':

+ 2 - 2
locations/bedr.qsrc

@@ -3,9 +3,9 @@
 CLOSE ALL
 *clr & cla
 $loc = 'bedr'
-$metka = ''
+$loc_arg = ''
 $locM = 'bedr'
-$metkaM = ''
+$locM_arg = ''
 $menu_loc = 'bedr'
 $menu_arg = ''
 menu_off = 0

+ 2 - 2
locations/bedr2x.qsrc

@@ -3,9 +3,9 @@
 CLOSE ALL
 *clr & cla
 $loc = 'bedr2x'
-$metka = ''
+$loc_arg = ''
 $locM = 'bedr2x'
-$metkaM = ''
+$locM_arg = ''
 $menu_loc = 'bedr2x'
 $menu_arg = ''
 menu_off = 0

+ 100 - 86
locations/bedrPar.qsrc

@@ -3,7 +3,7 @@
 CLOSE ALL
 *clr & cla
 $loc = 'bedrPar'
-$metka = ''
+$loc_arg = ''
 $location_type = 'private'
 $locclass = 'bedr'
 $menu_loc = 'bedrPar'
@@ -24,7 +24,7 @@ if momloc = 26:
 		gt 'mother', 'plug_find'
 	else
 		'As you walk into your bedroom you find your <<$npc_nickname[''A29'']>> cleaning the room. Sweeping, folding clothes and putting them away, dusting, making the beds and just generally cleaning everything.'
-		act 'Leave': gt $loc, $metka
+		act 'Leave': gt $loc, $loc_arg
 	end
 end
 
@@ -35,19 +35,19 @@ if ParrotQW['Level'] = 2:
 	'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
 	ParrotQW['Level'] = 3
 	ParrotQW['Day'] = 3
-	act 'Continue':gt $loc, $metka
+	act 'Continue':gt $loc, $loc_arg
 	exit
 end
 if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
 	*clr & cla
 	menu_off = 1
 	'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
-	'You sister must have released him since you were not able to find a solution in time.'
+	'Your sister must have released him since you were not able to find a solution in time.'
 	ParrotQW['Owned2'] = 0
 	ParrotQW['Level'] = 0
 	ParrotQW['Day'] = 2
 	ParrotQW['Failed'] = 0
-	act 'Continue':gt $loc, $metka
+	act 'Continue':gt $loc, $loc_arg
 	exit
 end
 
@@ -59,20 +59,20 @@ if sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage'
-	'"I went to the shopping center and bought this bird. Isn''t he the cutest ?"'
+	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage.'
+	'"I went to the shopping center and bought this bird. Isn''t he the cutest?"'
 	if npc_rel['A33'] > 50:
-		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care"'
+		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care."'
 		ParrotQW['SisKeepParrot'] = 1
 	end
 	if npc_rel['A33']  <= 50:
-		'"No he isn''t cute, and I suggest you take it out of here, I am not sharing my room with a bird."'
-		'You feel kind of sad but you understand your sister. You should have asked her before buying it.'
-		'You go to the window, open it and release the bird'
+		'"No he isn''t cute, and I suggest you get it out of here. I am not sharing my room with a bird!"'
+		'You are somewhat upset, but you understand. You should have asked her before buying it.'
+		'You go to the window, open it and release the bird.'
 		ParrotQW['Owned2'] = 0
 	end
 
-	act 'Leave':gt $loc, $metka
+	act 'Leave':gt $loc, $loc_arg
 	exit
 end
 
@@ -89,25 +89,25 @@ end
 if ParrotQW['Owned2'] = 1:
 	'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
 	if daystart - ParrotQW['BuyDate'] <= 10: '<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
-	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. It sounds almost like he is saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is clearly saying "<b>hello  <<$pcs_nickname>></b>"'
-	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty</b>"'
-	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body</b>"'
-	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
-	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
-	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
+	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>>, you''re the best!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, swallow it all!</b>"'
+	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>, your pussy tastes great!</b>"'
 	if ParrotQW['Level'] = 3:
 		parfixrand = rand(0,9)
-		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Say To Me?</b>"'
-		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>3.1415926535897932384 ....</b>"'
-		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Come Closer, My Friend</b>"'
-		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Here Kitty, Kitty!</b>"'
-		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>I Just Met You and This is Crazy</b>"'
-		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Bow Before Me!</b>"'
-		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>He’s Just a Friend, Honest!</b>"'
-		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Do To My Socks?</b>"'
-		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>That’s What She Said!</b>"'
-		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
+		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you say to me?</b>"'
+		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>3.1415926535897932384....</b>"'
+		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Come closer, my friend.</b>"'
+		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Here kitty, kitty!</b>"'
+		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>I just met you, and this is crazy!</b>"'
+		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Bow before me!</b>"'
+		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>He’s just a friend, honest!</b>"'
+		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>What did you do to my socks?</b>"'
+		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>That''s what she said!</b>"'
+		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Help! They''ve turned me into a parrot!</b>"'
 		killvar 'parfixrand'
 	end
 
@@ -164,7 +164,7 @@ if sister_indorf = 0:
 		elseif anyaloc = 26:
 			if sisboypartyQW = 1: sisboypartyQW = 2
 			if sisboyparty = -1: sisboyparty = 1
-			'Your drunken sister Anya is sound asleep in her bed.'
+			'A drunken Anya is sound asleep in her bed.'
 		end
 	end
 end
@@ -198,7 +198,7 @@ sis_watch = 0
 if sisterHere = 0 or sisboytrio > 0:
 	if pornMagazine > 0:gs 'events', 'read_porn'
 	if rexCarCount >= 9 and hour < 3 and rexSmsDay ! daystart and smsForRex < 13:
-		act 'Send Rex a SMS message': gt 'reks','sms'
+		act 'Send Rex a text message': gt 'reks','sms'
 	end
 	if pcs_horny >= 50:
 		act 'Masturbate':gt 'selfplay', 'start'
@@ -243,7 +243,7 @@ if pcs_sewng >= 80:
 			gobramin = (pcs_sewng - 70) * 2
 			newgobelen += rand(gobramin,gobramax)
 			gs'stat'
-			if newgobelen < 1000:'You spent an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
+			if newgobelen < 1000:'You spend an hour working on your tapestry, which is now <<newgobelen/10>> percent finished.'
 				if newgobelen >= 1000:
 				newgobelen = 0
 				gobelen += 1
@@ -254,23 +254,60 @@ if pcs_sewng >= 80:
 	end
 end
 
-if ml_guitarWithMe = 1:
+if ml_guitar['carried'] = 1:
 	act 'Place the guitar next to your desk': 
-		ml_guitarWithMe = 0
-		ml_guitarAtHome = 1
+		ml_guitar['carried'] = 0
 		gt 'bedrPar', 'start'
 	end
-elseif ml_guitarAtHome = 1:
+elseif ml_guitar['hasguitar'] and ml_guitar['carried'] = 0:
 	act 'Pick up the guitar':
-		ml_guitarWithMe = 1
-		ml_guitarAtHome = 0
+		ml_guitar['carried'] = 1
 		gt 'bedrPar', 'start'
 	end
 end
 
-if hour > 8 and hour < 20:
+			
+if ml_online['account'] = 0 and internet > 0: 
+	act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
+end
+
+!!Uploading recorded music if there are any not uploaded yet
+if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
+	if pcs_inhib < 30:
+		if pcs_inhib < 10: 
+			$diff = 'hard'
+		elseif pcs_inhib < 20: 
+			$diff = 'medium'
+		else 
+			$diff = 'easy'
+		end
+		gs 'willpower', 'skill', 'self', $diff
+
+		will_cost = (will_cost * 2) - (pcs_perform)
+		if will_cost <= pcs_willpwr:
+			act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
+		else	
+			act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		end
+	end
+	act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
+end
 
-	if ml_guitar = 1 and (ml_chordbook = 1 or ml_guitarlessoncount > 0) and ml_performed_minutes <= ml_maxperform_minutes:
+if ml_uploadablemusic > 0:
+	act 'Delete old recordings': gt 'music_onlinemusic', 'deleteoldmusic'
+end
+
+if hour > 8 and hour < 22:
+
+	if ml_guitar['hasguitar'] = 1:
+		act 'Play something on the guitar (10 minutes)':
+			mood += 10
+			'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
+			'You hum along the tune, relaxing into the music, just enjoying it. When you look up a quarter of an hour has passed and you are in a much better mood.'
+		end
+	end
+
+	if ml_guitar['hasguitar'] = 1 and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 		if sisterHere = 1 and pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -283,7 +320,7 @@ if hour > 8 and hour < 20:
 			will_cost = (will_cost * 3) - (pcs_perform)
 			if will_cost <= pcs_willpwr:
 				act 'Practice guitar (0:30) (<<will_cost>> Willpower)': 
-					inhib_exp += rand(0,1)
+					inhib_exp += rand(1,2)
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					gt 'music_bedroomPractice', 'guitar'
@@ -295,13 +332,11 @@ if hour > 8 and hour < 20:
 			act 'Practice guitar (0:30)': gt 'music_bedroomPractice', 'guitar'
 		end
 	end
-			
-	if ml_online['account'] = 0 and internet > 0:
-		act 'Set up an online music account (0:30)': gt 'music_onlinemusic', 'setupAccount'
-	end
 
 	!! Streaming music 
-	if ml_guitar = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performed_minutes <= ml_maxperform_minutes:
+	if ml_guitar['hasguitar'] = 1 and ml_online['account'] = 1 and internet > 0 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15 and alko < 5 and ml_streaming['lastday'] ! daystart:
+		ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
+
 		if pcs_inhib < 30:
 			if pcs_inhib < 10: 
 				$diff = 'hard'
@@ -314,22 +349,22 @@ if hour > 8 and hour < 20:
 			will_cost = (will_cost * 3) - (pcs_perform)
 	
 			if will_cost <= pcs_willpwr:
-				act 'Live stream (1:00) (<<will_cost>> Willpower)': 
+				act 'Live stream (<<ml_streamtime>> minutes) (<<will_cost>> Willpower)': 
 					inhib_exp += rand(1,3)	
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					gt 'music_onlinemusic', 'liveStream'
 				end
 			else	
-				act 'Live stream (1:00) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Live stream (<<ml_streamtime>> minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else 
-			act 'Live stream (1:00)': gt 'music_onlinemusic', 'liveStream'			
+			act 'Live stream (<<ml_streamtime>> minutes)': gt 'music_onlinemusic', 'liveStream'			
 		end
 	end
 
 	!! Recording music
-	if ml_guitar = 1 and sisterHere = 0 and ml_performed_minutes <= ml_maxperform_minutes:
+	if ml_guitar['hasguitar'] = 1 and sisterHere = 0 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and alko < 5:
 		if pcs_inhib < 20:
 			if pcs_inhib < 10: 
 				$diff = 'medium'
@@ -360,35 +395,14 @@ if hour > 8 and hour < 20:
 		else
 			act 'Record a song with your phone (0:30)': gt 'music_onlinemusic', 'recordSong'
 			if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-				act 'Record and edit a song (1:30)': gt 'music_onlinemusic', 'recordAndEditSong'
-			end	
-		end
-	end
-
-		!!Uploading recorded music if there are any not uploaded yet
-	if ml_uploadablemusic > 0 and internet > 0 and ml_online['account'] = 1:
-		if pcs_inhib < 30:
-			if pcs_inhib < 10: 
-				$diff = 'hard'
-			elseif pcs_inhib < 20: 
-				$diff = 'medium'
-			else 
-				$diff = 'easy'
-			end
-			gs 'willpower', 'skill', 'self', $diff
-
-			will_cost = (will_cost * 2) - (pcs_perform)
-			if will_cost <= pcs_willpwr:
-				act 'Upload music (<<will_cost>> Willpower)': gt 'music_onlinemusic', 'uploadmusic'
-			else	
-				act 'Upload music (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Record and edit a song (2:00)': gt 'music_onlinemusic', 'recordAndEditSong' 
 			end
 		end
-		act 'Upload music': gt 'music_onlinemusic', 'uploadallmusic'
 	end
-end
 
+end
 
+ !! if ml_deparcoQW > 3: act 'Rehearse for your show': gt 'music_bedroomPractice', 'rehearsing'
 
 if sisterHere = 0 and breastpump = 1 and bp_unbox <= 0:
 	'<a href="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
@@ -409,7 +423,7 @@ act 'Relax on your bed': gt 'bed', 'start'
 
 if $ARGS[0] = 'intro':
 	cla & *clr
-	$metka = ''
+	$loc_arg = ''
 	$loc = 'korrPar'
 	$temp_nickname = '<<$npc_nickname[''A29'']>>'
 	grandmaQW['last_month_paid'] = month
@@ -421,7 +435,7 @@ if $ARGS[0] = 'intro':
 	'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
 	*nl
-	'All of a sudden you hear a familiar voice yell out, "<<$pcs_nickname>>, time to get up. You can''t spend the whole day laying around!"'
+	'All of a sudden, you hear a familiar voice yell out. "<<$pcs_nickname>>, time to get up! You can''t spend the whole day laying around!"'
 	wait 1000
 	$npc_nickname['A29'] = input('<center>What name do you address your mother by?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
 	if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
@@ -432,17 +446,17 @@ if $ARGS[0] = 'intro':
 		gs 'stat'
 		'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-		'You tiredly open your eyes seeing your <<$npc_nickname[''A29'']>> standing over you, "Fifteen more minutes..."'
-		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" as she yanks the cover off...'
-		'"<<$npc_nickname[''A29'']>>!" you exclaim, as you feel a slight cold breeze hit your body.'
-		'"No excuses, <<$pcs_nickname>>. The summer holidays will be over before you know it and you mustn''t get used to sleeping in, or you won''t be able to get up early when school starts again. So, from now on set your alarm to wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
+		'You tiredly open your eyes and see your <<$npc_nickname[''A29'']>> standing over you. "Fifteen more minutes..." you mumble.'
+		'Your <<$npc_nickname[''A29'']>> lets out a loud sigh, "No, up now!" she says as she yanks the covers off...'
+		'"<<$npc_nickname[''A29'']>>!" you exclaim as you feel a slightly cold breeze hit your body.'
+		'"No excuses <<$pcs_nickname>>. The summer holidays will be over before you know it and you mustn''t get used to sleeping in, or you won''t be able to get up early when school starts again. So, from now on set your alarm to wake up at a reasonable time." <<$npc_nickname[''A29'']>> says as she stares at you expectantly.'
 		act 'Get up':
 			cla & *clr
 			minut += 2
 			gs 'stat'
 			'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is no excuse to laze around all day, you can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
+			'As soon as you get off your now coverless bed, your <<$npc_nickname[''A29'']>> is quick to resume her nagging, telling you again what you already heard from her a few moments ago. "Summer is no excuse to laze around all day. You can''t sleep in anymore, not even for another fifteen minutes." She''s not even looking at you while she talks, but luckily for you that means she misses you rolling your eyes.'
 			'"What are you going to do when school starts, or when you get a job? You better get into the habit of setting your alarm so you can wake up bright and early."'
 			act 'Continue':
 				cla & *clr
@@ -450,23 +464,23 @@ if $ARGS[0] = 'intro':
 				gs 'stat'
 				'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-				'You let out an exasperated sigh, "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
-				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
+				'You let out an exasperated sigh. "Yeah, yeah I know, you told me that already. So, how early are we talking?"'
+				'Your <<$npc_nickname[''A29'']>> shoots you a sharp look and you know to fix your attitude or else. "Well, that depends on what you plan to do in the morning. There''s breakfast, showering and brushing your teeth, doing your hair and then makeup and shaving if you really need to. If I remember right... Anya used to wake up at 06:00 for school."'
 				act 'Continue':
 					cla & *clr
 					minut += 2
 					gs 'stat'
 					'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost4.jpg"></center>'
-					'"You want me to wake up that early?!" You huff. "Can''t I wake up at like... 07:00?"'
-					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either," she warns you before making her way towards the kitchen. "Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month," she adds quickly.'
+					'"You want me to wake up that early?!" you huff. "Can''t I wake up at like... 07:00?"'
+					'Your <<$npc_nickname[''A29'']>> shrugs. "You could, but then you might have to cut corners or even end up running late to school, and I won''t be having any of that. Your teachers won''t either." she warns you before making her way towards the kitchen. "Oh, don''t forget; you need to head down to the clinic and see the gynecologist for a check up. Not just once, but every month." she adds quickly.'
 					act 'But why do I--':
 						cla & *clr
 						minut += 2
 						gs 'stat'
 						'<center><h1><font color="maroon">Your Bedroom</font></h1></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost5.jpg"></center>'
-						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms out of the room, without giving you a chance to respond..'
+						'Before you can finish, she cuts you off. "I''m not going to have you running around town like so many of those other girls I see! Opening their legs for any boy that comes around..." She shakes her head in disgust. "I want a referral every month and it better tell me you''re still a virgin or else, understand?" <<$npc_nickname[''A29'']>> says as she storms out of the room without giving you a chance to respond.'
 						act 'I understand...':gt 'budilnik', 'start'
 					end
 				end

+ 15 - 15
locations/bedrPar2.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = '':
 	CLOSE ALL
 	*clr & cla
 	$loc = 'bedrPar2'
-	$metka = ''
+	$loc_arg = ''
 	$locclass = 'bedr'
 	$location_type = 'private'
 	$menu_loc = 'bedrPar2'
@@ -16,7 +16,7 @@ if $ARGS[0] = '':
 	'<center><h1><font color="maroon">Master bedroom</font></h1></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/bedrpar2.jpg"></center>'
 	*nl
-	'The room in which your parents live. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
+	'The room in which your parents sleep. Their large bed, <a href="exec: gt ''bedrPar2'',''parents_wardrobe''">wardrobe</a> and other closets take up most of the space.'
 	gs 'family'
 	gs 'family_schedule'
 
@@ -39,7 +39,7 @@ if $ARGS[0] = '':
 					prezikday = daystart
 					prezikProver = 0
 					'<center><img <<$set_imgh>> src="images/shared/accessories/birthcontrol/condoms_steal.jpg"></center>'
-					'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. Now you have '+iif(preziktype = 0, '<<prezik>>', '<<prezikcount>>')+' condoms.'
+					'After you make sure you''re not seen, you quickly search your parents'' room for their condom stash and take a few. You now have '+iif(preziktype = 0, '<<prezik>>', '<<prezikcount>>')+' condoms.'
 					act 'Continue': gt 'bedrPar2'
 				end
 			end
@@ -55,8 +55,8 @@ if $ARGS[0] = 'kamasutra':
 	menu_off = 1
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/book.jpg"></center>'
-	'The cover says "Kamasutra"'
-	act 'Leave': gt $loc, $metka
+	'The cover says "Kama Sutra"'
+	act 'Leave': gt $loc, $loc_arg
 	act 'Read': kamasutra_page = 0 & kamasutra_day = daystart & gt 'bedrPar2', 'read_book'
 end
 
@@ -68,7 +68,7 @@ if $args = 'read_book':
 	minut += 3
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/shared/accessories/books/kamasutra/ik' + kamasutra_page + '.jpg"></td></tr><tr><td align=center>'+iif(kamasutra_page < 1, '', '<a href="exec: kamasutra_page-=1 & gt''bedrPar2'',''read_book''"><br>Previous page</a>')+'</td><td align=center>'+iif(kamasutra_page > 45, '', '<a href="exec: kamasutra_page+=1 & gt''bedrPar2'',''read_book''"><br>Next page</a>')+'</center>'
-	act 'Close the book': gt $loc, $metka
+	act 'Close the book': gt $loc, $loc_arg
 	if pcs_horny >= 60 and week = 6 and family_trip = 1: act 'Masturbate': gt 'selfplay', 'start'
 end
 
@@ -77,7 +77,7 @@ if $ARGS[0] = 'parents_wardrobe':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/wardrobe.jpg"></center>'
 	'An old looking wardrobe, probably from the Soviet times.'
-	act 'Leave ': gt $loc, $metka
+	act 'Leave ': gt $loc, $loc_arg
 	act 'Rummage': gt 'bedrPar2', 'wardrobe_search'
 end
 
@@ -85,7 +85,7 @@ if $ARGS[0] = 'wardrobe_search':
 	*clr & cla
 	if (hour >= 21 or hour < 6) and indorf = 0:
 		'What are you thinking? You can''t go through the wardrobe while your parents are sleeping right there!'
-		act 'Leave ': gt $loc, $metka
+		act 'Leave ': gt $loc, $loc_arg
 		exit
 	end
 	if rand(1,100) > 75:
@@ -103,7 +103,7 @@ if $ARGS[0] = 'wardrobe_search':
 		*pl $findmomtoy[rand(0,2)]
 		killvar '$findmomtoy'
 	end
-	act 'Close the Cabinet': gt $loc, $metka
+	act 'Close the Cabinet': gt $loc, $loc_arg
 end
 
 if $ARGS[0] = 'momtoy_play':
@@ -114,7 +114,7 @@ if $ARGS[0] = 'momtoy_play':
 	selfmomtoyplay = 1
 	'<center><img <<$set_imgh>> src="images/shared/sex/mast/start.jpg"></center>'
 	if pcs_horny < 70:
-		act 'Put it back': gt $loc, $metka
+		act 'Put it back': gt $loc, $loc_arg
 	else
 		act 'Play with it': gt 'selfplay', 'start'
 	end
@@ -125,14 +125,14 @@ if $ARGS[0] = 'peek':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad1.jpg"></center>'
-	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed, you hear your mother say. "Stop the kids are here." As Vlad starts running his hands all over her body. He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
+	'You crack the door open just a little and you see your <<$npc_nickname[''A29'']>> and Vladimir near their bed. You hear your mother say "Stop the kids are here." as Vlad starts running his hands all over her body. He doesn''t seem to care about what she says as he doesn''t stop. "Come on, they won''t hear us and you know you want it."'
 	act 'Leave':gt 'korrPar'
 
 	act 'Keep peeking':
 		cla & *clr
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad2.jpg"></center>'
-		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked he pushes her down on the bed, so she is sitting on it right in front of him. Her head about crotch height to him, apparantly knowing what he wants. She opens the fly on his pants and pulls out his cock, she strokes it a few times in her hand until he gets hard. Then she takes his dick into her mouth and starts sucking it, he moans softly as she does. "Fuck you are the best cock sucker ever Natasha."'
+		'You mother seems to be loving the attention and doesn''t put up much of a fight as he starts to undress her. Once she is mostly naked, he pushes her down on the bed so she is sitting on it in front of him, her head about crotch height to him, apparantly knowing what he wants. She opens the fly on his pants and pulls out his cock, stroking it a few times in her hand until he gets hard. She then takes his dick into her mouth and starts sucking it. He moans softly as she does. "Fuck you are the best cock sucker ever, Natasha."'
 		gs 'arousal', 'voyeur_sex', 3
 		gs 'stat'
 
@@ -142,7 +142,7 @@ if $ARGS[0] = 'peek':
 			cla & *clr
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad3.jpg"></center>'
-			'After several minutes of watching your <<$npc_nickname[''A29'']>> sucks Vlads cock he says. "Come on I want to fuck you." With that he starts to strip and she helps him while never stopping sucking his dick. Once he is naked she finally stops and he lays down on the bed, she straddles him and quickly starts riding his dick reverse cowgirl style. Both of them start moaning as they fuck. "Vlad oh god your dick feels so good in my pussy, it is so big."'
+			'After several minutes of watching your <<$npc_nickname[''A29'']>> suck Vlad''s cock he says "Come on, I want to fuck you." With that he starts to strip and she helps him while contnuing to suck his dick. Once he is naked, she finally stops and he lies down on the bed. She straddles him and quickly starts riding his dick reverse cowgirl style. Both of them start moaning as they fuck. "Oh god Vlad, your dick feels so good in my pussy! It''s so big."'
 			gs 'arousal', 'voyeur_sex', 5
 			gs 'stat'
 
@@ -152,7 +152,7 @@ if $ARGS[0] = 'peek':
 				cla & *clr
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad4.jpg"></center>'
-				'Vlad suddenly grabs her and throws her on her side on the bed. Which causes his dick to come out of her, he turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against your anus, then he pushes it in, only her pussy juices for lubricate. It slides in surprisingly easy, you can only guess this is far from the firs time your <<$npc_nickname[''A29'']>> has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her butt.'
+				'Vlad suddenly grabs her and throws her on her side on the bed. He turns on his side, lifting up her leg with one hand while using the other to guide his cock. He feels around until he places the head of his dick against your anus, then he pushes it in, using only her pussy juices for lubrication. It slides in surprisingly easy and you can only guess that this is far from the first time your <<$npc_nickname[''A29'']>> has had a dick in her ass. They both moan in pleasure and she rubs her clit as Vlad fucks her ass.'
 				gs 'arousal', 'voyeur_sex', 5
 				gs 'stat'
 				act 'Leave':gt 'korrPar'
@@ -161,7 +161,7 @@ if $ARGS[0] = 'peek':
 					cla & *clr
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/sex/momvlad5.jpg"></center>'
-					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>> ass and lets out a loud moan as he twitches a bit. After a few moments of this pass he pulls out of her and rolls off the bed. She lays on her back and pulls her butt cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says. "You are such a nasty bitch Natasha." She smiles to him and replies. "Thats why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
+					'They keep going for several more minutes until Vlad starts to pant and then he buries his dick balls deep in your <<$npc_nickname[''A29'']>>''s ass and lets out a loud moan as he twitches a bit. After a few moments of this pass, he pulls out of her and rolls off the bed. She lays on her back and pulls her cheeks wide, giving Vlad and you both a good view of her asshole as cum starts leaking out of it. Vlad chuckles and says "You are such a nasty bitch Natasha." She smiles at him and replies "That''s why you love me." With them now starting to get cleaned up, you decide it is time to go before you get caught.'
 					gs 'arousal', 'voyeur_sex', 3
 					gs 'stat'
 					act 'Leave':gt 'korrPar'

+ 1 - 1
locations/beg.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'start':
 	*clr
 	menu_off = 1
 	minut += 5
-	'<center><img <<$set_imgh>> src="images/locations/shared/gym/fit1.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/exercise/fit1.jpg"></center>'
 	'You are stretching and warming up before your practice run. From where you are you can see your coach, Igor Yurisovich, talking to other athletes.'
 
 	act 'Do a couple of practice races':

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