Browse Source

Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

Derryth_Love 1 năm trước cách đây
mục cha
commit
21a7ab100b
100 tập tin đã thay đổi với 2911 bổ sung1296 xóa
  1. 4 0
      glife.qproj
  2. 2 1
      locations/Cum_Manage.qsrc
  3. 19 7
      locations/HotelRoom.qsrc
  4. 1 1
      locations/JuliaMilHome.qsrc
  5. 1 1
      locations/Katja_Tanga.qsrc
  6. 9 6
      locations/Komp.qsrc
  7. 1 0
      locations/LakeBoyDy.qsrc
  8. 1 1
      locations/LariskaSex.qsrc
  9. 19 19
      locations/Serge_kuh.qsrc
  10. 1 1
      locations/abduction.qsrc
  11. 6 6
      locations/agentned.qsrc
  12. 25 31
      locations/albina_chat.qsrc
  13. 2 2
      locations/albina_house_events.qsrc
  14. 7 7
      locations/anush_bedroom.qsrc
  15. 1 1
      locations/artem_sex.qsrc
  16. 4 4
      locations/artemhome.qsrc
  17. 1 1
      locations/audition_sex1.qsrc
  18. 1 1
      locations/audition_sex2.qsrc
  19. 1 1
      locations/audition_sex3.qsrc
  20. 8 8
      locations/backwater.qsrc
  21. 4 7
      locations/bedr.qsrc
  22. 4 7
      locations/bedr2x.qsrc
  23. 9 5
      locations/bedrPar.qsrc
  24. 102 0
      locations/beverage.qsrc
  25. 10 10
      locations/bicycle.qsrc
  26. 16 8
      locations/body_desc.qsrc
  27. 2 0
      locations/booty_call_condoms.qsrc
  28. 24 10
      locations/booty_call_cum.qsrc
  29. 1 1
      locations/booty_call_shower.qsrc
  30. 1 1
      locations/booty_call_start.qsrc
  31. 179 5
      locations/booty_call_talk.qsrc
  32. 13 13
      locations/brother_voyeur_sex.qsrc
  33. 1 1
      locations/carF.qsrc
  34. 1 1
      locations/cardgame_durak.qsrc
  35. 1 1
      locations/city_center.qsrc
  36. 2 2
      locations/city_clinic.qsrc
  37. 530 0
      locations/city_coffee_hole.qsrc
  38. 64 40
      locations/city_hotel.qsrc
  39. 3 2
      locations/city_house_res_bedr.qsrc
  40. 2 2
      locations/city_house_res_misc.qsrc
  41. 5 0
      locations/city_island.qsrc
  42. 504 249
      locations/city_kafe.qsrc
  43. 1 1
      locations/city_lake.qsrc
  44. 3 2
      locations/city_mansion_residence_2.qsrc
  45. 1 1
      locations/city_park.qsrc
  46. 1 1
      locations/clothing_QV.qsrc
  47. 2 2
      locations/dachain.qsrc
  48. 1 1
      locations/dachi.qsrc
  49. 1 1
      locations/dreams.qsrc
  50. 1 1
      locations/exhibitionistshop.qsrc
  51. 4 36
      locations/fit.qsrc
  52. 60 1
      locations/food.qsrc
  53. 52 1
      locations/food_menu.qsrc
  54. 1 1
      locations/foto_models2.qsrc
  55. 1 1
      locations/furi.qsrc
  56. 4 0
      locations/furisex.qsrc
  57. 1 32
      locations/gdktoilet.qsrc
  58. 3 3
      locations/gopsex.qsrc
  59. 17 17
      locations/gschool_break.qsrc
  60. 2 2
      locations/gschool_cheerleading.qsrc
  61. 24 1
      locations/gschool_coolkid_chats.qsrc
  62. 1 1
      locations/gschool_jock_chats.qsrc
  63. 13 11
      locations/gschool_nerd_chats.qsrc
  64. 2 2
      locations/gschool_sex.qsrc
  65. 1 1
      locations/gschool_socialchg.qsrc
  66. 108 108
      locations/gschool_socialchg1.qsrc
  67. 90 35
      locations/homes_properties.qsrc
  68. 48 8
      locations/homes_properties_attr.qsrc
  69. 10 8
      locations/hookup_after.qsrc
  70. 7 7
      locations/hookup_morning.qsrc
  71. 3 3
      locations/hotel_anna_gear.qsrc
  72. 72 72
      locations/hunter_ambient.qsrc
  73. 71 71
      locations/hunter_favors.qsrc
  74. 17 17
      locations/igorhunter.qsrc
  75. 8 9
      locations/internet_mobile.qsrc
  76. 1 1
      locations/intro_customization.qsrc
  77. 1 1
      locations/journal.qsrc
  78. 7 5
      locations/journal_quests.qsrc
  79. 1 1
      locations/katja_chat.qsrc
  80. 223 9
      locations/katja_city.qsrc
  81. 3 3
      locations/katja_uni.qsrc
  82. 1 1
      locations/katja_uni_sex.qsrc
  83. 1 1
      locations/liames.qsrc
  84. 143 143
      locations/meadow.qsrc
  85. 4 4
      locations/mey_home.qsrc
  86. 12 12
      locations/miroslavahome.qsrc
  87. 3 3
      locations/model_mari.qsrc
  88. 148 114
      locations/music_actions.qsrc
  89. 2 2
      locations/music_bedroompractice.qsrc
  90. 10 4
      locations/music_buskingevents.qsrc
  91. 4 4
      locations/music_gigstarts.qsrc
  92. 23 17
      locations/music_onlinemusic.qsrc
  93. 3 2
      locations/nichBedroomServant.qsrc
  94. 7 6
      locations/npcstatic1.qsrc
  95. 2 2
      locations/npcstatic2.qsrc
  96. 1 1
      locations/pav_clinic.qsrc
  97. 1 1
      locations/pav_commercial.qsrc
  98. 18 3
      locations/pav_disco_coolkids.qsrc
  99. 8 1
      locations/pav_disco_gopniks.qsrc
  100. 61 33
      locations/pav_hotelReception.qsrc

+ 4 - 0
glife.qproj

@@ -537,6 +537,7 @@
 	</Folder>
 	<Folder name="Sonia">
 		<Location name="soniadisco"/>
+		<Location name="soniahome"/>
 	</Folder>
 	<Folder name="Generator">
 		<Location name="placer"/>
@@ -940,6 +941,7 @@
 		<Location name="shop_dolls"/>
 		<Location name="shop_nerdvana"/>
 		<Location name="shop_flamingos"/>
+		<Location name="city_coffee_hole"/>
 	</Folder>
 	<Folder name="University">
 		<Location name="uni_grounds"/>
@@ -988,6 +990,8 @@
 		<Location name="therapist_reminder"/>
 		<Location name="gevent"/>
 		<Location name="pav_park"/>
+		<Location name="pav_park_sex"/>
+		<Location name="pav_parkev"/>
 		<Location name="gopskver"/>
 		<Location name="gskino"/>
 		<Location name="cafe_parco"/>

+ 2 - 1
locations/Cum_Manage.qsrc

@@ -233,6 +233,7 @@ if $ARGS[0] = '':
 						cumsumbod += sexvolume
 						cumsumvag += sexvolume
 						condom_break = 1
+						stat['broken_condoms'] += 1
 
 						sparridt[sparrtemp] = cumarrkno[cumarrtemp]
 						sparrslc[sparrtemp] = 0
@@ -331,7 +332,7 @@ if $ARGS[0] = '':
 				!!STD checks
 				if cumnostd = 0: gs 'dinSex', 'std_trigger'
 				!! safe creampie (if cycle > 3 or on pill or succubus):
-				if cycle > 3 or pillcon2 > 1000 or succubusflag = 1:
+				if cycle > 3 or birth_control['safe'] = 1 or succubusflag = 1:
 					if sexunaware = 1 or sexcontra = 6:
 						pcs_cp_safe_unknown += 1
 					else

+ 19 - 7
locations/HotelRoom.qsrc

@@ -15,11 +15,17 @@ if $ARGS[0] = 'normal':
 	hotelWiFi = 1
 	gs 'themes', 'indoors'
 	gs 'stat'
+	gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
+
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
-	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
+	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
+	
+	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
+	gs 'music_actions', 'music_icon'
+
 	*nl
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
@@ -56,15 +62,16 @@ if $ARGS[0] = 'better':
 	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
-	if komp = 1:
-		!!TODO: Can Sveta do camshow from the hotelroom?
-		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
-	end
+	gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
 	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
-	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
+	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
+	
+	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
+	gs 'music_actions', 'music_icon'
+	
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0
@@ -101,11 +108,16 @@ if $ARGS[0] = 'best':
 	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
+	gs 'internet_mobile', 'get_access'
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
 	'<center>You have paid to stay for <<hotelRoomDays[$hotel] - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
 	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
-	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">laptop</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
+	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>'+iif(komp = 1, ' and your <a href="exec: gt ''Komp'',''start''">computer</a> is on the desk. The hotel offers all guests free Wi-Fi.', '.')
+	
+	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
+	gs 'music_actions', 'music_icon'
+
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			hotelWiFi = 0

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -611,7 +611,7 @@ if $ARGS[0] = 'julia_chat':
 
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-			'You talk with Julia about a variety of things, mostly about his friends and the other Gopniks. He doesn''t ask about your life at all.'
+			'You talk with Julia about a variety of things, mostly about your common friends, school and some recent movies you have both seen.'
 
 			act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
 			act 'Stop talking': gt 'JuliaMilHome','julia_room'

+ 1 - 1
locations/Katja_Tanga.qsrc

@@ -60,7 +60,7 @@ if $ARGS[0] = 'secretroom':
 						act'Use dildo':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/tanga4_7.jpg"></center>'
-							'As her quivering body subsides and her panting breath gets under control, you pull the dildo out of her pussy and your tongue out of her ass. She gives you a dreamy smile and reaches over to take the dildo out of your hand. She gets up and sits down between your legs, lifting them up and and dragging your pussy up to her. "You''re so beautiful, I could just eat you right up..." she whispers before she starts licking your pussy, her tongue occasionally darting inside you. As your pussy gets wetter, you reach up and grab her hair. "Yes, faster, faster!" you moan, wanting more. For several minutes, she only uses her tongue before she pulls away, slides the dildo into your wet pussy and begins furiously fucking you with it. Using her other hand, she slips one of her fingers in your ass and begins to finger fuck your ass at the same time.'
+							'As her quivering body subsides and her panting breath gets under control, you pull the dildo out of her pussy and your tongue out of her ass. She gives you a dreamy smile and reaches over to take the dildo out of your hand. She gets up and sits down between your legs, lifting them up and dragging your pussy up to her. "You''re so beautiful, I could just eat you right up..." she whispers before she starts licking your pussy, her tongue occasionally darting inside you. As your pussy gets wetter, you reach up and grab her hair. "Yes, faster, faster!" you moan, wanting more. For several minutes, she only uses her tongue before she pulls away, slides the dildo into your wet pussy and begins furiously fucking you with it. Using her other hand, she slips one of her fingers in your ass and begins to finger fuck your ass at the same time.'
 							$orgasm_txt = 'You can''t take it and quickly orgasm. Your pussy overflows with your juices and you feel them running down your stomach as the intense orgasm rocks your body.'
 							$orgasm_or = 'custom'
 							gs 'arousal', 'anal_finger', -5, 'lesbian'

+ 9 - 6
locations/Komp.qsrc

@@ -106,7 +106,7 @@ if $ARGS[0] = 'browse':
 		if bankAccount > 0: act 'Visit your bank, maybe to purchase more online time': gt 'komp', 'bank'
 		if shantfoto > 0:act 'Find the girl you took photos of in the park on "Assbook"':gt 'komp', 'foto'
 		if gor_dorm = 7:act 'Read letter from Eugene':gt 'etoexhib', 'pos91'
-		if camhwore = 1 and access['nocamshow'] = 0: act 'Go to MyFreeCams.org': gt 'komp', 'mfc'
+		if camwhore = 1 and access['nocamshow'] = 0: act 'Go to MyFreeCams.org': gt 'komp', 'mfc'
 		if (mid($start_type,1,2) = 'sg' and SchoolAtestat = 0) or func('uniutil', 'student', 'enrolled'):act 'Spend time studying':gt 'komp', 'study'
 		if sucpcinfo = 0 and succubxp > 0: act 'Research the strange feelings you''ve been having': gt 'succubus', 'kompresearch'
 	end
@@ -434,9 +434,9 @@ if $ARGS[0] = 'rabota':
 
 		act '<B>Close the browser</B>':gt 'komp','start'
 	else
-		minut += 60
-		elektro += 6
-		gs 'internet_mobile', 'use_internet', $subs, 60
+		minut += 30
+		elektro += 3
+		gs 'internet_mobile', 'use_internet', $subs, 30
 		komprabota = rand(0, 10)
 		if $loc = 'vasilyhome':komprabota = rand(5, 15)
 		gs 'stat'
@@ -1840,8 +1840,10 @@ if $ARGS[0] = 'waitclients':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
 		'Suddenly you hear the handle of your door creak, and an annoyed voice shouting: "<<$pcs_nickname>>, what the hell!? Why is the door locked? Let me in!"'
-		'Oh crap, it''s your sister! "Sorry everyone, show''s over!" you whisper to the camera, and you slap your laptop shut. You quickly put your clothes back on and open your door, trying to avoid the scrutinizing gaze of your sister.'
-		'When she''s no longer paying attention to you, you open your laptop again and find yourself in the main lobby of MyFreeCams. You''re a bit bummed that you couldn''t get more out of that session, but cash in your earnings.'
+		'Oh crap, it''s your sister! "Sorry everyone, show''s over!" you whisper to the camera, and you close the stream and hide the website. You quickly put your clothes back on and open your door, trying to avoid the scrutinizing gaze of your sister.'
+		'When she''s no longer paying attention to you, you open the site again and find yourself in the main lobby of MyFreeCams. You''re a bit bummed that you couldn''t get more out of that session, but cash in your earnings.'
+		gs 'internet_mobile', 'add_limitation', 'noporn', 'You can''t watch porn with your sister in the room'
+		gs 'internet_mobile', 'add_limitation', 'nocamshow', 'You can''t do a camshow with your sister in the room'
 		act 'Continue':gt 'komp','mfc'
 	else
 		act 'Turn off the webcam':gt 'komp','startpagemfc'
@@ -1937,6 +1939,7 @@ if $ARGS[0] = 'hotornot':
 	
 	act 'Leave the site':
 		if $view_location = 'school':
+			killvar 'access'
 			gt 'gschool_lessons', 'short_break'
 		else
 			gt 'komp', 'browse'

+ 1 - 0
locations/LakeBoyDy.qsrc

@@ -69,6 +69,7 @@ if $ARGS[0] = 'go':
 end
 
 if $ARGS[0] = 'slap':
+	cla
 	gs 'willpower', 'misc', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Tell him to fuck off (<<will_cost>> Willpower)':

+ 1 - 1
locations/LariskaSex.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'lick1':
 	'You start by running your fingers along her outer lips, making her shudder and pant, before laying on your back and pulling her onto your face. You attack her pussy with your tongue, drawing circles around her clitoris, but carefully not touching it.'
 	'She starts grinding into your face as you start fucking her with your tongue, begging for you to keep going. She grabs your head with one hand and reaches behind her to grab one of your tits to keep herself stable, but the pleasure is too much for her to sit still for long.'
 	'As her juices begin to coat your face, you stop licking and just keep your tongue out, letting her decide her own pace. She humps your tongue in glee, loving it, as you reach between your own legs and start rubbing your wet pussy.'
-	'You decide to step it up and and start licking her clit directly, before closing your lips around it and gently sucking. This sends her into a frenzy, moaning her way into pure bliss. As the orgasm breaks over her, her hips begin to jerk, her back arches, and her head swings around wildly.'
+	'You decide to step it up and start licking her clit directly, before closing your lips around it and gently sucking. This sends her into a frenzy, moaning her way into pure bliss. As the orgasm breaks over her, her hips begin to jerk, her back arches, and her head swings around wildly.'
 	$orgasm_txt = 'You are so aroused by the sight of Lariska riding your tongue that your fingers manage to trigger a massive orgasm. Your hips start bucking, and your feet flail in the air, as you try and keep yourself focused enough to continue eating Lariska out.'
 	$orgasm_or = 'custom'
 	gs 'arousal', 'clit_finger', -5, 'lesbian'

+ 19 - 19
locations/Serge_kuh.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge2.jpg"></center>'
 	'Sergey is standing at the kitchen counter. He''s making soup, cutting up ingredients and throwing them into a large pan.'
 	gs 'Serge_Shulgin', 'rep'
-	act 'Leave him alone': gt 'vasilyhome', 'kitchen'
+	act 'Leave him alone': gt 'vasilyhome', 'vasilykitchen'
 	act 'Chat with Sergey':
 		*clr & cla
 		if sergebazarkuh_count > 0:minut += 15
@@ -57,7 +57,7 @@ if $ARGS[0] = 'kuh_buh':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/serge/serge2.jpg"></center>'
 	'Sergey is sitting at the kitchen table, drinking vodka. "Hi, <<$pcs_nickname>>! Great day, isn''t it?" he shouts cheerfully as he raises his glass to you.'
 	gs 'Serge_Shulgin', 'rep'
-	act 'Leave him alone': gt 'vasilyhome', 'kitchen'
+	act 'Leave him alone': gt 'vasilyhome', 'vasilykitchen'
 	act 'Chat with Sergey':
 		*clr & cla
 		if sergebazarkuh_count > 0:minut += 15
@@ -89,7 +89,7 @@ if $ARGS[0] = 'vodka':
 	'He looks at you intently and says: "No, <<$pcs_nickname>>. I''m not giving you any vodka."' 
 	'"Aww, why not?" you ask him.'
 	'Sergey takes a sip of his vodka and laughs: "I''ve seen women drink... it never ends well. Besides that, you''re still a girl! I''m not giving you any, end of discussion!"'
-	act 'Leave him alone': gt 'vasilyhome', 'kitchen'
+	act 'Leave him alone': gt 'vasilyhome', 'vasilykitchen'
 
 	gs 'willpower', 'drink', 'force'
 	if will_cost <= pcs_willpwr:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'vodka':
 						gs 'willpower', 'sex', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'vasilyhome', 'kitchen'
+						gt 'vasilyhome', 'vasilykitchen'
 					end
 				else
 					act 'Quickly get away from him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'vodka':
 												'You don''t answer his question, but just give him a weak smile.'
 												gs 'arousal', 'end'
 												gs 'stat'
-												act 'Straighten your clothes': gt 'vasilyhome', 'kitchen'
+												act 'Straighten your clothes': gt 'vasilyhome', 'vasilykitchen'
 											end
 										end
 									end
@@ -322,7 +322,7 @@ if $ARGS[0] = 'help_ev1':
 				gs 'willpower', 'exhib', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'vasilyhome', 'kitchen'
+				gt 'vasilyhome', 'vasilykitchen'
 			end
 		else
 			act 'Leave him alone (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -342,14 +342,14 @@ if $ARGS[0] = 'help_ev1':
 						gs 'willpower', 'sex', 'resist'
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
-						gt 'vasilyhome', 'kitchen'
+						gt 'vasilyhome', 'vasilykitchen'
 					end
 				else
 					act 'Stop teasing Sergey (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Continue teasing Sergey': gt 'Serge_kuh', $rand_kuh_izdev
 			else
-				act 'Stop teasing Sergey': gt 'vasilyhome', 'kitchen'
+				act 'Stop teasing Sergey': gt 'vasilyhome', 'vasilykitchen'
 			end
 		end
 	end
@@ -426,7 +426,7 @@ if $ARGS[0] = 'izdev1':
 								'Once you think he''s done, you try to swallow his load. But wow... it''s a lot! You let some of it run down your chin onto your boobs, and give his cock one last kiss when you reluctantly let go. There are so many things you could do with it! All in good time, though... that was enough for one day.'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Finish': gt 'vasilyhome', 'kitchen'
+								act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 							end
 						end
 					end
@@ -538,7 +538,7 @@ if $ARGS[0] = 'izdev2':
 											'While you put your clothes on, Sergey suddenly says: "Yes, I do." When you look at him questioningly, he adds: "I do think you have a nice body. Can''t wait to get another crack at it!"'
 											gs 'arousal', 'end'
 											gs 'stat'
-											act 'Finish': gt 'vasilyhome', 'kitchen'
+											act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 										end
 									end
 								end
@@ -862,7 +862,7 @@ if $ARGS[0] = 'izdev8':
 								'"That was fun, uncle Sergey", you grin. "I can''t wait to come help you again!"'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Finish': gt 'vasilyhome', 'kitchen'
+								act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 							end
 						end
 					end
@@ -959,7 +959,7 @@ if $ARGS[0] = 'izdev9':
 								'He pulls out of your ass and jerks himself off over your buttocks, his sperm landing all over your back and your ass as he lets out a primal roar.'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Finish': gt 'vasilyhome', 'kitchen'
+								act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 							end
 						end
 					end
@@ -1216,7 +1216,7 @@ if $ARGS[0] = 'izdev13':
 										'Sergey laughs: "It sure did, <<$pcs_nickname>>. Fair warning though: I went easy on you this time..."'	
 										gs 'arousal', 'end'
 										gs 'stat'
-										act 'Finish': gt 'vasilyhome', 'kitchen'
+										act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 									end
 								end	
 							end
@@ -1301,7 +1301,7 @@ if $ARGS[0] = 'izdev14':
 									'Sergey doesn''t want to get you pregnant, and pulls out right before he orgasms. He shoots his thick jets of cum all over your stomach and labia, some of it even landing on your tits. He came so much! You smear it out with a satisfied smile on your face, your head still feeling a bit hazy from the intense fucking you just received.'
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Finish': gt 'vasilyhome', 'kitchen'
+									act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 								end
 							end
 						end
@@ -1508,7 +1508,7 @@ if $ARGS[0] = 'izn1':
 					'Sergey scoffs, not showing any compassion: "Don''t give me that tone. I warned you, <<$pcs_nickname>>... if you act like a whore around me, I''ll treat you like one. You should freshen up before you head out, you look horrible."'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Finish': gt 'vasilyhome', 'kitchen'
+					act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 				end
 			end
 		end
@@ -1604,7 +1604,7 @@ if $ARGS[0] = 'izn2':
 					'He points at his chin demonstratively as he says it, and you both laugh. You drink the vodka in one large gulp, and you feel a shiver run down your spine as you swallow it. "Thank you, uncle Sergey... I can''t wait to come help you in the kitchen again", you say with a meek smile and head towards the bathroom.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Finish': gt 'vasilyhome', 'kitchen'
+					act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 				end
 			end
 		end
@@ -1654,7 +1654,7 @@ if $ARGS[0] = 'sex1':
 				$orgasm_or = 'yes'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Finish': gt 'vasilyhome', 'kitchen'
+				act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 			end
 		end
 	end
@@ -1713,7 +1713,7 @@ if $ARGS[0] = 'sex2':
 					$orgasm_or = 'yes'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Finish': gt 'vasilyhome', 'kitchen'
+					act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 				end
 			end
 		end
@@ -1806,7 +1806,7 @@ if $ARGS[0] = 'sex3':
 							gs 'arousal', 'vaginal', 5, 'sub'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Finish': gt 'vasilyhome', 'kitchen'
+							act 'Finish': gt 'vasilyhome', 'vasilykitchen'
 						end
 					end
 				end

+ 1 - 1
locations/abduction.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'abdRoom':
 	act 'Look around':gt 'abduction', 'abdFood'
 
 	eventChance = rand(1,100)
-	if eventChance <= 60:
+	if pcs_sleep > 30 and eventChance <= 60:
 		act 'Take a nap (4:00)':gt 'abduction', 'abdSomeoneComing'
 	else
 		act 'Take a nap (4:00)':gt 'abduction', 'abdSleep'

+ 6 - 6
locations/agentned.qsrc

@@ -116,10 +116,10 @@ if $ARGS[0] = 'buy':
 				'A(n) <<$property_display[i]>> is available for sale for <<func(''agentned'', ''format_price_string'', property_sales_price[i])>> <b>₽</b>.'
 			end
 			if karta + bankDebtLimit >= property_sales_price[i]: 
-				if $property_code[i] = 'city_apartment': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'city_apartment'
-				if $property_code[i] = 'village_cottage': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'village_cottage'
-				if $property_code[i] = 'matryona_mansion': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'matryona_mansion'
-				if $property_code[i] = 'city_house': act 'Sell the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'city_house'
+				if $property_code[i] = 'city_apartment': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'city_apartment'
+				if $property_code[i] = 'village_cottage': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'village_cottage'
+				if $property_code[i] = 'matryona_mansion': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'matryona_mansion'
+				if $property_code[i] = 'city_house': act 'Buy the <<$property_display[i]>>': gs 'agentned', 'buy_property', 'city_house'
 			end
 			i += 1
 		if i < count: jump 'listing_properties_for_sale_loop'
@@ -346,8 +346,8 @@ if $ARGS[0] = 'get_rent_detail_dialogue':
 		$result = '"We have a flat available right now in the St. Petersburg residential area."'
 	else
 		gs 'agentned', 'get_rent_detail_dialogue_hook', $ARGS[1]
-		$result = agency_rental_dialogue
-		killvar 'agency_rental_dialogue'
+		$result = $agency_rental_dialogue
+		killvar '$agency_rental_dialogue'
 	end 
 end
 

+ 25 - 31
locations/albina_chat.qsrc

@@ -434,7 +434,6 @@ if $ARGS[0] = 'sex_talk_start':
 end
 
 if $ARGS[0] = 'sex_talk':
-	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 	act 'Ask her about her sex life instead': gt 'albina_chat', 'anal'
@@ -448,11 +447,9 @@ if $ARGS[0] = 'sex_talk2':
 		AlbinaQW['chat_rand'] = rand(1,3)
 		if AlbinaQW['chat_rand'] = 1:
 			'"So what''s your favourite position?" she asks.'
-			act 'Missionary': gt 'albina_chat', 'Missionary'
-			act 'Doggystyle': gt 'albina_chat', 'Doggystyle'
-			act 'Cowgirl': gt 'albina_chat', 'Cowgirl'
-	elseif AlbinaQW['chat_rand'] = 2:
-			gs'albina_chat','sex_talk'
+			act 'Missionary': gt 'albina_chat', 'missionary'
+			act 'Doggystyle': gt 'albina_chat', 'doggystyle'
+			act 'Cowgirl': gt 'albina_chat', 'cowgirl'
 		else
 			gs'albina_chat','sex_talk'
 		end
@@ -472,14 +469,14 @@ if $ARGS[0] = 'missionary':
 		'"You''re trying to tell me that lying on your back doing nothing is ''nice''?" She rolls her eyes. "Nuh uh. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
 		gs 'albina_chat','missionary2'
 	end
-	
+
 	act 'It''s romantic':
 		cla & *nl
 		'"It''s romantic!" you protest. "You can look up into his eyes when you cum. Or kiss. It makes it so much better."'
 		'"Romance is for decrepit old fucks," she rolls her eyes. "Nuh uh. Give it to me <i>dirty</i>. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
 		gs 'albina_chat','missionary2'
 	end
-	
+
 	act 'It''s easy':
 		cla & *nl
 		'"It''s easy," you shrug. "I don''t have to do any work. Just lay there and get dicked."'
@@ -492,8 +489,7 @@ if $ARGS[0] = 'missionary2':
 	pcs_horny += 15
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -510,14 +506,14 @@ if $ARGS[0] = 'doggystyle':
 		'"I definitely get that," Albina says. "I love that about it too. All I want from a guy is for him to grab me by the hair, shove his cock up my ass, and spank me until I cum. Best night ever."'
 		gs 'albina_chat','doggystyle2'
 	end
-	
+
 	act 'It goes deeper':
 		cla & *nl
 		'"It goes deeper in doggy," you explain. "I feel like it <i>fills</i> me, hitting every part of my insides. It just feels the best in that position."'
 		'"Fuck yeah," Albina says. "Doggy is the only way to <i>really</i> get balls deep inside a girl. And then when you get grabbed by the hair and pulled back even harder? And when he shoves it up your ass and spanks you? Fuck me, I could cum just thinking about it."'
 		gs 'albina_chat','doggystyle2'
 	end
-	
+
 	act 'Easy spankings':
 		cla & *nl
 		'"I love getting spanked," you grin.'
@@ -530,8 +526,7 @@ if $ARGS[0] = 'doggystyle2':
 	pcs_horny += 15
 	gs'stat'
 	'You giggle at her answer, feeling warmth blossoming between your hips and wetness seeping from your pussy. With the "fuck me eyes" Albina is giving you think she''s probably feeling something similar.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -548,14 +543,14 @@ if $ARGS[0] = 'cowgirl':
 		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position, which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck." She then gives you a sly grin. "But riding dick is a close second for me."'
 		gs 'albina_chat','cowgirl2'
 	end
-	
+
 	act 'I like being in control':
 		cla & *nl
 		'"I like being in control," you explain. "If I want to go slow, I can go slow. If I want to go fast, I can ride him as hard as I like. It makes me feel... powerful? Just knowing that I''m the one in charge is such a turn on for me."'
 		'"That kind of stuff doesn''t matter to me," Albina shrugs back. "I like it hard and rough every time. Don''t get all slow and gentle with me. If I''m gonna get fucked, I want to <i>feel</i> it. If I want my face forced into the sheets with a cock balls deep up my ass being spanked until my eyes water, I''m only going to get that in doggy." She grins at you, clearly imagining a cock stuffed up her ass right now, but a few seconds later, it melts into a concessionary smile. "I''ll admit though, a hard ride is pretty good too."'
 		gs 'albina_chat','cowgirl2'
 	end
-		
+
 	act 'I like it when he grabs my breasts':
 		cla & *nl
 		'"I like having my boobs grabbed," you grin. "If I''m on top, then his hands are free to grope me."'
@@ -568,8 +563,7 @@ if $ARGS[0] = 'cowgirl2':
 	pcs_horny += 15
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -601,10 +595,10 @@ if $ARGS[0] = 'anal':
 		act 'I want to try it (shy)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-			'"Well..." you stammer. I... I want to try it and..."'
+			'"Well..." you stammer. "I... I want to try it and..."'
 			'Albina gives you a hard stare. "And you thought to ask the school buttslut how to do it?"'
 			'You stutter trying to form an answer, and she breaks into laughter.'
-			'"Relax <<$pcs_nickname>>, I''m fucking with you. What do you want to know?"'
+			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
 			*nl
 			gs 'albina_chat','anal_questions_shy'
 		end
@@ -623,7 +617,7 @@ if $ARGS[0] = 'anal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Well... I- I''ve tried it a few times..." you stammer. "But it''s always been... painful... So I thought could ask-"'
-			'"The class buttslut about it?" Albina asks, giving you a hard stare. You sputter, trying to come up with an answer that will get you out of this before she breaks into laughter.'
+			'"The class buttslut about it?" she asks, giving you a hard stare. You sputter, trying to come up with an answer that will get you out of this before she breaks into laughter.'
 			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
 			gs 'albina_chat','anal_questions_shy'
 		end
@@ -632,7 +626,7 @@ if $ARGS[0] = 'anal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"I''ve tried anal a few times, but it''s always painful and not very enjoyable," you explain. "So I thought-"'
-			'"You could ask the class buttslut about it and she''d tell you all about how to get your asshole ravaged by cock?" Albina asks, glaring at you.'
+			'"You could ask the class buttslut about it and she''d tell you all about how to get your asshole ravaged by cock?" she asks, glaring at you.'
 			'"Well... Yeah," you grin. "Is there a better person to ask than you?"'
 			'Albina laughs heartily and grins back at you.'
 			'"No, you''re probably right about that. I''m the queen of buttfucking. So what is it you want to know?"'
@@ -646,28 +640,28 @@ if $ARGS[0] = 'anal_questions_shy':
 		act 'Where do I start?':
 			cla & *nl
 			'"Well..." you mumble. "Where do I even start?"'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			'She nods. "Humble question. Good. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'What position?':
 			cla & *nl
 			'"What... position should I have my first time in?" you ask shyly.'
-			'"You''re getting way too far ahead of yourself," Albina interrupts. "Here''s my advice: Start small."'
+			'"You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small," she replies.'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'Does it hurt?':
 			cla & *nl
 			'"Does it hurt?" you ask shyly.'
-			'"Oh man, if you''re asking that then you''re <i>definitely</i> not ready," Albina laughs. "Here''s my advice: Start small."'
+			'She smiles in reponse. "Oh man, if you''re asking that then you''re <i>definitely</i> not ready. Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
 		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you... enjoy it?" you ask, cringing at how badly you phrased it.'
-			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
 			gs 'albina_chat','anal_end2'
 		end
 	end
@@ -678,21 +672,21 @@ if $ARGS[0] = 'anal_questions_open':
 		act 'Where do I start?':
 			cla & *nl
 			'"Where do I even start?" you ask.'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			'She nods. "Humble question. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'What''s the best position?':
 			cla & *nl
 			'"What''s the best position to try it in?" you ask excitedly. "Cowgirl seems hard, but doggy seems like it could be rough. I was won-"'
-			'"You''re getting way too far ahead of yourself," Albina interrupts, holding her hand up. "Here''s my advice: Start small."'
+			'She holds her hand up and interrupts you. "You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
 		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you enjoy it?" you ask, cringing at the memories of your past experiences.'
-			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
 			'"Yeah. It''s always too painful for me. I can''t even get wet."'
 			gs 'albina_chat','anal_end2'
 		end
@@ -707,12 +701,12 @@ end
 if $ARGS[0] = 'anal_end1':
 	*nl
 	'You thank her for her helpful advice and she continues answering your questions and giving you all the advice she feels you need to know.'
-	'"And, if you need some <i>hands on</i> teaching... you know you can always come here," Albina says, shamelessly eye fucking you.'
+	'"And, if you need some <i>hands on</i> teaching... you know you can always come here," she says, shamelessly eye fucking you.'
 	gs 'albina_chat','sex_talk'
 end
 
 if $ARGS[0] = 'anal_end2':
-	'"One word," she says, holding up her finger. "Practice. Your mistake was going straight for a real dick. That''s a big no no. Practice with your fingers or a small dildo first to see what works for you. Some girls like it slow and gentle, others like it fast and rough. Just keep practicing and getting used to it. And relax. It will always be a little painful, but it will become more pleasurable the more you do it, especially when you get better at controlling the instinctive reflex to clench your asscheeks on what''s inside of you, whether that be a dildo or a fat cock."'
+	'"One word," she says, holding up her finger. "Practice. Your mistake was going straight for a real dick. That''s a big no no. Practice with your fingers or a small dildo first to see what works for you. Some girls like it slow and gentle, others like it fast and rough. Just keep practicing and getting used to it. And relax. It will always be a little painful, but it will become more pleasurable the more you do it, especially when you get better at controlling the instinctive reflex to clench around what''s inside you, whether that be a dildo or a fat cock."'
 	'She grins at you. "If you ever want a <i>hands on</i> lesson, then I''m willing to ''teach'' you some things..."'
 	gs 'albina_chat','sex_talk'
 end

+ 2 - 2
locations/albina_house_events.qsrc

@@ -430,7 +430,7 @@ if $ARGS[0] = 'after_swim_shower':
 					act 'Enter':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/nudealbina.jpg"></center>'
-						'You enter the room and are taken aback slightly when you find a nude Albina laying on her bed, her legs spread. She smiles at you knowingly and winks. It''s obvious that she was rubbing one out before you disturbed her, but she doesn''t seem to care and and stands up and walks over to her closet. She slides on a lacy white thong and skimpy tank top and walks out. "My favourite show is about to start. I think you''ll like it."'
+						'You enter the room and are taken aback slightly when you find a nude Albina laying on her bed, her legs spread. She smiles at you knowingly and winks. It''s obvious that she was rubbing one out before you disturbed her, but she doesn''t seem to care and stands up and walks over to her closet. She slides on a lacy white thong and skimpy tank top and walks out. "My favourite show is about to start. I think you''ll like it."'
 						act 'Go and watch TV': gt 'albina_house_events', 'tv_1'
 					end
 				end
@@ -1292,7 +1292,7 @@ if $ARGS[0] = 'flash_drive':
 	menu_off = 1
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
-	'You plug the flash drive into your laptop and open its contents. You''re presented with a series of videos.'
+	'You plug the flash drive into your computer and open its contents. You''re presented with a series of videos.'
 
 	act 'Watch the first video':
 		cla & *clr

+ 7 - 7
locations/anush_bedroom.qsrc

@@ -55,7 +55,6 @@ if $ARGS[0] = 'anushroom':
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
-	internet_free = 0
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -157,6 +156,7 @@ if $ARGS[0] = 'nushcloset':
 				'The last pair of cargo shorts you try to put on, as you start to button them up, one of the buttons pops off it, bouncing across the floor. You blush as you say. "Sorry, I... I shouldn''t have tried to wear these. They are all too small. I can buy you a new one or get this button fixed."'
 				'She shakes her head and giggles slightly. "Don''t worry about it. I didn''t really like those shorts anyways." You sigh at the fact you are just too big to wear her clothes and put your own clothes back on. She glances at you while grinning. "Maybe you should lay off the sweets, <<$pcs_nickname>>," she says teasingly while poking you in the side.'
 				'"Hey... just because I''m not as skinny as a rail... doesn''t mean the boys don''t come running. I got myself a nice bubble butt. Unlike your flat ass." You reply, teasing her back for being skinny. The two of you laugh and put her clothes back away as the two of you talk about where she gets her clothes from.'
+				act 'Find something else to do':gt 'anush_bedroom','anushroom'
 			else
 				if pcs_mood > 10: pcs_mood -= 20
 				minut += 10
@@ -465,7 +465,8 @@ if $ARGS[0] = 'computer':
 		*clr & cla
 		'You decide to use Anushka''s computer. You''re sure she wouldn''t mind.'
 		act 'Turn the computer off':gt 'anush_bedroom','anushroom'
-		act 'Go online': internet_free = 1 & gt 'Komp', 'start'
+		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
+		act 'Go online': gt 'Komp', 'start'
 		act 'Check out her porn':
 			*clr & cla
 			'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
@@ -567,7 +568,7 @@ if $ARGS[0] = 'agreeporn':
 		gs 'arousal', 10, 'porn', 'lesbian'
 		gs 'stat'
 		gs 'arousal', 'end'
-		act 'Follow her': gt 'anush_bedroom','snack'
+		act 'Follow her': gt 'anushapt','snack'
 	end
 	gs 'willpower', 'exhib', 'self', 'medium'
 	if will_cost <= pcs_willpwr:
@@ -585,8 +586,7 @@ if $ARGS[0] = 'agreeporn':
 			gs 'arousal', 'clit_finger', 10, 'masturbate', 'lesbian'
 			gs 'arousal', 'end'
 			gs 'stat'
-			minut -= 15
-			act 'Follow her': gt 'anush_bedroom','snack'
+			act 'Follow her': gt 'anushapt','snack'
 		end
 	else
 		act 'Masturbate as well (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -748,7 +748,7 @@ if $ARGS[0] = 'nush_guitar':
 			npc_rel['A144'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushplay.jpg"></center>'
-			'Anushka''s eyes brighten up as you ask her. She reaches over and grabs the acoustic guitar, pulling it over to her. She strums a few bars to check it is still in tune. "I will play you the very first song I ever learned how to play. It is one of my dad''s favourites." She starts playing and then singing the song. It takes you a moment to recognize the song. Then, she plays the whole song while singing Wanted Dead or Alive by Bon Jovi..'
+			'Anushka''s eyes brighten up as you ask her. She reaches over and grabs the acoustic guitar, pulling it over to her. She strums a few bars to check it is still in tune. "I will play you the very first song I ever learned how to play. It is one of my dad''s favourites." She starts playing and then singing the song. It takes you a moment to recognize the song. Then, she plays the whole song while singing Wanted Dead or Alive by Bon Jovi.'
 			*nl
 			'You''re impressed with her talent. She is a good singer, better than some people you have heard on the radio, but is an even better guitar player. As she ends her song, you clap your hands and say, "Wow, I''ve heard you''re good, but I didn''t know that you were this good."'
 			'Anushka blushes a little at your compliment. "Thanks, I work hard at it, so it is nice to be appreciated for it," she replies as she gets up and puts her guitar back in its place.'
@@ -765,7 +765,7 @@ if $ARGS[0] = 'nush_guitar':
 			npc_rel['A144'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/nushplay.jpg"></center>'
-			'She reaches over and grabs the acoustic guitar, pulling it over to her. "Sure, I will play you something else." She strums the guitar and checks to ensure it is still in tune. "This is another song my dad taught me. It''s Behind Blue Eyes by the Who." Starts playing and singing the new song for your listening pleasure.'
+			'She reaches over and grabs the acoustic guitar, pulling it over to her. "Sure, I will play you something else." She strums the guitar and checks to ensure it is still in tune. "This is another song my dad taught me. It''s Behind Blue Eyes by The Who." Starts playing and singing the new song for your listening pleasure.'
 			*nl
 			'She plays and sings just as well as before. When she ends her song, you clap your hands and praise her. "Another great song. You really are good at this."'
 			'"Thanks. After I learned this one, I guess that''s when my dad knew I was serious about playing. That''s when he gave me this." She says, patting the guitar. "It used to be his. He got it when he was only fifteen and kept it all these years..." She looks down at the guitar and smiles softly at the memories, one of the few times you see her softer side. Then she looks back up at you. "And now it''s mine." Just by how she says that and holds the guitar when she puts it back in its place, you can tell the old guitar means a lot to her. Probably because of who gave it to her and memories of who taught her to play it. Who knew Anushka was a daddy''s girl.'

+ 1 - 1
locations/artem_sex.qsrc

@@ -350,7 +350,7 @@ if $ARGS[0] = 'cum_surprise':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/firstfacial.jpg"></center>'
 		'As you are riding him, getting lost in your own pleasure, you glance down at his face and see him tense up before he warns you: "<<$pcs_nickname>>... I''m going to cum..."'
 		'You quickly climb off him, and he rolls up to his knees. You start jerking his cock, with it pointed right at your face. As a stream of his sperm hits you, you keep jerking him off. Then, causing several more streams of cum to land on your face, you stop jerking him off and open your eyes once the last of his cum has been drained.'
-		act 'Continue': gs 'artem_events', 'after_sex', 'facial'
+		act 'Continue': gs 'artem_sex', 'after_sex', 'facial'
 	end
 end
 

+ 4 - 4
locations/artemhome.qsrc

@@ -278,7 +278,6 @@ if $ARGS[0] = 'artemroom':
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
-	internet_free = 0
 	*clr & cla
 	minut += 1
 	gs 'stat'
@@ -548,6 +547,7 @@ end
 if $ARGS[0] = 'computer':
 	menu_off = 1
 	gs 'stat'
+	gs 'internet_mobile', 'get_access', 'free', 'nocamshow', 'noporn'
 	if ArtemLoc = 2 and ArtemCompUse = 0:
 		ArtemCompUse = 1
 		*clr & cla
@@ -557,14 +557,14 @@ if $ARGS[0] = 'computer':
 		'"I saved up my allowance for years before I could afford it." He says.'
 		'"Mind if I use it? I want to check my emails and stuff." You ask him.'
 		'He nods. "Sure go ahead."'
-		act 'Go online': internet_free = 1 & gt 'Komp', 'start'
+		act 'Go online': gt 'Komp', 'start'
 		act 'Find something else to look at':gt 'artemhome','artemroom'
 	elseif ArtemLoc = 2 and ArtemCompUse > 0:
 		'You look at the computer, then at Artem. Artem meets your look... and breaks into a smile. "Go ahead and use it if you want. I don''t mind."'
-		act 'Go online': internet_free = 1 & gt 'Komp', 'start'
+		act 'Go online': gt 'Komp', 'start'
 		act 'Find something else to look at':gt 'artemhome','artemroom'
 	else
-		act 'Go online': internet_free = 1 & gt 'Komp', 'start'
+		act 'Go online': gt 'Komp', 'start'
 		act 'Find something else to look at':gt 'artemhome','artemroom'
 	end
 end

+ 1 - 1
locations/audition_sex1.qsrc

@@ -43,7 +43,7 @@
 !! audition['cast_couch'] = 4 - gave a blowjob and took a facial and swallowed
 !! audition['cast_couch'] = 5 - gave a blowjob and took a facial
 !! audition['cast_couch'] = 6 - fucked and swallowed
-!! audition['cast_couch'] = 7 - fucked and and tried to swallow but failed
+!! audition['cast_couch'] = 7 - fucked and tried to swallow but failed
 !! audition['cast_couch'] = 8 - fucked and spit
 !! audition['cast_couch'] = 9 - fucked and took a facial and swallowed
 !! audition['cast_couch'] = 10 - fucked and came in condom

+ 1 - 1
locations/audition_sex2.qsrc

@@ -48,7 +48,7 @@
 !! audition['cast_couch'] = 4 - gave a blowjob and took a facial and swallowed
 !! audition['cast_couch'] = 5 - gave a blowjob and took a facial
 !! audition['cast_couch'] = 6 - fucked and swallowed
-!! audition['cast_couch'] = 7 - fucked and and tried to swallow but failed
+!! audition['cast_couch'] = 7 - fucked and tried to swallow but failed
 !! audition['cast_couch'] = 8 - fucked and spit
 !! audition['cast_couch'] = 9 - fucked and took a facial and swallowed
 !! audition['cast_couch'] = 10 - fucked and came in condom

+ 1 - 1
locations/audition_sex3.qsrc

@@ -44,7 +44,7 @@
 !! audition['cast_couch'] = 4 - gave a blowjob and took a facial and swallowed
 !! audition['cast_couch'] = 5 - gave a blowjob and took a facial
 !! audition['cast_couch'] = 6 - fucked and swallowed
-!! audition['cast_couch'] = 7 - fucked and and tried to swallow but failed
+!! audition['cast_couch'] = 7 - fucked and tried to swallow but failed
 !! audition['cast_couch'] = 8 - fucked and spit
 !! audition['cast_couch'] = 9 - fucked and took a facial and swallowed
 !! audition['cast_couch'] = 10 - fucked and came in condom

+ 8 - 8
locations/backwater.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'alone':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(DayStage < 4,'backwater_winter.jpg','backwater_winter_night.jpg')+'"></center>'
 	end
 	*nl
-	'A small creek with relatively clean water. If the weather is warm you can clean yourself up. Also, if your clothes are dirty you can wash them here.'
+	'A small creek with relatively clean water. If the weather is warm, you can clean yourself up. Also, if your clothes are dirty, you can wash them here.'
 	*nl
 
 	if clothesAtLocation = 1:'Your clothes lie on the shore.'
@@ -50,7 +50,7 @@ if $ARGS[0] = 'alone':
 		act 'Wash self':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif($pantyworntype = 'none','backwaterswim2.jpg','backwaterswim1.jpg')+'"></center>'
-			*nl 'You washed yourself in the creek.'
+			*nl 'You washed in the creek.'
 			menu_off = 1
 			noShampoo = 1
 			dynamic $showerdin
@@ -136,7 +136,7 @@ if $ARGS[0] = 'alone':
 				menu_off = 1
 				if huntersKnowSlut > 0 or (hunters_outside = 0 and hunters_available = 0) or (hour < 7 or hour > 22) or (pcs_inhib >= 25 or exhibitionist_lvl > 1):
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/'+iif(PCloSkirt > 0,'backwaterundress_ski.jpg','backwaterundress.jpg')+'"></center>'
-					'You do not hesitate getting undressed, not caring if anyone is watching.'
+					'You do not hesitate to get undressed, not caring if anyone is watching.'
 					minut+=5
 					if huntersRape = 1: huntersRape = 2
 					gs 'clothing', 'strip_all', 'backwater'
@@ -144,7 +144,7 @@ if $ARGS[0] = 'alone':
 					act'Back': gt 'backwater'
 				else
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/noundress.jpg"></center>'
-					'You hesitate getting undressed, what if someone suddenly sees you?'
+					'You hesitate to get undressed. What if someone suddenly sees you?'
 
 					act'Back': gt 'backwater'
 				end
@@ -174,7 +174,7 @@ end
 if $ARGS[0] = 'hunter':
 	'<center><B>Backwater</B></center>'
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hunter_looks.jpg"></center>'
-	'While cleaning yourself in the backwater, you suddenly get the feeling that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you, his camouflage is almost indistinguishable compared to the bushes and trees.'
+	'While cleaning yourself in the backwater, you suddenly feel that you are not alone here. Turning around, you see one of the hunters. He''s just standing there watching you. His camouflage is almost indistinguishable compared to the bushes and trees.'
 	menu_off = 1
 	minut += 5
 	gs 'stat'
@@ -183,7 +183,7 @@ if $ARGS[0] = 'hunter':
 		act'Get dressed':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude1.jpg"></center>'
-			*nl 'Noticing the hunter, you rush over to your clothes and begin dressing yourself in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
+			*nl 'Noticing the hunter, you rush to your clothes and begin dressing in panic. As you get fully dressed, you look over your shoulder, expecting the hunter standing there, but there is no one there.'
 			gs 'underwear', 'wear'
 			gs 'clothing', 'recover_lost_clothes', 'backwater', 1
 			minut += 5
@@ -194,7 +194,7 @@ if $ARGS[0] = 'hunter':
 		act'Hide':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude2.jpg"></center>'
-			'Covering your breasts and crotch you jump into the nearest bush. In your state of fear and confusion, you start scanning the area but you don''t see anyone there. You quickly run back towards the cabin.'
+			'Covering your breasts and crotch, you jump into the nearest bush. In your state of fear and confusion, you start scanning the area, but you don''t see anyone there. So you quickly run back towards the cabin.'
 			minut += 1
 
 			act'Go back to the hut':gt 'swamp_yard', 'start'
@@ -203,7 +203,7 @@ if $ARGS[0] = 'hunter':
 	act'Stay naked':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/swampbackwaternude3.jpg"></center>'
-		'You decide that you have nothing to be afraid of, and continue on completely nude. The hunter looks at you for a minute or so, all of a sudden you hear a "Hmph", him turning around and going away.'
+		'You decide that you have nothing to be afraid of and continue on completely nude. The hunter looks at you for a minute or so, and suddenly, you hear a "Hmph", him turning around and going away.'
 		hunterslut += 1
 		hunterknowday = day
 		gs'stat'

+ 4 - 7
locations/bedr.qsrc

@@ -43,6 +43,7 @@ else
 	*nl
 	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'
 end
+if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 *nl
 act 'The corridor':gt 'korr'
 
@@ -50,9 +51,11 @@ if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your drunken husband sleeps on the bed, with a butt plug up his ass.'
 	if husbanstrapon = 2:'Your drunken husband sleeps on the bed, after you''ve put a dildo up his ass.'
 	if husbanstrapon = 3:'Your drunken husband sleeps on the bed, after you''ve fucked him with a strapon.'
+	gs 'music_actions', 'no_music'
 end
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if hour > 22 or hour < 7:'<a href="exec:gt ''husb'', ''start''">Husband is sleeping on the bed.</a>'
+	gs 'music_actions', 'no_music'
 end
 
 if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
@@ -213,12 +216,6 @@ if sick >= 1:
 end
 
 dynamic $palelady
-!! Computer and internet use.
-if komp = 1:
-	gs 'internet_mobile', 'get_access'
-	!!TODO: Need to build a check for husband being at home or something.			
-	'On the other bedside table is your <a href="exec:gt ''Komp'',''start''">laptop</a>.'
-end
 
 if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
 
@@ -231,6 +228,6 @@ gs 'subkid'
 act 'Relax on your bed': gt 'bed', 'start'
 
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
-
+gs 'music_actions', 'music_icon'
 --- bedr ---------------------------------
 

+ 4 - 7
locations/bedr2x.qsrc

@@ -29,24 +29,20 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 *nl
 'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 *nl
-!! Computer and internet use.
-if komp = 1:
-	!!TODO: Need to build a check for husband being at home or something.			
-	gs 'internet_mobile', 'get_access'
-	'On the other bedside table is your <a href="exec:gt ''Komp'',''start''">laptop</a>.'
-end
-
+if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 *nl
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used an anal plug on him.'
 	if husbanstrapon = 2:'Your husband is still passed out drunk, after you stuck a dildo in his ass.'
 	if husbanstrapon = 3:'Your husband is still passed out drunk, after you fucked him in the ass with a strap-on.'
+	gs 'music_actions', 'no_music'
 end
 act 'In the corridor':gt'korr2x'
 
 if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if hour > 22 or hour < 7:
 		'<a href="exec: gt''husb'',''start'' ">On the bed your husband is sleeping.</a>'
+		gs 'music_actions', 'no_music'
 	end
 end
 if husbandrink = 11 and husbanstrapon > 0 and husbandrinkday ! daystart:
@@ -212,6 +208,7 @@ gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
+gs 'music_actions', 'music_icon'
 
 --- bedr2x ---------------------------------
 

+ 9 - 5
locations/bedrPar.qsrc

@@ -17,6 +17,9 @@ gs 'stat'
 gs 'themes', 'indoors'
 gs 'family_schedule'
 
+!! This is runs only once, just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.
+if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
+
 if $ARGS[0] = '' or $ARGS[0] = 'start':
 	if locat['Mother'] = 26 and fromoutside:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
@@ -90,6 +93,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		*nl
 		'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it'+iif(strapon = 1, '. You keep your strapon inside it.', '')+'. Your sister''s bed is in the other corner.'
 		*nl
+		if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
+
 		if ParrotQW['Owned2'] = 1:
 			'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
 			if daystart - ParrotQW['BuyDate'] <= 10: 
@@ -142,7 +147,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			msg 'You have detention this morning and must be at school before 09:00.'
 		end
 
-		if komp = 1: 'Your <a href="exec: gt ''Komp'',''start''">laptop</a> is on your desk.'
+		if komp = 1: 'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on your desk.'
 
 		if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 
@@ -270,9 +275,6 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			$access['noporn-message'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
 			$access['nocamshow-message'] ='You can''t do any webcam activities with your sister in the room!'
 		end
-		!! This is just to make sure that Sveta can sing from the start, does not have to wait a whole day for `cikl` to run.
-		if ml_performance['max_perform_minutes'] = 0: ml_performance['max_perform_minutes'] = pcs_instrmusic + pcs_vokal
-		gs 'music_actions', 'start'
 
 		if locat['Anya_inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
 			'<a hlpf="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
@@ -288,7 +290,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'</td><td width = "100" valign="top"></td><td>'
 		gs 'subkid'
 		'</td></tr></table>'
-		
+
+		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon. 
+		gs 'music_actions', 'music_icon'
 	end
 end
 

+ 102 - 0
locations/beverage.qsrc

@@ -431,5 +431,107 @@ if $ARGS[0] = 'coffee':
 	pcs_breath = 0
 	gs 'stat'
 end
+
+
+!! ------------ just the stats, no descriptions or extra stuff with cost -----------------------
+
+if $ARGS[0] = 'only_cost_bco':
+	*clr & cla
+	frost = 0
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	if pcs_sleep <= 20: pcs_sleep += 5
+	pcs_health += 5
+	pcs_mood += 20
+	pcs_energy += 15
+	if pcs_hydra >= 100:
+		pcs_hydra += 20
+	else
+		pcs_hydra += 40
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	teeth['caffe_or_tea'] += 5
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_cof':
+	*clr & cla
+	frost = 0
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	if pcs_sleep <= 20: pcs_sleep += 5
+	pcs_health += 5
+	pcs_mood += 20
+	pcs_energy += 15
+	if pcs_hydra >= 100:
+		pcs_hydra += 20
+	else
+		pcs_hydra += 40
+	end
+	fat += 1
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	teeth['caffe_or_tea'] += 5
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_tea':
+	*clr & cla
+	frost = 0
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 20
+	pcs_energy += 10
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	teeth['caffe_or_tea'] += 2
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_esp':
+	*clr & cla
+	frost = 0
+	if alko > 0: alko -= 1
+	money -= val($_drink['<<args[1]>>,price'])
+	if pcs_sleep <= 20: pcs_sleep += 5
+	pcs_health += 5
+	pcs_mood += 20
+	pcs_energy += 15
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'stat'
+	killvar '$_drink'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
 --- beverage ---------------------------------
 

+ 10 - 10
locations/bicycle.qsrc

@@ -22,7 +22,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/village/findvel.jpg"></center>'
 		end
 		*nl
-		'You see your old bike. It looks like it''s still in a good condition, you can probably ride it without any trouble.'
+		'You see your old bike. It looks like it''s still in good condition. You can probably ride it without any trouble.'
 
 		if BikeLoc = 1:
 			act 'Leave your bike alone':gt 'gadsarai'
@@ -67,7 +67,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_1.jpg"></center>'
 							*nl
-							'During your ride you lift your skirt several times, showing a glimpse of your panties to a few lucky villagers passing-by.'
+							'You lift your skirt several times during your ride, showing a glimpse of your panties to a few lucky villagers passing by.'
 						else
 							pcs_horny += 10
 							pcs_mood += 10
@@ -78,7 +78,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike_tanga_2.jpg"></center>'
 							*nl
-							'During your ride you lift your skirt several times, showing your bare ass to a few lucky villagers passing-by.'
+							'You lift your skirt several times during your ride, showing your bare ass to a few lucky villagers passing by.'
 						end
 					else
 						pcs_mood += 5
@@ -94,7 +94,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/village/bike.jpg"></center>'
 					*nl
-					'You ride your bike, enjoying the surrounding country-side.'
+					'You ride your bike, enjoying the surrounding countryside.'
 				end
 				act 'Finish your ride':gt 'gadsarai'
 			end
@@ -102,9 +102,9 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 
 		if BikeLoc ! 1:
 			if BikeLoc = 2:
-				$bikeaction = 'Bike to your grandparents barn (0:12)'
+				$bikeaction = 'Bike to your grandparents'' barn (0:12)'
 			elseif BikeLoc = 3:
-				$bikeaction = 'Bike to your grandparents barn (0:44)'
+				$bikeaction = 'Bike to your grandparents'' barn (0:44)'
 			end
 			act '<<$bikeaction>>':
 				*clr & cla
@@ -117,7 +117,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 					pcs_mood += 5
 					pcs_sweat += 1
 					if swamp_clothes = 1:
-						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
+						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents'' house.'
 						gs 'clothing', 'strip', 'gadforest'
 						gs 'clothing', 'swamp_clothes', 0
 					end
@@ -129,7 +129,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 					pcs_mood += 15
 					pcs_sweat += 3
 					if swamp_clothes = 1:
-						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents house.'
+						'You remove the terrible excuse for clothing the hunters gave you. You''re sure you can find something better to wear at your grandparents'' house.'
 						gs 'clothing', 'strip', 'gadforest'
 						gs 'clothing', 'swamp_clothes', 0
 					end
@@ -139,7 +139,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 
 				gs 'bicycle', 'clothes'
 				*nl
-				'You jump onto your bike and ride to your grandparent barn.'
+				'You jump onto your bike and ride to your grandparents'' barn.'
 
 				act 'Finish your ride':gt 'gadsarai'
 			end
@@ -209,7 +209,7 @@ if ($ARGS[0] = 'gadsarai' and BikeLoc = 1) or ($ARGS[0] = 'gadforest' and BikeLo
 
 				gs 'bicycle', 'clothes'
 				*nl
-				'You jump onto your bike and ride to the hunters cabin.'
+				'You jump onto your bike and ride to the hunters'' cabin.'
 
 				act 'Finish your ride':gt 'swamp_yard','start'
 			end

+ 16 - 8
locations/body_desc.qsrc

@@ -1208,17 +1208,25 @@ if $ARGS[0] = 'hair':
 end
 
 if $ARGS[0] = 'appearance':
-	if pcs_apprnc = -10:
+	if pcs_apprnc < 40:
 		$pcs_apprnc = 'Your looks are even worse than terrible. It''s god-awful. No one wants to see or talk to you and people avoid you at any cost.'
-	elseif pcs_apprnc < 20:
-		$pcs_apprnc = 'Your looks are terrible. People try to avoid looking and talking to you.'
 	elseif pcs_apprnc < 60:
-		$pcs_apprnc = 'You''re a wallflower. Hardly anyone notices you.'
-	elseif pcs_apprnc < 120:
-		$pcs_apprnc = 'You have good looks. Men and women check you out when they think you aren''t looking.'
-	elseif pcs_apprnc < 160:
+		$pcs_apprnc = 'Your looks are terrible. People try to avoid looking and talking to you, unless they are making fun of the way you look.'
+	elseif pcs_apprnc < 80:
+		$pcs_apprnc = 'Your looks are bad. People often tease you about your looks or just ignore you exist.'
+	elseif pcs_apprnc < 100:
+		$pcs_apprnc = 'Your looks are below average. Hardly anyone notices you, except to occasionally tease you about your looks.'
+	elseif pcs_apprnc < 125:
+		$pcs_apprnc = 'Your looks are average. Hardly anyone notices you.'
+	elseif pcs_apprnc < 150:
+		$pcs_apprnc = 'You are considered cute. Most guys and some girls find you cute, in a cute girl next door look.'
+	elseif pcs_apprnc < 165:
+		$pcs_apprnc = 'You are considered attractive. You sometimes catch guys and even some other girls checking you out.'
+	elseif pcs_apprnc < 180:
+		$pcs_apprnc = 'You have good looks. Men and women check you out when they think you aren''t looking, you often get asked if you are a model.'
+	elseif pcs_apprnc < 199:
 		$pcs_apprnc = 'You''re unquestionably gorgeous. Men constantly get caught staring at you by their girlfriends.'
-	elseif pcs_apprnc < 200:
+	elseif pcs_apprnc < 220:
 		$pcs_apprnc = 'You have a simply stunning appearance. Other girls are a bit jealous and guys constantly check you out.'
 	else
 		$pcs_apprnc = 'Your appearance is divine! No one is able to take his or her eyes off of you.'

+ 2 - 0
locations/booty_call_condoms.qsrc

@@ -867,11 +867,13 @@ if $ARGS[0] = 'pc_dangerous_day':
 							gs 'booty_call_condoms', 'npc_condom_use_stats'
 							gs 'booty_call_sex', 'position_choose'
 						else
+							booty_call['no_condom'] = 1
 							'"If you say so," he smiles back.'
 							gs 'booty_call_sex', 'position_choose'
 						end
 					end
 				else
+					booty_call['no_condom'] = 1
 					gs 'booty_call_sex', 'position_choose'
 				end
 			end

+ 24 - 10
locations/booty_call_cum.qsrc

@@ -292,11 +292,11 @@ if $ARGS[0] = 'fuck_cum':
 		end
 		
 		if booty_call['condom'] = 1 and booty_call['no_condom'] ! 1:
-			if booty_call['he_ask_creampie'] = 1:
-				act'Come together':gs 'booty_call_cum', 'cum_condom'
-			else
+		!!	if booty_call['he_ask_creampie'] = 1:
+		!!		act'Come together':gs 'booty_call_cum', 'cum_condom'
+		!!	else
 				act'Let him come in the condom':gt 'booty_call_cum', 'cum_condom'
-			end
+		!!	end
 		else
 			!!if booty_call['orgasm'] < orgasm or pcs_horny >= 85:
 			if booty_call['orgasm'] < orgasm:
@@ -712,6 +712,13 @@ if $ARGS[0] = 'facial_brace':
 		'The first shot of cum hits you directly in the eye, and you squeeze both of them shut as you to cringe in disgust. More and more spurts come out, spraying across your face and completely covering your eyes. By the time he''s finished orgasming, your visage is absolutely plastered with semen and your expression is stuck in an involuntary grimace.'
 		'"Oh my god! That''s so gross!" you cringe.'
 		'Carefully wiping the cum from your eyes, you blink them open, vision ringed with blurry white edges, and the first sight you''re greeted with is <<$npc_firstname[$boy]>> wearing a shit eating grin, looking at your plastered face.'
+		act'Why do boys like this?':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial34.jpg"></center>'
+			'"Why do boys even like this?" you grimace, while <<$npc_firstname[$boy]>> keeps leering at you. "What on earth is so hot about plastering a girl''s face with <i>this</i>?"'
+			gs'booty_call_sex', 'sex_end'
+		end
+		
 		act'I hate you':
 			booty_call['mad'] = 1
 			cla & *clr
@@ -853,7 +860,7 @@ if $ARGS[0] = 'cum_mouth':
 		'You keep your lips wrapped tight around the tip of <<$npc_firstname[$boy]>>''s cock while he comes, sucking every last drop of spunk from it until it stops twitching and you think his orgasm if finished. Looking up at him, you stick out your tongue, showing him the entire load you gathered in your mouth.'
 		act'Spit':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['spit'] = 1
 			booty_call['spit_count'] += 1
 			$booty_call['last_cum'] = 'spit'
@@ -867,7 +874,7 @@ if $ARGS[0] = 'cum_mouth':
 		
 		act'Swallow':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['swallow'] = 1
 			booty_call['swallow_count'] += 1
 			$booty_call['last_cum'] = 'swallow'
@@ -886,6 +893,7 @@ if $ARGS[0] = 'cum_mouth':
 			npc_cum_gag[$boy] += 1
 			booty_call['spit_count'] += 1
 			booty_call['gag'] = 1
+			booty_call['react'] = 1
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/gag2.mp4"></video></center>'
 			'The intensity of the bitter flavor is far more than you expect and you immediately pull your mouth off, spitting out the first load. You stick your tongue out, tryiing to soldier through and at least take the rest of it but as soon as the next shot hits your tongue your gag reflex kicks in instead, causing you to retch.'
 			'Still holding onto <<$npc_firstname[$boy]>>''s cock with one hand, you clamp your other hand over your mouth, throat convulsing. It smears the cum on your lips all over your face, but you somehow manage to stop yourself from throwing up all over the bed.'
@@ -1452,8 +1460,8 @@ if $ARGS[0] = 'cum_pullout':
 	if booty_call['pullout_ask'] = 1:
 		!! differing descriptions based on position
 		if $booty_call['position'] = 'miss':
-			$booty_call['cum_choice'] = 'pullout'
 			booty_call['cum_stomach'] += 1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			gs'cum_call', 'stomach',$boy,1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			'"Pull out!"'
@@ -1463,22 +1471,24 @@ if $ARGS[0] = 'cum_pullout':
 			booty_call['cum_back'] += 1
 			gs'cum_call', 'butt',$boy,1
 			gs'cum_call', 'back',$boy,1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			'"Pull out!"'
 			*nl
 			'At your words, he yanks himself from your pussy and begins furiously jacking off over your ass. Moments later, you feel hot viscious liquid spatter all over it and across your back.'
 		elseif $booty_call['position'] = 'cowgirl':
-			$booty_call['cum_choice'] = 'ass'
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			gs'cum_call', 'butt',$boy,1
 			booty_call['cum_ass'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 			'"Pull out!"'
 			*nl
-			'At your words, you jump off his cock and reach behind you to grab it with your hand, furiously jerking it. Moments later, you feel hot viscious liquid spatter all over your ass.'
+			'You slip off his cock just in time, as not even a second later you feel hot liquid spatter all over your ass.'
 		end
 	else
 		if $booty_call['position'] = 'miss':
 			gs'cum_call', 'stomach',$boy,1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			booty_call['cum_stomach'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			if booty_call['not_inside'] = 1:
@@ -1501,6 +1511,7 @@ if $ARGS[0] = 'cum_pullout':
 			gs'cum_call', 'back',$boy,1
 			booty_call['cum_back'] += 1
 			booty_call['cum_ass'] += 1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			if booty_call['not_inside'] = 1:
 				'"Not inside me!" you yelp frantically.'
@@ -1517,6 +1528,7 @@ if $ARGS[0] = 'cum_pullout':
 			if booty_call['not_inside'] = 1:
 				gs'cum_call', 'stomach',$boy,1
 				booty_call['cum_stomach'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 				'"Not inside me!" you yelp frantically.'
 				*nl
@@ -1526,11 +1538,11 @@ if $ARGS[0] = 'cum_pullout':
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. Moments later, he ejaculates, sending cum spattering across your belly.'
 				end
 			else
-				$booty_call['cum_choice'] = 'pullout'
 				gs'cum_call', 'butt',$boy,1
 				gs'cum_call', 'back',$boy,1
 				booty_call['cum_back'] += 1
 				booty_call['cum_ass'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 				if booty_call['condom'] = 1:
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. He rips the condom off his cock and moments later, he ejaculates, sending cum spattering across your belly.'
@@ -1737,6 +1749,8 @@ if $ARGS[0] = 'cum_condom':
 	gs'cum_call', '',$boy,1,3
 	$booty_call['cum_choice'] = 'condom'
 	$booty_call['last_cum'] = 'condom'
+	!! remove later when reactions are written
+	booty_call['react'] = 1
 	if $booty_call['position'] = 'miss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
 		$booty_call['cum_describe2'] = 'looking between your legs as he removes his cock, the rubber casing around it bulging with liquid.'

+ 1 - 1
locations/booty_call_shower.qsrc

@@ -385,7 +385,7 @@ if $ARGS[0] = 'before_shower_creampie_surprise':
 		*nl
 		'Finally, your orgasms subside and you untangle yourselves. As his cock leaves your pussy, something hot dribbles down your leg.'
 		act'That was nice':
-			cla & *nl
+			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/shower/after1.mp4"></video></center>'
 			'"That was nice," you pant, unable to say anything else.'
 			'"Yeah..." <<$npc_firstname[$boy]>> smiles back at you. "Bedroom?"'

+ 1 - 1
locations/booty_call_start.qsrc

@@ -1589,7 +1589,7 @@ end
 
 if $ARGS[0] = 'bj_sub_lets_fuck':
 	'After a couple minutes <<$npc_firstname[$boy]>> pushes your head away, your saliva trailing from his cock.'
-	if stat['think_virgin'] = 1:
+	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
 		if know_virgin[$boy] = 1:
 			'"That was great," he smiles. "That was exactly what I wanted. But I want more now."'
 			act'I''m saving my virginity':gt'booty_call_virgin', 'wait'

+ 179 - 5
locations/booty_call_talk.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'cum_react':
 		act'React':
 			booty_call['react'] = 1
 			cla
+			gs'booty_call_talk', 'bask_satisfaction'
 			if booty_call['he_ask_creampie'] = 1 and $booty_call['last_cum'] ! 'creampie' and booty_call['condom'] ! 1:
 				gs 'booty_call_talk', 'no_cum_inside'
 			elseif booty_call['he_ask_mouth'] = 1 and $booty_call['last_cum'] ! 'swallow' and $booty_call['last_cum'] ! 'mouth'and $booty_call['last_cum'] ! 'face_mouth':
@@ -460,13 +461,21 @@ if $ARGS[0] = 'cum_together_no_bc':
 				if booty_call['risky_creampie'] = 1:
 					act'Danger day (stress)':
 						cla & *nl
-						'"Oh fuck," you pant. "This is really bad. Today is a dangerous day..."'
+						if booty_call['danger_day'] = 1:
+							'"I thought I told you," you pant nervously. "It''s a danger day... I could get pregnant..."'
+						else
+							'"Oh fuck," you pant. "This is really bad. Today is a dangerous day..."'
+						end
 						gs'booty_call_sex', 'sex_end'
 					end
 					
 					act'Danger day (not mad)':
 						cla & *nl
-						'"Well that''s not good," you pant, smiling wryly at <<$npc_firstname[$boy]>>. "Today is a dangerous day for me..."'
+						if booty_call['danger_day'] = 1:
+							'"Hey," you pant, smiling wryly at <<$npc_firstname[$boy]>>. "Didn''t I tell you something about today being a dangerous day for me...?"'
+						else
+							'"Well that''s not good," you pant, smiling wryly at <<$npc_firstname[$boy]>>. "Today is a dangerous day for me..."'
+						end
 						gs'booty_call_sex', 'sex_end'
 					end
 				end
@@ -736,6 +745,171 @@ if $ARGS[0] = 'cum_together_yeah':
 	end
 end
 
+if $ARGS[0] = 'bask_satisfaction':
+	if booty_call['orgasm'] < orgasm and booty_call['cum_together_fake'] ! 1:
+		!! if Sveta came
+		act'Quiet satisfaction':
+			cla & *clr
+			minut += rand(1,3)
+			gs 'stat'
+			booty_call['react'] = 1
+			if $booty_call['last_cum'] = 'creampie':
+				if booty_call['cock_remove'] = 1:
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
+					if booty_call['came_together'] > 0:
+						'You lay back, panting as you wind down from your simultaneous orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+					elseif orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+					end
+					*nl
+					'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+				else
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You lay back, panting as you wind down from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You lay back, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						else
+							'You lay back, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You just lay there, panting from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You just lay there, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						else
+							'You just lay there, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard from your simultaneous orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your string of multiple orgasms, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+						else
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your recent orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+						end
+					end
+					*nl
+					if booty_call['speed'] <= 2:
+						'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+					else
+						'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+					end
+				end
+			elseif $booty_call['last_cum'] = 'condom':
+				if booty_call['cock_remove'] = 1:
+					'<center><img <<$set_imgh>> src="images/shared/after/pillow_talk1.jpg"></center>'
+					if booty_call['came_together'] > 0:
+						'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down from your simultaneous orgasm.'
+					elseif orgasm - booty_call['orgasm'] > 1:
+						'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down from your string of multiple orgasms.'
+					else
+						'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down from your recent orgasm.'
+					end
+					*nl
+					'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+				else
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You lay back, panting as you wind down from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You lay back, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						else
+							'You lay back, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You just lay there, panting from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You just lay there, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						else
+							'You just lay there, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard from your simultaneous orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your string of multiple orgasms, your breasts pressing against his chest as you feel your body melt into his, filled with his cock.'
+						else
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your recent orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock.'
+						end
+					end
+					*nl
+					if booty_call['speed'] <= 2:
+						'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+					else
+						'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+					end
+				end
+			else
+				if $booty_call['last_cum'] = 'face_mouth':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+					end
+				elseif $booty_call['last_cum'] = 'spit':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+					end
+				elseif $booty_call['last_cum'] = 'swallow':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+					end
+				elseif $booty_call['last_cum'] = 'facial':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+					end
+				elseif $booty_call['last_cum'] = 'tits':
+					$npc_apt_bedroom[$boy]
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+					end
+				elseif $booty_call['last_cum'] = 'pullout':
+					if $booty_call['position'] = 'miss' or $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/sleep1.jpg"></center>'
+						if orgasm - booty_call['orgasm'] > 1:
+							'You lay back, panting  as you wind down from your string of multiple orgasms, feeling the warm cum on your belly already beginning to cool.'
+						else
+							'You lay back, panting as you wind down from your recent orgasm, feeling the warm cum on your belly already beginning to cool.'
+						end
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+						if orgasm - booty_call['orgasm'] > 1:
+							'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, panting as you wind down from your string of multiple orgasms.'
+						else
+							'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, panting as you wind down from your recent orgasm.'
+						end
+					end				
+				end
+				*nl
+				'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
+	end
+end
+
 if $ARGS[0] = 'creampie_felt_great':
 	act'That felt great':
 		cla & *clr
@@ -1820,7 +1994,7 @@ if $ARGS[0] = 'cheating_rules':
 			$npc_apt_bedroom[$boy]
 			'"No kissing," you say.'
 			'"That''s fine," <<$npc_firstname[$boy]>> nods.'
-			gs'booty_call_after', 'cheating_rules'
+			gs'booty_call_talk', 'cheating_rules'
 		end
 	end
 	
@@ -1844,7 +2018,7 @@ if $ARGS[0] = 'cheating_rules':
 			elseif $npc_cum_pref[$npclastgenerated] = 'pullout':
 				'"I prefer the pullout method anyways," <<$npc_firstname[$boy]>> grins.'
 			end
-			gs'booty_call_after', 'cheating_rules'
+			gs'booty_call_talk', 'cheating_rules'
 		end
 	end
 	
@@ -1864,7 +2038,7 @@ if $ARGS[0] = 'cheating_rules':
 			else
 				'"I guess that''s fair," <<$npc_firstname[$boy]>> says.'
 			end
-			gs'booty_call_after', 'cheating_rules'
+			gs'booty_call_talk', 'cheating_rules'
 		end
 	end
 end

+ 13 - 13
locations/brother_voyeur_sex.qsrc

@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 			else
-				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+				act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -1021,7 +1021,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 			else
-				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+				act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -1035,7 +1035,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 			else
-				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+				act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -1055,7 +1055,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 			act'I prefer to swallow':
@@ -1066,7 +1066,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 			act'I prefer creampies':
@@ -1077,7 +1077,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 				
@@ -1094,7 +1094,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 			else
-				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+				act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'shower_facial':
 			if broshowerfuck = daystart:
 				act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 			else
-				act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+				act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 			end
 		end
 
@@ -1129,7 +1129,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 
@@ -1143,7 +1143,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 		end
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 		end
@@ -1182,7 +1182,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 
@@ -1196,7 +1196,7 @@ if $ARGS[0] = 'shower_facial':
 				if broshowerfuck = daystart:
 					act'Continue':gt'brother_voyeur_sex','brother_shower_fuck_end'
 				else
-					act'Finish showering together': gt 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
+					act'Finish showering together': gs 'arousal', 'end' & gt 'brother_voyeur', 'brother_shower_end'
 				end
 			end
 		end

+ 1 - 1
locations/carF.qsrc

@@ -353,7 +353,7 @@ end
 
 if $ARGS[0] = 'city':
 	cla
-	if func('homes_properties', 'can_live_here', 'city_apartment') and cardrive ! 8: act 'Go home to St. Petersburg''s residential area':gs 'carF', 'nearby', 8
+	if func('homes_properties', 'is_property_of_status', 'owned', 'city_house') and cardrive ! 8: act 'Go to your house in the residential area':gs 'carF', 'nearby', 8
 	if cardrive ! 3:act 'Go to St. Petersburg''s Industrial Region':gs 'carF', 'nearby', 3
 	if cardrive ! 1:act 'Go to St. Petersburg''s residential area':gs 'carF', 'nearby', 1
 	if cardrive ! 2:act 'Go to St. Petersburg city center':gs 'carF', 'nearby', 2

+ 1 - 1
locations/cardgame_durak.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'start':
 				gs 'willpower', 'misc', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'shulga_room', 'start'
+				gt 'vasilyhome', 'livingroom'
 			end
 		else
 			act 'Not now (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 1 - 1
locations/city_center.qsrc

@@ -93,7 +93,7 @@ if shantpopala > 0:
 	exit
 end
 
-gs 'music_actions', 'start'
+gs 'music_actions', 'music_icon'
 
 
 if car > 0 and cardrive = 2:'In the parking stands your <a href="exec:GS ''carF'', ''start''"><<$car>></a>.'

+ 2 - 2
locations/city_clinic.qsrc

@@ -261,7 +261,7 @@ if $ARGS[0] = 'start':
 					if karta >= zubpay:
 						act 'Sort out your teeth (card)':
 							*clr & cla
-							money -= zubpay
+							karta -= zubpay
 							minut += 60
 							if pcs_missing_teeth > 0:
 								pcs_missing_teeth = 0
@@ -1566,7 +1566,7 @@ end
 
 if $ARGS[0] = 'milk_reception':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/milk_reception.jpg"></center>'
-	'The woman at the reception looks at you annoyed and and stands up.'
+	'The woman at the reception looks at you annoyed and stands up.'
 	'Nurse at the reception: Yes, yes... go this way.'
 	'She waves into a general direction down the hallway.'
 	'Nurse at the reception: There should be a sign on the door, it is only a small room.'

+ 530 - 0
locations/city_coffee_hole.qsrc

@@ -0,0 +1,530 @@
+# city_coffee_hole
+
+!!Joanna - owner, model = Joanna Angel
+!!Klara - worker, model = Kleio Valentien
+
+$location_type = 'public_indoors'
+
+if $args[0]= 'start':
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'start'
+	menu_off = 0
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/street_sign.jpg"></center>'
+	'Along the street is a sign advertising a cafe called the "Coffee Hole". Following the direction of the sign, you find the door to the cafe in a little nook between two buildings. It would have been hard to see from the street without the sign. Opening hours are 07:00 to 23:00.'
+	act 'Return to the city': gt 'city_island'
+	if hour >= 7 and hour < 23: act 'Enter the cafe': gt 'city_coffee_hole', 'inner'
+end
+
+if $args[0]= 'inner':
+	$loc = 'city_coffee_hole'
+	$loc_arg = 'inner'
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'inner'
+	menu_off = 0
+	gs 'stat'
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/inside.jpg"></center>'
+	'The cafe looks like it was once some type of industrial building, with tall ceilings, exposed pipes, ductwork and lights. The counter is in the far corner, while the middle of the room contains several tables and chairs. Along the wall opposite the counter is an area with several couches for people to sit and relax. The menu board shows a wide range of flavoured coffees, teas, espressos and pastries, among other things.'
+	if mid($start_type,1,2) = 'sg' and yearstart = 2 and (day = 2 or day = 4 or day = 7) and hour >= 18:
+		'You see a familiar face working behind the counter, your classmate <a href="exec:gt ''city_coffee_hole'', ''anushka_work''">Anushka.</a>'
+	end
+	if week < 6 and hour >= 17:
+		temprand = rand(1,10)
+		if mid($start_type,1,2) = 'sg' and yearstart = 2:
+			if temprand = 1:
+				'You see a familiar face sitting at one of the tables, your classmate <a href="exec:gt''city_coffee_hole','lazar''">Lazar.</a>'
+			elseif temprand = 2:
+				'You see a familiar face sitting at one of the tables, your classmate <a href="exec:gt''city_coffee_hole','dimka''">Dimka.</a>'
+			elseif temprand = 3:
+				'You see a familiar face sitting at one of the tables, your classmate <a href="exec:gt''city_coffee_hole','marcus''">Marcus.</a>'
+			end
+		end
+		if temprand = 4:
+			if meet_kendra = 1:
+				'You see a familiar face sitting at one of the tables, <a href="exec:gt''city_coffee_hole','kendra''">Kendra.</a>'
+			elseif kendraslave >= 1:
+				'You see a familiar face sitting at one of the tables, your mistress <a href="exec:gt''city_coffee_hole','kendra''">Kendra.</a>'
+			elseif hotcat >= 5:
+				'As you look around, you see a beautiful young <a href="exec:gt''city_coffee_hole','kendra''">black woman</a> sitting at one of the tables. She notices you and gives you a quick once-over before smiling and leaning back. She seems to be watching you with an inviting smile to join her.'
+			else
+				'As you look around, you see a beautiful young black woman sitting at one of the tables. She notices you and gives you a quick once-over before returning to what she was doing. After a few minutes, she finishes her drink before getting up and leaving.'
+			end
+		elseif temprand = 5:
+			if DjibrilQW['meet'] = 1:
+				'You see a familiar face sitting at one of the tables, Olu''s nephew <a href="exec:gt''city_coffee_hole','djibril''">Djibril.</a>'
+			elseif hotcat >= 5:
+				'As you look around, you see an attractive young <a href="exec:gt''city_coffee_hole','djibril''">black man</a> sitting at one of the tables. When he notices you looking at him, he gives you a friendly smile and a wave. It seems he is the friendly sort and seems to be interested in you.'
+			else
+				'As you look around, you see an attractive young black man sitting at one of the tables. He notices you and gives you a quick once-over before returning to what he is doing. After a few minutes, he finishes his drink before getting up and leaving.'
+			end
+		else 
+			'As you look around, you don''t see anyone you recognize hanging out today.'
+		end
+	end
+	act 'Exit the cafe': gt 'city_island'
+	if hour >= 7 and hour < 23:
+		act 'Go up to the counter to order': gt 'city_coffee_hole', 'counter'
+		act 'Go to restroom': gt 'city_coffee_hole', 'toilet'
+	end
+end
+
+if $ARGS[0] = 'eat':
+	!!set return to skip to post komp if you use computer
+	$loc = 'city_coffee_hole'
+	$loc_arg = 'post_komp'
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'eat'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
+	if coffe_hole_ordered = 1:
+		minut += 10
+		mood += 5
+		gs 'stat'
+		'You take your order and find an empty table. You quietly enjoy your order as you look around at the other people.	You feel your mood brighten as you enjoy the ambience of the place.'
+	else
+		gs 'stat'
+		'You''re sitting at a table in the cafe. It''s nice here.'
+	end
+	act 'Exit the cafe': gt 'city_island'
+	act 'Get up from table': gt 'city_coffee_hole', 'inner'
+	if komp = 1:
+		act 'Open your laptop':
+			gs 'internet_mobile', 'get_access', 'free', 'noporn', 'nocamshow'
+			gt 'Komp','start'
+		end
+	end
+end
+
+if $ARGS[0] = 'post_komp':
+	*clr & cla
+	mood += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
+	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something more to eat or drink first.'
+	act 'Get up from table': gt 'city_coffee_hole', 'inner'
+end
+
+if $ARGS[0] = 'toilet':
+	$locM = city_coffee_hole
+	$locM_args = 'toilet'
+	$menu_loc = city_coffee_hole
+	$menu_args = 'toilet'
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/restroom.jpg"></center>'
+	'The first thing you notice about the restroom is there seems to be only one, and it''s co-ed. The walls are covered in what you can only describe as graffiti art, but it''s otherwise nice and clean. Several stalls are along one wall, and a row of sinks with mirrors line the other.'
+	dynamic $tampon
+    dynamic $quickwash
+    dynamic $basin
+    dynamic $publicpan
+	act 'Exit restroom': gt 'city_coffee_hole', 'inner'
+end
+
+if $args[0]= 'counter':
+	*clr & cla
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'counter'
+	menu_off = 0
+	minut += 5
+	gs 'stat'
+	if mid($start_type,1,2) = 'sg' and yearstart = 2 and (day = 2 or day = 4 or day = 7) and hour >= 18:
+		gt 'city_coffee_hole','anushka_work'
+	else 
+		temprand = rand(1,2)
+		if temprand = 1:
+			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/worker1.jpg"></center>'
+			'As you approach, the woman behind the counter looks up at you. She appears to be in her late twenties or maybe early thirties. She has dark hair with purple streaks, and her arms are covered in tattoos. "Welcome to the Coffee Hole. What can I get you?" she asks in a friendly and welcoming tone. You notice she has a familiar accent; it reminds you a little bit of Marcus'' accent.'
+			act 'Exit the cafe': gt 'city_island'
+			act 'Leave counter': gt 'city_coffee_hole', 'inner'
+			act 'Order from the menu (0:05)':gs 'food_menu'
+		else
+			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/worker2.jpg"></center>'
+			'As you approach, the girl behind the counter looks up at you. She appears to be in her late teens or early twenties. She has short blond hair with one side shaved, her arms are covered in tattoos, and she has a large tattoo on her chest. "Welcome to the Coffee Hole. What can I get you?" she asks in a bored and monotone voice.'
+			act 'Exit the cafe': gt 'city_island'
+			act 'Leave counter': gt 'city_coffee_hole', 'inner'
+			act 'Order from the menu (0:05)':gs 'food_menu'
+		end
+	end
+end
+
+if $args[0]= 'anushka_work':
+	*clr & cla
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'anushka_work'
+	menu_off = 0
+	minut += 5
+	gs 'npc_relationship', 'modify', 'A144', 'like', 1, 'coffee_hole'
+	gs 'stat'
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/nush_counter.jpg"></center>'
+	if anushkaQW[coffee_hole] = 1:
+		if npc_rel['A144'] >= 60:
+			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. Need your holes filled with something hot and black again?" she says with a wink, even making ordering coffee sound dirty.'
+			'You smile at her. "You are so bad."'
+			if anushkaQW['photoshoot'] >= 1 and hour = 22:
+				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job. After talking for a bit, you notice that it''s close to closing, and the place is almost empty. Maybe she would be up for a little after-hours photo shoot for you?'
+				act 'Let''s do a photo shoot':
+					*clr & cla
+					'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/nush_counter.jpg"></center>'
+					'You grin at her. "We should totally do a photo shoot here."'
+					'She gives you a slightly surprised look. "What? Now?"'
+					'You find her reaction amusing. "Well, we could, but I was thinking after you closed up. So what do you say?"'
+					'She bites her lower lip for a moment. "Fuck, okay, why not? Just hang around until I close up."'
+					act 'Wait': gt 'city_coffee_hole', 'photo_shoot'
+				end
+			else
+				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+			end
+		elseif npc_rel['A144'] <= 20:
+			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
+			'You smile at her. "So, do you like the job?"'
+			'She doesn''t return your smile. "It''s a job. Do you want something or not? I''ve got work to do and can''t stand around chatting." You sigh. It seems she still doesn''t like you. You look up at the menu on the wall to see if you might want to order something.'
+		else
+			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. What can I get you?"'
+			'You smile at her. "So you like working here?"'
+			'She shrugs a little. "Yeah, it''s alright. As I said, it''s pretty easy, close to my place, and I can study when it''s slow. Plus, the owner, Joanna, is pretty cool and chill about what I do at work. As long as I don''t leave a mess or ignore customers, she doesn''t really care what I do." You chat about the university and her job when you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+		end
+	else
+		anushkaQW[coffee_hole] = 1
+		if npc_rel['A144'] >= 60:
+			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole, where we can fill your holes with something hot and black, but maybe not in the way you would like..." she says with a wink, even making ordering coffee sound dirty.'
+			'You smile at her. "Oh my god, you''re terrible. I didn''t know you worked here."'
+			'She shrugs. "I need some extra money coming in to help pay for stuff. This is pretty easy, close to my place, and I can study when it''s slow." You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+		elseif npc_rel['A144'] <= 20:
+			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
+			'You smile at her. "I didn''t know you worked here."'
+			'She doesn''t return your smile. "Well, now you do, so do you want something or not? I''ve got work to do and can''t stand around chatting." You sigh. It seems she still doesn''t like you. You look up at the menu on the wall to see if you might want to order something.'
+		else
+			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. What can I get you?"'
+			'You smile at her. "I didn''t know you worked here."'
+			'She shrugs. "I need some extra money coming in to help pay for stuff. This is pretty easy, close to my place, and I can study when it''s slow." You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
+		end
+	end
+	act 'Exit the cafe': gt 'city_island'
+	act 'Leave counter': gt 'city_coffee_hole', 'inner'
+	act 'Order from the menu (0:05)':gs 'food_menu'
+end
+
+if $ARGS[0] = 'photo_shoot':
+	*clr & cla
+	anushkaQW['photoshoot'] += 1
+	minut += 65 - minut
+	gs 'exp_gain', 'photoskl', rand(1,2)
+	gs 'npc_relationship', 'modify', 'A144', 'like', 1, 'coffee_hole_photo'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose1.jpg"></center>'
+	'Once the last of the customers are gone, Anushka locks the doors before you pull your camera out and have her stand in front of the counter. You start snapping photos of her standing in different poses as you direct her, asking her to hold various items for you as you snap pictures.'
+	act 'Spice this up':
+		minut += 5
+		*clr & cla
+		gs 'exp_gain', 'photoskl', rand(1,2)
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose2.jpg"></center>'
+		'You want more, and you know she loves showing off. "Come on, famous model, let''s do something a little more risque!" Anushka reaches up and pulls down her top enough to expose her bra underneath as she poses while holding a coffee pot in her other hand.'
+		gs 'arousal', 'voyeur', 5
+		gs 'stat'
+		act 'Let''s see that butt':
+			minut += 5
+			*clr & cla
+			gs 'exp_gain', 'photoskl', rand(1,2)
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose3.jpg"></center>'
+			'"Let''s see that tight little butt you love getting fucked in." She turns around to show off her butt covered in tight little booty shorts. "Okay, lose the bra now," you tell her. She takes off her bra and pulls down her shirt while still keeping her ass pointed towards you. "Okay, turn around, so we can see those firm little titties of yours."'
+			act 'She turns':
+				minut += 5
+				*clr & cla
+				gs 'exp_gain', 'photoskl', rand(1,2)
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose4.jpg"></center>'
+				'She turns around, her top around her waist, and pulls her apron aside so you get a view of her firm little breasts. You snap a few more photos. "Lose the apron."' 
+				'She tosses it aside, and you take a few more snaps of her. "Now the top." She pulls off the top and throws it on a nearby table. "Now the shorts."'
+				act 'Keep taking photos':
+					*clr & cla
+					gs 'exp_gain', 'photoskl', rand(1,2)
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose5.jpg"></center>'
+					'She slips her shorts off and kicks them at you, forcing you to duck to avoid being hit in the face by them. You snap a few more photos while she hooks her thumbs into her panties to pull them this way and that, teasing you by almost showing off her pussy at times but stopping just short. "That''s it, work the camera for me, Nush!"'
+					gs 'arousal', 'voyeur', 5
+					gs 'stat'
+					act 'Stop teasing':
+						*clr & cla
+						gs 'exp_gain', 'photoskl', rand(1,2)
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose6.jpg"></center>'
+						'She finally stops teasing and pulls her panties down just enough to give you glimpses of her pussy, until she finally pulls them about mid-way down her thighs, providing a much clearer view of her clean-shaven pussy. "Okay, lose them completely now," you tell her as you change spots and direct her into different poses for you.'
+						gs 'arousal', 'voyeur', 5
+						gs 'stat'
+						act 'Completely naked':
+							*clr & cla
+							gs 'exp_gain', 'photoskl', rand(1,2)
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose7.jpg"></center>'
+							'She slips the panties down her legs, stepping out of them and kicking them aside. Now all she is wearing is knee-high striped socks, sneakers and a smile. You keep moving around her, snapping photos as she changes poses for you. "Nice, nice. But how about you get up on the counter for me?" you tell her as you keep taking photos. She pauses a moment, then smirks before climbing up on the counter, where she gets down on her knees and starts posing some more.'
+							gs 'arousal', 'voyeur', 5
+							gs 'stat'
+							act 'Work the camera':
+								*clr & cla
+								gs 'exp_gain', 'photoskl', rand(1,2)
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose8.jpg"></center>'
+								'Under your direction, she spreads her legs wide while staying on her knees and sitting back on her heels, giving you a better shot at her pussy. After a bit, she starts playing with her nipples, pinching and pulling them as you keep taking pictures of her. "Okay, let''s see that little pussy of yours." You tell her.'
+								gs 'arousal', 'voyeur', 5
+								gs 'stat'
+								act 'That''s it':
+									*clr & cla
+									gs 'exp_gain', 'photoskl', rand(1,2)
+									gs 'stat'
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose9.jpg"></center>'
+									'She turns and sits on her side, with one arm supporting her while reaching back to grab her butt cheek with the other. She spreads her thighs to give you a better view of her pussy and asshole.'
+									gs 'arousal', 'voyeur', 5
+									gs 'stat'
+									act 'Final photos':
+										*clr & cla
+										gs 'exp_gain', 'photoskl', rand(1,2)
+										!!portfolio_people[5] = 1
+										!!I commented this out as I don''t know how to add another photo set to the portfolio and even if we want to add a second for nush
+										gs 'stat'
+										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose9.jpg"></center>'
+										'She sits in various poses, some fully exposed and others not, before you finally think you have the perfect final image. She''s leaning back on her elbows with her legs together, pointing up in the air. The angle you pick doesn''t show off much of her naked body, yet is still erotic, and she looks so happy and alive. It seems especially fitting with the Coffee Hole sign behind her; it''s the perfect image to end this photo session.'
+										*nl
+										'With the image taken, you lower the camera. "Thanks, Nush, that was amazing. This place made for an amazing place to take photos in. You can get dressed now."'
+										'She gets off the counter and grabs her panties off the floor before pulling them back on. "My pleasure. I love modelling almost as much as I love my music."' 
+										'You review the photos on your camera as she gets dressed again. "Well, I should really finish cleaning up so I can go home and get some sleep before classes tomorrow."'
+										gs 'arousal', 'voyeur', 5
+										gs 'arousal', 'end'
+										gs 'stat'
+										act 'Head out': 
+											*clr & cla
+											minut +=5
+											gs 'stat'
+											'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
+											'You nod at her. "Sure thing, I should get going anyways. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
+											'She stops at the door without unlocking it. "I''m not. I was going to, but the boys wanted to get a place in the city, so we rented an apartment close to campus. Costs me less as I only have to pay a quarter of the bills than the dorm was going to cost. Living with three boys is a nightmare though, so I only regret it constantly," she says with a laugh.'
+											*nl
+											'"You should stop by sometime," she says and tells you where to find the place.'
+											'You write it down on your phone. "Thanks, I will. See you later." With that, she unlocks the door, and you head out while she relocks the door behind you and sets about cleaning up for the night.'
+											act 'Walk away': gt 'city_island'
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $args[0]= 'lazar':
+	*clr & cla
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'lazar'
+	menu_off = 0
+	minut += 5
+	gs 'npc_relationship', 'modify', 'A149', 'like', 1, 'coffee_hole'
+	gs 'stat'
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
+	if fame['pav_slut'] > 300:
+		'You notice Lazar sitting at a table. As you approach, he says "Well, look who it is; The Queen of Cocks." You sit and talk to him for a few minutes, but all he does is talk about how easy you were back in school. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should come sometime and hang out, so we can have some fun."' 
+		'How he says it leaves no doubt about what he means by fun. Even moving to a new city won''t let get away from your reputation as a slut. He tells you where they live before he heads outside and walks away.'
+	else
+		if npc_rel['A149'] >= 60:
+			lazarQW[city_invite] = 1
+			if hotcat >= 6:
+				'You notice Lazar sitting at a table. As you approach, he says "What''s up, hottie? You enjoying the city?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." He tells you where they live before he heads outside and walks away.'
+			else
+				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
+			end
+		elseif npc_rel['A149'] <= 20:
+			'You notice Lazar sitting at a table. As you approach, all he says is "Hey." You sit and talk to him for a few minutes, but he doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." He heads outside and walks away.'
+		else
+			if hotcat >= 6:
+				'You notice Lazar sitting at a table. As you approach, he says "Hey, good looking. What have you been up to?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going. Give me your number, and I''ll give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him before he heads outside and walks away.'
+			else
+				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going, but it was nice catching up. Maybe I''ll see you around sometime?" he says before heading outside and walking away.'
+			end
+		end
+	end
+	act 'Exit the cafe': gt 'city_island'
+	act 'Leave him be': gt 'city_coffee_hole', 'inner'
+end
+
+if $args[0]= 'dimka':
+	*clr & cla
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'dimka'
+	menu_off = 0
+	minut += 5
+	gs 'npc_relationship', 'modify', 'A1', 'like', 1, 'coffee_hole'
+	gs 'stat'
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
+	if fame['pav_slut'] > 225:
+		'You notice Dimka sitting at a table. As you approach, he says "Get away from me, you disgusting slut! I don''t want any of the diseases you have." He starts ignoring you, so you turn and walk away.'
+	else
+		if npc_rel['A1'] >= 60:
+			if grupTipe = 1:
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around me did you good. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as always." You sit and talk to him for a few minutes. He is relatively nice to you, even asking about what you''ve been up to until he finishes his drink. "I know you love thinking this is like the old days when we could hang out all the time, but now things are different. Maybe I''ll see you around, and if you''re good, I''ll introduce you to the cool crowd at the uni," he says in a haughty tone, as if he''s already the King of the university. He then stands and walks away.'
+			else
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as usual." You sit and talk to him for a few minutes, but all he does is give you back-handed compliments until he finishes his drink. "I know you love being seen with me, but I have better things to do. Maybe I''ll see you around?" he says before getting up and walking away.'
+			end
+		elseif npc_rel['A1'] <= 20:
+			'You notice Dimka sitting at a table. As you approach, he says "What the fuck do you want, loser? Never mind, I don''t want to know. Just go away." He starts ignoring you, so you turn and walk away.'
+		else
+			if grupTipe = 1:
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around on me did you good. You managed to make it out of Pavlovsk before you got knocked up  by some loser." You sit down and talk to him for a few minutes, but all he does is make snide remarks until he finishes his drink. "I know you love being seen with me, but we''re not in Pavlovsk anymore and no longer run in the same social circles." He gets up and walks away, leaving you alone in the cafe.'
+			else
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I honestly never thought you would make it out of Pavlovsk. I figured you would be knocked up and married to some loser by now." You sit and talk to him for a few minutes, but all he does is berate you until he finishes his drink. "I know you love being seen with me, but I have better things to do." he says before getting up and walking away.'
+			end
+		end
+	end
+	act 'Exit the cafe': gt 'city_island'
+	act 'Leave him be': gt 'city_coffee_hole', 'inner'
+end
+
+if $args[0] = 'marcus':
+	*clr & cla
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'marcus'
+	menu_off = 0
+	minut += 5
+	gs 'npc_relationship', 'modify', 'A146', 'like', 1, 'coffee_hole'
+	gs 'stat'
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
+	if fame['pav_slut'] > 250:
+		marcusQW[city_invite] = 1
+		'You notice Marcus sitting at a table. As you approach, he says "Hey you." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together, you should come by sometime and hang out, so we can have some fun." How he says it leaves no doubt about what he means by fun. Seems that even moving to a new city can''t get you away from your reputation as a slut. He tells you where they live before he heads outside and walks away.'
+	else
+		if npc_rel['A146'] >= 50:
+			marcusQW[city_invite] = 1
+			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
+		elseif npc_rel['A146'] <= 20:
+			'You notice Marcus sitting at a table. As you approach, he says "Hey." You sit down and talk to him for a few minutes. He doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
+		else
+			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. It was nice catching up. Maybe I''ll see you around?" he asks before he heads outside and walks away.'
+		end
+	end
+	act 'Exit the cafe': gt 'city_island'
+	act 'Leave him be': gt 'city_coffee_hole', 'inner'
+end
+
+if $args[0]= 'kendra':
+	*clr & cla
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'kendra'
+	menu_off = 0
+	minut += 5
+	gs 'stat'
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
+	if meet_kendra = 1:
+		'As you walk  over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you "You change your mind about serving me?"'
+		act 'No':
+			*clr & cla
+			kendrano = 1
+			gs 'npc_relationship', 'modify', 'A84', 'dislike', 1, 'coffee_hole'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
+			'You smile at her. "Sorry, no. I still don''t belong to anyone."'
+			'She sighs softly. "Such a waste. Oh well, there are plenty of pretty little white Russian bitches that love being owned by an ebony Mistress. Perhaps we''ll meet again, and you''ll change your mind. I go to the university, so you should stop by sometime." She gives you directions to her dorm room before she returns to browsing.'
+			act 'Exit the cafe': gt 'city_island'
+			act 'Leave her be': gt 'city_coffee_hole', 'inner'
+		end
+		act 'Yes':
+			*clr & cla
+			gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
+			'You look down a little to show your submission to her. "Yes, Mistress Kendra."'
+			'She smiles widely. "I think you''re going to make a great little slave. We''re going to have a lot of fun together. I wish I had time to start your training now, but I have things I need to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+			act 'Exit the cafe': gt 'city_island'
+			act 'Leave the table': gt 'city_coffee_hole', 'inner'
+		end
+	elseif kendraslave >= 1:
+		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
+		'As you walk over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you, "Who do we have here? My favourite little white bitch. Come to service me? I wish I had time for a training session, but unfortunately, I have things to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+	elseif hotcat >= 5:
+		'As you walk over to her, she invites you to sit down. You take a seat opposite her as she says. "You''re a pretty little thing. What''s your name?"'
+		'"<<$pcs_firstname>>, but most people call me <<$pcs_nickname>>. What''s your name?" you reply.'
+		'She smiles. "<<$pcs_nickname>>, what a pretty name. I''m Kendra, but you can call me Mistress Kendra," she says confidently.'
+		'"Oh..." you reply. She''s one of those people.'
+		act 'Exit the cafe': gt 'city_island'
+		act 'Leave the table': gt 'city_coffee_hole', 'inner'
+		act 'Talk to her':
+			*clr & cla
+			meet_kendra = 1
+			npc_rel['A84'] = 45
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
+			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+			  'You start talking with her. You tell her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo and attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			else
+			  'You start talking with her. You tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
+			end
+			act 'Call her Kendra':
+				*clr & cla
+				kendrano = 1
+				gs 'npc_relationship', 'modify', 'A84', 'dislike', 1, 'coffee_hole'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend.jpg"></center>'
+				'You smile at her. "Sorry, but I don''t belong to anyone."'
+				'She sighs softly. "Such a waste. Oh well, there are plenty of pretty little white Russian bitches that love being owned by an ebony Mistress. Perhaps we''ll meet again, and you''ll change your mind?" She gives you directions to her dorm room, and she returns to browsing.'
+				act 'Exit the cafe': gt 'city_island'
+				act 'Leave the table': gt 'city_coffee_hole', 'inner'
+			end
+			act 'Call her Mistress Kendra':
+				*clr & cla
+				gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend.jpg"></center>'
+				'You look down a little to show your submission to her. "Yes, Mistress Kendra."'
+				'She smiles widely. "I think you''re going to make a great little slave. We''re going to have a lot of fun together. I wish I had time to start your training now, but I have things I need to do. Do come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+				act 'Exit the cafe': gt 'city_island'
+				act 'Leave the table': gt 'city_coffee_hole', 'inner'
+			end
+		end
+	elseif npc_rel['A84'] < 40:
+		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
+		'You walk over to her table and stand next to it. "Hi," you smile at her as you greet her.'
+		'She looks up at you with an annoyed look. "I don''t have time for games, and I''m tired of yours. Now get lost." She proceeds to ignore you, so you turn and leave.'
+	end
+	act 'Exit the cafe': gt 'city_island'
+	act 'Leave her be': gt 'city_coffee_hole', 'inner'
+end
+
+if $args[0]= 'djibril':
+	*clr & cla
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'djibril'
+	menu_off = 0
+	minut += 5
+	DjibrilQW['invite'] = 1
+	DjibrilQW['meet'] = 1
+	gs 'npc_relationship', 'modify', 'A82', 'like', 1, 'coffee_hole', 1, 'coffee_hole'
+	gs 'stat'
+	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+	if DjibrilQW['invite'] = 1:
+		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
+	elseif DjibrilQW['meet'] = 1 and DjibrilQW['invite'] = 0:
+		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
+		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
+		
+	elseif hotcat >= 5:
+		DjibrilQW['meet'] = 1
+		'As you approach him, the young African man sitting at the table introduces himself. "I am Djibril Maina. What''s your name?"'
+		'You smile at him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people just call me <<$pcs_nickname>>."'
+		'He looks surprised for a moment. "Are you from Pavlovsk?" When you nod your head, he looks even more surprised. "Do you have an Aunt Luda dating a man named Olu?"'
+		'Now it''s your turn to look surprised. "Yes, how did you know that?"'
+		*nl
+		'He shakes his head with a slight laugh. "He is my uncle. They''ve told me about you. Small world, huh?"'
+		'You giggle as well. "Yeah, it really is."'
+		'You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
+	end
+	act 'Exit the cafe': gt 'city_island'
+	act 'Leave him be': gt 'city_coffee_hole', 'inner'
+end
+
+--- city_coffee_hole ---------------------------------

+ 64 - 40
locations/city_hotel.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'reception':
 			tobiQW = 2001
 			minut += 1
 			'"Why so the hotel so crowded today?" you ask.'
-			'"There''s an conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
+			'"There''s a conference on indigenous languages, they meet every year and complain about their disappearing languages." she says laughing.'
 				act 'Move away': gt 'city_hotel', 'start'
 		end
 	end
@@ -108,57 +108,39 @@ if $ARGS[0] = 'reception':
 				'Standard room - 500 <b>₽</b> / night;'
 				'Luxury room - 1500 <b>₽</b> / night;'
 				'and the Royal Suite - 10000 <b>₽</b> / night.'
-
+				*nl
 				act'Standard room':
-					*clr & cla
-					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
-					totalCost = hotelRoomDays['city_hotel'] * 500
-					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
-
-					if totalCost<=money:
-						money-=totalCost
-						hotelRoom['city_hotel']=3
-						hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
-						'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
-						act'Step away from the reception desk':gt'city_hotel'
+					cla
+					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['city_hotel'] > 0 : 
+						totalCost = hotelRoomDays['city_hotel'] * 500
+						'"A standard room for <<hotelRoomDays[''city_hotel'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'city_hotel', 'pay_the_room', 1
 					else
-						msg'You can''t afford to stay in the hotel for that long.'
-						gt'city_hotel'
+						gt'city_hotel'					
 					end
 				end
 				act 'Luxury room':
-					*clr & cla
-					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
-					totalCost = hotelRoomDays['city_hotel'] * 1500
-					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
-
-					if totalCost<=money:
-						money-=totalCost
-						hotelRoom['city_hotel']=3
-						hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
-						'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
-						act'Step away from the reception desk':gt'city_hotel'
+					cla
+					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['city_hotel'] > 0:
+						totalCost = hotelRoomDays['city_hotel'] * 1500
+						'"A luxury room for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+						$temp_nomoney = '"You can''t afford to stay in a luxury room at this hotel for that long.'
+						gs 'city_hotel', 'pay_the_room', 2
 					else
-						msg'You can''t afford to stay in the hotel for that long.'
 						gt'city_hotel'
 					end
 				end
 
 				act'Royal Suite':
-					*clr
 					cla
-					hotelRoomDays['city_hotel']=input ("For how long would you like to stay?")
-					totalCost = hotelRoomDays['city_hotel'] * 10000
-					if hotelRoomDays['city_hotel'] <= 0:gt'city_hotel'
-
-					if totalCost<=money:
-						money-=totalCost
-						hotelRoom['city_hotel']=3
-						hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
-						'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
-						act'Step away from the reception desk':gt'city_hotel'
-					else
-						msg'You can''t afford to stay in the hotel for that long.'
+					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['city_hotel'] > 0: 
+						totalCost = hotelRoomDays['city_hotel'] * 10000
+						'"The royal suite for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'city_hotel', 'pay_the_room', 3
+					else	
 						gt'city_hotel'
 					end
 				end
@@ -170,6 +152,48 @@ if $ARGS[0] = 'reception':
 	end
 end
 
+if $ARGS[0] = 'pay_the_room':
+	hotel_room_id = ARGS[1]
+	if totalCost<=money:		
+		act 'Pay with cash':
+			cla
+			money-=totalCost
+			hotelRoom['city_hotel'] = hotel_room_id
+			hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+			'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
+			act 'Step away from the reception desk': gt 'city_hotel'
+			killvar 'totalCost'
+			killvar 'hotel_room_id'
+		end
+	end
+	if totalCost<=karta+bankDebtLimit:
+		act 'Pay with card':
+			cla
+			karta-=totalCost
+			'hotel_room_id: <<hotel_room_id>>'
+			hotelRoom['city_hotel'] = hotel_room_id
+			hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+			'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
+			act 'Step away from the reception desk': gt 'city_hotel'
+			killvar 'totalCost'
+			killvar 'hotel_room_id'
+		end
+	end
+
+	if totalCost > karta+bankDebtLimit and totalCost > money:
+		if ARGS[1] = 1: act 'You can''t afford to stay in the hotel for that long.': gt 'city_hotel'
+		if ARGS[1] = 2: act 'You can''t afford to stay in a luxury room at this hotel for that long.': gt 'city_hotel'
+		if ARGS[1] = 3: act 'You can''t afford to stay in the Royal Suite at this hotel for that long.': gt 'city_hotel'
+		killvar 'totalCost'
+		killvar 'hotel_room_id'
+	end
+
+	act 'You change your mind': 
+		killvar 'totalCost' 
+		killvar 'hotel_room_id'
+		gt 'city_hotel'
+	end
+end
 
 --- city_hotel ---------------------------------
 

+ 3 - 2
locations/city_house_res_bedr.qsrc

@@ -24,9 +24,9 @@ if $ARGS[0] = 'bedro':
 	act 'Relax on your bed': gt 'bed', 'start'
 
 	if pornMagazine > 0:gs 'events', 'read_porn'
-
+	
 	if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
-
+	gs 'music_actions', 'music_icon'
 	*nl
 	'It''s a bright and beautiful room, with a large <a href="exec:gt ''bed'', ''start''">continental bed</a>.'
 	*nl
@@ -34,6 +34,7 @@ if $ARGS[0] = 'bedro':
 	if pornMagazine > 0:'You have hidden your porn magazine in your nightstand.'
 	*nl
 	'On one side of the room is the entrance to a walk-in <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
+	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	gs 'prostitution_functions', 'prostitute_outfit_at_home'	
 end
 

+ 2 - 2
locations/city_house_res_misc.qsrc

@@ -141,7 +141,7 @@ if $ARGS[0] = 'livroom':
 	act 'Leave the room': gt 'city_house_res_misc', 'hallw'
 
 	'A place where you can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your <a href="exec:gt ''divan'', ''start''">sofa</a>.'
-
+	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to the sofa.'
 	!! Computer and internet use.
 	if komp = 1:
 		gs 'internet_mobile', 'get_access'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'livroom':
 	gs 'subkid'
 
 	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_actions', 'not_alone' should be added with the correct conditions.
-	gs 'music_actions', 'start'
+	gs 'music_actions', 'music_icon'
 
 	if sewing_kit = 1:
 		'Your <a href="exec:gt ''sewing'',''start''">sewing kit</a> is stored next to your favorite chair.'

+ 5 - 0
locations/city_island.qsrc

@@ -69,6 +69,11 @@ if hour >= 8 and hour < 22:
 else
 	'You can see Patch Work Dolls a clothing store that caters to Alternative styles, like gothic, punk, skater, and the like. Next to that is Nerdvana the nerd clothing store, they both open every day between 08:00 - 22:00'
 end
+if hour >= 7 and hour <= 23:
+	'You can see a sign advertising a coffee shop called <a href="exec: minut += 3 & gt ''city_coffee_hole'', ''start''">The Coffee Hole</a> just a few blocks from the University.'
+else
+	'The The Coffee Hole, coffee shop is closed, they open again at 7:00'
+end
 if hour >= 4:
 	'The <a href="exec:minut += 1 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 else

+ 504 - 249
locations/city_kafe.qsrc

@@ -14,14 +14,37 @@ if $ARGS[0] = 'start':
 	gs 'kit_din'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'With its bright neon signs, pictures of flashy American muscle cars and pop-art, and a jukebox playing popular music ranging from the 50s to the 80s, The Roadhouse is something of a specialty diner, having been designed to have a retro, American feel. From the outside, the place doesn’t look very big, but in reality the diner is quite spacious, comfortably able to fit a well stocked bar, a moderately sized dinning area while also offering a handful of private booths tucked away in darker corners of the diner, and even boasting a dance floor with a small stage to play live music when available.'
-	'Sitting at one end of the bar, you see <a href="exec:gt ''city_kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
+	'The Roadhouse is decorated with bright neon signs, pictures of flashy American muscle cars and pop art, and even the body of an old pink Cadillac hanging from the ceiling, like something from an old American TV show. Although it looks cramped and small from the outside, The Roadhouse is surprisingly spacious inside, managing to fit a well-stocked bar and a moderately-sized dining area alongside several private booths tucked away in the corners and dance floor.'
+	'A large, flashy jukebox features popular hits from the 50s to the 80s, mostly American and British but with a sprinkling of songs from other European countries. This is obviously a specialty diner, as very few places in Russia look anything like this!'
 	*nl
 	'They serve American style meals'
 	*nl
+
+	if workKafe['job'] = 0:
+		'Sitting at one end of the bar you see middle-aged the owner of the diner, engrossed in paperwork.'
+	elseif workKafe['job'] = -1:
+		'Sitting at one end of the bar you see Fabi, engrossed in paperwork.'
+	elseif hour = 11:
+		*clr
+		'Inside the diner is a bustle of activity as Fabi notes in the log that you arrived for work on time, Ashot and Nika ready the kitchen for the day, and Marisha bustles from table to table making sure everything is ready to receive patrons.'
+	else
+		'Sitting at one end of the bar you see Fabi, engrossed in paperwork.'
+	end
+		
+	
 	act 'Leave the diner': minut += 5 & gt 'city_residential'
 
 	act 'Sit down at a table': gt 'city_kafe', 'table'
+
+	if workKafe['job'] = 0:
+		act 'Talk to owner about job': gt 'city_kafe', 'fabi'
+	elseif workKafe['job'] = -1:
+		act 'Talk to Fabi about getting your old job back': gt 'city_kafe', 'old_job'
+	elseif hour = 11:
+		act 'Start your shift': gt 'city_kafe', 'work'
+	else
+		act 'Talk to Fabi': gt 'city_kafe', 'fabi2'
+	end
 end
 
 if $ARGS[0] = 'table':
@@ -35,8 +58,8 @@ if $ARGS[0] = 'table':
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'With its bright neon signs, pictures of flashy American muscle cars and pop-art, and a jukebox playing popular music ranging from the 50s to the 80s, The Roadhouse is something of a specialty diner, having been designed to have a retro, American feel. From the outside, the place doesn’t look very big, but in reality the diner is quite spacious, comfortably able to fit a well stocked bar, a moderately sized dinning area while also offering a handful of private booths tucked away in darker corners of the diner, and even boasting a dance floor with a small stage to play live music when available.'
-	'Sitting at one end of the bar, you see <a href="exec:gt ''city_kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
+	'The Roadhouse is decorated with bright neon signs, pictures of flashy American muscle cars and pop art, and even the body of an old pink Cadillac hanging from the ceiling, like something from an old American TV show. Although it looks cramped and small from the outside, The Roadhouse is surprisingly spacious inside, managing to fit a well-stocked bar and a moderately-sized dining area alongside several private booths tucked away in the corners and dance floor.'
+	'A large, flashy jukebox features popular hits from the 50s to the 80s, mostly American and British but with a sprinkling of songs from other European countries. This is obviously a speciality diner, as very few places in Russia look anything like this!'
 	*nl
 	'They serve American style meals'
 
@@ -52,308 +75,539 @@ if $ARGS[0] = 'table':
 	end
 end
 
-if $ARGS[0] = 'vlad':
+if $ARGS[0] = 'fabi2':
 	$menu_loc = 'city_kafe'
-	$menu_arg = 'vlad'
+	$menu_arg = 'fabi2'
 	menu_off = 0
+	minut += 5
 	cla
 	*clr
+	gs 'stat'
+	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/fabi/FAB-001.jpg"></center>'
+
+	'Fabi is filling in some government forms as you sit down next to him. "Hi, <<$pcs_nickname>>. "What are you up to?'
+	
+	act 'Leave': gt 'city_kafe', 'start'
+	act 'Quit your job': gt 'city_kafe', 'quit'
+end
+
+if $ARGS[0] = 'quit':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'quit'
+	menu_off = 0
+	workKafe['job'] = -1
 	minut += 5
+	cla
+	*clr
+	gs 'stat'
+	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/fabi/FAB-002.jpg"></center>'
+	'"I''m going to need my work book back," you tell him. "I''m afraid I''m quitting."'
+
+	'Fabi frowns, but nods. "Waitress isn''t the sort of job young girls tend to stay in long-term, so I understand. Wait here."'
+
+	'He disappears into the office and comes back a few minutes later with your work book. As he hands it to you, he tells you, "You''re good worker and we all like you here. If you change your mind, the position is likely to be open for a little while as I look for someone else."'
+
+	act 'Leave the diner': minut += 5 & gt 'city_residential'
+
+	act 'Sit down at a table': gt 'city_kafe', 'table'
+	
+	act 'Talk to Fabi about getting your old job back': gt 'city_kafe', 'old_job'
+end
+
+if $ARGS[0] = 'old_job':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'old_job'
+	menu_off = 0
+	workKafe['job'] = 1
+	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
+	'"Ah, <<$pcs_nickname>>, good to see you again!" Fabi says with a smile. "What brings you back to The Roadhouse?"'
 
-	if npc_rel['A41'] = 0:'At the end of the bar sits a short, but very broad caucasian, he''s writing something.'
-	if npc_rel['A41'] > 0:'At the end of the bar sits the owner of the diner, Givi K. He''s writing something.'
+	'"I was wondering if you needed any help," you tell him. "I''d like to waitress for you again."'
 
-	if workKafe['job'] = 0:
-		if GiviSex >= 2 and Givisexday < 1 and Venera < 4:
-			act 'Have some fun with Givi':
-				*clr & cla
-				Givisexday = 1
-				GiviSex += 1
-				'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-				'You go behind the bar to Givi and tell him you want to do something.'
-				'"Wow, <<$pcs_nickname>> you must be so bored!" says Givi K. unbuttoning his pants.'
+	'His smile widens. "I loved having you here. We still need the help, so if you want to come back to work the same hours you''re welcome."'
 
-				act 'To kneel':
-					*clr & cla
-					harakBoy = 2
-					gs 'boyStat', 'A41'
-					npc_sex[$boy] += 1
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/barbj.jpg"></center>'
-					'You bend down so the customers can''t see you behind the bar and kneel before Givi, as he takes out his member.'
-					gs 'oral', 'start'
-					'Givis grabs you by the hair and pulls your mouth deeply on to his cock.'
-					gs 'arousal', 'bj', 15, 'sub'
-					gs 'stat'
+	act 'Leave the diner': minut += 5 & gt 'city_residential'
 
-					act 'Continue to suck.':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum31.jpg"></center>'
-						'A hot jet of sperm hits the back of your throat. You start to swallow his cum, and <<$boydesc>> continues to cum in your mouth. Finally the flow of hot, pungent liquid stops.'
-						gs 'cum_call','mouth_swallow',$boy,1
-						'"Best waitress, ever!" Says Givi as he gives you 500 <b>₽</b>.'
-						money += 500
-						gs 'arousal', 'end'
-						gs 'stat'
+	act 'Sit down at a table': gt 'city_kafe', 'table'
+end
 
-						act 'Leave':gt 'city_kafe', 'start'
-					end
-				end
-			end
-		end
-	else
-		if GiviSex >= 2 and Givisexday < 1 and Venera < 4:
-			act 'Have some fun with Givi':
-				*clr & cla
-				Givisexday = 1
-				GiviSex += 1
-				'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-				'You go behind the bar to Givi and tell him his paperwork will be much easier after taking a break.'
-				'"Have I got something you want?" asks K. Givi not interested in your answer. He takes you by the hand.'
-				gs 'stat'
+if $ARGS[0] = 'fabi':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'fabi'
+	menu_off = 0
+	minut += 5
+	cla
+	*clr
+	gs 'stat'
+	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/fabi/FAB-001.jpg"></center>'
 
-				act 'Kneel':
-					*clr & cla
-					smenaKafe += 1
-					harakBoy = 2
-					gs 'boyStat', 'A41'
-					npc_sex[$boy] += 1
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/barbj.jpg"></center>'
-					'You bend down so the customers can''t see you behind the bar and kneel before Givi, as he takes out his member'
-					gs 'oral', 'start'
-					'Givis grabs you by the hair and pulls your mouth deeply on to his cock.'
-					gs 'arousal', 'bj', 15, 'sub'
-					gs 'stat'
+	'The owner is a tall man but stooped as though bowed under the weight of great burdens. As you approach, he looks up from his papers and gives you a tired smile. "Hello. I''m Fabiyan Pankratov, owner of The Roadhouse. Everyone calls me Fabi. I don''t think I''ve seen you around here before. What can I do for you?"'
 
-					act 'Continue to suck.':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum31.jpg"></center>'
-						'A hot jet of sperm hits the back of your throat. You start to swallow cum, and <<$boydesc>> continues to cum in your mouth. Finally the flow of hot, pungent liquid stops.'
-						gs 'cum_call','mouth_swallow',$boy,1
-						gs 'arousal', 'end'
-						gs 'stat'
+	'"I''m <<$pcs_firstname>> <<$pcs_lastname>>," you tell him. "I was wondering if you have any waitress jobs available?"'
 
-						act 'Leave':gt 'city_kafe', 'start'
-					end
-				end
-			end
-		end
+	'His smile broadens and he looks a little less tired. "Ah, so you want to work here? Well why wouldn''t you? Rockabilly music, the greaser subculture, Cadillacs and motorcycles and hamburgers! I love this period of American culture, it''s so vibrant and exciting! I''ve put every ruble I have into making this place the perfect recreation of an American diner from 1958. Who doesn''t love that?"'
 
-		act 'Resign':
-			cla
-			work = 0
-			workKafe['job'] = 0
-			pay = smenaKafe * 600
-			money += pay
-			smenaKafe = 0
-			'Givi Karapetovich sadly shakes his head, "Okay, here''s your <<pay>> <b>₽</b> and employment history. Go."'
-
-			act 'Leave':gt 'city_kafe', 'start'
-		end
-	end
+	'A glance around the place shows you that the diner is barely half full, and most of those dining here are eating Russian food rather than American. Fabi is still raving about America in the 1950s, talking about Elvis Presley and someone called Carl Perkins and cheeseburgers and French fries and honestly it''s all a bit of a whirlwind, but his enthusiasm is honest and infectious and before long you''re thinking maybe this place has more going on than it would appear on the surface. Still, you came here for a reason, so after a while you clear your throat and say, "Fabi? About the job?"'
 
-	if workKafe['job'] > 0 and week > 1 and week < 5:'Hi, <<$pcs_nickname>>. Skipping work?'
-	if workKafe['job'] > 0 and week > 4:'Well, hello <<$pcs_nickname>>!'
-	if npc_rel['A41'] = 1 and workKafe['job'] < 1:'He looks up waiting for you to speak.'
+	'He grins sheepishly. "Sorry, I get carried away sometimes. So, you want to work here. Let me tell you about the job. We''re open every day from 12:00 to 20:00. You''d be working five days a week, Monday through Friday. You''d be expected to arrive between 11:00 and 12:00, before we open, to help get the place ready – if you''re late you don''t work that day. You don''t work, you don''t get paid. Pay is 600 rubles per shift plus whatever you get in tips, and you get paid on the 25th of each month. On days you work, we give you a free meal. Oh, and local regulations say I have to hold your work book as long as you''re employed here. So, are you interested?"'
 
-	if npc_rel['A41'] = 0:
-		npc_rel['A41'] = 1
-		'Hello! I''m Givi Karapetovich, owner of the diner. What do you want?'
+	act 'Yes':
+		*nl
+		minut += 5
+		gs 'stat'
+		cla
+		'You hand over your work book and Fabi takes it with a smile. "Good! Now remember, you have to be here between 11:00 and noon, Monday through Friday."'
+		act 'Leave': gt 'city_kafe', 'start'
 	end
+	
+	act 'No':gt 'city_kafe', 'start'
+end
 
-	if (work = 0 and workKafe['job'] = 0 and cheatWork = 0) or (workKafe['job'] = 0 and cheatWork = 1):
-		act 'Apply for a job at the diner':
-			cla
-			'You ask Givi if he has any job openings at the diner.'
-			*nl
-			if hotcat < 4:'No no no, you would scare all the customers away. You need to improve your appearance, try better clothing, use makeup, brush your hair. You look just terrible.'
-			if hotcat >= 4:
-				'"Of course you want to work here, who doesn’t?" Givi says with a dreamy sigh, "The rockabilly music, greaser subculture, and 1950s pop art — I love everything about that time in American culture, which is why I invested every penny I had bringing this place to life!" he says with a grand flourish. He continues to gush about American culture for what seems like forever, until you finally clear your throat and bring him back to reality.'
-				'Annoyed that you interrupted him, he scoffs and gives you a stern look. "So many people don’t understand what I’m trying to do here. Customers demand I serve more Russian cuisine and all these "bands" can’t even play a halfway decent Johnny Cash song!" You can see him grinding his teeth as he talks. "In the end, I’m left with no choice but to give into their demands or lose customers…" He takes a deep breath and rubs his temples. "I try to introduce some culture to Russia, and all I get in return is complaints…"'
-				*nl
-				'After a moment, his anger has subsided and he looks to have mellowed a bit. "Right…so you want to work here." Givi gives you a once over, examining you from head to toe. "Alright, these are the working conditions." He says flatly.'
-				'"The diner is open from 12 to 22 every day, except on Mondays. You’ll work Tuesdays, Wednesdays and Thursdays, and I expect you to be here between 11 and 12, before we open. If you do not come to work, that day will not count towards your salary, which is paid on the 25th of each month. Each shift you’ll earn 600 ₽, plus whatever you bring in as tips. You also get the added bonus of free meals."'
-				*nl
-				'He pauses for a moment, as if making sure you absorbed everything he said. "Oh, and one more thing." Givi holds out his hand, "I''ll be taking your work book. I need dedicated employees and can’t have you applying for other jobs while working here. So, are you interested?"'
-
-				act 'Take the job':
-					cla
-					*nl
-					work = 1
-					workKafe['job'] = 1
-					smenaKafe = 0
-					'You hand over your work book, and with a smile Givi takes it. "Don''t forget: work is every Tuesday, Wednesday and Thursday, and you need to be here between 11 and 12."'
 
-					act 'Leave':gt 'city_kafe', 'start'
-				end
-			end
+!!--------------------------------------------Work day--------------------------------
 
-			act 'Leave':gt 'city_kafe', 'start'
-		end
+if $ARGS[0] = 'work':
+	$location_type = 'event'
+	*clr & cla
+	workKafe['at_work'] = 1
+	gs 'stat'
+	smenaKafe += 1
+	
+	if rand(0,5) = 0:
+		gt 'city_kafe', 'beg1'
+	elseif rand(0,4) = 0:
+		gt 'city_kafe', 'beg2'
+	elseif rand(0,3) = 0:
+		gt 'city_kafe', 'beg3'
+	elseif rand(0,2) = 0:
+		gt 'city_kafe', 'beg4'
+	elseif rand(0,1) = 0:
+		gt 'city_kafe', 'beg5'
+	else
+		gt 'city_kafe', 'beg6'
 	end
+end
 
-	act 'Leave':gt 'city_kafe', 'start'
+if $ARGS[0] = 'beg1':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'beg1'
+	menu_off = 0
+	workKafe['tips_roll'] += 30
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/BEG-001.jpg"></center>'
+	'The lunch rush starts strong and stays strong, and you spend the first few hours running frantically just to keep up. It''s not bad though – all your customers are in good moods and nobody has any major problems, and being busy like this makes the time go fast. If every day were like this you''d have no complaints.'
+	act 'Lunch time': gt 'city_kafe', 'lunch'
 end
 
-if $ARGS[0] = 'work':
+if $ARGS[0] = 'beg2':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'beg2'
+	menu_off = 0
+	workKafe['tips_roll'] -= 30
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/BEG-002.jpg"></center>'
+	'Today starts off slow but builds so that a couple hours in the place is almost as full as it ever gets during lunch. It''s not bad at first, but there''s always that one table that messes up your day. This time it''s a group of young executive-types who talk loudly amongst themselves and place very particular orders, each changing their minds several times as they tell you what they want. You double-check the orders before you leave the table and you''re sure you have it right, but when you bring them their food, each of them complains that something is wrong. One of them claims he ordered something you''re sure he never mentioned at all! You get the suspicion that they might be doing it just to screw with someone who can''t screw back, but as much as you''d like to argue, you''re just too busy. Besides, Fabi insists that an American-style diner should have American-style service, which he says is "The customer is always right." Sometimes the customers are wrong and sometimes they''re jerks, but you do it Fabi''s way and do your best to put the unpleasantness behind you.'
+	act 'Lunch time': gt 'city_kafe', 'lunch'
+end
+
+if $ARGS[0] = 'beg3':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'beg3'
+	menu_off = 0
+	workKafe['tips_roll'] += 30
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/BEG-003.jpg"></center>'
+	'Some days are just fun, and today is one of them. The crowd for lunch isn''t huge but it is happy, with some families (maybe tourists) and bunch of regular customers who are happy to see you and who engage you in good-natured banter and teasing. Everyone seems like they''re having a good time, and some of them include you in it for a few moments. Aside from the normal issues that arise, the first part of the day flows smoothly and easily, and you make decent tips too.'
+	act 'Lunch time': gt 'city_kafe', 'lunch'
+end
+
+if $ARGS[0] = 'beg4':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'beg4'
+	menu_off = 0
+	workKafe['tips_roll'] -= 30
+	!!Fabi
+	npc_rel['A41'] += 1
+	!!Ashot
+	npc_rel['A42'] += 1
+	!!Marisha
+	npc_rel['A93'] += 1
+	!!Nika
+	npc_rel['A43'] += 1
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/BEG-004.jpg"></center>'
+	'It''s a slow lunch rush and you''re able to take some time and chat with friendly customers and with your coworkers. One large group does come in, tourists from another part of Russia, and they''re fascinated by the décor and the theme. They take pictures of everything, including you. You cheerfully pose for the happy people, and since it''s a quiet day you can spend time at their table telling them about the diner and what it''s like to work here. They vow to tell everyone back home to come to the Roadhouse whenever they visit St. Petersburg!'
+	act 'Lunch time': gt 'city_kafe', 'lunch'
+end
+
+if $ARGS[0] = 'beg5':
 	$menu_loc = 'city_kafe'
-	$menu_arg = 'work'
+	$menu_arg = 'beg5'
 	menu_off = 0
+	workKafe['tips_roll'] += 40
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/BEG-005.jpg"></center>'
+	'You get slammed as soon as the doors open, a flood of people filling every table and not slowing for hours. It''s all you can do to keep your head above water as you run from table to table taking orders, delivering food, checking on customers, and resolving issues. It''s stressful and challenging, but you don''t screw up anything major and your customers leave satisfied, which is about the best you can expect from a day like today.'
+	act 'Lunch time': gt 'city_kafe', 'lunch'
+end
+
+if $ARGS[0] = 'beg6':
+	$menu_loc = 'city_kafe'
+	$menu_arg = 'beg6'
+	menu_off = 0
+	workKafe['tips_roll'] -= 40
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/BEG-006.jpg"></center>'
+	'Today is one of those days you wish you''d stayed in bed. The customers are inexplicably grumpy, you make a few irksome mistakes, there are complaints about the menu and the food, and generally everything kind of sucks. It only gets worse toward the end of lunch rush when two groups of young men, all of them already very drunk in spite of the early hour, get into a shouting match that rapidly escalates into shoving. Fabi and Ashot hurry to push them out the doors and onto the street, where they continue to argue and shout at each other for some time. All of this frightens off customers, which means you have fewer people to wait on and you get fewer tips.'
+	act 'Lunch time': gt 'city_kafe', 'lunch'
+end
+
+if $ARGS[0] = 'lunch':
 	$location_type = 'event'
 	*clr & cla
-	minut += 5
-	workKafe['at_work'] = 1
+	!!set time to 15:30
+	minut += 270 - minute
 	gs 'stat'
-	smenaKafe += 1
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'You have arrived for work at the diner, Givi K. writes in a book that you came to work on time and stands behind the bar. The kitchen cook is a sturdy young caucasian, Ashot. Another waitress Irina is preparing for work. Tamara the dishwasher is cleaning the sink.'
+	'Your break time comes, giving you a chance to sit down, eat some food, talk to your coworkers, and maybe go to the bathroom.'
+	
+	if city_cafe['lunch'] ! daystart:
+		act 'Eat lunch': gt 'city_kafe', 'lunch'
+	end
+	if city_cafe['lunch_talk'] ! daystart:
+		act 'Talk to Fabi': gt 'city_kafe', 'lunch_fabi'
+		act 'Talk to Ashot': gt 'city_kafe', 'lunch_ashot'
+		act 'Talk to Marisha': gt 'city_kafe', 'lunch_marisha'
+		act 'Talk to Nika': gt 'city_kafe', 'lunch_nika'
+	end
+	act 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
+	act 'Return to work': gt 'city_kafe', 'events'
+end
 
-	act 'Start work':
-		cla
-		minut = 0
-		hour = 12
-		npc_rel['A41'] += rand(5, 10)
-		gt 'city_kafe', 'workPred'
+if $ARGS[0] = 'lunch':
+	city_cafe['lunch'] = daystart
+	frost = 0
+	minut += 15
+	pcs_health += 10
+	fat += 4
+	pcs_energy += 40
+	if pcs_hydra >= 100:
+		pcs_hydra += 20
+	else
+		pcs_hydra += 40
 	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/shared/food/food_'+rand(1, 4)+'.jpg"></center>'
+	'You take your time eating your meal and playing on your phone. It''s just a light lunch but quite tasty and<<$mtxt>>'
+	gs 'stat'
+	act 'Finish': gt 'city_kafe', 'lunch'
+end
 
-	act 'Resign':
-		cla
-		work = 0
-		workKafe['job'] = 0
-		workKafe['at_work'] = 0
-		pay = smenaKafe * 600
-		money += pay
-		smenaKafe = 0
-		'Givi Karapetovich sadly shakes his head, "Okay, here''s your <<pay>> <b>₽</b> and employment history. Go."'
-
-		act 'Leave':gt 'city_kafe', 'start'
+if $ARGS[0] = 'lunch_fabi':
+	city_cafe['lunch_talk'] = daystart
+	minut += 10
+	npc_rel['A41'] += 1
+	*clr & cla
+	gs 'stat'
+	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/fabi/FAB-001.jpg"></center>'
+	'You spend much of your break chatting with Fabi. He''s a nice man, kind and generous, but he always has a lot on his mind and he always looks tired. He talks to you about his favorite topics: American cuisine, American culture, American music, and how the people of St. Petersburg just don''t understand what he''s trying to achieve with the Roadhouse.'
+	if city_cafe['lunch'] ! daystart:
+		act 'Eat lunch': gt 'city_kafe', 'lunch'
 	end
+	act 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
+	act 'Return to work': gt 'city_kafe', 'events'
 end
 
-if $ARGS[0] = 'workPred':
-	$menu_loc = 'city_kafe'
-	$menu_arg = 'workPred'
-	menu_off = 0
-	$loc_arg = 'workPred'
-	$loc = 'city_kafe'
-	$location_type = 'event'
-	killvar '$locclass'
+if $ARGS[0] = 'lunch_ashot':
+	city_cafe['lunch_talk'] = daystart
+	minut += 10
+	npc_rel['A42'] += 1
 	*clr & cla
-	gs 'kit_din'
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'You''re at work in the café, the cook <a href="exec:gt ''city_kafe2'', ''ashot''">Ashot</a> is busy in the kitchen. Your fellow server <a href="exec:gt ''city_kafe2'', ''ira''">Ira</a> waits tables with customers. The owner <a href="exec:gt ''city_kafe2'', ''givi''">Givi K.</a> is standing behind the bar.'
-	'A small door leads to the <a href="exec:gt ''city_kafe2'', ''toilet''">toilets</a>.'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Ashot/ASH-001.jpg"></center>'
+	'Most of your break is spent in the kitchen chatting with Ashot, whose irrepressible good mood and constant smile seem as much a part of him as north and south are parts of the compass. He tells you stories about his family, many of which revolve around him doing something crazy and being a disappointment to his parents, something he doesn''t seem too bothered about. "They''ll be proud of me yet!" he vows cheerfully.'
+	if city_cafe['lunch'] ! daystart:
+		act 'Eat lunch': gt 'city_kafe', 'lunch'
+	end
+	act 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
+	act 'Return to work': gt 'city_kafe', 'events'
+end
 
-	if npc_rel['A41'] > 60:npc_rel['A41'] = 60
-	if npc_rel['A41'] > 50 and GiviSex = 0:npc_rel['A41'] = 50
+if $ARGS[0] = 'lunch_marisha':
+	city_cafe['lunch_talk'] = daystart
+	minut += 10
+	npc_rel['A93'] += 1
+	*clr & cla
+	gs 'stat'
+	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Marisha/MAR-001.jpg"></center>'
+	'Marisha has some quiet time when you''re on break and you two spend it chatting as much as her duties permit. Honestly, you do most of the talking, as she is as guarded and reserved as she always is at work, but she listens with interest and makes comments and asks questions that make you think about things in new ways. She''s a smart girl, even if she usually chooses not to show it, and you can''t help but wonder if waitressing in a diner is really the best use of her talents.'
+	if city_cafe['lunch'] ! daystart:
+		act 'Eat lunch': gt 'city_kafe', 'lunch'
+	end
+	act 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
+	act 'Return to work': gt 'city_kafe', 'events'
+end
 
-	if IrinaSlut = 1 and hour = 22:
-		*clr & cla
-		IrinaSlut = 2
-		gs 'stat'
-		'<center><b><font color="maroon">The Roadhouse</font></b></center>'
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-		'Your shift has finished and Ira has disappeared somewhere. Looking around you see that Givi is nowhere to be seen. Tamara has slipped out the door, and Ashot is putting the dishes away.'
+if $ARGS[0] = 'lunch_nika':
+	city_cafe['lunch_talk'] = daystart
+	minut += 10
+	npc_rel['A43'] += 1
+	*clr & cla
+	gs 'stat'
+	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Nika/NIK-001.jpg"></center>'
+	'You eat your lunch in the kitchen, spending the time talking to Nika as she washes dishes. She''s bright, bubbly, and energetic as always, talking about partying and clubbing – she''s especially fond of the nightclub over in the City Center – and how much fun St. Petersburg can be if you don''t have a steady guy to tie you down. She definitely seems to be enjoying her life, and she tells you tales of prowling the streets until dawn and shutting down every fun bar in town.'
+	if city_cafe['lunch'] ! daystart:
+		act 'Eat lunch': gt 'city_kafe', 'lunch'
+	end
+	act 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
+	act 'Return to work': gt 'city_kafe', 'events'
+end
 
-		act 'Search for missing Ira':
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/irinaslut.jpg"></center>'
-			'You walk to the back room from as a pleased looking Givi emerges, fastening his belt. He smiles at you and says, "What a good whore you found me. Help cleaning her up. After what she has done this guy does not have anything left."'
-			'You go into the back room and see Irina there bent over. Sperm is sprayed all over her naked butt. Ira blissfully moans "Such a thrill, I''ve never done something this naughty before."'
+if $ARGS[0] = 'events':
+	!!set time to 18:00
+	if hour = 15:
+		miunt += 180 - minut
+	else
+		minut += 120 - minut
+	end
+	if city_cafe['events_firsttime'] = 0:
+		gt 'city_kafe', 0
+	elseif city_cafe['events_firsttime'] = 1:
+		gt 'city_kafe', 1
+	elseif city_cafe['events_firsttime'] = 2:
+		gt 'city_kafe', 2
+	elseif city_cafe['events_firsttime'] = 3:
+		gt 'city_kafe', 3
+!!	elseif rand(0,4) <= 1:
+!!		gt random events yet to be added
+	else
+		gt 'city_kafe', 'shift_end'
+	end
+end
 
-			gs 'arousal', 'voyeur_sex', 15
-			gs 'stat'
+if ARGS[0] = 0:
+	npc_rel['A93'] += 1
+	minut += 10
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Marisha/MAR-002.jpg"></center>'
+	'During a lull, you find yourself chatting with the other waitress, Marisha. She''s a tall, pretty girl who always seems to be smiling, but who also always seems to be holding something back. You get to talking about the job, and the subject of tips comes up. "Tips are what let you make a living from this job," she tells you. "You definitely want to do everything you can to maximize them."'
 
-			act 'Clean Ira and take her home':
-				cla
-				minut += 15
-				gs 'stat'
-				'Taking a napkin you wipe the cum from her ass, help her to feet and sort her out. Ira, regaining her senses, looks at you with a beatific smile "That Givi is chock-bellied ugly, but he fucked me like I''ve never been fucked before. I even lost consciousness from an orgasm."'
-				'Ira is still floating in ecstasy, so you decide to walk her home. At her front door, she kisses you on the lips and leaves.'
+	'"How do I do that?" you ask.'
 
-				gs 'arousal', 'end'
-				gs 'stat'
+	'"Well, first of all wear a waitress uniform," she tells you. "There''s no dress code here, but you definitely make more if you wear appropriate clothing. Your skill as a waitress plays a big part too of course. And I hate to say it, but honestly the hotter you are, the better your tips. People, especially guys, want to give money to pretty women who show some skin."'
 
-				act 'Go home': minut += 5 & gt 'city_residential'
-			end
+	'"Isn''t that...I dunno, kind of tacky?" you ask.'
 
-			if pcs_horny >= 50:
-				act 'Lick off her "problem"':
-					*clr & cla
-					pcs_horny += 10
-					minut += 5
-					gs 'boyStat', 'A41'
-					gs 'cum_call','mouth_swallow',$boy,1
-					gs 'boyStat', 'A93'
-					npc_sex[$boy] += 1
-					gs 'arousal', 'cuni_give', 5
-					gs 'arousal', 'rimming_give', 5
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/irinaslut2.jpg"></center>'
-					'You kneel behind Ira, her reddening holes telling you she has just been fucked in her pussy and ass. You begin to lick up the sperm.'
-					'Ira moans, "Oh, it''s so nice, why was I afraid of this before?"'
-
-					act 'Swallow sperm and take Ira home':
-						cla
-						'You swallow the sperm, help her to her feet and sort her out. Ira, regaining her senses, looks to you with a beatific smile "That Givi is chock-bellied ugly, but he fucked me like I''ve never been fucked before. I even lost consciousness from an orgasm."'
-						'Ira is still floating in ecstasy, so you decide to walk her home. At her front door, she kisses you on the lips and leaves.'
-						gs 'arousal', 'end'
-						gs 'stat'
+	'Marisha laughs. "We aren''t strippers here, but I figure if I can bring home more at the end of the day by wearing a short skirt and showing some cleavage, well, why not? I keep it professional – I don''t show nearly as much here as I would at a club or at the beach. I just leave the top button or two undone and make sure they can see some leg. Customers get to look at something they like, and I walk home with their money in my purse."'
 
-						act 'Go home': minut += 5 & gt 'city_residential'
-					end
-					gs 'willpower', 'swallow', 'force', 'medium'
-					if will_cost <= pcs_willpwr:
-						act 'Spit sperm into her mouth (<<will_cost>> Willpower)':
-							*clr & cla
-							gs 'willpower', 'pay', 'force'
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/irinaslut3.jpg"></center>'
-							'You take Iras head in your hands and lift her face to yours. She readily opens her mouth and you spit the sperm into it.'
-							gs 'arousal', 'kiss', 5, 'dom'
-							gs 'stat'
+	'"I guess that doesn''t sound too bad," you admit.'
 
-							act 'Kiss':
-								*clr & cla
-								'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/irinaslut4.jpg"></center>'
-								'You move your lips to Ira and start kissing her exchanging the sperm between your mouths. Finally you both swallow some of the semen.'
-								gs 'arousal', 'kiss', 5, 'dom'
-								gs 'stat'
+	'"And because of that, I can afford to pay my rent and buy the necessities of life," she tells you with a grin. "I couldn''t otherwise. Give it some thought."'
+	act 'Return to work': gt 'city_kafe', 'shift_end'
+elseif ARGS[0] = 1:
+	npc_rel['A41'] += 1
+	minut += 10
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/fabi/FAB-002.jpg"></center>'
+	'Since there are almost no patrons in the place at the moment, you wander over to the end of the bar where Fabi is sitting doing some paperwork. He welcomes you with a smile and asks how you like working here so far.'
 
-								act 'Take Ira home':
-									cla
-									minut += 15
-									'You wipe the remaining sperm off your face, help her to her feet and sort her out. Ira,regaining her senses, looks to you with a beatific smile "That Givi is chock-bellied ugly, but he fucked me like I''ve never been fucked before. I even lost consciousness from an orgasm."'
-									'Ira is still floating in ecstasy, so you decide to walk her home. At her front door, she kisses you on the lips and leaves.'
-									gs 'arousal', 'end'
-									gs 'stat'
+	'"It''s only my second day," you tell him, "but it''s fun so far. Everyone is nice and the customers seem to enjoy it."'
 
-									act 'Go home': minut += 5 & gt 'city_residential'
-								end
-							end
+	'"Of course they enjoy it!" he laughs. "Why wouldn''t they? This is the best diner in St. Petersburg, and the only one with any style!" He goes on to tell you about how his family visited some friends in Chicago in the USA right after the USSR fell, and how those friends took them to a 1950s-themed restaurant. "It was the greatest day of my life. Ever since then, it''s been my dream to duplicate that experience here, with the music and the food and the aesthetic. Not that it''s been easy, and not that everyone seems to understand what I''m trying for here."'
 
-							act 'Take Ira home':
-								cla
-								minut += 15
-								gs 'stat'
-								'You wiped the remnants of sperm off your face, help her to feet and sort her out. Ira, regaining her senses, looks to you with a beatific smile "That Givi is chock-bellied ugly, but he fucked me like I''ve never been fucked before. I even lost consciousness from an orgasm."'
-								'Ira is still floating in ecstasy, so you decide to walk her home. At her front door, she kisses you on the lips and leaves.'
+	'"What are some of the problems?" you ask.'
 
-								act 'Go home': minut += 5 & gt 'city_residential'
-							end
-						end
-					else
-						act 'Spit sperm into her mouth (<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
-		end
+	'"A lot of people around here don''t get it," he complains. "I try to serve burgers and fried chicken, and customers come in and complain that they don''t see herring blini or piroshki on the menu. I have Johnny Cash and Buddy Holly on the jukebox, customers come in and complain that there''s no Little Big or Korni. I put up classy decorations like American advertisements and a Cadillac, and they come in and complain that there are no fucking stuffed bear heads on the wall."'
+
+	'You consider for a moment, then ask, "Is there something you could do to...I don''t know, to make it more what you want?"'
+
+	'"I''ve thought about getting live music in here," he admits. "We could put a little stage right over there, just big enough for a trio or a quartet. But there are no decent rockabilly bands in St. Petersburg, and anyway I can''t save enough money to do that with Rakov on my back."'
+
+	'"Rakov?" you ask. "Who''s Rakov?"'
+
+	'Fabi is suddenly nervous as though he just realized he said something he shouldn''t have, and he gathers together the papers he was working on and stands up from his desk. "Um, never mind. That''s not something you need to worry about. I''ll just finish these up back in the office."'
+	act 'Return to work': gt 'city_kafe', 'shift_end'
+elseif ARGS[0] = 2:
+	npc_rel['A43'] += 1
+	minut += 10
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Nika/NIK-002.jpg"></center>'
+	'With things quiet for the moment, you wind up talking with Nika, the dishwasher, as she takes a break. She''s a pretty woman in her mid-20s, and she''s reading a book at a table as you approach. "Hey, mind if I join you?"'
+
+	'"Please do," she says with a smile as she sets her book down. "How do you like working here?"'
+
+	'"So far, so good," you reply. "So many new faces. I''m sure there are regulars I''ll get to know, but mostly it''s just been a whirlwind."'
+
+	'Nika laughs. "Oh, there are regulars alright. Some of them you should steer clear of, but mostly they''re alright."'
+
+	'"Who should I avoid?" you ask.'
+
+	'"One guy, Borushka, is always trying to get Marisha to do things with him," Nika says, shaking her head. "I think he''s wasting his time, I''m pretty sure she plays for the other team, if you know what I mean. On the other hand there''s a guy who comes in here sometimes, Instinsky, who''s a gambler. He sometimes lays bets with bookies for us if we''re feeling adventuresome. He''s alright."'
+
+	'After a moment''s pause, you cautiously say, "The other day, Fabi mentioned something about someone named Rakov. Is that a regular too?"'
+
+	'Nika immediately grows sober. "Not exactly. Mr. Rakov is an Avtoritet in the Grekov gang. He''s a gangster, and very bad news. He comes in here sometimes with a couple of scary-looking guys. Fabi got into money trouble a couple years back and borrowed a bunch of cash from Rakov, thinking he could pay it back fast. But you know how that goes, you never really finish paying off guys like that. I don''t know how much Fabi still owes, but it''s a lot. Maybe even more than he originally borrowed."'
+
+	'You don''t know what to say to that, so you change the subject to the St. Petersburg nightlife, which is something Nika seems intimately familiar with, and spend the next few minutes talking with her about party spots until customers come in that you need to attend to.'
+	act 'Return to work': gt 'city_kafe', 'shift_end'
+elseif ARGS[0] = 3:
+	npc_rel['A42'] += 1
+	minut += 10
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Ashot/ASH-002.jpg"></center>'
+	'You''re killing time in the kitchen during a slow period when you start chatting with Ashot, the fry cook. He''s a good-looking guy, funny and relaxed, and he''s enjoyable to talk to. You''re curious about him, because he looks like he''s from the Caucasus but he sounds like a native of St. Petersburg, so you tactfully raise the topic.'
+
+	'"Oh, my great-grandfather was a civil engineer," he tells you. "After the Great Patriotic War, Leningrad was trashed, so the state sent him up here to help rebuild, and we''ve been here ever since. I''ve never even been to Armenia. Nobody in my family goes there except to find a wife or husband, but then we come back. We''re Russian now."'
+
+	'"Do you have any siblings?" you ask.'
+
+	'He laughs. "Yes. Everyone in my family for generations have been professionals of some kind, and my brother and sister are no exception. My brother is a lawyer in Moscow, and my sister is in residency as a cardiac surgeon here in the city."'
+
+	'"And you''re a short-order cook in a diner," you observe with a grin.'
+
+	'"And my parents remind me how disappointed they are in me every time they see me," he agrees with a carefree laugh. "But all that studying and stuff isn''t for me. I''m going to make my fortune another way."'
+
+	'"And what way is that?"'
+
+	'"There''s plenty of money out there for a guy who''s willing to hustle for it," he shrugs. "I''ve got all kinds of things lined up, people who want things that I can go find. Oh nothing illegal, but things you can''t just look for on the internet."'
+
+	'You arch an eyebrow. "That sounds interesting. Like what?"'
+
+	'"Oh, all kinds of stuff," he says with a mysterious grin. "If you''re interested, maybe I can cut you in if you''re willing to help me out with it."'
+
+	'"And there will be money involved?" you ask.'
+
+	'"Of course!"'
+
+	'From her dishwashing station, you see Nika roll her eyes and shake her head.'
+	act 'Return to work': gt 'city_kafe', 'shift_end'
+end
+
+
+if $ARGS[0] = 'shift_end':
+	minut += 120
+	if rand(0,5) = 0:
+		gt 'city_kafe', 'end_1'
+	elseif rand(0,4) = 0:
+		gt 'city_kafe', 'end_2'
+	elseif rand(0,3) = 0:
+		gt 'city_kafe', 'end_3'
+	elseif rand(0,2) = 0:
+		gt 'city_kafe', 'end_4'
+	elseif rand(0,1) = 0:
+		gt 'city_kafe', 'end_5'
+	else
+		gt 'city_kafe', 'end_6'
+	end
+end
+
+
+if $ARGS[0] = 'end_1':
+	workKafe['tips_roll'] += 50
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/END-001.jpg"></center>'
+	'You''re fortunate this evening to be able to wait on three regulars who are fully immersed into the vibe Fabi is trying to present. Each uses an English-language nickname – Lucky, Spike, and Slim – and they pepper their conversation with 1950s American slang. You follow most of it, though some is confusing: you have no idea what it means when they call you a “hepkitty”, for example, and their suggestions for your attire are confusing (why would you wear a poodle''s skirt? Why would a dog wear a skirt in the first place?) But you laugh with them all the same, because they''re fun guys who eat dinner here all the time and who always tip well. They''re Fabi''s favorite customers, so he always spends time at their table chatting with them whenever they come in.'
+	act 'Count your tips': gt 'city_kafe', 'tips'
+end
+		
+if $ARGS[0] = 'end_2':
+	workKafe['tips_roll'] -= 40
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/END-002.jpg"></center>'
+	'It''s a bad evening. You''re saddled with a continuous stream of demanding customers who are constantly calling for your attention, and by the time your shift ends you''re so frazzled you barely know which end is up. You begin mixing up orders, forgetting drinks, dropping plates, and generally having a lousy time of it. You''re ready to pull out your hair when Marisha grins and tells you, “Look at it this way: in a hundred years, who''s gonna care?” You can''t help but feel like you heard that in a movie once, and it''s not particularly comforting.'
+	act 'Count your tips': gt 'city_kafe', 'tips'
+end
+		
+if $ARGS[0] = 'end_3':
+	workKafe['tips_roll'] += 30
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/END-003.jpg"></center>'
+	'It''s a busy night and time flies. You''re constantly rushing back and forth between the kitchen and the dining area as fast as your feet can take you, and you find yourself in a good groove. You get all your orders right, you don''t forget anything, and you make enjoyable, light conversation with most of your customers. On nights like this being a waitress isn''t a bad job at all; sure it''s not intellectually challenging and the pay isn''t great, but it can be quite enjoyable to bring good food to happy people so that they can enjoy themselves. Plus your tips should be decent.'
+	act 'Count your tips': gt 'city_kafe', 'tips'
+end
+		
+if $ARGS[0] = 'end_4':
+	workKafe['tips_roll'] += 40
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/END-004.jpg"></center>'
+	'Ugh. Most of the time the customers at the Roadhouse are pretty cool, but sometimes, like tonight, they can be a real pain in the ass. An unusually high percentage of your tables tonight are guys with no women, and most of them seem to want to hit on you more than they want to eat. Some of it is playful, but a few of the guys get overly insistent and make it unpleasant just to walk past their table with their constant comments. One guy even gets a little too handsy and you “accidentally” dump his kvass into his lap; his suggestions for how you can clean it up are unwelcome. Oh well, at least you get a few decent tips.'
+	act 'Count your tips': gt 'city_kafe', 'tips'
+end
+		
+if $ARGS[0] = 'end_5':
+	workKafe['tips_roll'] -= 30
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/END-005.jpg"></center>'
+	'The evening begins pretty well, except for a couple of misbehaved kids whose parents are more interested in looking at their phones than monitoring their demonspawn. It all goes downhill, though, with a single jerk: one customer seems determined to have a terrible time, which wouldn''t be so bad if he weren''t also determined to do it loudly. No matter what you do, his complaints echo from one end of the room to the other. He shouts at you for being too slow, he tells you that you got his order wrong (until his dining companion corrects him and tells him that you gave him what he ordered, much to his annoyance), and he insists that everything tastes terrible. He takes up way too much of your time and energy, and in the end he stiffs you on the tip. Asshole.'
+	act 'Count your tips': gt 'city_kafe', 'tips'
+end
+		
+if $ARGS[0] = 'end_6':
+	workKafe['tips_roll'] -= 50
+	!!Fabi
+	npc_rel['A41'] += 1
+	!!Ashot
+	npc_rel['A42'] += 1
+	!!Marisha
+	npc_rel['A93'] += 1
+	!!Nika
+	npc_rel['A43'] += 1
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/END-006.jpg"></center>'
+	'S. L. O. W. For some reason almost nobody comes in for dinner, and you and the rest of the staff spend most of your time standing around and talking. You give your few customers excellent service and they tip you well, but there aren''t enough of them to make this a lucrative evening. But you actually enjoy yourself more than you''d expect, because you and your coworkers tell each other funny stories and jokes and talk about music and movies and anything else to pass the time. By the time the last customer leaves, you feel like you know all of them a little bit better.'
+	act 'Count your tips': gt 'city_kafe', 'tips'
+end
+		
+	
+if $ARGS[0] = 'tips':
+	!! Bonus for wearing server outfit
+	if PCloStyle2 = 2: workKafe['tips_roll'] += 50
+	!! Tips calc: 4 x rands for a bell curve base. Add the daily modifier appearance -1 per point under 100 and +1 per point over and serving skill.
+	workKafe['tips_total'] = (rand(1,125) + rand(1,125) + rand(1,125) + rand(1,125)) + workKafe['tips_roll'] + pcs_apprnc - 100 + pcs_servng
+	!! minimum and maximum at 100 and 500 with small randomisation
+	if workKafe['tips_total'] < 100: workKafe['tips_total'] = 110 - rand(0,20)
+	if workKafe['tips_total'] > 500: workKafe['tips_total'] = 510 - rand(0,20)
+	!! Reset daily modifier
+	workKafe['tips_roll'] = 0
+	!! Skill and attribute gains
+	if pcs_servng < 100:gs 'exp_gain', 'servng', 1
+	if pcs_vital < 30:gs 'exp_gain', 'vital', 1 + rand(0,steroid_dose) & steroidcheck = 1
+	if steroidcheck = 1 and steroid_dose > 0 and rand(1,5) <= steroid_dose:clit_size += rand(0,1) & killvar 'steroidcheck'
+	*clr & cla
+	gs 'stat'
+	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
+	'With your shift finally over you sit at one of the tables and count out your tips for the day.'
+	*nl
+	'You made <<workKafe[''tips_total'']>> rub in tips.'
+	*nl
+	'Fabi switches the lights off in the kitchen and with a smile ushers you out of the dinner so he can finish closing up.'
+	act 'Leave': gt 'pav_residential'
+end
+
+
+!! old events in case any are worth saving
+!!{
 	elseif hour < 22:
 		act 'Serve tables':
 			*clr & cla
@@ -928,6 +1182,7 @@ if $ARGS[0] = 'razvod':
 		end	
 	end
 end
+}
 
 --- city_kafe ---------------------------------
 

+ 1 - 1
locations/city_lake.qsrc

@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'vlake1':
 	act 'Flirt with them':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake2.jpg"></center>'
-		'The men sit next to you and and start flirting with you while trying to sneak a touch of your body.'
+		'The men sit next to you and start flirting with you while trying to sneak a touch of your body.'
 
 		gs 'willpower', 'misc', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:

+ 3 - 2
locations/city_mansion_residence_2.qsrc

@@ -21,12 +21,13 @@ if $ARGS[0] = 'yliving':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
 	end
-
 	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
 
 	if ymanrem[7] = 2:
 		'A large room where you can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your luxury <a href="exec:gt ''divan'', ''start''">leather sofa</a>.'
+		if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to the sofa.'
 		gs 'subkid'
+		gs 'music_actions', 'music_icon'
 	end
 end
 
@@ -254,7 +255,7 @@ if $ARGS[0] = 'yoffice':
 		'There''s a <a href="exec:gt ''Komp'', ''start''">computer</a> sitting on your antique <a href="exec:gt ''stol'', ''start''">desk</a>.'
 
 	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_actions', 'not_alone' should be added with the correct conditions.
-	gs 'music_actions', 'start'
+	gs 'music_actions', 'music_icon'
 		
 	end
 end

+ 1 - 1
locations/city_park.qsrc

@@ -187,7 +187,7 @@ if $ARGS[0] = 'start':
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 
-	gs 'music_actions', 'start'
+	gs 'music_actions', 'music_icon'
 
 	if hour <= 7 or hour >= 21:
 		!!Succubus active hunting, can only hunt successfully once a day, but can try until success

+ 1 - 1
locations/clothing_QV.qsrc

@@ -90,7 +90,7 @@ if $ARGS[0] = 'clothing_list':
 		i = 1
 		:loopgm_outfits
 		if gm_outfits[i] = 1:
-			gs 'clothing_attributes', 'gm_server', i
+			gs 'clothing_attributes', 'gm_outfits', i
 			gs 'clothing_QV', 'clo_filter'
 			!!sort by filter
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:

+ 2 - 2
locations/dachain.qsrc

@@ -32,7 +32,7 @@ if $args[0] = 'start':
 	*nl
 	if komp = 1:
 		gs 'internet_mobile', 'get_access'
-		'Your <a href="exec: internet_free = 2 & gt ''Komp'',''start''">laptop</a> is on the table, but there is no internet coverage here.'
+		'Your <a href="exec: gt ''Komp'',''start''">computer</a> is on the table. Unfortunately, there is no internet service in the village.'
 	end
 	*nl
 	
@@ -60,7 +60,7 @@ if $args[0] = 'start':
 !!-------------------------------------------------------------------------------------------------------------------------------------
 
 	!! IMPORTANT: if there is anything added later that could mean that others are in the room, gs 'music_actions', 'not_alone' should be added with the correct conditions.
-	gs 'music_actions', 'start'
+	gs 'music_actions', 'music_icon'
 	
 end
 

+ 1 - 1
locations/dachi.qsrc

@@ -24,7 +24,7 @@ end
 
 act 'Go to the highway':minut += 15 & nroad = 5 & gt 'road'
 
-if func('homes_properties', 'is_accessible_property','village_cottage'):
+if func('homes_properties', 'has_access','village_cottage'):
 	'Enter <a href="exec:gt ''dachamy'', ''start''">your yard</a>.'
 	'Across the street from your cottage is another <a href="exec:gt ''etoexhib'', ''pos8''">cottage</a> almost identical to yours.'
 	if hour = meethour:

+ 1 - 1
locations/dreams.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'hypno_dreams':
 	if guy = 0:
 		'You wake up feeling strange and excited, even though you have never had sex the dream felt very real.'
 	elseif pcs_vag > 0 and stat['vaginal'] = 0:
-		'You have never had a cock in your pussy and and yet the sensations from the dream felt very real and have gotten you a little excited.'
+		'You have never had a cock in your pussy and yet the sensations from the dream felt very real and have gotten you a little excited.'
 	elseif stat['vaginal'] > 0 or pcs_vag > 0:
 		'It seems your <<$vaginatipe>> pussy urgently needs some attention.'
 	end

+ 1 - 1
locations/exhibitionistshop.qsrc

@@ -221,7 +221,7 @@ if $ARGS[0] = 'bodysuit':
 	*clr & cla
 	gs'stat'
 
-	act 'Return': minut += 1 & gt 'exhibitionistshop', 'changingroom'
+	act 'Return': minut += 1 & gt 'exhibitionistshop', 'start'
 
 	i = 1
 

+ 4 - 36
locations/fit.qsrc

@@ -3,6 +3,8 @@
 CLOSE ALL
 if $ARGS[0] = 'start':
 	*clr & cla
+	$loc = 'fit'
+	$loc_arg = 'start'
 	$menu_loc = 'fit'
 	$menu_arg = 'start'
 	killvar '$locclass'
@@ -46,7 +48,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-! Pay cash or card - Hooded Silence.
+!! Pay cash or card - Hooded Silence.
 
 	*nl
 	if abonement = 0:
@@ -83,7 +85,6 @@ if $ARGS[0] = 'dressing room':
 	$locclass = 'changingroom'
 	*clr & cla
 	gs 'stat'
-
 	'<center><b><font color="maroon">Dressing</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/locker.jpg"></center>'
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
@@ -94,7 +95,7 @@ if $ARGS[0] = 'dressing room':
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
 	end
-	'There is a <a href="exec: gt ''fit'', ''watercooler''">drinking fountain</a> near the doors to the bathrooms.'
+
 	act 'Exit the locker room':
         if $clothingworntype ! 'nude' and PCloswimwear = 0:
             if Fit['FMR'] = 0 and vidage <= 40 and hotcat >=6 and fame['city_sport'] >=10:
@@ -826,38 +827,5 @@ if $ARGS[0] = 'FMR':
 	end
 end
 
-if $ARGS[0] = 'watercooler':
-	*clr & cla
-	minut += 1
-	$menu_arg = 'watercooler'
-	$loc_arg = 'watercooler'
-	gs 'stat'
-
-	'<center><b><font color="maroon">Community Center - Restrooms</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/bathroom_entrance.jpg"></center>'
-	
-	act 'Leave': gt 'fit', 'start'
-	act 'Take a drink':
-		*clr & cla
-		frost = 1
-		if alko > 0: alko -= 1
-		minut += 2
-		pcs_health += 10
-		pcs_energy += 4
-		if pcs_hydra >= 100:
-			pcs_hydra += 25
-		else
-			pcs_hydra += 50
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		gs 'stat'
-		
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/waterfountain.jpg"></center>'		
-		'You drink some water.'
-		act 'Finish': gt 'fit', 'start'
-	end
-end
-
 --- fit ---------------------------------
 

+ 60 - 1
locations/food.qsrc

@@ -7,6 +7,7 @@
 ! Large Meal: +100 pcs_energy +100 pcs_hydra, +14 fat (steak dinners, new years party dinner, etc)
 ! Bagged Lunch: +40 pcs_energy +40 pcs_hydra, +5 fat (sandwich, cold leftovers, etc)
 ! Health Meal: +50 pcs_energy +50 pcs_hydra, +1 fat (Diet food, Salads, rice cakes with peanut butter)
+! 16/10/2022 - Added watercooler - HS
 
 menu_off = 1
 
@@ -149,7 +150,7 @@ if $ARGS[0] = 'reuben':
 		else
 			act 'Finish':gt $loc, $loc_arg
 		end
-	end	
+	end
 
 	killvar '$_eat'
 end
@@ -918,6 +919,64 @@ if $ARGS[0] = 'aftermeal':
 	end
 end
 
+if $ARGS[0] = 'watercooler':
+	*clr & cla
+	frost = 0
+	if alko > 0: alko -= 1
+	minut += 2
+	pcs_health += 10
+	pcs_energy += 4
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	gs 'stat'
+
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/waterfountain.jpg"></center>'
+	'You drink some water and feel refreshed.'
+	act 'Finish':gt $loc, $loc_arg
+end
+
+
+!! ------------ just the stats, no descriptions or extra stuff with cost -----------------------
+
+if $ARGS[0] = 'only_cost_snack':
+	*clr & cla
+	gs 'stat'
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 20
+	fat += 6
+	pcs_energy += 20
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	killvar '$_eat'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
+
+if $ARGS[0] = 'only_cost_light_snack':
+	*clr & cla
+	money -= val($_eat['<<args[1]>>,price'])
+	pcs_health += 5
+	pcs_mood += 20
+	fat += 3
+	pcs_energy += 20
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	killvar '$_eat'
+
+	*nl
+	'Added to your order'
+	gt 'food_menu'
+end
 
 --- food ---------------------------------
 

+ 52 - 1
locations/food_menu.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] ! 'mod':
 	food_loc = 1
 	killvar '$_drink'
 	killvar '$_eat'
-end	
+end
 
 act 'Return':
 	killvar 'food_loc'
@@ -474,6 +474,57 @@ elseif $loc = 'uni_cafe':
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
 	$_drink['5,price'] = 200
+elseif $loc = 'city_coffee_hole':
+	$loc_arg = 'eat'
+	'<center><B><font color=maroon>Cafe "Coffee hole"</font></B></center>'
+	*nl
+	'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
+	$_eat['0,name'] = 'Biscotti'
+	$_eat['0,type'] = 'only_cost_light_snack'
+	$_eat['0,price'] = 100
+	$_eat['1,name'] = 'Cannoli'
+	$_eat['1,type'] = 'only_cost_snack'
+	$_eat['1,price'] = 120
+	$_eat['2,name'] = 'Muffin'
+	$_eat['2,type'] = 'only_cost_snack'
+	$_eat['2,price'] = 120
+	$_eat['3,name'] = 'Croissants'
+	$_eat['3,type'] = 'only_cost_snack'
+	$_eat['3,price'] = 120
+	$_eat['4,name'] = 'Danish'
+	$_eat['4,type'] = 'only_cost_snack'
+	$_eat['4,price'] = 120
+	$_eat['5,name'] = 'Cookies'
+	$_eat['5,type'] = 'only_cost_light_snack'
+	$_eat['5,price'] = 100
+	$_eat['6,name'] = 'Miagkie Plushki s Sakharom'
+	$_eat['6,type'] = 'only_cost_snack'
+	$_eat['6,price'] = 120
+	$_eat['7,name'] = 'Mannik'
+	$_eat['7,type'] = 'only_cost_snack'
+	$_eat['7,price'] = 120
+	$_eat['8,name'] = 'Korzinochki'
+	$_eat['8,type'] = 'only_cost_snack'
+	$_eat['8,price'] = 120
+
+	$_drink['0,name'] = 'Tea'
+	$_drink['0,type'] = 'only_cost_tea'
+	$_drink['0,price'] = 120
+	$_drink['1,name'] = 'Espresso'
+	$_drink['1,type'] = 'only_cost_esp'
+	$_drink['1,price'] = 100
+	$_drink['2,name'] = 'Black Coffee'
+	$_drink['2,type'] = 'only_cost_bco'
+	$_drink['2,price'] = 120
+	$_drink['3,name'] = 'Cappuccino'
+	$_drink['3,type'] = 'only_cost_cof'
+	$_drink['3,price'] = 150
+	$_drink['4,name'] = 'Cafe Latte'
+	$_drink['4,type'] = 'only_cost_cof'
+	$_drink['4,price'] = 150
+	$_drink['5,name'] = 'Iced Latte'
+	$_drink['5,type'] = 'only_cost_cof'
+	$_drink['5,price'] = 150
 end
 
 $_str = '<center><table border="0" width="800" cellpadding="0" cellspacing="1">'

+ 1 - 1
locations/foto_models2.qsrc

@@ -824,7 +824,7 @@ if $ARGS[0] = 'jeff_modelling':
 	act'Continue':
 		if jeff['model'] = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy.jpg"></center>'
 			'"Whooo! Yipee!"'
 			'You find her in the middle of a photoshoot and she''s jumping up and down on the bed kicking her legs and striking poses mid air.'
 			'The photographer seems really excited saying, "Yes! I love that Jeff! Do you think you can do that again but get your leg higher so we can get a better look at your pussy?"'

+ 1 - 1
locations/furi.qsrc

@@ -361,7 +361,7 @@ act 'Try to get a lift':
 				end
 			end
 
-			if prezik > 0:
+			if prezik > 0 or prezikcount > 0:
 				act 'Yes':
 					*clr & cla
 					gs 'stat'

+ 4 - 0
locations/furisex.qsrc

@@ -23,6 +23,10 @@ if ARGS[0] = 2:
 	'When you reach out to touch it, he playfully slaps it away and says: "Put on the condom first, girl! I don''t take risks with slutty hitchhikers."'
 	if prezik > 0:
 		dynamic $prezik
+	elseif prezikcount > 0:
+		prezik += 1
+		prezikcount -= 1
+		dynamic $prezik
 	else
 		'Your search through your pile of clothes becomes more and more frantic; you''d swear you had a condom with you! When you turn to the trucker to tell him you can''t find one, he wordlessly hands you one from his pocket before you can say anything.'
 	end

+ 1 - 32
locations/gdktoilet.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Community Center - Restrooms</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/bathroom_entrance.jpg"></center>'
 
-	'There is a <a href="exec: gt ''gdktoilet'', ''watercooler''">drinking fountain</a> near the doors to the bathrooms.'
+	'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the bathrooms.'
 	
 	act 'Go outside': gs 'arousal', 'end' & gt 'pav_commcenter'
 	
@@ -81,38 +81,7 @@ if $ARGS[0] = 'start':
 	if (week < 6 and hour >= 14 and hour < 20) or (week >= 6 and hour >= 9 and hour < 20): act 'Go to the gym': gt 'gdksport', 'start'
 end
 
-if $ARGS[0] = 'watercooler':
-	*clr & cla
-	minut += 1
-	$menu_arg = 'watercooler'
-	$loc_arg = 'watercooler'
-	gs 'stat'
 
-	'<center><b><font color="maroon">Community Center - Restrooms</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/bathroom_entrance.jpg"></center>'
-	
-	act 'Leave': gt 'gdktoilet', 'start'
-	act 'Take a drink':
-		*clr & cla
-		frost = 1
-		if alko > 0: alko -= 1
-		minut += 2
-		pcs_health += 10
-		pcs_energy += 4
-		if pcs_hydra >= 100:
-			pcs_hydra += 25
-		else
-			pcs_hydra += 50
-		end
-		cumspclnt = 2
-		gs 'cum_cleanup'
-		gs 'stat'
-		
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/bathroom/waterfountain.jpg"></center>'		
-		'You drink some water.'
-		act 'Finish': gt 'gdktoilet', 'start'
-	end
-end
 
 
 --- gdktoilet ---------------------------------

+ 3 - 3
locations/gopsex.qsrc

@@ -218,7 +218,7 @@ if $ARGS[0] = 'gopsex_select':
 			gs 'willpower', 'sex', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'shulga_room', 'start'
+			gt 'vasilyhome', 'livingroom'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -258,7 +258,7 @@ if $ARGS[0] = 'shgopsex':
 			*clr & cla
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'shulga_room', 'start'
+			gt 'vasilyhome', 'livingroom'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -515,7 +515,7 @@ if $ARGS[0] = 'shgopsex_group':
 			*clr & cla
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'shulga_room', 'start'
+			gt 'vasilyhome', 'livingroom'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 17 - 17
locations/gschool_break.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/occupied.jpg"></center>'
 		'You head into the girls bathroom and find the gopnik girls hanging out. One is in each of the stalls, standing on the toilets so they can look over the top of the doors. You can tell they are being bitches and blocking any of the other girls from using the toilets. Luckily you just need to wash your hands, so you''re not bothered by it. Lera spots you and says "Occupied, you will just have to wait."'
-		'You know it is pointless to reply, so you just shrug, finish washing your hands, and head back outside.'
+		'You know it''s pointless to reply, so you just shrug, finish washing your hands, and head back outside.'
 		act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 	elseif girls_event_rand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/pose.jpg"></center>'
@@ -168,21 +168,21 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand <= 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsgossip'+rand(1,2)+'.jpg"></center>'
-		'As you enter the restroom, there is a group of girls clustered together chatting about the latest gossip or whatever has caught their interest of late. As you go about your business, you over hear them saying;'
+		'When you enter the restroom, you find a group of girls clustered together chatting about the latest gossip or whatever has caught their interest of late. As you go about your business, you overhear them saying;'
 		gs 'gschool_gossip', 'mixed'
 
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose'+rand(1,2)+'.jpg"></center>'
-		'As you enter the restroom, there is a group of girls clustered together. They are taking turns posing as a group while one girl takes their picture. They do this over and over until every girl has her picture taken in a group and they all like the pictures.'
+		'When you enter the restroom, you see a group of girls clustered together taking turns posing as a group while one girl takes their picture. They do this over and over until every girl has her picture taken in a group and they all like the pictures.'
 		
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/gopniks.jpg"></center>'
 		if grupTipe = 4:
-			'As you enter the restroom, you see Paulina, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. You exchange smiles and with them as you go about your business.'
+			'As you enter the restroom, you see Pauline, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. You exchange smiles with them as you go about your business.'
 		else
-			'As you enter the restroom, you see Paulina, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. As you go about your business, they start taunting you as well, but you know better than to start something back at 3-to-1 odds. You do your best to ignore them as you go about your business.'
+			'As you enter the restroom, you see Pauline, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. As you go about your business, they start taunting you as well, but you know better than to say something back. You do your best to ignore them as you go about your business.'
 		end
 
 		gs 'gschool_break', 'restroom_actions'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					'You shake your head. "What? No I''m not going to eat your pussy."'
 					'She takes a step towards you. "You better, if you know what''s good for you."'
 					'You know these gopnik girls are dangerous. Most of them like to fight for fun, and many of them carry knives. Not sure how serious she is about this, you know you''re far enough away that you can just dash out of the restroom, but she might come after you later. You could also just do what she says and lick her pussy.'
-!!ToDo: Add in a option to fight once we revamp fighting (nutluck)
+!!ToDo: Add in an option to fight once we revamp fighting (nutluck)
 					gs 'willpower', 'cuni', 'resist', 'easy'
 					if will_cost <= pcs_willpwr:
 						act 'Make a run for it (<<will_cost>> Willpower)':
@@ -296,7 +296,7 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 		if grupTipe = 4:
-			'As you walk in, you see a group of gopnik girls standing around chatting. You know who Lena, Lera, Paulina and Ekaterina are, but the others are from your brother''s class. They exchange causal greetings with you, but seem engrossed in their conversation.'
+			'As you walk in, you see a group of gopnik girls standing around chatting. You know who Lena, Lera, Pauline and Ekaterina are, but the others are from your brother''s class. They exchange causal greetings with you, but seem engrossed in their conversation.'
 			act 'Listen in':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
@@ -308,14 +308,14 @@ if $ARGS[0] = 'girls_restroom_events':
 !!					*clr & cla
 !!					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 !!					'You speak up. "Can I join in on this fight night? It sounds fun."'
-!!					'They stop and look at you, Paulina and Ekaterina sizing you up before Ekaterina grabs you roughly by the arm, squeezes your bicep and snorts. "I don''t know, we''ll think about it and let you know." Not sure what more you can do, you just nod and go about your business.'
+!!					'They stop and look at you, Pauline and Ekaterina sizing you up before Ekaterina grabs you roughly by the arm, squeezes your bicep and snorts. "I don''t know, we''ll think about it and let you know." Not sure what more you can do, you just nod and go about your business.'
 !!					*nl
 !!					gs 'gschool_break', 'restroom_actions'
 !!				end
 			end
 			gs 'gschool_break', 'restroom_actions'
 		else
-			'As you walk in, you see a group of gopnik girls standing around chatting. It''s obvious they are up to something as they turn as one to glare at you. A chill run down your spine - you picked the wrong time to come to the bathroom. You know who Lena, Lera, Paulina and Ekaterina are, but the other ones are from your brother''s class. Paulina takes a step towards you and in a menacing tone says "Leave. Now!" You know you should leave since you are no match for these girls. If they decide to kick your ass, or worse, you won''t be able to prevent it or escape, but you are also tired of the gopniks acting like they run the school and the rules don''t apply to them.'
+			'As you walk in, you see a group of gopnik girls standing around chatting. It''s obvious they are up to something as they turn as one to glare at you. A chill run down your spine - you picked the wrong time to come to the bathroom. You know who Lena, Lera, Pauline and Ekaterina are, but the other ones are from your brother''s class. Pauline takes a step towards you and in a menacing tone says "Leave. Now!" You know you should leave since you are no match for these girls. If they decide to kick your ass, or worse, you won''t be able to prevent it or escape, but you are also tired of the gopniks acting like they run the school and the rules don''t apply to them.'
 			act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost < pcs_willpwr:
@@ -327,13 +327,13 @@ if $ARGS[0] = 'girls_restroom_events':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 					if fame['pav_slut'] > 200:
 						'You decide to stand up to them. "No! I have as much right to be in this bathroom as you do. If you don''t like it, then you leave."'
-						'Paulina gives you a dangerous smile. "Well, looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
+						'Pauline gives you a dangerous smile. "Well, looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
 						'Hearing that, you take a step back, but the other girls quickly surround you, giving you nowhere to go. As you start to look for a way to escape, Lena speaks up. "No, we can''t do it now. We''ll have to wait for her after school. If we give her the beating she deserves, the teachers will see the blood and marks on her face. It''s better to wait, so no one asks questions."'
 						*nl
 						'The other girls seem none to happy about waiting, but they understand the logic. For just a brief moment you think you might have got a reprieve, even if only a temporary one. Then Lera steps up and grabs you by the hair and says "Or we can teach her a lesson right now, and not leave any marks on her. At least none she will show anyone. She needs to see what happens to little sluts that don''t know their place. I''ve got all the toys we need in my backpack."'
 						*nl
 						'Ekaterina just shakes her head. "God, you''re such a fucking dyke, Lera."'
-						'Lera lets go of you and steps towards Ekaterina. "Fuck you bitch!" As Ekaterina steps towards Lera, Paulina gets between the two of them, dashing your hopes they might start fighting amongst themselves and allow you to escape. "Enough, both of you! Lera makes a good point though..." She looks at the rest of the girls. "So do we wait or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
+						'Lera lets go of you and steps towards Ekaterina. "Fuck you bitch!" As Ekaterina steps towards Lera, Pauline gets between the two of them, dashing your hopes they might start fighting amongst themselves and allow you to escape. "Enough, both of you! Lera makes a good point though..." She looks at the rest of the girls. "So do we wait or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
 						act 'Try to resist':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully1.jpg"></center>'
@@ -376,14 +376,14 @@ if $ARGS[0] = 'girls_restroom_events':
 											act 'Continue':
 												*clr & cla
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully6.jpg"></center>'
-												'Paulina puts on the other harness and then takes takes the dildo from Lera, making her pull it out of your ass, much to your relief. "Give me that! If we are going to do this, then we should at least fuck the slut right." Mounting the dildo to the harness, she kneels down behind you and shoves it back up your ass. It feels like the <<dick>>cm <<$dick_girth>> dildo is ripping your ass as both dildos are hammered into your holes.'
+												'Pauline puts on the other harness and then takes takes the dildo from Lera, making her pull it out of your ass, much to your relief. "Give me that! If we are going to do this, then we should at least fuck the slut right." Mounting the dildo to the harness, she kneels down behind you and shoves it back up your ass. It feels like the <<dick>>cm <<$dick_girth>> dildo is ripping your ass as both dildos are hammered into your holes.'
 												gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
 												gs 'arousal', 'anal_strap', -3, 'humiliation', 'maso', 'gangbang', 'lesbian'
 												gs 'stat'
 												act 'Continue':
 													*clr & cla
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully7.jpg"></center>'
-													'The girl on the bottom finally has enough and pushes you off her dildo. Paulina keeps fucking your ass while the other one slides out from under you. The other girls soon demand a turn, although none seem to want to use your pussy anymore. They take turns wearing a strapon and fucking your ass.'
+													'The girl on the bottom finally has enough and pushes you off her dildo. Pauline keeps fucking your ass while the other one slides out from under you. The other girls soon demand a turn, although none seem to want to use your pussy anymore. They take turns wearing a strapon and fucking your ass.'
 													gs 'arousal', 'anal_strap', 10, 'humiliation', 'maso', 'gangbang', 'lesbian'
 													gs 'arousal', 'end'
 													gs 'stat'
@@ -392,7 +392,7 @@ if $ARGS[0] = 'girls_restroom_events':
 														gs 'clothing', 'strip_all'
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully8.jpg"></center>'
-														'Your ass has been pounded so hard and so much it feels like it''s on fire. They finally seem to get bored and the last one pulls the dildo out of your ass. Paulina reaches down, grabs you by the chin and says "Next time we fucking tell you to leave, you better listen." With that the girls leave, laughing and talking about you, but you''re not paying attention. You crawl over into one of the stalls and curl up, waiting until you can no longer hear them. Maybe next time you will do what Paulina says and leave when you can. Once you are sure they are gone, you do your best to clean up, but that''s when you notice they have also stolen your clothes.'
+														'Your ass has been pounded so hard and so much it feels like it''s on fire. They finally seem to get bored and the last one pulls the dildo out of your ass. Pauline reaches down, grabs you by the chin and says "Next time we fucking tell you to leave, you better listen." With that the girls leave, laughing and talking about you, but you''re not paying attention. You crawl over into one of the stalls and curl up, waiting until you can no longer hear them. Maybe next time you will do what Pauline says and leave when you can. Once you''re sure they''re gone, you do your best to clean up, but that''s when you notice they have also stolen your clothes.'
 														act 'Continue': gt 'gschool_break', 'naked_bathroom'
 													end
 												end
@@ -404,12 +404,12 @@ if $ARGS[0] = 'girls_restroom_events':
 						end
 					else
 						'You decide to stand up to them. "No! I have as much right to be in this bathroom as you do. If you don''t like it, then you leave."'
-						'Paulina gives you a dangerous smile. "Well looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
+						'Pauline gives you a dangerous smile. "Well looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
 						'Hearing that, you take a step back, but the other girls quickly surround you, giving you nowhere to go. As you start to look for a way to escape, Lena speaks up. "No, we can''t do it now. We''ll have to wait for her after school. If we give her the beating she deserves, the teachers will see the blood and marks on her face. Better to wait, so no one asks questions."'
 						*nl
 						'The other girls don''t seem happy about waiting, but they understand the logic. For just a brief moment you think you might have got a reprieve, even if only a temporary one. Then Lera steps up and grabs you by your hair and says "Or we can teach her a lesson right now."'
 						*nl
-						'Paulina looks at the rest of the girls. "So do we wait, or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
+						'Pauline looks at the rest of the girls. "So do we wait, or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
 						act 'Try to resist':
 							*clr & cla
 							gs 'clothing', 'strip_all'
@@ -925,7 +925,7 @@ if $ARGS[0] = 'boys_restroom_events':
 									act 'Take his load':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/alylav5.jpg"></center>'
-										'He quickly pulls out of you and pushes you down, your ass barely hits the toilet seat before hot steams of cum splatter your tits. Once the last spurts splash onto your tits, he pulls up his pants and steps out of the stall. "Not bad, but I''m not sure if you''re better than Alyona though. I might need a few more ''demonstrations'' to make up my mind. Perhaps a side by side comparison would be best."' 
+										'He quickly pulls out of you and pushes you down, your ass barely hitting the toilet seat before hot steams of cum splatter your tits. Once the last spurts splash onto your tits, he pulls up his pants and steps out of the stall. "Not bad, but I''m not sure if you''re better than Alyona though. I might need a few more ''demonstrations'' to make up my mind. Perhaps a side by side comparison would be best."' 
 										'It takes you a few minutes to straighten out your clothes and by the time you do and step out, he is gone.'
 										gs 'cum_call', 'breasts', 'A155', 1
 										gs 'arousal', 'foreplay', 2

+ 2 - 2
locations/gschool_cheerleading.qsrc

@@ -310,7 +310,7 @@ if $ARGS[0] = 'practice':
 					'The squad is already out practicing when you arrive at the locker room and change. You don''t have the privelege of owning a uniform and instead train in your sports clothing.'
 				end
 			else
-				'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
+				'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their outfits while chatting to each other. You head to your locker and strip down. You pull your uniform out and start getting dressed. You just finish tying your shoes when Albina gives the order to head out into the PE hall.'
 			end
 		end
 
@@ -457,7 +457,7 @@ if $ARGS[0] = 'game':
 	if pregtime >= 90:
 		gt 'gschool_cheerleading', 'Cheerleadersreact'
 	else
-		'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their uniforms while chatting to each other. You head to your locker and and strip down. You pull your uniform out and start getting dressed.'+iif(cheerleadingQW['backup_game'] = 1,' The fact that you are actually wearing the uniform and are going out to perform with them doesn''t seem real to you, even if the girls have only reluctantly let you join them.','')+' You finish tying your shoes when Albina stands on the bench. "You already know that today is game day! So let''s go out there and cheer our boys to victory!"'
+		'Heading into the locker room, you see Albina and the rest of the squad have already arrived and are in various states of changing into their uniforms while chatting to each other. You head to your locker and strip down. You pull your uniform out and start getting dressed.'+iif(cheerleadingQW['backup_game'] = 1,' The fact that you are actually wearing the uniform and are going out to perform with them doesn''t seem real to you, even if the girls have only reluctantly let you join them.','')+' You finish tying your shoes when Albina stands on the bench. "You already know that today is game day! So let''s go out there and cheer our boys to victory!"'
 		'The squad cheers in unison as you all head out onto the field.'
 
 		act 'Go to the field':

+ 24 - 1
locations/gschool_coolkid_chats.qsrc

@@ -1489,7 +1489,7 @@ if $ARGS[0] = 'sonia':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 	if fame['pav_slut'] > 200:
 		if npc_rel['A139'] >= 50:
-			'"Hey Sonia!" you greet her with a smile and she gives you a friendly smile.'
+			'"Hey Sonia!" you greet her with a smile and she gives you a friendly smile in return.'
 			'"Hey..." Her smile fades as she notices the looks everyone else is giving you. You try talking to her and at times she is very animated, only to catch herself and be a lot more reserved. You can tell she is worried about being seen talking to you, but at least she''s nice about it.'
 		elseif npc_rel['A139'] <= 20:
 			'"Hey Sonia!" you greet her with a smile.'
@@ -1503,6 +1503,12 @@ if $ARGS[0] = 'sonia':
 			'"Oh man!" Sonia groans and stretches. "I can''t WAIT for this day to be over!"'
 			'"What''s wrong?" you ask.'
 			'Sonia sighs and looks around. "Just tired of... all this. I just want to have some fun. Is that too much to ask?" The two of you start talking about some of your recent nights out and it seems like Sonia really wants to just cut loose.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class, Sonia says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+				'She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading, which is a bit disappointing, but at least she stuck around.'
 		else
@@ -1515,6 +1521,12 @@ if $ARGS[0] = 'sonia':
 			'"Oh man!" Sonia groans and stretches. "I can''t WAIT for this day to be over!"'
 			'"What''s wrong?" You ask her.'
 			'Sonia sighs and looks around. "Just tired of... all this. I just want to have some fun. Is that too much to ask?" The two of you start talking about some of your recent nights out and it seems like Sonia really wants to just cut loose.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class, Sonia says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+				'She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'"Have you seen the new clothes they''re selling at the garment factory in town?" you ask Sonia, trying to catch her interest, but you manage to do the exact opposite.'
 			'"Garment factory?" she asks with a hurt and slightly annoyed look. "What makes you think I shop at that place?"'
@@ -1528,6 +1540,11 @@ if $ARGS[0] = 'sonia':
 		if npc_rel['A139'] >= 50:
 			'"Hey Sonia!" you greet her with a smile and she gives you a friendly little wave.'
 			'"What''s up neeeeerd?" she asks with a giggle and you tell her you just wanted to hang out for a bit. With Sonia being so friendly, you slip into an easygoing banter with her for the rest of break.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class Sonia says. "Hey why don''t you come by my house sometime and we can hang out." She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading, which is a bit disappointing, but at least she stuck around.'
 		else
@@ -1539,6 +1556,12 @@ if $ARGS[0] = 'sonia':
 		if npc_rel['A139'] >= 50:
 			'"Hey Sonia!" you greet her with a smile and she gives you a friendly little wave.'
 			'"What''s up? Mind if I ask you some questions?" she asks and you shrug. She launches into a barrage of questions about partying with your fellow gopniks. What they''re like, what it''s like to run wild, etc. She seems very interested in what you and the other gopniks do for fun and you talk for a while, mostly sharing some of your favorite stories.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class, Sonia says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+				'She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading, which is a bit disappointing, but at least she stuck around.'
 		else

+ 1 - 1
locations/gschool_jock_chats.qsrc

@@ -1113,7 +1113,7 @@ if $ARGS[0] = 'ivan':
 	elseif fame['pav_slut'] >= 225:
 		if npc_rel['A3'] >= 50:
 			'You see Ivan standing by the lockers and approach him. You cover his eyes from behind with your hands and whisper in his ear. "Guess who?"'
-			'Ivan grabs your hands, pulls free and and turns around. "Judging by the mixture of your perfume and the shame I can smell in the air, who else could it be but the school''s resident minx?" he jokingly replies.'
+			'Ivan grabs your hands, pulls free and turns around. "Judging by the mixture of your perfume and the shame I can smell in the air, who else could it be but the school''s resident minx?" he jokingly replies.'
 			'"Come on, since when are you interested in gossip?" you reply, twirling a lock of hair with your finger and then running your eyes over Ivan''s body. "Besides, a little flirting never hurts, right?" you ask playfully.'
 			*nl
 			'"You sure know how to play this game, I''ll give you that," he replies. You flirt back and forth with each other for the next few minutes. The air between you is almost glowing. "By the way, if you ever decide you want to train your ass, let me know. I can help you with that." Ivan winks.'

+ 13 - 11
locations/gschool_nerd_chats.qsrc

@@ -149,17 +149,12 @@ if $ARGS[0] = 'julia':
 	gs 'npc_relationship', 'modify', 'A12', 'like'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-	if juliaQW['study_unlocked'] = 0 and npc_rel['A12'] >= 60:
-		juliaQW['study_unlocked'] = 1
-		if fame['pav_slut'] >= 175:
-			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She obliquely comments on your damaged reputation at school, but agrees to help you anyway. She doesn''t seem to care much either way as long as you don''t tell anyone.'
-		else
-			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure thing, <<$pcs_nickname>>. That could be fun!"'
-		end
-	elseif grupTipe = 5 and fame['pav_slut'] >= 175:
+	if grupTipe = 5 and fame['pav_slut'] >= 175 and juliaQW['slut_chat'] = 0 and npc_rel['A12'] >= 40:
 		*clr & cla
+		if juliaQW['study_unlocked'] = 0: juliaQW['study_unlocked'] = 1
+		juliaQW['slut_chat'] = 1
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/12.jpg"></center>'
-		'As you start to approach the nerds, Julia takes hold of your elbow. She leans in close to you and says quietly, "<<$pcs_nickname>>, I want to have a quick chart with you in private please. Then she walks out of the classroom, you wonder what the chat could be about. After all your life in school is difficult enough already getting tormented by most of your classmates. However, Julia has always been kind towards you so you decide to wait a moment and then follower, to find out what she wants. After all it can''t be any worse that it already is for you!'
+		'As you start to approach the nerds, Julia takes hold of your elbow. She leans in close to you and says quietly, "<<$pcs_nickname>>, I want to have a quick chart with you in private please. Then she walks out of the classroom, you wonder what the chat could be about. After all your life in school is difficult enough already getting tormented by most of your classmates. However, Julia has always been kind towards you so you decide to wait a moment and then follower, to find out what she wants. After all it can''t be any worse that it already is for you!"'
 		*nl
 		'Julia leads you away from most of your classmates so it''s not possible to be overheard.'
 		'"Sorry for the subterfuge <<$pcs_nickname>> but I wanted a quick word with you in private, I hope that''s okay?"'
@@ -175,13 +170,20 @@ if $ARGS[0] = 'julia':
 			'You respond, "Well many thanks for the kind offer Julia, it''s certainly something I''ll consider and I won''t say anything so don''t worry. That''s brightened up my day and is very kind of you."'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
+	elseif juliaQW['study_unlocked'] = 0 and npc_rel['A12'] >= 60:
+		juliaQW['study_unlocked'] = 1
+		if fame['pav_slut'] >= 175:
+			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She obliquely comments on your damaged reputation at school, but agrees to help you anyway. She doesn''t seem to care much either way as long as you don''t tell anyone.'
+		else
+			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees. "Sure thing, <<$pcs_nickname>>. That could be fun!"'
+		end
 	elseif fame['pav_slut'] >= 175:
 		if npc_rel['A12'] >= 50:
 			'A thin smile appears on Julia''s lips. "Hi <<$pcs_nickname>>." She chews her lip before releasing a sigh. "Look, don''t take this the wrong way. I like you, but..." A moment of awkward silence hangs in the air as Julia''s eyes refuse to face you. "With your reputation... It might be better if you stayed away for a bit. Radomir..." she sighs. "I... don''t want to give him more avenues to do something, you know?"'
 		elseif npc_rel['A12'] <= 20:
 			'Julia narrows her eyes. "<<$pcs_nickname>>... just stay away and don''t talk to me, or Zina ever again."'
 		else
-			'Julia smiles sadly. "Look <<$pcs_nickname>>... It''s not that I don''t like you but... I need you to stay away. Please.'
+			'Julia smiles sadly. "Look <<$pcs_nickname>>... It''s not that I don''t like you but... I need you to stay away. Please."'
 		end
 	elseif grupTipe = 1:
 		if npc_rel['A12'] >= 50:
@@ -248,7 +250,7 @@ if $ARGS[0] = 'julia':
 			if hotcat >= 6:
 				'Upon seeing you, Julia puts her homework away and smiles. "Oh! <<$pcs_nickname>>! How nice to see you! What did you think of our last lesson? Math with Tsarev... works. I''m not the greatest fan of the Shop... don''t tell my dad. But art? Mr. Vasilyev might mean well but... it lacks photography. There''s so much about shot composition that can even be extended to drawing!" She looks away briefly, her face reddening. "I mean, I could show you a lot about composition if you were willing to model for me..."'
 			else
-				'Upon seeing you, Julia puts her homework away and smiles. "Oh! <<$pcs_nickname>>! How nice to see you! What did you think of our last lesson? Math with Tsarev... works. I''m not the greatest fan of the Shop... don''t tell my dad. But art? Mr. Vasilyev might mean well but... it lacks photography. There''s so much about shot composition that can even be extended to drawing!'
+				'Upon seeing you, Julia puts her homework away and smiles. "Oh! <<$pcs_nickname>>! How nice to see you! What did you think of our last lesson? Math with Tsarev... works. I''m not the greatest fan of the Shop... don''t tell my dad. But art? Mr. Vasilyev might mean well but... it lacks photography. There''s so much about shot composition that can even be extended to drawing!"'
 			end
 		elseif npc_rel['A12'] <= 20:
 			if hotcat >= 6:

+ 2 - 2
locations/gschool_sex.qsrc

@@ -1282,7 +1282,7 @@ if $ARGS[0] = 'femdom_petka_doggy':
 				act 'Let him cum on you':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/petka/sex/school/locker/peggingfacial.jpg"></center>'
-					'You pull your dildo out of his ass and and squat down next to the bench. "Stand up." you tell him. He does as you ask and stands up. You take his dick in your hand and start jerking him off. It doesn''t take long until he starts cumming, his cum splattering all over your chin and breasts. He just keeps cumming, more than you have ever seen anyone cum. Once he finally stops, he has coated you pretty well. You let go of him and stand up.'
+					'You pull your dildo out of his ass and squat down next to the bench. "Stand up." you tell him. He does as you ask and stands up. You take his dick in your hand and start jerking him off. It doesn''t take long until he starts cumming, his cum splattering all over your chin and breasts. He just keeps cumming, more than you have ever seen anyone cum. Once he finally stops, he has coated you pretty well. You let go of him and stand up.'
 					gs 'arousal', 'foreplay', 5, 'dom'
 					gs 'cum_call', 'face', 'A6'
 					gs 'cum_call', 'breasts', 'A6'
@@ -1671,7 +1671,7 @@ if $ARGS[0] = 'victor_lockerroom_cum':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/victor/sex/locker9.jpg"></center>'
 	'He grabs you by the hair with one hand while he jerks off with the other. It doesn''t take long before he starts moaning loudly and hot sperm comes streaming out. Most of it lands on your face, but a little ends up in your open mouth. He keeps stroking his dick until he stops cumming. You lick the tip of his dick, licking up the last couple of drops of cum.'
 	*nl
-	'He pulls up his shorts, tucking his dick away as he looks around, apparently making sure no one is coming to find out what the noise was. He then looks down at you and smiles. "Congratulations, you just passed P.E. Now you better get cleaned up." Satisfied, he turns and and walks out of the locker room, leaving you on your knees with his cum all over your face.'
+	'He pulls up his shorts, tucking his dick away as he looks around, apparently making sure no one is coming to find out what the noise was. He then looks down at you and smiles. "Congratulations, you just passed P.E. Now you better get cleaned up." Satisfied, he turns and walks out of the locker room, leaving you on your knees with his cum all over your face.'
 	gs 'arousal', 'foreplay', 5
 	gs 'cum_call', 'face', 'A131'
 	gs 'arousal', 'end'

+ 1 - 1
locations/gschool_socialchg.qsrc

@@ -118,7 +118,7 @@ if $ARGS[0] = 'Pavlovsk slut':
 		if soniaPS = 0:
 			'"Go and hang out with the other losers because none of us give a shit about you anymore." Lazar says before turning and walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 		else	
-			'"Go and hang out with the other losers because none of us give a shit about you anymore. I''m sure you and and Sonia have a lot in common now." Lazar says mockingly before walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+			'"Go and hang out with the other losers because none of us give a shit about you anymore. I''m sure you and Sonia have a lot in common now." Lazar says mockingly before walking away. Albina looks at you with what you think is disappointment before she shakes her head and follows Lazar. Having been publicly shamed and disavowed by your clique, the other students are ready to prey on your weakness and either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
 		end	
 	elseif grupTipe = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'

+ 108 - 108
locations/gschool_socialchg1.qsrc

@@ -9,8 +9,8 @@ if $ARGS[0] = 'tLazar':
 	socialchg['tLazar_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
-	'You decide to walk over and see what the fuss is about. As usual, Lazar is showing off his skills as some of the younger kids challenge him 1-on-1 or even 1-on-2 and he easily bests them. You see several of the girls from school sitting on the bleachers watching Lazar and notice that he glances over at them from time to time, obviously trying to show off.'
-	'As you walk out onto the field, he waves at you to come over before he kicks the ball away so that the younger kids go chasing after it. You stop in your tracks when you see your brother is among the kids chasing the ball and you know he would do anything to embarrass you.'
+	'You decide to walk over and see what the fuss is about. As usual, Lazar is showing off his skills as some younger kids challenge him 1-on-1 or even 1-on-2, and he easily bests them. You see several girls from school sitting on the bleachers watching Lazar and notice that he glances at them from time to time, obviously trying to show off.'
+	'As you walk out onto the field, he waves at you to come over before he kicks the ball away so that the younger kids go chasing after it. You stop in your tracks when you see your brother among the kids chasing the ball, and you know he would do anything to embarrass you.'
 
 	act 'Run away':
 		cla & *clr
@@ -18,7 +18,7 @@ if $ARGS[0] = 'tLazar':
 		npc_rel['A149'] -= 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
-		'You blush and quickly turn your back before Kolka notices you. Lazar watches dumbfounded, wondering why you suddenly had a change of heart before he shrugs it off and challenges the kids to try and best him again.'
+		'You blush and quickly turn your back before Kolka notices you. Lazar watches dumbfounded, wondering why you suddenly had a change of heart before he shrugs it off and challenges the kids to try besting him again.'
 		act 'Leave': gt 'gschool_grounds', 'main'
 	end
 
@@ -37,7 +37,7 @@ if $ARGS[0] = 'tLazar':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 			'Turning around, you see Kolka and his friends laughing. Your face turns bright red and just as you''re about to yell at him, Lazar steps in. "Hey! Why did you do that?!"'
 			'You sigh. "It''s okay... He''s my stupid little brother. He''s probably just jealous that I''m talking to you."'
-			'Lazar nods before walking over and whispering at them. Kolka and his friends then walk up to you and apologize. You smile and turn to Lazar, giving him a little nod. The kids then start organizing themselves into teams for a game of football, asking Lazar to watch and give them some pointers. He laughs at their request, but eventually agrees. You feel it''s time for you to leave since it looks like Lazar is going to be busy, but just as you start to leave Lazar stops you. "Hey, why don''t you hang around and watch?"'
+			'Lazar nods before walking over and whispering at them. Kolka and his friends then walk up to you and apologize. You smile and turn to Lazar, giving him a little nod. Next, the kids start organizing themselves into teams for a football game, asking Lazar to watch and give them some pointers. He laughs at their request but eventually agrees. Finally, you feel it''s time to leave since it looks like Lazar will be busy, but just as you start to go, Lazar stops you. "Hey, why don''t you hang around and watch?"'
 			!! Maybe show photo request
 			gs 'camera', 'check_person', 'lazar'
 			act 'Maybe another time':
@@ -45,7 +45,7 @@ if $ARGS[0] = 'tLazar':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 				'You shake your head. "That''s okay, I''ve got some stuff I need to do. Maybe some other time."'
-				'He nods in response. "Okay, suit yourself." He then turns back to watch Kolka and his classmates play.'
+				'He nods in response. "Okay, suit yourself." He then turns back to watch Kolka and his classmates'' play.'
 				act 'Leave': gt 'gschool_grounds', 'sports'
 			end
 			act 'Sure':
@@ -58,13 +58,13 @@ if $ARGS[0] = 'tLazar':
 				else
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football4.jpg"></center>'
 				end
-				'The kids constantly yell at Lazar to watch them and he gives them support or advice, but after a while, they get into the game and you''re pretty sure they''ve forgotton that you and Lazar are there. "Hey, I''m going to take off. Talk to you later, okay?"'
+				'The kids constantly yell at Lazar to watch them, and he gives them support or advice. Still, after a while, they get into the game, and you''re pretty sure they''ve forgotten that you and Lazar are there. "Hey, I''m going to take off. Talk to you later, okay?"'
 				if npc_rel['A149'] >= 50 and hotcat > 5 and fame['pav_slut'] > 150:
-					'He reaches over and grabs you by the hand to stop you. "Why don''t you stick around? We could go over there behind those trees and have a little fun..."'
-					'"Yeah? What kind of fun?" you reply and he smiles.'
-					'"You know... fun." His body language and tone of voice leaves no doubt in your mind what he means, but you want him to say it anyway.'
-					'"Yeah, and exactly what is fun to you?" you ask teasingly and he grins. "Well... blowjobs are fun."'
-					'You roll your eyes and look over at Kolka and his friends. "They might see." you tell him while indicating to them. The trees aren''t that far away from the field.'
+					'He reaches over and grabs you by the hand to stop you. "Why don''t you stick around? We could go behind those trees and have a little fun..."'
+					'"Yeah? What kind of fun?" you reply, and he smiles.'
+					'"You know... fun." His body language and tone of voice leave you no doubt about what he means, but you want him to say it anyway.'
+					'"Yeah, and exactly what is fun to you?" you ask teasingly, and he grins. "Well... blowjobs are fun."'
+					'You roll your eyes and look over at Kolka and his friends. "They might see," you tell him while indicating to them. The trees aren''t that far away from the field.'
 					'He shakes his head confidently. "They won''t see anything. We''ll be too far away and they won''t even be looking anyway."'
 					gs 'willpower', 'bj', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
@@ -73,10 +73,10 @@ if $ARGS[0] = 'tLazar':
 							gs 'willpower', 'pay', 'resist'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
-							'You roll your eyes. You''re not taking any chances. "No, I don''t think it''s a good idea." you tell him as you pull your hand free from his.'
+							'You roll your eyes. You''re not taking any chances. "No, I don''t think it''s a good idea," you tell him as you pull your hand free from his.'
 							'He shrugs and laughs. "Well, you can''t blame a guy for trying."'
 							'You shake your head and start walking away. "See you later, Lazar."'
-							'"Bye <<$pcs_nickname>>." he calls after you.'
+							'"Bye, <<$pcs_nickname>>," he calls after you.'
 							act 'Leave': gt 'gschool_grounds', 'sports'
 						end
 					else
@@ -87,14 +87,14 @@ if $ARGS[0] = 'tLazar':
 						npc_rel['A149'] += 1
 						minut += 2
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/stay.jpg"></center>'
-						'Your brother and his friends seem engrossed in the game and haven''t looked your way in a while, and the treeline is far enough way for them to hopefully not see anything. "Sure, why not? Let''s go."'
+						'Your brother and his friends seem engrossed in the game and haven''t looked your way in a while, and the treeline is far enough for them to hopefully not see anything. "Sure, why not? Let''s go."'
 						'He grins and walks with you over to the trees. Once you''re behind the trees, he lets go of your hand and unbuttons his pants, pulling his underwear down enough for his stiffening cock to spring free. You take hold of it and give it a few strokes, feeling it harden in your hand.'
 						gs 'arousal', 'hj', 2, 'exhibitionism'
 						gs 'stat'
 						act 'Get on your knees':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/bj1.jpg"></center>'
-							'You get down on your knees and take his cock into your mouth. You start sucking his dick while stroking his shaft and playing with his balls, his moans of pleasure telling he''s enjoying it. After a few minutes, he starts trying to thrust into your mouth. "I want to fuck you now, <<$pcs_nickname>>."'
+							'You get down on your knees and take his cock into your mouth. You start sucking his dick while stroking his shaft and playing with his balls, his moans of pleasure saying he''s enjoying it. Then, after a few minutes, he starts trying to thrust into your mouth. "I want to fuck you now, <<$pcs_nickname>>."'
 							gs 'arousal', 'bj', 5, 'exhibitionism'
 							gs 'stat'
 							gs 'willpower', 'sex', 'resist', 'medium'
@@ -103,8 +103,8 @@ if $ARGS[0] = 'tLazar':
 									*clr & cla
 									gs 'willpower', 'pay', 'resist'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/bjtalk.jpg"></center>'
-									'You pop his dick out of your mouth and slowly stroke with your hand. "I said I would give you a blowjob, nothing else."'
-									'"Come on <<$pcs_nickname>>! You know you want it just as bad as I do. Just let me fuck you, I promise I won''t cum in you."'
+									'You pop his dick out of your mouth and slowly stroke it with your hand. "I said I would give you a blowjob, nothing else."'
+									'"Come on, <<$pcs_nickname>>! You know you want it just as bad as I do. Just let me fuck you. I promise I won''t cum in you."'
 									gs 'arousal', 'hj', 1, 'exhibitionism'
 									gs 'stat'
 									act 'Give in': gt 'gschool_socialchg1', 'lazar_vaginal'
@@ -116,19 +116,19 @@ if $ARGS[0] = 'tLazar':
 											gs 'willpower', 'pay', 'resist'
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/bj2.jpg"></center>'
 											'You''re getting a little annoyed at the way he keeps pushing things. "I said no! We can just stop if you want?"'
-											'"No, a blowjob is fine. I just thought you wanted to get off too is all..." His excuse rings hollow in your ears as you take his dick back into your mouth and start sucking him off again.'
+											'"No, a blowjob is fine. I just thought you wanted to get off too, is all..." His excuse rings hollow in your ears as you take his dick back into your mouth and start sucking him off again.'
 											gs 'arousal', 'bj', 5, 'exhibitionism'
 											gs 'stat'
 											act 'Continue':
 												*clr & cla
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/bj3.jpg"></center>'
-												'You keep working his cock with your mouth as you stroke his shaft and play with his balls. He moans softly in pleasure, enjoying the blowjob you''re giving him.'
+												'You keep working his cock with your mouth as you stroke his shaft and play with his balls. He moans softly, enjoying the blowjob you''re giving him.'
 												gs 'arousal', 'bj', 5, 'exhibitionism'
 												gs 'stat'
 												act 'No warning':
 													*clr & cla
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/bj3.jpg"></center>'
-													'You keep one eye on the sports field to make sure no one is coming over when you suddenly feel his cum squirting into your mouth without warning. When he finishes cumming, he pulls his dick out of your mouth and tucks it away before buttoning his pants up as you swallow his cum. "Thanks <<$pcs_nickname>>. I needed that, but I should get back before they notice I''m gone. Catch you later." He turns and heads back to the sports field.'
+													'You keep one eye on the sports field to ensure no one is coming over when you suddenly feel his cum squirting your mouth without warning. When he finishes cumming, he pulls his dick out of your mouth and tucks it away before pressing his pants as you swallow his cum. "Thanks, Sveta. I needed that, but I should get back before they notice I''m gone. Catch you later." He turns and heads back to the sports field.'
 													gs 'arousal', 'bj', 5, 'exhibitionism'
 													gs 'cum_call', 'mouth', 'A149'
 													gs 'arousal', 'end'
@@ -160,20 +160,20 @@ end
 if $ARGS[0] = 'lazar_vaginal':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/getfucked.jpg"></center>'
-	'"Fine, you can fuck me." you tell him and he grins. "Awesome. Now just turn around and bend over."'
-	'You turn around and face the tree before pulling your clothes aside to expose your pussy to him and bending over. You feel the tip of his dick rubbing against your wet slit before he slides his massive dick into your pussy. You feel it stretching to accommodate him and you feel completely full.'
+	'"Fine, you can fuck me," you tell him, and he grins. "Awesome. Now just turn around and bend over."'
+	'You turn around and face the tree before pulling your clothes aside to expose your pussy to him and bending over. You feel the tip of his dick rubbing against your wet slit before he slides his massive dick into your pussy. You can feel it stretching to accommodate him and feel completely full.'
 	gs 'arousal', 'vaginal', 3, 'exhibitionism'
 	gs 'stat'
 	act 'Get fucked':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/vaginal1.jpg"></center>'
-		'It starts to feel amazing despite it''s size, or maybe because of it. Either way you feel yourself getting wetter as he fucks your pussy and you start moaning in pleasure, trying not to be too loud and attracting any attention.'
+		'It starts to feel amazing despite its size, or maybe because of it. Either way, you feel yourself getting wetter as he fucks your pussy. Then, you start moaning in pleasure, trying not to be too loud and attract any attention.'
 		gs 'arousal', 'vaginal', 5, 'exhibitionism'
 		gs 'stat'
 		act 'Keep going':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/vaginal2.jpg"></center>'
-			'As your moans get louder, he starts fucking you harder and faster, eventually fucking you balls deep with each thrust. His dick slides out of you during one thrust, but he misses when he tries sliding it back in. Instead of penetrating your pussy, his massive dick slides balls deep into your ass with a single thrust.'
+			'As your moans get louder, he starts fucking you harder and faster, eventually fucking you balls-deep with each thrust. His dick slides out of you during one thrust, but he misses when he tries sliding it back in. So instead of penetrating your pussy, his massive dick slides balls deep into your ass with a single thrust.'
 			anal_slip += 4
 			gs 'arousal', 'anal', 5, 'exhibitionism'
 			gs 'arousal', 'end'
@@ -181,18 +181,18 @@ if $ARGS[0] = 'lazar_vaginal':
 			act 'Wrong hole!':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/anal2.jpg"></center>'
-				'You squeal at the pain and try to pull away, but he has a firm grip of your hips. When you try to pull away, he just pulls you back as he pounds your ass without mercy. "Lazar, stop! That''s my ass!"'
+				'You squeal at the pain and try to pull away, but he has a firm grip on your hips. When you try to pull away, he pulls you back as he pounds your ass without mercy. "Lazar, stop! That''s my ass!"'
 				'He keeps pounding away and grunting with exertion. "What?"'
 				*nl
 				'"I said that''s my asshole! You''re fucking my ass!" you cry out as you keep trying in vain to get him to slow down or pull away.'
-				'He looks at you before looking down. He slows down, but doesn''t stop fucking you as he grins. "Sorry, I didn''t notice. Seriously, it was an accident! I''m almost there anyway."'
+				'He looks at you before looking down. He slows down but doesn''t stop fucking you as he grins. "Sorry, I didn''t notice. Seriously, it was an accident! I''m almost there anyway."'
 				gs 'arousal', 'anal', 5, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Cum':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/buttcum.jpg"></center>'
-					'A few minutes later, he pulls out and you feel his warm cum splatter across your ass cheeks. When he finishes cumming, he tucks his dick away and buttons his pants up. "Thanks <<$pcs_nickname>>. I needed that, but I should get back before they notice I''m gone. Catch you later." He turns and heads back to the sports field, leaving you bent over the tree with his cum running down your ass.'
+					'A few minutes later, he pulls out, and you feel his warm cum splattered across your ass cheeks. When he finishes cumming, he tucks his dick away and buttons his pants up. "Thanks, <<$pcs_nickname>>. I needed that, but I should get back before they notice I''m gone. Catch you later." He turns and heads back to the sports field, leaving you bent over the tree with his cum running down your ass.'
 					gs 'cum_call', 'butt', 'A149'
 					gs 'stat'
 					act 'Leave': gt 'gschool_grounds', 'sports'
@@ -208,11 +208,11 @@ if $ARGS[0] = 'lazar_anal':
 	'"Fine, but you can only fuck my ass!"'
 	'His grin tells you he doesn''t mind at all. "Works for me. Now just turn around and bend over."'
 	if lubri = 0:
-		'You turn around and face the tree before pulling your clothes aside to expose your ass to him and bending over. He spits on your asshole a few times and rubs it in with his fingers to give you some lubrication. You then feel the tip of his dick pressing up against your wet hole and the pressure builds until his dick pops into your asshole, causing you to gasp in pain. He pauses to let you adjust before he starts to slowly fuck your ass.'
+		'You turn around and face the tree before pulling your clothes aside to expose your ass to him and bending over. He spits on your asshole a few times and rubs it with his fingers to give you some lubrication. You then feel the tip of his dick pressing up against your wet hole, and the pressure builds until his dick pops into your asshole, causing you to gasp in pain. Finally, he pauses to let you adjust before he starts to slowly fuck your ass.'
 		anal_slip += 4
 	else
 		lubri -= 1
-		'You dig around in your purse and pull out your bottle of lube and hand it to him. You then turn around and face the tree before pulling your clothes aside to expose your ass to him and bending over. He squirts some lube onto your asshole and rubs it in to give you some lubrication before you feel the tip of his dick press up against your hole and the pressure builds until the head of his dick pops into your asshole, causing you to gasp in pain. He pauses to let you adjust and squirts a little more lube onto his dick before he starts to slowly fuck your ass.'
+		'You dig around in your purse, pull out your bottle of lube, and hand it to him. You then turn around and face the tree before pulling your clothes aside to expose your ass to him and bending over. He squirts some lube onto your asshole and rubs it in to give you some lubrication before you feel the tip of his dick press up against your hole. The pressure builds until the head of his dick pops into your asshole, causing you to gasp in pain. Then, he pauses to let you adjust and squirts a little more lube onto his dick before he starts to slowly fuck your ass.'
 		anal_slip += 10
 	end
 	gs 'arousal', 'anal', 3, 'exhibitionism'
@@ -220,20 +220,20 @@ if $ARGS[0] = 'lazar_anal':
 	act 'Get fucked':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/anal1.jpg"></center>'
-		'He tries to be gentle, but it feels like he''s splitting your ass in two. He keeps working his cock deeper and deeper up your ass and you take several deep breaths, trying to relax to make it feel more pleasant. It starts to feel good after a few seconds despite it''s size, or maybe because of it. Either way the pain gives way to pleasure and you start to moan as he holds you by the hips and fucks you.'
+		'He tries to be gentle, but it feels like he''s splitting your ass. He keeps working his cock deeper and deeper up your ass, and you take several deep breaths, trying to relax to make it feel more pleasant. It starts to feel good after a few seconds despite its size, or maybe because of it. Either way, the pain gives way to pleasure, and you start to moan as he holds you by the hips and fucks you.'
 		gs 'arousal', 'anal', 5, 'exhibitionism'
 		gs 'stat'
 		act 'Keep going':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/anal2.jpg"></center>'
-			'He steadily works himself deeper into your ass until you feel his balls slapping against your pussy with each thrust. Once he''s sure you''re into it, he tightens his grip on your hips and starts to really hammer your ass, grunting and moaning loudly. You can tell he is getting close.'
+			'He steadily works deeper into your ass until you feel his balls slap against your pussy with each thrust. Once he''s sure you''re into it, he tightens his grip on your hips and starts hammering your ass, grunting and moaning loudly. You can tell he is getting close.'
 			gs 'arousal', 'anal', 5, 'exhibitionism'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Cum':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/lazar/sex/school/sportsfield/buttcum.jpg"></center>'
-			    'A few seconds later, he pulls out and you feel his warm cum splatter across your ass cheeks. When he finishes cumming, he tucks his dick away and buttons his pants up. "Thanks <<$pcs_nickname>>. I needed that, but I should get back before they notice I''m gone. Catch you later." He turns and heads back to the sports field, leaving you bent over the tree with his cum running down your ass.'
+			    'A few seconds later, he pulls out, and you feel his warm cum splatter your ass cheeks. When he finishes cumming, he tucks his dick away and buttons his pants up. "Thanks, <<$pcs_nickname>>. I needed that, but I should get back before they notice I''m gone. Catch you later." He turns and heads back to the sports field, leaving you bent over the tree with his cum running down your ass.'
 				gs 'cum_call', 'butt', 'A149'
 				gs 'stat'
 				act 'Leave': gt 'gschool_grounds', 'sports'
@@ -256,10 +256,10 @@ if $ARGS[0] = 'tIvan':
 		npc_rel['A3'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
-		'You carefully listen while Ivan rambles a bit. "You should join us sometime <<$pcs_nickname>>. I''m sure you can''t be any worse than Fedor over here."'
+		'You carefully listen while Ivan rambles a bit. "You should join us sometime, <<$pcs_nickname>>. You can''t be any worse than Fedor over here."'
 		'He winks at Fedor, who makes a funny face while you smile back. "I''ll think about it."'
 		'"Great!" Ivan replies, "Well, that''s enough resting, Fedor. Time for another lap."'
-		'The two of them bid you farewell and you watch them disappear over the horizon.'
+		'The two of them bid you farewell, and you watch them disappear over the horizon.'
 		act 'Return to the secluded beach': gt 'pav_lake_nude'
 
 	end
@@ -271,7 +271,7 @@ if $ARGS[0] = 'tFedor':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"> <img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
 	'A flustered Fedor is huffing and puffing. "You really need to take it easy. I can barely keep up with you, Ivan..."'
-	'"Come on, Fedor. Don''t sell yourself short. You''ve got potential and remember the dirtbag you wanted to get revenge on..." Ivan replies in an attempt to motivate a dejected Fedor.'
+	'"Come on, Fedor. Don''t sell yourself short. You''ve got potential, and remember the dirtbag you wanted to get revenge on..." Ivan replies in an attempt to motivate a dejected Fedor.'
 	act 'Ask about the dirtbag':
 		cla & *clr
 		minut += 5
@@ -279,13 +279,13 @@ if $ARGS[0] = 'tFedor':
 		npc_rel['A3'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"> <img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
-		'"I don''t mind to pry but what is this about a dirtbag?" you ask.'
+		'"I don''t mean to pry, but what is this about a dirtbag?" you ask.'
 		'Fedor looks uncomfortable, but Ivan gives him a nudge. "Go on, tell her."'
-		'Fedor starts telling you about a boxing fight last year where he went against an opponent that beat him badly and ever since then he''s been seeking revenge.'
-		'Ivan chimes in. "And we just found out our opponents for the next fight and Fedor here is going to meet that guy again."'
+		'Fedor starts by telling you about a boxing fight last year where he went against an opponent that beat him badly, and ever since then, he''s been seeking revenge.'
+		'Ivan chimes in. "And we just found out who our opponents will be for the next fight, and Fedor here is going to meet that guy again."'
 		'You give Fedor an encouraging smile. "I''m sure you''ll do great! He''s got nothing on you."'
 		'Fedor acknowledges your attempt to motivate him by giving you a slight nod as he takes a deep breath. "No time to rest. Let''s go!" he says before taking off running again.'
-		'Ivan gives you a thumb up as he starts running after Fedor. "Hey champ, wait up! You''re running too fast!"'
+		'Ivan gives you a thumbs-up as he starts running after Fedor. "Hey champ, wait up! You''re running too fast!"'
 		act 'Return to the secluded beach':gt 'pav_lake_nude'
 	end
 end
@@ -297,36 +297,36 @@ if $ARGS[0] = 'ivan_fedor_naked':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked1.jpg"></center>'
 	'You put on your best smile, despite feeling exposed. You really should have considered that you might run into someone you knew while walking around the beach naked. "Hey guys..."'
 	if fedorKozlovQW >= 5:
-		'Ivan has a huge grin on his face while Fedor looks shocked and tries to cover you up with his hands. "What are you doing <<$pcs_nickname>>?!"'
+		'Ivan has a massive grin, while Fedor looks shocked and tries to cover you up with his hands. "What are you doing, <<$pcs_nickname>>?!"'
 		'You shrug in response. "You know, just out to enjoy the cool breeze and warm sun on my skin while I take a walk. How about you guys?" you reply while trying to act as casual as you can.'
-		'Fedor glances around. "What if someone else sees you? What will they think? What will they say?" He sounds very worried.'
+		'Fedor glances around. "What if someone else sees you? What will they think? What will they say?" He sounds perturbed.'
 		*nl
-		'You frown. "I understand you''re worried about what people will think and say about your girlfriend Fedor, but this is my body and this makes me happy. I don''t care what anyone else says. Unless you''re ashamed of me?"'
-		'He shakes his head while Ivan walks off a little, obviously not wanting to get involved. "No no, it''s not that. It''s just... I worry... never mind." He sighs. "You''re right, it is your body and if you want to do this, then I won''t stop you."'
-		'You smile at him and give him a quick kiss which is interupted by Ivan. "You ready? We''ve got a few more miles to go."'
+		'You frown. "I understand you''re worried about what people will think and say about your girlfriend, Fedor, but this is my body, and it makes me happy. I don''t care what anyone else says. Unless you''re ashamed of me?"'
+		'He shakes his head while Ivan walks off a little, obviously not wanting to get involved. "No, no, it''s not that. It''s just... I worry... never mind." He sighs. "You''re right, it is your body, and if you want to do this, then I won''t stop you."'
+		'You smile at him and give him a quick kiss, interrupted by Ivan. "You ready? We''ve got a few more miles to go."'
 		'Fedor nods at Ivan before turning back to you. "Okay, I''ve got to go. Talk to you later, okay?" He turns and runs after Ivan, who has already started running again.'
 		act 'Leave them to their training':gt 'pav_lake_nude'
 	else
-		'Ivan has a huge grin while Fedor seems to be shocked. "So what are you up to <<$pcs_nickname>>?"'
+		'Ivan has a massive grin, while Fedor seems to be shocked. "So what are you up to, <<$pcs_nickname>>?"'
 		'You shrug in response. "You know, just out to enjoy the cool breeze and warm sun on my skin while I take a walk. How about you guys?" you reply while trying to act as casual as you can.'
-		'Ivan chuckles. "We were out training. So, is it normal for you to be walking around naked like this?"'
+		'Ivan chuckles. "We were out training. So, is it normal for you to walk around naked like this?"'
 		act 'I made a mistake':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/coverupnaked.jpg"></center>'
-			'You blush and suddenly feel very self conscious, quickly covering yourself up with your hands as best as you can. "I... I made a mistake. I don''t know what I was thinking. Please don''t tell anyone." you beg them.'
-			'Fedor shakes his head. "Don''t worry, we won''t tell anyone." he says as he glances at Ivan.'
+			'You blush and suddenly feel very self-conscious, quickly covering yourself up with your hands as best as possible. "I... I made a mistake. I don''t know what I was thinking. Please don''t tell anyone." you beg them.'
+			'Fedor shakes his head. "Don''t worry, we won''t tell anyone," he says as he glances at Ivan.'
 			'Ivan nods. "Yeah, not a problem. We won''t tell anyone, but if you don''t want anyone to see you, maybe you should go put some clothes on?" he says with a bemused smile.'
-			'You nod and turn to head back towards your clothes. "Thanks guys, see you around." With that, they wave goodbye and go back to their run.'
+			'You nod and turn to head back towards your clothes. "Thanks, guys. See you around." With that, they wave goodbye and go back to their run.'
 			act 'Go to your clothes':gt 'pav_lake_nude'
 		end
 		act 'I''m not ashamed':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked1.jpg"></center>'
 			if hotcat => 5:
-				'"I have nothing to be ashamed of. This is how I was made and I look amazing, plus I like showing it off." you reply.'
-				'Their eyes roam all over your naked body and you feel more than a bit of a thrill from it. "Yeah you do, and no you have nothing to be ashamed of." Ivan says. "Yeah, you have every reason to be proud." Fedor adds before they exchange looks and grin at you.'
+				'"I have nothing to be ashamed of. This is how I was made, and I look amazing, plus I like showing it off," you reply.'
+				'Their eyes roam all over your naked body, and you feel more than a thrill from it. "Yeah, you do, and no, you have nothing to be ashamed of," Ivan says. "Yeah, you have every reason to be proud," Fedor adds before they exchange looks and grin at you.'
 				'You arch a brow at them. "What?"'
-				'They exchange looks again and Ivan speaks up. "Would you want to go somewhere more private where we could...appreciate your body even more?" You know exactly what he means.'
+				'They exchange looks again, and Ivan speaks up. "Would you want to go somewhere more private where we could...appreciate your body even more?" But, of course, you know precisely what he means.'
 				if stat['think_virgin'] = 0:
 					act 'Sure': gt 'gschool_socialchg1', 'ivanfedor_threesome'
 				end
@@ -335,14 +335,14 @@ if $ARGS[0] = 'ivan_fedor_naked':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/talknaked1.jpg"></center>'
 					'You shake your head with a bemused smile. "Thanks, but just because I like to walk around naked doesn''t mean I want to have sex."'
-					'They both shake their heads and stammer and talk over each other while trying to explain themselves.'
-					'You interrupt them. "It''s okay, I don''t mind you asking but no."'
+					'They both shake their heads, stammer, and talk over each other while trying to explain themselves.'
+					'You interrupt them. "It''s okay. I don''t mind you asking but no."'
 					'Ivan nods. "Yeah, cool. Well okay... I guess we''ll get back to training then... Have fun on your walk." With that, they wave goodbye and go back to their run.'
 					act 'Leave them to their training':gt 'pav_lake_nude'
 				end
 			else
-				'"I have nothing to be ashamed of. This is how I was made and I look amazing, plus I like showing it off." you reply.'
-				'They''re both looking at anything but your naked body, and Ivan scratches his head while looking up at the clouds. "Yeah, I guess. But... we should really get back to training." Ivan says. "Yeah, have fun." Fedor adds and they exchange looks before they go back to their run.'
+				'"I have nothing to be ashamed of. This is how I was made, and I look amazing, plus I like showing it off," you reply.'
+				'They''re both looking at anything but your naked body, and Ivan scratches his head while looking up at the clouds. "Yeah, I guess. But... we should really get back to training." Ivan says. "Yeah, have fun," Fedor adds, and they exchange looks before returning to their run.'
 				act 'Leave them to their training':gt 'pav_lake_nude'
 			end
 		end
@@ -353,14 +353,14 @@ if $ARGS[0] = 'ivanfedor_threesome':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some1.jpg"></center>'
-	'The three of you walk further down the beach past the sauna where almost no one ever goes. Once you''re sure no one else is around, the boys start stripping off their clothes as you drop to your knees between them. You take both their cocks in your hands and start jerking them until you get them both rock hard.'
+	'The three of you walk further down the beach past the sauna, where almost no one ever goes. Once you''re sure no one else is around, the boys start stripping off their clothes as you drop to your knees between them. You take their cocks in your hands and start jerking them until you get them both rock hard.'
 	gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
 	gs 'arousal', 'hj', -5, 'group', 'exhibitionism'
 	gs 'stat'
 	act 'Suck them':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some2.jpg"></center>'
-		'Once they''re both hard, you take Ivan''s cock into your mouth and start sucking it while you keep stroking it with your hand. You use your other hand to keep stroking Fedor''s dick. After a few minutes, you switch cocks and the boys give each other a high five.'
+		'Once they''re both hard, you take Ivan''s cock into your mouth and start sucking it while you keep stroking it with your hand. You use your other hand to keep stroking Fedor''s dick. After a few minutes, you switch cocks, and the boys give each other a high five.'
 		gs 'arousal', 'hj', 5, 'group', 'exhibitionism'
 		gs 'arousal', 'bj', -5, 'group', 'exhibitionism'
 		gs 'stat'
@@ -368,7 +368,7 @@ if $ARGS[0] = 'ivanfedor_threesome':
 			cla & *clr
 			gs 'boyStat', 'A5'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some3.jpg"></center>'
-			'Once you switch back to sucking on Ivan''s cock, Fedor takes hold of your hips and pulls you up. You keep sucking Ivan''s cock, which forces you to bend over as Fedor pulls you up into a standing position. Fedor steps in behind you and teases your clit to get you wet before he rubs the tip of his dick against your slit. Once he is sure you''re wet enough, he pushes his <<dick>>cm <<$dick_girth>> dick inside your pussy, stretching and filling it out. He slowly starts fucking you, steadily going deeper with each thrust as you suck on Ivan''s cock.'
+			'Once you switch back to sucking on Ivan''s cock, Fedor takes hold of your hips and pulls you up. You keep sucking Ivan''s cock, which forces you to bend over as Fedor pulls you up into a standing position. Next, Fedor steps in behind you and teases your clit to get you wet before he rubs the tip of his dick against your slit. Once he is sure you''re wet enough, he pushes his <<dick>>cm <<$dick_girth>> dick inside your pussy, stretching and filling it out. Then, he slowly starts fucking you, steadily going deeper with each thrust as you suck on Ivan''s cock.'
 			gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
 			gs 'arousal', 'bj', -5, 'group', 'exhibitionism'
 			gs 'stat'
@@ -376,8 +376,8 @@ if $ARGS[0] = 'ivanfedor_threesome':
 				cla & *clr
 				gs 'boyStat', 'A3'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some4.jpg"></center>'
-				'You moan around Ivan''s cock as Fedor fucks you before Ivan interupts things. "Fedor, get on your back so <<$pcs_nickname>> can ride you. I want some of that ass."'
-				'Fedor pulls out of you and lays down on his back. You straddle him and Ivan fingers you before smearing your juices on his dick. You lower yourself down onto Fedor''s dick and it slides inside your pussy. Ivan kneels down behind you, spits on your asshole and rubs it with his fingers before you feel the tip of his dick pressing against your asshole. The pressure builds until the head of his dick pops in your ass and Ivan starts slowly fucking your ass, being as gentle as he can while you adjust to his <<dick>>cm <<$dick_girth>> dick stretching your ass.'
+				'You moan around Ivan''s cock as Fedor fucks you before Ivan interrupts things. "Fedor, get on your back so <<$pcs_nickname>> can ride you. I want some of that ass."'
+				'Fedor pulls out of you and lays down on his back. You straddle him, and Ivan fingers you before smearing your juices on his dick. You lower yourself down onto Fedor''s dick, which slides inside your pussy. Ivan kneels down behind you, spits on your asshole and rubs it with his fingers before you feel the tip of his dick pressing against your asshole. The pressure builds until the head of his dick pops in your ass, and Ivan starts slowly fucking your ass, being as gentle as he can. At the same time, you adjust to his <<dick>>cm <<$dick_girth>> dick stretching your ass.'
 				anal_slip += 4
 				gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
 				gs 'arousal', 'anal', -5, 'group', 'exhibitionism'
@@ -385,17 +385,17 @@ if $ARGS[0] = 'ivanfedor_threesome':
 				act 'Double the fun':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some5.jpg"></center>'
-					'Ivan grabs your hips and holds them in place while Fedor thrusts into your pussy from below and Ivan pounds your asshole. You find yourself moaning louder and louder as the boys fuck both your holes.'
+					'Ivan grabs your hips and holds them in place, Fedor thrusts into your pussy below, and Ivan pounds your asshole. You moan louder and louder as the boys fuck both your holes.'
 					gs 'arousal', 'vaginal', 5, 'group', 'exhibitionism'
 					gs 'arousal', 'anal', -5, 'group', 'exhibitionism'
 					gs 'stat'
 					act 'Cum':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/sex/ivanfed3some5.jpg"></center>'
-						'They both start grunting and you can tell they''re both getting close. They both quickly pull out of you and stand up as you get on your knees. Their cum starts splattering over your breasts, covering them. You can feel it running down your chest until they finally both finish.'
+						'They both start grunting, and you can tell they''re both getting close. Then, they both quickly pull out of you and stand up as you get on your knees. Their cum starts splattering over your breasts, covering them. You can feel it running down your chest until they finally both finish.'
 						*nl
-						'They start getting dressed. "That was great <<$pcs_nickname>>, you''re amazing." Fedor says when he finishes.'
-						'Ivan nods in agreement. "We should get back to our training. I hope we see you around again <<$pcs_nickname>>. Catch you later." Ivan says with a wink. They wave goodbye and start running again.'
+						'They start getting dressed. "That was great, <<$pcs_nickname>>. You''re amazing," Fedor says when he finishes.'
+						'Ivan nods in agreement. "We should get back to our training. I hope we see you around again, <<$pcs_nickname>>. Catch you later." Ivan says with a wink. They wave goodbye and start running again.'
 						gs 'arousal', 'foreplay', 5, 'group', 'exhibitionism'
 						gs 'cum_call', 'breasts', 'A3'
 						gs 'cum_call', 'breasts', 'A5'
@@ -416,7 +416,7 @@ if $ARGS[0] = 'tSvyatoslav':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 	'You wait patiently until Svyatoslav ends one of his runs. "You''re improving greatly!" you compliment him with a smile.'
-	'"Thanks! I''ve been trying my hardest to one up Ivan this year." he replies while panting as sweat runs down his forehead.'
+	'"Thanks! I''ve been trying my hardest to one-up Ivan this year," he replies while panting as sweat runs down his forehead.'
 	act 'Keep up the good work':
 		cla & *clr
 		minut += 5
@@ -424,7 +424,7 @@ if $ARGS[0] = 'tSvyatoslav':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 		'You give him some encouraging words. "If you continue working out as hard as you''re currently doing, then I''m sure you''ll finally be able to beat Ivan."'
-		'Still panting, Svyatoslav smiles and nods while picking up the water bottle and taking a sip. You stand and chat with him a little longer until he tells you that his break is up and once again gets ready to do some sprints.'
+		'Still panting, Svyatoslav smiles and nods while picking up the water bottle and taking a sip. You stand and chat with him a little longer until he tells you that his break is up and again gets ready to sprint.'
 		act 'Leave him to it': gt 'gschool_grounds', 'sports'
 	end
 	act 'Laugh at him':
@@ -433,8 +433,8 @@ if $ARGS[0] = 'tSvyatoslav':
 		npc_rel['A8'] -= 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
-		'You can''t contain your laughter as you listen to him. "Don''t be silly! You''ll never be able to beat Ivan. You''ve tried and failed so many times that it''s not even funny anymore."'
-		'You can clearly see that Svyatoslav is agitated by your words. "You know what, I''ll show you and the rest of the school that I''m going to be the best. I''ll beat Ivan and you''ll feel like idiots for laughing at me!"'
+		'You can''t contain your laughter as you listen to him. "Don''t be silly! You''ll never be able to beat Ivan. You''ve tried and failed so often that it''s not even funny anymore."'
+		'You can clearly see that Svyatoslav is agitated by your words. "You know what, I''ll show you and the rest of the school that I will be the best. I''ll beat Ivan, and you''ll feel like idiots for laughing at me!"'
 		'"Okay, champ, take it easy now." you patronize him.'
 		'Svyatoslav scoffs before he turns and starts sprinting up and down the makeshift track while ignoring you.'
 		act 'Leave him to it': gt 'gschool_grounds', 'sports'
@@ -447,7 +447,7 @@ if $ARGS[0] = 'tVanya':
 	socialchg['tVanya_day'] = daystart
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
-	'Vanya stops in his tracks when he sees you. "Hey <<$pcs_nickname>>, you''re out early today!" he says with a subtle smile.'
+	'Vanya stops in his tracks when he sees you. "Hey, <<$pcs_nickname>>, you''re out early today!" he says with a subtle smile.'
 	'"The same can be said about you!" you answer playfully.'
 	'"Well, to be honest, I was looking for something..." he mumbles before trailing off.'
 	act 'Ask what he''s up to':
@@ -457,10 +457,10 @@ if $ARGS[0] = 'tVanya':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
 		'"What are you up to, Vanya?" you impatiently ask.'
-		'Vanya lights up in a snicker. "Well, since you asked, I might as well tell you." He goes silent for a few seconds before continuing. "I was looking for a secluded spot for Vicky and I..."'
-		'Looking at him, you start loudly laughing. "Why am I not surprised? That''s so typical of you!"'
-		'"Well, you know, there''s barely anyone in the park right now, so seems like the perfect time to be on the look out..." He touches the back of his head and nervously laughs.'
-		'"If it was anyone else I would say you were being really weird, but I get that. I hope you find a decent spot. And tell Vicky I said hi!" You give him a smile and a wink.'
+		'Vanya lights up in a snicker. "Well, since you asked, I might as well tell you." He goes silent for a few seconds before continuing. "I was looking for a secluded spot for Vicky and me..."'
+		'Looking at him, you start laughing loudly. "Why am I not surprised? That''s so typical of you!"'
+		'"Well, you know, there''s barely anyone in the park right now, so it seems like the perfect time to be on the lookout..." He touches the back of his head and nervously laughs.'
+		'"If it was anyone else, I would say you were being really weird, but I get that. So I hope you find a decent spot. And tell Vicky I said hi!" You give him a smile and a wink.'
 		'"Sure, sure!" he replies as he slowly starts scampering away from you.'
 		act 'Go back to what you were doing': gt 'pav_park', 'start'
 	end
@@ -471,8 +471,8 @@ if $ARGS[0] = 'tErast':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
-	'You walk up to Erast. You don''t want to bother him, but you feel the need to ask him how it works. "Sorry Erast, I don''t want to bother you..." you start as he puts down the weights.'
-	'"Oh, hi <<$pcs_nickname>>. You need some help?" Erast politely replies.'
+	'You walk up to Erast. You don''t want to bother him, but you must ask him how it works. "Sorry, Erast, I don''t want to bother you..." you start as he puts down the weights.'
+	'"Oh, hi, <<$pcs_nickname>>. You need some help?" Erast politely replies.'
 	act 'Nod your head':
 		cla & *clr
 		minut += 20
@@ -485,7 +485,7 @@ if $ARGS[0] = 'tErast':
 		'You silently nod your head. "Have you seen the new machine they''ve added?"'
 		'Erast gives a subtle smile and nods. "Yeah, what about it?"'
 		'You squirm a little as you continue. "Well, I want to try it out, but I don''t know how to use it..."'
-		'"Don''t worry, <<$pcs_nickname>> I''ll show you on how to use it." He leads you back to the machine and shows you on how to usee it, making sure that you''ve got the hang of it before leaving.'
+		'"Don''t worry, <<$pcs_nickname>>. I''ll show you how to use it." He leads you back to the machine and shows you how to use it, ensuring you''ve got the hang of it before leaving.'
 		act 'Thank him':gt 'pav_commcenter'
 	end
 	act 'Shake your head':
@@ -493,8 +493,8 @@ if $ARGS[0] = 'tErast':
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
-		'Feeling rather embarrassed, you quickly shake your head as your face turns bright red.'
-		'"Are you sure you don''t need any help?" he asks once more.'
+		'Feeling somewhat embarrassed, you quickly shake your head as your face turns bright red.'
+		'"Are you sure you don''t need any help?" he asks again.'
 		'"N-No, I''m sorry to have bothered you..." you shyly reply and quickly move away.'
 		'Erast is still scratching his head as you quickly dash away.'
 		act 'Leave':gt 'pav_commcenter'
@@ -510,7 +510,7 @@ if $ARGS[0] = 'lariska_gm_1':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 	if LariskaQW['story'] = 4:
-		'She sees you coming into the store behind her and smiles. "Hey <<$pcs_nickname>>. Here to do some shopping?"'
+		'She sees you coming into the store behind her and smiles. "Hey, <<$pcs_nickname>>. Here to do some shopping?"'
 		act 'Leave the store': gt 'pav_commercial'
 		act 'Stay and shop alone': gt 'shop_coco_carmen', 'start'
 		act 'Offer to try on clothes with Lariska': gt 'gschool_socialchg1', 'lariska_gm_2'
@@ -521,19 +521,19 @@ if $ARGS[0] = 'lariska_gm_1':
 			act 'Stay and shop alone': gt 'shop_coco_carmen', 'start'
 			act 'Offer to try on clothes with Lariska': gt 'gschool_socialchg1', 'lariska_gm_2'
 		elseif npc_rel['A13'] <= 20 and fame['pav_slut'] < 200:
-			'She sees you coming in the store behind her and frowns, but doesn''t say anything.'
-			'"Hey Lariska. Doing some shopping?"'
+			'She sees you in the store behind her and frowns but doesn''t say anything.'
+			'"Hey, Lariska. Doing some shopping?"'
 			'She just looks at you and doesn''t respond at all. It''s pretty obvious she wants nothing to do with you.'
 			act 'Leave the store': gt 'pav_commercial'
 			act 'Stay and shop alone': gt 'shop_coco_carmen', 'start'
 		elseif fame['pav_slut'] >= 200:
-			'She sees you coming in the store behind her, and with a disgusted look on her face says "What are <i>you</i> doing here? This place doesn''t sell anything slutty enough for <i>you</i> to wear."'
-			'Your face turns red with anger and you shoot back. "At least I can make my own decisions. Are you even allowed to be here without Christina keeping an eye on you?"'
-			'She just sneers at you. "Go fuck yourself, slut." With that, she turns and leaves the store, obviously not wanting to shop anymore.'
+			'She sees you coming into the store behind her and, with a disgusted look on her face, says, "What are <i>you</i> doing here? This place doesn''t sell anything slutty enough for <i>you</i> to wear."'
+			'Your face turns red with anger, and you shoot back. "At least I can make my own decisions. Are you even allowed to be here without Christina keeping an eye on you?"'
+			'She just sneers at you. "Go fuck yourself, slut." With that, she leaves the store, obviously not wanting to shop anymore.'
 			act 'Leave the store': gt 'pav_commercial'
 			act 'Stay and shop alone': gt 'shop_coco_carmen', 'start'
 		else
-			'She sees you coming in the store behind her and nods at you. "Hey <<$pcs_nickname>>. Doing some shopping?"'
+			'She sees you coming into the store behind her and nods at you. "Hey, <<$pcs_nickname>>. Doing some shopping?"'
 			act 'Leave the store': gt 'pav_commercial'
 			act 'Stay and shop alone': gt 'shop_coco_carmen', 'start'
 			act 'Offer to try on clothes with Lariska': gt 'gschool_socialchg1', 'lariska_gm_2'
@@ -553,10 +553,10 @@ if $ARGS[0] = 'lariska_gm_2':
 		cla & *clr
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_2.jpg"></center>'
-		'Eventually you start changing in the same room, laughing and giggling as you try on the various items you picked out for each other.'
-		'At one point you catch her staring at you in the mirror while you are both topless. You notice her nipples are hard, and checking her out, you feel yours getting hard too. Slipping an arm around her waist, you both stare at your reflections in the mirror, comparing yourselves to each other.'
+		'Eventually, you start changing in the same room, laughing and giggling as you try on the various items you picked out for each other.'
+		'At one point, you catch her staring at you in the mirror while you are both topless. You notice her nipples are hard, and you feel yours getting hard checking her out too. Slipping an arm around her waist, you both stare at your reflections in the mirror, comparing yourselves to each other.'
 		if lariskalove < 7 and LariskaQW['story'] < 10:
-			'She eventually gets embarrassed at the attention and turns away, her face bright red.'
+			'She eventually gets embarrassed at the attention and turns away, her face turning bright red.'
 		else
 			'You smile at her through her reflection in the mirror with a suggestive look in your eyes.'
 		end
@@ -584,14 +584,14 @@ if $ARGS[0] = 'lariska_gm_3':
 	lariskalove += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_3.jpg"></center>'
-	'You maintain eye contact as you slide your hand down her back until you reach her panties. Soflty hooking your finger over them, you slowly drag them down until her pink pussy is exposed. Dropping your own panties, you gently push her against the mirror, taking a moment to enjoy the sight of her naked in the stand-up mirror before pulling her into your arms and kissing her.'
+	'You maintain eye contact as you slide your hand down her back until you reach her panties. Softly hooking your finger over them, you slowly drag them down until her pink pussy is exposed. Dropping your panties, you gently push her against the mirror, enjoying the sight of her naked in the stand-up mirror before pulling her into your arms and kissing her.'
 	gs 'arousal', 'erotic_nudity', 5
 	gs 'stat'
 	act 'Finger her':
 		cla & *clr
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_4.jpg"></center>'
-		'As you make out with her, you push her up against the wall and reach between her legs to rub her pussy. Her breath quickens as lust takes over and she starts exploring your body with her hands, keeping her lips locked on yours. Eventually her fingers find their way between your legs, and you both finger each other.'
+		'You push her up against the wall as you make out with her. Then, you reach between her legs to rub her pussy. Her breath quickens as lust takes over, and she starts exploring your body with her hands, keeping her lips locked on yours. Eventually, her fingers find their way between your legs, and you both finger each other.'
 		gs 'arousal', 'vaginal_finger_give', 10, 'lesbian'
 		gs 'arousal', 'vaginal_finger', -10, 'lesbian'
 		gs 'stat'
@@ -599,18 +599,18 @@ if $ARGS[0] = 'lariska_gm_3':
 			cla & *clr
 			menu_off = 1
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_5.jpg"></center>'
-			'You sit on the bench in the changing room, pulling her onto your lap while you continue to explore her mouth with your tongue. Her hips start moving, as if she was riding an imaginary cock, grinding her pussy into yours.'
+			'You sit on the bench in the changing room, pulling her onto your lap while you continue to explore her mouth with your tongue. Her hips start moving like she is riding an imaginary cock, grinding her pussy into yours.'
 			gs 'arousal', 'trib', -8
 			gs 'stat'
 			act '69':
 				cla & *clr
 				menu_off = 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/gm/gm_lariska_6.jpg"></center>'
-				'Face red with desire, Lariska stands up and pulls you off the bench and down to the floor, on your back. Straddling your bare chest, she buries her face between your legs, licking and slurping wildly. You do the same, licking her clit while thrusting your fingers inside her pussy.'
-				$orgasm_txt = 'You can tell she is getting close, her pussy is soaking wet and leaking like crazy. The sight and feeling of her going wild on your clit sends you over the edge, and your body starts shaking. Your orgasm sets hers off as well, both of you writhing on the floor, attempting to keep licking your way through the others orgasm.'
+				'Face red with desire, Lariska stands up, pulling you off the bench and down to the floor on your back. Straddling your bare chest, she buries her face between your legs, licking and slurping wildly. You do the same, licking her clit while thrusting your fingers inside her pussy.'
+				$orgasm_txt = 'You can tell she is getting close. Her pussy is soaking wet and leaking like crazy. The sight and feeling of her going wild on your clit sends you over the edge, and your body starts shaking. Your orgasm also sets hers off, both of you writhing on the floor, attempting to keep licking your way through the other orgasm.'
 				$orgasm_or = 'custom'
-				'Exhausted, you let your head fall back while you catch your breath. You hear her panting and can feel her breath on your now sensitive lower lips as you come down in a post orgasmic bliss.'
-				'Once you catch your breath, you stand up and share a long kiss while stroking her cheek with your hand. When you pull back from it, she seems to remember you''re in a public place and gets nervous, hger face red again.'
+				'Exhausted, you let your head fall back while you catch your breath. You hear her panting and feel her breath on your now sensitive lower lips as you come down in post-orgasmic bliss.'
+				'Once you catch your breath, you stand up and share a long kiss while stroking her cheek with your hand. When you pull back from it, she seems to remember you''re in a public place and gets nervous, her face red again.'
 				act 'Clean up and leave the store':
 					gs 'arousal', 'end'
 					gs 'stat'
@@ -627,18 +627,18 @@ if $ARGS[0] = 'tBella':
 	minut += 20
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
-	'You approach Bella and tap her on her shoulder. "Hey Bella! You heading into the city?"'
-	'Bella sighs loudly as she replies. "Yeah, I''m meeting some of my friends in town. There''s a new gym opening and we thought we might check it out."'
+	'You approach Bella and tap her on her shoulder. "Hey, Bella! You''re heading into the city?"'
+	'Bella sighs loudly as she replies. "Yeah, I''m meeting some of my friends in town. There''s a new gym opening, and we thought we might check it out."'
 
 	act 'Sounds amazing':
 		cla & *clr
 		npc_rel['A22'] += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
-		'You start grinning, but then turn serious. "That sounds great, but isn''t there an age limit at those gyms though?"'
+		'You start grinning but then turn serious. "That sounds great, but isn''t there an age limit at those gyms?"'
 		'"Hanging around with older people does have its perks." she winks. "One of my friends can get me in, no questions asked."'
 		'You nod your head. "Must be great hanging around with older people..."'
-		'"Oh, the stories I''ve got to tell..." Bella replies, but before she can continue there''s an announcement and she excuses herself saying that''s the train she needs to catch.'
+		'"Oh, the stories I''ve got to tell..." Bella replies, but before she can continue, there''s an announcement. She excuses herself, saying that''s the train she needs to catch.'
 		act 'Return to the train station': gt 'pav_train_hall'
 	end
 
@@ -647,11 +647,11 @@ if $ARGS[0] = 'tBella':
 		npc_rel['A22'] -= 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
-		'"Why not just train here instead? We have a perfectly good gym." you innocently ask.'
+		'"Why not just train here instead? We have an excellent gym." you innocently ask.'
 		'Bella starts laughing loudly. "Poor little <<$pcs_nickname>>. You''re so innocent and still have a lot to learn..."'
 		'"Like what?" you ask, a little offended.'
-		'Bella just smirks. "Well first of all, there''s fully grown men there, not little wimpy boys that think they''re the shit. Real men that know how to treat women... And let''s not talk about all the sexy women that work out."'
-		'As she''s about to continue, you hear an announcement. "That''s my train. Too bad <<$pcs_nickname>>. I thought about inviting you, but you disappointed me. I had higher hopes about you..." she says before walking away from you.'
+		'Bella just smirks. "Well, first of all, there are fully grown men there, not little wimpy boys that think they''re the shit. Real men that know how to treat women... And let''s not talk about all the sexy women that work out."'
+		'As she''s about to continue, you hear an announcement. "That''s my train. Too bad, <<$pcs_nickname>>. I thought about inviting you, but you disappointed me. I had higher hopes about you..." she says before walking away from you.'
 		act 'Return to the train station': gt 'pav_train_hall'
 	end
 end
@@ -661,15 +661,15 @@ if $ARGS[0] = 'tVeronika':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big141.jpg"></center>'
-	'Noticing it''s Veronika, you start waving and trying to catch her attention. She barely bats an eye towards you as you try your hardest to get her attention.'
-	'After a while, she stops practicing and starts skating towards you.'
+	'Noticing it''s Veronika, you start waving and trying to catch her attention. But, unfortunately, she barely bats an eye towards you as you try your hardest to get her attention.'
+	'After a while, she stops practising and starts skating towards you.'
 	act 'Greet her':
 		cla & *clr
 		minut += 20
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big141.jpg"></center>'
 		'"Hey Veronika!" you shout out. "Looking great out there!"'
-		'Ice cold with a blank expression, she stops in front of you. "What do you want? Can''t you see that I''m practicing?"'
+		'Ice cold with a blank expression, she stops in front of you. "What do you want? Can''t you see that I''m practising?"'
 
 		act 'Discourage her':
 			cla & *clr
@@ -680,7 +680,7 @@ if $ARGS[0] = 'tVeronika':
 			'"Sheesh, why are you always such a bitch?" you reply, irritated by her nonchalant greeting.'
 			'Veronika rolls her eyes and lets out a sigh. "Do I really need to explain it to you?"'
 			'"You''re such an ungrateful bitch!!!" you yell out. "I just wanted to encourage you, but since you''re being a bitch about it, I hope you break your leg! Or your face."'
-			'Stone cold Veronika just shrugs her shoulders before turning and skating away like the conversation never happened.'
+			'Stone-cold Veronika shrugs her shoulders before turning and skating away like the conversation never happened.'
 			act 'Walk away': gt 'pav_lake'
 		end
 
@@ -690,7 +690,7 @@ if $ARGS[0] = 'tVeronika':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big141.jpg"></center>'
 			'"I just wanted to say that you''re looking great out there." you smile. "I bet you''ll have no issues getting on the Russian team."'
-			'Veronika, still stone faced and rigid, replies a little reluctantly. "Thanks, I guess... I train a lot so I can leave this god forsaken hellhole behind."'
+			'Veronika, still stone-faced and rigid, replies a little reluctantly. "Thanks, I guess... I train a lot, so I can leave this god-forsaken hellhole behind."'
 			'You awkwardly smile. "I know what you mean. It really is a dump, isn''t it?"'
 			'She just blankly stares at you. "If there''s nothing more, I need to get back to my training..." Before you''re able to reply, Veronika has already started skating away from you.'
 			act 'Walk away': gt 'pav_lake'

+ 90 - 35
locations/homes_properties.qsrc

@@ -61,15 +61,17 @@ end
 !!			  A number as str - really should remove this 	
 !!
 if $ARGS[0] = 'set_home':
-	if $ARGS[1] = '':
-		gs 'homes_properties_attr', 'get_property_attr', $home_name[$loc]
-	else
-		gs 'homes_properties_attr', 'get_property_attr', $home_name[$ARGS[1]]
+	$homepropcode = iif($ARGS[1] = '', $home_name[$loc], $home_name[$ARGS[1]])
+	if $homepropcode ! '':
+		killvar 'home'
+		gs 'homes_properties_attr', 'get_property_attr', $homepropcode
+	 	if INSTR($property['type'], 'residence') > 0:
+			COPYARR 'home','property'
+			$home['current'] = $property['code']			
+			if accessible_property[$home['current']] = 0: gs 'homes_properties', 'set_access', $home['current'], 1
+			killvar 'property'
+		end
 	end
-
-	COPYARR 'home','property'
-	$home['current'] = $property['code']
-	killvar 'property'
 end
 
 !! Call: `gs 'homes_properties', 'set_access', $ARGS[1], ARGS[2], ARGS[3]. ARGS[4]
@@ -140,7 +142,11 @@ if $ARGS[0] = 'set_access':
 				if accessible_property['<<$propcode>>-construction-status'] = 2: accessible_property['furnishable_home_count'] -= 1
 				accessible_property['accessible_home_count'] -= 1
 			end
-			if accessible_property['accessible_home_count'] = 1: $accessible_property[0]
+			if accessible_property['accessible_home_count'] = 1: 
+				gs 'homes_properties', 'get_accessible_properties', 'home'
+				if accessible_property['<<$ARGS[1]>>-is-home'] = 1: gs 'homes_properties', 'set_home', $property_code
+				gs 'homes_properties', 'clean_up_property_data'
+			end
 		!! Property is rented
 		elseif accessible_property[$propcode] = 1:
 			!! Updating home counts
@@ -175,9 +181,12 @@ if $ARGS[0] = 'set_access':
 			!! Updating home counts
 			!! NOTE: Valid transitions: 2 -> 3
 			if accessible_property['<<$propcode>>-is-home'] = 1:
+				if $home['current'] = $propcode: killvar '$home'
+				
 				accessible_property['tenant_home_count'] += 1
 				accessible_property['owned_home_count'] -= 1
 				accessible_property['accessible_home_count'] -= 1
+				
 				if accessible_property['<<$propcode>>-construction-status'] = 2: accessible_property['furnishable_home_count'] -= 1
 			end
 		!! Property is just accessible
@@ -240,7 +249,7 @@ end
 if $ARGS[0] = 'is_at_a_home':
 	$isathomecode = iif($ARGS[1] = '', $home_name[$loc], $home_name[$ARGS[1]])
 	result = accessible_property['<<$isathomecode>>-is-home'] = 1
-	killvar 'propcode'
+	killvar 'isathomecode'
 end
 
 !! Call: `func('homes_properties', 'is_property_of_status', $ARGS[1])`
@@ -303,7 +312,7 @@ end
 !!  Home and Property Counts - FUNC()
 !!---------------------------------------------------------
 
-!! Call: `func('homes_properties', 'get_rented_property_count')`
+!! Call: `func('homes_properties', 'get_rented_property_count', $ARGS[1])`
 !! Returns the count of rented properties
 !!
 !! ARGS[1] - property type filter: 'home', 'business', 'all' or '' or missing
@@ -317,8 +326,8 @@ if $ARGS[0] = 'get_rented_property_count':
 	end
 end
 
-!! Call: `func('homes_properties', 'get_accessible_property_count')`
-!! Returns the count of rented properties
+!! Call: `func('homes_properties', 'get_accessible_property_count', $ARGS[1])`
+!! Returns the count of accessible properties
 !!
 !! ARGS[1] - property type filter: 'home', 'business', 'all' or '' or missing
 if $ARGS[0] = 'get_accessible_property_count':
@@ -331,7 +340,7 @@ if $ARGS[0] = 'get_accessible_property_count':
 	end
 end
 
-!! Call: `func('homes_properties', 'get_rentable_property_count')`
+!! Call: `func('homes_properties', 'get_rentable_property_count', $ARGS[1])`
 !! Returns the count of properties that can be rented (all properties with where property['rental'] = 1)
 !!
 !! ARGS[1] - property type filter: 'home', 'business', 'all' or '' or missing
@@ -345,6 +354,7 @@ if $ARGS[0] = 'get_rentable_property_count':
 	end
 end
 
+!! Call: `func('homes_properties', 'get_available_for_rent_property_count', $ARGS[1])`
 !! Returns the number of properties that are avaiable for rent - rentable properties that are not rented.
 !! ARGS[1] - property type filter: 'home', 'business', 'all' or '' or missing
 if $ARGS[0] = 'get_available_for_rent_property_count':
@@ -357,7 +367,7 @@ if $ARGS[0] = 'get_available_for_rent_property_count':
 	end
 end
 
-!! Call: `func('homes_properties', 'get_rented_property_count')`
+!! Call: `func('homes_properties', 'furnishable_home_count', $ARGS[1])`
 !! Returns the count of furnishable properties (for shops)
 !!
 !! ARGS[1] - property type filter: 'home', 'business', 'all' or '' or missing
@@ -390,7 +400,7 @@ if $ARGS[0] = 'get_rented_properties':
 		:get_rented_properties_loop
 			$getrentedpropcode = $accessible_property[i]
 			if $home_name[$getrentedpropcode] ! '' and accessible_property[i] = 1:
-				if ($ARGS[1] ! 'home' and accessible_property['<<$getrentedpropcode>>-is-home'] = 0) or ($ARGS[1] ! 'business' and accessible_property['<<$prgetrentedpropcodeopcode>>-is-home'] = 1):
+				if ($ARGS[1] ! 'home' and accessible_property['<<$getrentedpropcode>>-is-home'] = 0) or ($ARGS[1] ! 'business' and accessible_property['<<$getrentedpropcode>>-is-home'] = 1):
 					$property_code[j] = $getrentedpropcode
 					if ARGS[2] = 0:
 						$property_name[j] = $accessible_property['<<$getrentedpropcode>>-name']
@@ -431,7 +441,7 @@ if $ARGS[0] = 'get_owned_properties':
 		!!'<h3>Building Owned Properties List</h3>'
 		!!'Count: <b><<count>></b>'
 		:get_owned_properties_loop
-			$getownedpropcode = iif($ARGS[2] = '', $accessible_property[i], $ARGS[2])
+			$getownedpropcode = iif( $ARGS[2] = '', $accessible_property[i], $ARGS[2] )
 			!!'  Index: <b><<i>></b> Code: <b><<$getownedpropcode>></b> Status: <b><<accessible_property[i]>></b>'
 			if $home_name[$getownedpropcode] ! '' and (accessible_property[$getownedpropcode] = 2 or accessible_property[$getownedpropcode] = 3):
 				!!'    $ARGS[1]: <b><<$ARGS[i]>></b> Is home: <b><<accessible_property[''<<$getownedpropcode>>-is-home'']>></b>'
@@ -452,7 +462,7 @@ if $ARGS[0] = 'get_owned_properties':
 						$property_status_display[j] = 'A(n) <<$property_display[j]>> ' + iif($accessible_property[$getownedpropcode] = $home['current'], 'where you currently live.', 'which is currently empty.')
 					end
 
-					property_status[j] =accessible_property[$getownedpropcode]
+					property_status[j] = accessible_property[$getownedpropcode]
 					property_construction_status[j] = accessible_property['<<$getownedpropcode>>-construction-status']
 					property_is_renovated[j] = accessible_property['<<$getownedpropcode>>-renovated']
 					property_sales_price[j] = accessible_property['<<$getownedpropcode>>-sales-price']
@@ -540,7 +550,7 @@ if $ARGS[0] = 'get_properties_for_sale':
 				hasprice = iif($accessible_property[$getforsalespropcode] = '', property['price'] > 0, accessible_property['<<$getforsalespropcode>>-sales-price'] > 0)
 				if (($ARGS[1] ! 'home' and ishome = 0) or ($ARGS[1] ! 'business' and ishome)) and hasprice:
 					$property_code[j] = $getforsalespropcode
-					$property_name[j] = iif($accessible._property[$getforsalespropcode] = '', $property['name'], $accessible_property['<<$getforsalespropcode>>-name'])
+					$property_name[j] = iif($accessible_property[$getforsalespropcode] = '', $property['name'], $accessible_property['<<$getforsalespropcode>>-name'])
 					$property_type[j] = iif($accessible_property[$getforsalespropcode] = '', $property['type'], $accessible_property['<<$getforsalespropcode>>-type'])
 					if property['construction_needed'] = 1:
 						$property_display[j] = iif($accessible_property[$getforsalespropcode] = '', $property['display_0'], $accessible_property['<<$getforsalespropcode>>-display'])
@@ -563,11 +573,11 @@ if $ARGS[0] = 'get_properties_for_sale':
 end
 
 !! Use it as `gs`, creates a set of arrays that contains the relevant info for 
-!! all properties that are for sale.
+!! all properties that the player can rent.
 !!
 !! "Returns": 
-!! $property_code[], $property_name[], $property_display[], $property_type[]
-!! property_construction_status,property_is_renovated[], property_sales_price[], property_renovation_value[]
+!! $property_code[], $property_name[], $property_display[]
+!! property_days[], property_rent[]
 !!
 !! $ARGS[1] - the class of the property: 'home' - returns only homes; 'business' - returns only business properties; '' - returns both types
 if $ARGS[0] = 'get_properties_for_rent':
@@ -608,7 +618,7 @@ if $ARGS[0] = 'get_properties_for_rent':
 end
 
 !! Use it as `gs`, creates a set of arrays that contains the relevant info for 
-!! all properties that are for sale.
+!! all properties for which the player can buy an internet subscription
 !!
 !! "Returns": 
 !! $property_code[], $property_name[], $property_status[], property__is_current_home[]
@@ -631,7 +641,7 @@ if $ARGS[0] = 'get_internet_enabled_properties':
 				accesscheck = ($ARGS[2] = 'hasaccess' and accessible_property[$getnetenabledprocode] ! 0 and accessible_property[$getnetenabledprocode] ! 4) or $ARGS[2] = ''
 				typecheck = (($ARGS[1] ! 'home' and INSTR($property['type'], 'residence') = 0) or ($ARGS[1] ! 'business' and INSTR($property['type'], 'residence') > 0))				
 				if accesscheck and typecheck and property['internet_enabled']:
-					$property_name[j] = $poperty['name']
+					$property_name[j] = $property['name']
 					$property_code[j] = $getnetenabledprocode
 					if accessible_property[$getnetenabledprocode] = 0: 
 						$property_status[j] = 'no access'
@@ -680,7 +690,7 @@ end
 if $ARGS[0] = 'give_access':
 	$accesscode = iif($ARGS[1] = '', $home_name[$loc], $ARGS[1])
 	gs 'homes_properties', 'set_access', $accesscode, 1
-	if accessible_property['accessible_home_count'] = 1 and $home['current'] = '': gs 'homes_properties', 'set_home', $accesscode
+	if accessible_property['accessible_home_count'] = 1 and accessible_property['<<$accesscode>>-is-home'] = 1 and $home['current'] = '': gs 'homes_properties', 'set_home', $accesscode
 	killvar '$accesscode'
 end
 
@@ -694,6 +704,11 @@ end
 if $ARGS[0] = 'block_access':
 	$blockcode = iif($ARGS[1] = '', $home_name[$loc], $ARGS[1])
 	gs 'homes_properties', 'set_access', $blockcode, 0
+	if accessible_property['accessible_home_count'] = 1 and $home['current'] = '': 
+		gs 'homes_properties', 'get_accessible_properties', 'home'
+		if accessible_property['<<$property_code>>-is-home'] = 1: gs 'homes_properties', 'set_home', $property_code
+		gs 'homes_properties', 'clean_up_property_data'
+	end
 	killvar 'blockcode'
 end
 
@@ -763,9 +778,25 @@ end
 !!  ARGS[2] - the tenancy end day
 !!  ARGS[3] - the tenancy end month
 if $ARGS[0] = 'tenants_move_in':
-	gs 'homes_properties', 'set_ownership', $ARGS[1], 3
+	gs 'homes_properties', 'set_access', $ARGS[1], 3
 	accessible_property['<<$ARGS[1]>>-tenant-day'] = ARGS[2]
 	accessible_property['<<$ARGS[1]>>-tenant-month'] = ARGS[3]
+	if $home['current'] = '' and accessible_property['accessible_home_count'] = 1:
+		gs 'homes_properties', 'get_accessible_properties', 'home'
+		if accessible_property['<<$property_code>>-is-home']: gs 'homes_properties', 'set_home', $property_code
+		gs 'homes_properties', 'clean_up_property_data'
+	end
+end
+
+!! Call: gs 'homes_properties', 'tenants_move_out', $ARGS[1]
+!! Makes the necessary changes to the property to track the tenants. 
+!!
+!! $ARGS[1] - the property code of the home that was rented to tenants
+if $ARGS[0] = 'tenants_move_out':
+	if $ARGS[1] ! '':
+		gs 'homes_properties', 'set_access', $ARGS[1], 2
+		if $home['current'] = '' and accessible_property['<<$ARGS[1]>>-is-home'] = 1 and accessible_property['accessible_home_count'] = 1: gs 'homes_properties', 'set_home', $ARGS[1]
+	end
 end
 
 !! Call: `func('homes_properties', 'tenant_move_out_check')`
@@ -791,9 +822,15 @@ if $ARGS[0] = 'tenant_move_out_check':
 			killvar 'property'
 		if i < count: jump 'tenantloop'
 	end
+	if accessible_property['accessible_home_count'] = 1 and $home['current'] = '': 
+		gs 'homes_properties', 'get_accessible_properties', 'home'
+		if accessible_property['<<$property_code>>-is-home'] = 1: gs 'homes_properties', 'set_home', $property_code
+		gs 'homes_properties', 'clean_up_property_data'
+	end
 	killvar 'i' && killvar 'j' && killvar 'count'
 end
 
+
 !! Call: `func('homes_properties', 'get_property_sales_price', $ARGS[1])`
 !! Returns the actual sales price of the property
 !!
@@ -803,7 +840,7 @@ if $ARGS[0] = 'get_property_sales_price':
 		result = accessible_property['<<$ARGS[1]>>-sales-price']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]
-		result = $property['price']
+		result = property['price']
 		killvar 'property'
 	end
 end
@@ -829,6 +866,11 @@ end
 if $ARGS[0] = 'cancel_rent':
 	gs 'homes_properties', 'set_access', $ARGS[1], 0
 	gs 'homes_properties', 'set_rent_days', $ARGS[1], -1
+	if accessible_property['accessible_home_count'] = 1 and $home['current'] = '': 
+		gs 'homes_properties', 'get_accessible_properties', 'home'
+		if accessible_property['<<$ARGS[1]>>-is-home'] = 1: gs 'homes_properties', 'set_home', $ARGS[1]
+		gs 'homes_properties', 'clean_up_property_data'
+	end
 end
 
 !! Call: `gs 'homes_properties', 'cancel_rent'`, $ARGS[1]`, $ARGS[2]
@@ -844,8 +886,8 @@ if $ARGS[0] = 'pay_rent':
 	gs 'homes_properties', 'add_rent_days', $ARGS[1]
 end
 
-!! Call: `gs 'homes_properties', 'set_rent_days', $ARGS[1], ARGS[2]`
-!! Sets the remaining rental days to a specific amount
+!! Call: `gs 'homes_properties', 'add_rent_days', $ARGS[1], ARGS[2]`
+!! Add the number of days passed to the remaining rental days.
 !!
 !! $ARGS[1] = the code name of the property, e.g. 'city_apartment'
 !! ARGS[2] - the number of days to add (can be negative).
@@ -872,6 +914,15 @@ if $ARGS[0] = 'set_rent_days':
 	end
 end
 
+!! Call: `gs 'homes_properties', 'set_rent_amount', $ARGS[1], ARGS[2]`
+!! Sets the monthly rent of the property
+!!
+!! $ARGS[1] - property code
+!!  ARGS[2] - the new rent amount
+if $ARGS[0] = 'set_rent_amount':
+	if accessible_property['<<$ARGS[1]>>-rental'] and ARGS[2] >= 0 : accessible_property['<<$ARGS[1]>>-rent'] = ARGS[2]
+end
+
 !! Call: `func('homes_properties', 'get_rent_days', $RGS{1])`
 !! Returns the remaining rent days for the property
 !!
@@ -889,7 +940,7 @@ if $ARGS[0] = 'get_rent_amount':
 		result = accessible_property['<<$ARGS[1]>>-rent']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]
-		result = $property['rent']
+		result = property['rent']
 		killvar 'property'
 	end
 end
@@ -940,8 +991,12 @@ end
 !! Call: `func('homes_properties', 'progress_construction_status', $ARGS[1])`
 !! $ARGS[1] - the property code or location, if empty it will use $loc
 if $ARGS[0] = 'progress_construction_status':
-	$constrstatpropcode = iif($ARGS[1] = '', $loc, $ARGS{2})
-	if accessible_property['<<$constrstatpropcode>>-construction-status'] < 2: owned_property['<<$constrstatpropcode>>-construction-status'] += 1
+	'$ARGS[1]: <<$ARGS[1]>>'
+	$constrstatpropcode = iif($ARGS[1] = '', $loc, $ARGS[1])
+	'$constrstatpropcode: <<$constrstatpropcode>>'
+	'accessible_property[''<<$constrstatpropcode>>-construction-status'']: <<accessible_property[''<<$constrstatpropcode>>-construction-status'']>>'
+	if accessible_property['<<$constrstatpropcode>>-construction-status'] < 2: accessible_property['<<$constrstatpropcode>>-construction-status'] += 1
+	'accessible_property[''<<$constrstatpropcode>>-construction-status'']: <<accessible_property[''<<$constrstatpropcode>>-construction-status'']>>'
 	killvar 'constrstatpropcode'
 end
 
@@ -957,10 +1012,10 @@ end
 !!  ARGS[2] - the value of the renovation
 !! $ARGS[3] - the part of the property that was renovated - 'bedroom', 'living room', etc.  Optional
 if $ARGS[0] = 'renovate_property':
-	$renovatepropcode = iif($ARGS[1] = '', $loc, $ARGS{2})
+	$renovatepropcode = iif($ARGS[1] = '', $loc, $ARGS[1])
 	accessible_property['<<$renovatepropcode>>-renovated'] = 1
 	accessible_property['<<$renovatepropcode>>-renovation-value'] += ARGS[2]
-	if $ARGS[3] ! '' : accessible_property['<<$renovatepropcode>>-renovations'] += ';<<$ARGS[3]>>' 
+	if $ARGS[3] ! '' : $accessible_property['<<$renovatepropcode>>-renovations'] += ';<<$ARGS[3]>>' 
 	killvar '$renovatepropcode'
 end
 
@@ -992,7 +1047,7 @@ end
 !!			- empty string - in this case the actual $loc value will be used 	
 if $ARGS[0] = 'free_internet_available':
 	gs 'homes_properties_attr', 'get_property_attr', iif($ARGS[1] = '', $home_name[$loc], $home_name[$ARGS[1]])
-	result = $property['free_internet'] = 1
+	result = property['free_internet'] = 1
 	killvar 'property'
 end
 

+ 48 - 8
locations/homes_properties_attr.qsrc

@@ -148,7 +148,6 @@ end
 				Possible values are:
 
 	free_internet: if the property comes with free internet (uses subscription['free']) then the value is `1`
-				   Right now there are two potential homes with this: Meynold Household, University Dorm	
 
 	internet_enabled: If the value is 1, then Sveta can buy, cancel, transfer an internet subscription here
 
@@ -205,7 +204,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['type'] = 'permanent_residence'
 		
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'village_cottage':
 		property['id'] = 3
 		$property['code'] = $ARGS[1]
@@ -265,7 +264,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['type'] = 'temporary_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'maid_bedroom':
 		property['id'] = 7
 		$property['code'] = $ARGS[1]
@@ -278,7 +277,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['type'] = 'permanent_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'niko_apartment':
 		property['id'] = 8
 		$property['code'] = $ARGS[1]
@@ -302,7 +301,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'hallway'
 		$property['type'] = 'temporary_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'lyceum_dorm':
 		property['id'] = 10
 		$property['code'] = $ARGS[1]	
@@ -315,7 +314,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'pos40'
 		$property['type'] = 'permanent_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'university_dorm':
 		property['id'] = 11
 		$property['code'] = $ARGS[1]
@@ -328,7 +327,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'dorm_room'
 		$property['type'] = 'permanent_residence'
 
-		$property['free_internet'] = 1		
+		property['free_internet'] = 1		
 	elseif $ARGS[1] = 'hunters_lodge':
 		property['id'] = 12
 		$property['code'] = $ARGS[1]
@@ -352,7 +351,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['type'] = 'temporary_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'grandparents_house':
 		property['id'] = 14
 		$property['code'] = $ARGS[1]
@@ -396,4 +395,45 @@ if $ARGS[0] = 'get_property_attr':
 	end
 end
 
+!!-----------------------------------------------------------------------------------------------------
+!!
+!!   Calls for mods 
+!!
+!!-----------------------------------------------------------------------------------------------------
+
+!! This does nothing, the only reason to have this is that a mod can use a redirect to their own 
+!! location, $args[0[] where they have the property info and can return it.
+if $ARGS[0] = 'property_query_hook':
+	!! use this for the redirect
+	mod_result = 1
+end
+
+
+!!{ This is for the mods that want to introduce some new home
+**OR** they rename an existing home location.
+Call this when the mod is initialised and then never again
+
+Example: A mod changes some things in the bedroom at the parents home and for this
+	redirects to `mod_whatever_bedrPar`. 
+	In this case it would fail as the location code passed would not match
+	`bedrPar` and would get back an empty string a the name of the home 
+	To avoid this, the mod should call this function with to location to the mapping.
+
+IMPORTANT: $ARGS[1] is mandatory, and either $ARGS[2] or $ARGS[3] must have a value! 
+
+$ARGS[1]	the new location name as it would appear in the $loc variable. This must start with `mod_` otherwise  it will be ignored
+$ARGS[2] 	the name of the home if it is a completely new location - otherwise pass '' or don''t pass it
+$ARGS[3] 	the location that is being replaced - if it is a new location, leave this as an empty string }
+if $ARGS[0] = 'add_new_home_location':
+	if $home_name[$ARGS[1]] ! '': 
+		!! WARNING: Do Nothing, the location already exists
+	elseif $ARGS[2] = '' and $ARGS[3] = '':
+		!! WARNING: Either $ARGS[2] or $ARGS[3] must have a value, otherwise no mapping will be created
+		$home_name[$ARGS[1]] = ''
+	elseif $ARGS[2] = '':
+		$home_name[$ARGS[1]] = $home_name[$ARGS[2]]
+	else
+		$home_name[$ARGS[1]] = $ARGS[3]
+	end
+end
 --- homes_properties_attr ---------------------------------

+ 10 - 8
locations/hookup_after.qsrc

@@ -867,7 +867,7 @@ if $ARGS[0] = 'light_cigarette':
 					act'Continue':
 						cla & *clr
 						siga_bum = 1
-						gs 'drugs ', 'smoke'
+						gs 'drugs', 'smoke'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 						'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed as both of you unwind with a post-fuck smoke together.'
@@ -885,7 +885,7 @@ if $ARGS[0] = 'light_cigarette':
 				'Pulling a cigarette from your purse, you place it in your mouth, sparking it with your lighter while you inhale.'
 				act'Continue':
 					cla & *clr
-					gs 'drugs ', 'smoke'
+					gs 'drugs', 'smoke'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 					'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed.'
@@ -909,7 +909,7 @@ if $ARGS[0] = 'light_cigarette2':
 			cla & *clr
 			siga += 1
 			siga_bum = 1
-			gs 'drugs ', 'smoke'
+			gs 'drugs', 'smoke'
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 			'He leans over with the lighter and lights it for you and you inhale with him, savoring the smoke that fills your lungs as the two of you sit back and puff away together.'
 			gs 'hookup_after', 'pre'
@@ -924,7 +924,7 @@ if $ARGS[0] = 'light_cigarette2':
 			'You decide to grab a smoke too, pulling one from your purse. You place it in your mouth, sparking it with your lighter while you inhale.'
 			act'Continue':
 				cla & *clr
-				gs 'drugs ', 'smoke'
+				gs 'drugs', 'smoke'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 				'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed as both of you unwind with a post-fuck smoke together.'
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'start':
 	elseif hookup['cigarette'] = 3:
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone_smoke.jpg"></center>'
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		if npc_smoker[$boy] > 0:
 			'Reaching down to your purse, you pull out your phone and a cigarette, sparking the latter and taking a long enjoyable drag from it. <<$npc_firstname[$boy]>> sees you light up and does the same, pulling his own smokes from his nightstand. The two of your relax, smoking together, while you unwind checking messages and scrolling through social media feeds.'
 		else
@@ -1411,16 +1411,16 @@ if $ARGS[0] = 'start':
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
 		siga += 1
 		siga_bum = 1
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		'The two of you lay back and relax, enjoying a post-fuck smoke together as you wind down.'
 	elseif npc_smoker[$boy] > 0 and hookup['cigarette'] = 1:
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		'Seeing you light up, <<$npc_firstname[$boy]>> does as well, pulling a pack from his nightstand. You spark the end with your lighter and relax, taking a long drag, relishing the flavor as it fills your mouth and lungs. The two of you just sit there in silence for a few minutes, enjoying a post-fuck smoke together as you wind down.'
 	elseif hookup['cigarette'] = 1:
 		cla & *clr
-		gs 'drugs ', 'smoke'
+		gs 'drugs', 'smoke'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
 		'Smoke fills your lungs and you hold it there, savoring it, before exhaling slowly. As the smoke blows past your lips, it''s like all your stress goes with it and you sigh happily, relaxing into the bed.'
@@ -1813,6 +1813,7 @@ if $ARGS[0] = 'npc_date_request':
 			'"I won''t," you promise.'
 		end
 		'Your little exchange done, you wave him goodbye and head out the door.'
+		act'Leave':gt 'hookup_after', 'exit'
 	end
 	act'I''m not up for anything serious':
 		cla & *clr
@@ -1861,6 +1862,7 @@ if $ARGS[0] = 'npc_date_request':
 end
 
 if $ARGS[0] = 'fuckbuddy_text':
+	hookup['fuckbuddy'] = 1
 	hookup['text_message'] = rand(1,2)
 	if hookup['text_message'] = 1:
 		'	<b><font color="blue">hey fuck buddy</font></b>'

+ 7 - 7
locations/hookup_morning.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'confused':
 	'What happened last night...? You blink blearily, looking around, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
 	*nl
 	'That''s right! You hooked up with a guy last night and accidentally fell asleep in his bed...'
-	if npc_earlyriser[$boy] = 1:
+!!	if npc_earlyriser[$boy] = 1:
 		act'... <i>his</i> bed...?':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'confused':
 			'"Yeah," you mumble back.'
 			gs'hookup_morning','wakeup'
 		end
-	elseif npc_latesleeper[$boy] = 1:
+!!{	elseif npc_latesleeper[$boy] = 1:
 		act'What was his name?':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -186,7 +186,7 @@ if $ARGS[0] = 'confused':
 		end
 	else
 		
-	end
+	end}
 	if mid($start_type,1,2) = 'sg':
 		act'Mom!':gt'hookup_morning','mom'
 	end
@@ -241,7 +241,7 @@ end
 
 if $ARGS[0] = 'guilt2':
 	'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-	if npc_earlyriser[$boy] = 1:
+!!{	if npc_earlyriser[$boy] = 1:
 		!! for later: create option for him to burst in with breakfast in bed
 		if npc_apt_type[$boy] = 2:
 			'The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'guilt2':
 		end
 	elseif npc_latesleeper[$boy] = 1:
 		'<<$npc_firstname[$boy]>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
-	else
+	else}
 		'<<$npc_firstname[$boy]>> stirs next to you.'
 		if npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1 and rand(1,3) = 3:
 			'"Hey," he mumbles, looking over. "What''s up? Something wrong?"'
@@ -271,7 +271,7 @@ if $ARGS[0] = 'guilt2':
 				gs'hookup_morning','wakeup'
 			end
 		end
-	end
+!!	end
 end
 
 if $ARGS[0] = 'mom':
@@ -660,7 +660,7 @@ end
 	if npc_apt_type[$boy] > 2:
 !!		act'Put your underwear on':
 
-		act'Go explore his place':gt'hookup_morning','explore'
+!!		act'Go explore his place':gt'hookup_morning','explore'
 
 		act'Find the kitchen':
 

+ 3 - 3
locations/hotel_anna_gear.qsrc

@@ -1263,7 +1263,7 @@ if $ARGS[0] = 'restraints_cuff':
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/cuff1.jpg"></center>'
 						'"Sure <<$pcs_nickname>>... just give me a moment." Anna starts freeing your ankles and wrists.'
-						'"Just remember <<$pcs_nickname>> I won''t force you to do anything you don''t want to... the main things is for you to learn, and and it seems you''ve learned enough today."'
+						'"Just remember <<$pcs_nickname>> I won''t force you to do anything you don''t want to... the main things is for you to learn, and it seems you''ve learned enough today."'
 						'"Just get me out of this please." Anna smiles as she removes your cuffs. Once your arms and legs are free you hurriedly get dressed, you chat a little with Anna before she she walks you to the front door and say goodbye and walk out to the residential area.'
 						act 'Leave': gt'pav_hotel'
 					end
@@ -1361,7 +1361,7 @@ if $ARGS[0] = 'restraints_leash':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 					'"I''m happy to hear it... anyway we should stop for now. The walk ends. "We shouldn''t get carried away, this is a practice session after all, so <<$pcs_nickname>> I hope it has been instructive for you, you should have a better idea about the collar and the leash. You can get dressed now, and we''ll continue next time"'
-					'"Thank you Anna." You get dressed and and chat a little about collars before saying goodbye and leaving.'
+					'"Thank you Anna." You get dressed and chat a little about collars before saying goodbye and leaving.'
 					act 'Leave': gt'pav_hotel'
 				end
 				act'S-stop...':
@@ -1403,7 +1403,7 @@ if $ARGS[0] = 'restraints_leash':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/Anna/sessionhotel/leashnakfine.jpg"></center>'
 					'"I''m happy to hear it... But we should stop for now." The walk ends. "We shouldn''t drag this on too long, this is for you to learn after all, so <<$pcs_nickname>> I hope it has been a learning experience for you, hopefully you should have a better idea about the collar and the leash. You can get dressed now, and we''ll follow up on this next time"'
-					'"Thank you Anna."You get dressed and and chat a little about collars before saying goodbye and leaving.'
+					'"Thank you Anna."You get dressed and chat a little about collars before saying goodbye and leaving.'
 					act 'Leave': gt'pav_hotel'
 				end
 				act'S-stop...':

+ 72 - 72
locations/hunter_ambient.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'nude_model_convo':
 	hunter_collective_opinion += 3
 
 	'"I''m telling you, I''ve seen her pictures in a men''s magazine." you overhear Igor.'
-	'As soon as they noticed you the men stop talking and changed the subject to another topic.'
+	'As soon as they notice you, the men stop talking and change the subject to another topic.'
 end
 
 if $ARGS[0] = 'stripper_convo':
@@ -18,7 +18,7 @@ if $ARGS[0] = 'stripper_convo':
 	hunter_collective_opinion -= 3
 
 	'"I promise you, it was her, I swear!" you overhear Sergei. "She was on the stage, stripping and dancing."'
-	'As soon as they noticed you the men stop talking and changed the subject to another topic.'
+	'As soon as they notice you, the men stop talking and change the subject to another topic.'
 end
 
 if $ARGS[0] = 'pornstar_convo':
@@ -27,8 +27,8 @@ if $ARGS[0] = 'pornstar_convo':
 	hunter_sexual_comfort += 7
 	hunter_collective_opinion -= 5
 
-	'"I recently downloaded some porn, and guess who was getting fucked in the video. Trust me, it was <<$pfname>>." you overhear Andrei.'
-	'As soon as they noticed you the men stop talking and changed the subject to another topic.'
+	'"I recently downloaded some porn, and guess who was getting fucked in the video. Trust me, it was <<$pcs_firstname>>." you overhear Andrei.'
+	'As soon as they notice you, the men stop talking and change the subject to another topic.'
 end
 
 if $ARGS[0] = 'river_rape_convo':
@@ -49,131 +49,131 @@ if $ARGS[0] = 'generic_convo':
 
 	elseif convo_rng_roll = 2:
 		'"I swear, it was something like a large orangutan standing by the trees watching us! I also saw those massive prints the other day!"'
-		'"Sure, it had nothing to with that vodka bottle you were chugging." says Igor'
-		'"Nah I totally believe him. It was just his mom making sure his baby boy was fine" says Sergei before starting to laugh loudly'
+		'"Sure, it had nothing to with that vodka bottle you were chugging," says Igor'
+		'"Nah, I totally believe him. It was just his mom making sure his baby boy was fine," says Sergei before starting to laugh loudly'
 
 	elseif convo_rng_roll = 3:
-		'We once found a perfect spot while hunting. So we unpacked and checked what we brought with us. There was ammo, water and snacks.'
+		'We once found a perfect spot while hunting. So we unpacked and checked what we had brought with us. There was ammo, water and snacks.'
 		'But we forgot the vodka. So we had to pack up and go back.'
 
 	elseif convo_rng_roll = 4:
-		'The men had gathered for a hunt, all but one were joyful. He had fallen in trouble with his wife. She had said: "I know what you do when you go hunt, you only get drunk as pigs and then crawl home." In the middle of the argument the man had enough and told his wife that she could join them. When the rest of the men noticed that a woman was supposed to join them they got quite irritated.'
-		'They walked into the forest, found a suitable clearing, and the man gave his wife a rifle and said:'
-		'"You can sit here hidden in the bushes, and I will drive the moose towards you. I will drive it straight at you and you better do not miss, or else all the hard work will go waste..."'
-		'The man leaves, and joins the other men near a hut and they start to drink. Time passed by and all of a sudden the man woke up after sundown... The man grabbed his head, thinking that he would get a scolding by his wife.'
-		'He comes near the clearing and sees an odd picture: in the middle of the clearing there lies a carcass and the wife is jumping with joy around it. Standing next to her is an upset man, rubbing his bald head.'
-		'"Yes dear, look at the elk you killed. We just need to remove the saddle..."'
+		'The men had gathered for a hunt. All but one were joyful. Unfortunately, he had gotten in trouble with his wife. She said: "I know what you do when you hunt. You only get drunk as pigs and then crawl home." In the middle of the argument, the man had enough and told his wife that she could join them. When the rest of the men noticed that a woman was supposed to join them, they got pretty irritated.'
+		'They walked into the forest, found a suitable clearing and the man gave his wife a rifle and said:'
+		'"You can sit here hidden in the bushes, and I will drive the moose towards you. I will drive it straight at you, and you better not miss, or else all the hard work will go waste..."'
+		'The man leaves and joins the other men near a hut, and they start to drink. Time passed by, and all of a sudden, the man woke up after sundown... The man grabbed his head, thinking that he would get a scolding from his wife.'
+		'He arrives near the clearing and sees an odd picture: in the middle of the clearing lies a carcass, and the wife jumps with joy around it. Standing next to her is an upset man rubbing his bald head.'
+		'"Yes, dear, look at the elk you killed. We just need to remove the saddle..."'
 
 	elseif convo_rng_roll = 5:
 		'Two hunters are hunting in the woods. They notice a woman in the distance lying down on her stomach, sunbathing. One of the hunters looks at her legs and goes:'
-		'"Now this is a hunt I could chase forever!"'
+		'"Now, that''s a hunt I could chase forever!"'
 		'Then he looks at the woman''s ass and says:'
 		'"Well, maybe not."'
 
 	elseif convo_rng_roll = 6:
-		'There once was politician that was going hunting. He drove out in his fancy jeep, dressed in camouflage and had a super fancy rifle with optical sight night vision... He walks into the forest, and met a man in sandals, a simple hat and a torn jacket, he looked like a typical village guy.'
-		'Man: "Where are you heading?"'
-		'Politician: "I''m gonna shoot a bear!"'
-		'Man: "Yes, you seem well prepared..."'
-		'Politician: "Yes, you see! This rifle can shoot down an elephant..."'
-		'He continues on walking into the woods.'
-		'Smiling the man thinks: "Too bad there haven''t been any bears here for quite a while now"'
+		'There once was a politician that was going hunting. He drove out in his fancy jeep, dressed in camouflage and had a super fancy rifle with optical sight night vision... He walked into the forest and met a man in sandals, a simple hat and a torn jacket. He looked like a typical village guy.'
+		'The man asked: "Where are you heading?"'
+		'The politician told him: "I''m gonna shoot a bear!"'
+		'The man replies: "Yes, you seem well prepared..."'
+		'The politician says: "Yes, you see! This rifle can shoot down an elephant..."'
+		'He continues walking into the woods.'
+		'Smiling, the man thinks, "Too bad there haven''t been any bears here for quite a while now."'
 
 	elseif convo_rng_roll = 7:
-		'After a shot a hunter asks his partner:'
-		'"Can you take a look what beast I''ve put down?"'
+		'After a shot, a hunter asks his partner:'
+		'"Can you look at what beast I''ve put down?"'
 		'He comes back after a while:'
-		'"Judging by the beasts passport, his last name was Ivanov."'
+		'"Judging by the beast''s passport, his last name was Ivanov."'
 
 	elseif convo_rng_roll = 8:
 		'There are two types of shroom trips you can have.'
 		'The first can lead you to an extremely thoughtful introspection, letting you know way more about yourself than before you ate the shrooms.'
-		'While the second can make you feel paranoid as if you were being chased by a guy with a chainsaw in a maze.'
+		'While the second can make you feel paranoid, as if you were being chased by a guy with a chainsaw in a maze.'
 	elseif convo_rng_roll = 9:
 		'"I once killed a whale with one shot."'
 		'"Oh yeah? Well, I strangled a bear with my bare hands."'
 		'"What about this: Have you two ever heard of the Dead Sea?"'
-		'"Yeah what about it?"'
+		'"Yeah, what about it?"'
 		'"So I was walking on the beach this one time..."'
 	elseif convo_rng_roll = 10:
 		hunter_sexual_comfort += 1
 		'"I heard you beat down a snake with your bare hands once?"'
-		'"The rumors are true, my friend."'
+		'"The rumours are true, my friend."'
 		'"So tell me, how did you manage that?"'
-		'"As usual, with wine, soft music and porn"'
+		'"As usual, with wine, soft music and porn."'
 
 	elseif convo_rng_roll = 11:
-		'If nothing comes by while you''re hunting, that means the you''ve become one with the forest.'
+		'If nothing comes by while you''re hunting, you''ve become one with the forest.'
 
 	elseif convo_rng_roll = 12:
 		hunter_sexual_comfort += 1
-		'I once went hunting. I brought my rifle but forgot the cartridges. I let the dog sniff the rifle and she retrieved the ammo!'
-		'Something similar happened to me. I brought the bullets with me but forgot the rifle. I let the dog sniff the ammo and she retrieved the rifle!'
-		'I went to swim with my wife but she forgot the swimsuit. I let the dog sniff my wife between her legs and she retrieved the neighbor by his balls!!!"'
+		'I once went hunting. I brought my rifle but forgot the cartridges. So I let the dog sniff the gun, and she retrieved the ammo!'
+		'Something similar happened to me. I brought the bullets with me but forgot the rifle. So I let the dog sniff the ammo, and she retrieved the gun!'
+		'I went swimming with my wife, but she forgot the swimsuit. I let the dog sniff my wife between her legs, and she retrieved the neighbour by his balls!!!"'
 	elseif convo_rng_roll = 13:
-		'"I once went on a hunt, with only the bullet in the barrel, no spares. I ended up meeting a pack of wolves, they did not even flinch when I shot at them and kept running towards me so I climbed up a tree.'
+		'"I once went on a hunt with only the bullet in the barrel, no spares. I ended up meeting a pack of wolves. They didn''t even flinch when I shot at them and kept running towards me, so I climbed up a tree.'
 		'"Oh wow... How did you survive?"'
 		'"I just hung up in that tree for hours until the wolves decided they had better things to do. Needed a new pair of pants after that."'
 
 	elseif convo_rng_roll = 14:
-		'"Guys do you all ever look into the sky and thing whether if we are all alone in the universe?"'
-		'"Not really. The universe is massive. There is no way no other life exists out there" says Igor'
-		'"Then how do we not see any signs of other life out there? We should have been seeing something, anything by now." says Sergei'
+		'"Guys, do you all ever look into the sky and think whether we are all alone in the universe?"'
+		'"Not really. The universe is massive. There is no way no other life exists out there," says Igor'
+		'"Then how do we not see any signs of other life out there? We should have been seeing something, anything, by now," says Sergei'
 
 	elseif convo_rng_roll = 15:
-		'The man returns home being out hunting for a month. A friend asks him:'
+		'The man returns home after being out hunting for a month. A friend asks him:'
 		'"Well, I guess you''ve made quite a fortune. You''ve been away for a month. You will be able to buy your wife lots of things!"'
-		'"Not really, I drank it all up."'
+		'"Not really. I drank it all up."'
 
 	elseif convo_rng_roll = 16:
 		hunter_sexual_comfort += 1
-		'A hunter was chasing a bear. The bear was though and healthy and ran quickly, leaving the hunter behind. While looking backwards the bear got stuck between two trees. A rabbit runs by and asks the bear:'
+		'A hunter was chasing a bear. The bear was tough and healthy and sprinted, leaving the hunter behind. While looking backwards, the bear got stuck between two trees. A rabbit runs by and asks the bear:'
 		'"How did you get stuck there?"'
-		'"Well..." the bear began its story but the rabbit jumps on the bear and starts fucking it in the ass. The bear got upset but could not get out.'
+		'"Well..." the bear began its story, but the rabbit jumped on the bear and started fucking it in the ass. The bear got upset but could not get out.'
 		'Then he saw a fox running by and called it over:'
-		'"Hey fox, come over here and help me out!"'
-		'The fox thought about it and like the rabbit it started fucking the bear. The bear was now getting desperate, when he saw the wolf. The wolf comes over and asks:'
+		'"Hey, fox, come over here and help me out!"'
+		'The fox thought about it, and like the rabbit, it started fucking the bear. The bear was now getting desperate when he saw the wolf. The wolf comes over and asks:'
 		'"What happened to you?"'
-		'The bear answers: "Well, wolf, you might as well fuck me over first then I''ll tell you!!"'
+		'The bear answers: "Well, wolf, you might as well fuck me over first, then I''ll tell you!!"'
 
 	elseif convo_rng_roll = 17:
-		'I went out with some men hunting and as usual we got drunk. One of the men grabs his rifle and goes to hunt. All of a sudden a bear appears, and he starts climbing a tree. He shouts:'
+		'I went out with some men hunting, and as usual, we got drunk. One of the men grabs his rifle and goes hunting. Suddenly a bear appears, and he starts climbing a tree. He shouts:'
 		'"Guys, save me! Kill the bear."'
-		'Since we''re all drunk, we take aim, shoot and the shots fly by the bear. The bear continues on, not caring about the shots. Guy yells again:'
-		'"Come on guys! Kill this fucking bear."'
-		'We take aim again, shoot and miss. The man now desperate shouts:'
-		'"What are you bastards doing! Are you trying to kill me or the bear!"'
+		'Since we''re all drunk, we take aim, shoot, and the shots fly by the bear. The bear continues on, not caring about the shots. Guy yells again:'
+		'"Come on, guys! Kill this fucking bear."'
+		'We retake, aim, shoot and miss. The man, now desperate, shouts:'
+		'"What are you bastards doing!? Are you trying to kill the bear or me!"'
 
 	elseif convo_rng_roll = 18:
-		'"Every year we do our annual cleaning of the hut, throwing away old canned food and stuff. Well, one guy threw a family size can of baked beans in the burn barrel instead of in the trash can.'
-		'"That night, as we were all telling stories and drinking around the burn barrel, the can exploded! Hot baked beans covered everything within a 10 meter radius, including us.'
+		'"Every year, we clean the hut, throwing away old canned food and stuff. Well, one guy threw a family-size can of baked beans in the burn barrel instead of in the trash can.'
+		'"That night, as we were all telling stories and drinking around the burn barrel, the can explode! Hot baked beans covered everything within a 10-meter radius, including us.'
 
 	elseif convo_rng_roll = 19:
-		'One the hunters tells the other: "I once had a sparrow try to fly over my head so I whacked it with my shotgun barrel, killing it."'
+		'One of the hunters tells the other: "I once had a sparrow try to fly over my head, so I whacked it with my shotgun barrel, killing it."'
 
 	elseif convo_rng_roll = 20:
-		'The hunters are all huddled up and one of the hunters puts the rifle on his knees, pointing it at his neighbor.'
-		'"Sorry I''ll be more careful next time so I don''t accidentally gun you down!"'
+		'The hunters are all huddled up, and one of them puts their rifle on his knees, pointing it at his neighbour.'
+		'"Sorry, I''ll be more careful next time, so I don''t accidentally gun you down!"'
 		'"Just finish me off already..." the other hunter replies.'
 
 	elseif convo_rng_roll = 21:
-		'"So I got lost in the forest one night and was trying to get back to the hut. I stumbled around in the darkness for hours until I hear someone yelling "MARK! MARK! MARK!" So I say to myself "This guy knows where he is so go find him."'
-		'"I walk all the way there in the dark and when I got there all I found was an old hair lipped dog..."'
+		'"So I got lost in the forest one night and was trying to return to the hut. I stumbled around in the darkness for hours until I heard someone yelling, "MARK! MARK! MARK!" So I say to myself, "This guy knows where he is, so go find him."'
+		'"I walked all the way there in the dark, and when I got there, all I found was an old hair-lipped dog..."'
 
 	elseif convo_rng_roll = 22:
-		'So the local government was looking for investors in the area, and a certain Minister was invited to a rabbit hunt.'
-		'At the end he was unanimously proclaimed one of the greatest hunters to pass the village, managing to hunt 30 rabbits just in a day.'
+		'So the local government was looking for investors in the area, and a particular Minister was invited to a rabbit hunt.'
+		'Ultimately, he was unanimously proclaimed one of the most excellent hunters to pass the village, managing to hunt 30 rabbits in a day.'
 		'"Yes indeed", the Minister then commented jokingly, "Especially considering that I only took ten shots."'
 
 	elseif convo_rng_roll = 23:
-		'"I have a dog, that can locate a wounded duck and bring it to me."'
-		'"My dog is way cooler. If I see a flying flock of ducks I put the dog in my man-made catapult. Aim it in the direction of the pack, fire off, the dog flies towards them and brings me some ducks back..."'
-		'Meanwhile, a calf grazing in nearvy raises its head and sees the dog flying.'
+		'"I have a dog that can locate a wounded duck and bring it to me."'
+		'"My dog is way cooler. If I see a flying flock of ducks, I put the dog in my man-made catapult. Aim it in the direction of the pack, fire off, and the dog flies towards them and brings me some ducks back..."'
+		'Meanwhile, a calf grazing nearby raises its head and sees the dog flying.'
 		'"Mom, look! That dog is flying after those ducks!"'
-		'The cow responds: "I told you we should not have eaten those mushrooms and stuck to grass."'
+		'The cow responds: "I told you we should not have eaten those mushrooms and stuck to the grass."'
 
 	elseif convo_rng_roll = 24:
-		'Remember, it is best to hunt with dogs for extra help. If you get lost and want to return home, they will always find the way back. But keep them on a short leesh and don''t let go of them when they try running at something they smell'
+		'Remember, it is best to hunt with dogs for extra help. They will always find the way back if you get lost and want to return home. But keep them on a short leash and don''t let go of them when they try running at something they smell.'
 
 	elseif convo_rng_roll = 25:
 		'"Yesterday I shot two geese..."'
@@ -182,19 +182,19 @@ if $ARGS[0] = 'generic_convo':
 
 	elseif convo_rng_roll = 26:
 		hunter_sexual_comfort += 1
-		'A depressed man goes hunting. He finds a bear den, starts firing his rifle, shots towards the bear and says:'
-		'"Listen here, either I kill you or we fuck, your choice! If you wanna survive I suggest you pick the second option... Not feeling satisfied, the hunter goes home, picks up more ammunition, returns to the den, empties his clip. He forces the bear out, saying:'
-		'"Listen, either we fuck again, or I''ll kill you, take your pick! The man survives even this time, wondering how he''s able to still be alive. He goes home and returns with dynamite wanting to blow up den. He sets up the dynamite, hides behind a rock and blows up the entrance to the den.'
-		'Behind him he hears the voice of the bear: "Man, I do not understand, are you this terrible a hunter or just really like getting fucked in the ass?"'
+		'A depressed man goes hunting. He finds a bear den, starts firing his rifle, shoots towards the bear and says:'
+		'"Listen here, either I kill you, or we fuck. Your choice! If you wanna survive, I suggest you pick the second option... Not satisfied, the hunter goes home, picks up more ammunition, returns to the den, and empties his clip. He forces the bear out, saying:'
+		'"Listen, either we fuck again, or I''ll kill you, take your pick! The man survives even this time, wondering how he can still be alive. He goes home and returns with dynamite wanting to blow up the den. He sets up the dynamite, hides behind a rock and blows up the entrance to the den.'
+		'Behind him, he hears the voice of the bear: "Man, I do not understand. Are you this terrible a hunter or just like getting fucked in the ass?"'
 
 	elseif convo_rng_roll = 27:
-		'"I went out hunting once and saw this huge wild boar killing one deer."'
-		'"Yeah they do that, nasty bastards."'
+		'"I went hunting once and saw this huge wild boar killing one deer."'
+		'"Yeah, they do that, nasty bastards."'
 
 	elseif convo_rng_roll = 28:
 		hunter_sexual_comfort += 1
-		'So it was goose hunting season. A hunter, tired off staying hidden, finally saw a lone goose. He sneaks on it, and gets as close as possible to take a shot.'
-		'When he''s finally close enough, he lets off a shot but misses the goose. It turns around and hisses towards the hunter.'
+		'So it was goose hunting season. A hunter, tired of staying hidden, finally saw a lone goose. He sneaks on it and gets as close as possible to take a shot.'
+		'He lets off a shot when he''s finally close enough but misses the goose. It turns around and hisses towards the hunter.'
 		'"Shit! Do they bite?" asked the hunter. "What did you expect? That they suck?" answered his friend.'
 	end
 end
@@ -204,7 +204,7 @@ end
 if $ARGS[0] = 'yard_convo':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterstalk.jpg"></center>'
-	'While walking around the yard you overhear the hunters'' conversation'
+	'While walking around the yard, you overhear the hunters'' conversation.'
 
 	convo_rng_roll = rand(1,20)
 
@@ -289,7 +289,7 @@ if $ARGS[0] = 'bring_food':
 		!TODO: Show the name of the hunter bringing the food. Also add variety besides rabbit
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/bunny_butcher.jpg"></center>'
-		'You see one of the hunters returning with a rabbit he shot. He proceeds to skin and butcher the animal.'
+		'You see one of the hunters returning with a rabbit he shot. He proceeds to skin and butchers the animal.'
 		raw_meat += 1
 
 		act 'Further': gt 'swamp_yard', 'start'

+ 71 - 71
locations/hunter_favors.qsrc

@@ -19,20 +19,20 @@ if $ARGS[0] = 'housekeeping_request':
 		end
 		gs 'stat'
 
-		'<<$boydesc>> approaches you. "Hey I need your help with something"'
+		'<<$boydesc>> approaches you. "Hey, I need your help with something."'
 
 		act 'Sure what is it?':
 			cla
 			!TODO: If collective opinion is low, make the opinion gain also low
 			!If fire is not going hunters nag at Sveta
 			if campfire = 0:
-				if hunter_collective_opinion >= 15: '"<<$pcs_nickname>>," he says. "The fire is out, can you please make sure it always keeps going while we are outside?"'
-				if hunter_collective_opinion < 15:'"<<$pcs_nickname>>," he uses his stern voice. "The fire is out. You can at least keep the fire going, no way you are that much of a whiny princess"'
+				if hunter_collective_opinion >= 15: '"<<$pcs_nickname>>," he says. "The fire is out. Can you please ensure it keeps going while we are outside?"'
+				if hunter_collective_opinion < 15:'"<<$pcs_nickname>>," he uses his stern voice. "The fire is out. You can at least keep the fire going. No way you are that much of a whiny princess."'
 				act 'Further':hunter_collective_opinion -= 3 & gt 'swamp_yard', 'campfire'
 			!Clean up the hut
 			elseif dirty_swamphouse > 5:
-				if hunter_collective_opinion >= 15: '"<<$pcs_nickname>>," he says. "The hut is a mess, could you take care of it please?"'
-				if hunter_collective_opinion < 15:'"<<$pcs_nickname>>," he uses his stern voice. "The house is a mess, take care of it."'
+				if hunter_collective_opinion >= 15: '"<<$pcs_nickname>>," he says. "The hut is a mess. Could you take care of it, please?"'
+				if hunter_collective_opinion < 15:'"<<$pcs_nickname>>," he uses his stern voice. "The house is a mess. Take care of it."'
 				act 'Clean the hut':hunter_collective_opinion += 2 & gt 'hunter_favors', 'dirty_swamphouse'
 			!Clean up the yard if hut is clean
 			elseif dirty_swamp_yard > 5:
@@ -42,7 +42,7 @@ if $ARGS[0] = 'housekeeping_request':
 			!Cook some mushroom soup or meat stew if yard is also clean and a fire is going on in the yard
 			elseif mushroom_soup + meat_stew < 4:
 				if hunter_collective_opinion >= 15:'"<<$pcs_nickname>>," he says. "We don''t have anything for dinner. Could you please cook something?"'
-				if hunter_collective_opinion < 15:'"<<$pcs_nickname>>," he says sternly. "We don''t have anything to eat for dinner you useless bitch. Go make something before we starve."'
+				if hunter_collective_opinion < 15:'"$<<pcs_nickname>>," he says sternly. "We have nothing to eat for dinner, you useless bitch. Go make something before we starve."'
 				if boletus > 0:
 					act 'Cook some mushroom soup (0:30)':hunter_collective_opinion += 4 & gs 'hunter_favors', 'mushroom_soup'
 				elseif raw_meat > 0:
@@ -52,8 +52,8 @@ if $ARGS[0] = 'housekeeping_request':
 					act '"There is nothing to cook though..."': gt 'swamp_yard', 'start'
 				end
 			else
-				if hunter_collective_opinion >= 15:'"Actually, nevermind. I got this, thanks though."'
-				if hunter_collective_opinion < 15:'"Actually, nevermind. I do not have anything you are useful for."'
+				if hunter_collective_opinion >= 15:'"Actually, never mind. I got this, thanks, though."'
+				if hunter_collective_opinion < 15:'"Actually, never mind. I do not have anything you are useful for."'
 				act 'Okay':
 					hunter_collective_opinion += 5
 					gt 'swamp_yard', 'start'
@@ -92,9 +92,9 @@ end
 if $ARGS[0] = 'yard_cleanup':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamp_yard.jpg"></center>'
-	'You notice that the yard has gotten pretty dirty. "I need to do something about this." you think to yourself.'
+	'You notice that the yard has gotten pretty dirty. "I need to do something about this." you think.'
 	'You grab a garbage bag and start picking up trash.'
-	'After a while you''ve finished tidying up the yard and put the trash in the garbage bag. You''re quite pleased with yourself.'
+	'After a while, you''ve tidied up the yard and put the trash in the garbage bag. You''re pretty pleased with yourself.'
 	if dirty_swamp_yard < 10:
 		minut += 60 & gs 'sweat', 'add', 10
 	elseif dirty_swamp_yard < 20:
@@ -114,8 +114,8 @@ if $ARGS[0] = 'dirty_swamphouse':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/dirty_swamphouse.jpg"></center>'
 	*nl
-	'Visiting the hut, you notice that the hut has gotten pretty dirty. "I need to do something about this." you think to yourself. You grab a broom and a rag and began cleaning.'
-	'After a while you''ve finished cleaning and put back everything in order again. You''re quite pleased with yourself.'
+	'Visiting the hut, you notice that the hut has gotten pretty dirty. "I need to do something about this." you think. So you grab a broom and a rag and begin cleaning.'
+	'After a while, you finish cleaning and put everything back in order again. You''re pretty pleased with yourself.'
 
 	if dirty_swamphouse < 10:
 		minut += 60
@@ -139,7 +139,7 @@ end
 if $ARGS[0] = 'meat_stew':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotsoup.jpg"></center>'
-	*nl	'You cooked a stew with the meat hunters brought. There''s enough for <<mushroom_soup>> servings'
+	*nl	'You cooked a stew with the meat hunters brought. There''s enough for <<mushroom_soup>> servings.'
 	raw_meat -= 1
 	minut += 60
 	bucket -= 1
@@ -152,7 +152,7 @@ end
 if $ARGS[0] = 'mushroom_soup':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hotsoup.jpg"></center>'
-	*nl	'You made a simple mushroom soup by the camppfire and carried it inside the hut. There''s enough for <<mushroom_soup>> servings'
+	*nl	'You made a simple mushroom soup by the campfire and carried it inside the hut. There''s enough for <<mushroom_soup>> servings.'
 	boletus -= 1
 	minut += 30
 	bucket -= 1
@@ -166,7 +166,7 @@ end
 if $ARGS[0] = 'creekside_gangbang_request':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax2.jpg"></center>'
-	'You''re sitting down in the meadow near the road, relaxing, enjoying the nice weather, when all of a sudden Andrei, Sergei and Igor approach you. They quickly surround you not letting move away.'
+	'You''re sitting down in the meadow near the road, relaxing, enjoying the nice weather, when Andrei, Sergei, and Igor suddenly approach you. They quickly surround you, not letting you move away.'
 	'"Hey, <<$pcs_nickname>>, we''ve been talking with each other, and we feel that you need to repay us somehow for the lessons. So what do you say?"'
 	minut += 5
 
@@ -180,8 +180,8 @@ if $ARGS[0] = 'creekside_gangbang_request':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgroupundress.jpg"></center>'
-		'"I guess you''re right I need to repay you somehow..."'
-		'As soon you''ve agreed the guys change their attitude towards you. Igor helps you up and leads you away from the road while Andrei and Sergei already began taking your clothes off...'
+		'"I guess you''re right. I need to repay you somehow..."'
+		'As soon as you''ve agreed, the guys change their attitude towards you. Igor helps you up and leads you away from the road while Andrei and Sergei already begin taking your clothes off...'
 
 		gs 'arousal', 'foreplay', 5, 'sub', 'gangbang'
 		gs 'stat'
@@ -190,7 +190,7 @@ if $ARGS[0] = 'creekside_gangbang_request':
 			*clr & cla
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/hantersgrouptanga.jpg"></center>'
-			'They lay you down on the blanket and quickly pull off your panties. They drop their pants and are standing in front of you with their cocks hanging in the open. "So what are you waiting for? Start sucking."'
+			'They lay you down on the blanket and quickly pull off your panties. They drop their pants and stand in front of you with their cocks hanging in the open. "So what are you waiting for? Start sucking."'
 
 			$clothingworntype = 'nude'
 			$pantyworntype = 'none'
@@ -221,8 +221,8 @@ if $ARGS[0] = 'creekside_gangbang_request':
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/backwaterrelax3.jpg"></center>'
-			'You politely refuse saying you don''t owe them anything, but the men won''t accept a no and you can see that they''re clearly not satisfied with your answer.'
-			'"<<$pcs_nickname>>, don''t fuck around with us. Deep inside you know you need to repay us." said Andrei, grabbing you by the hair.'
+			'You politely refuse, saying you don''t owe them anything, but the men don''t accept a no, and you can see they''re clearly not satisfied with your answer.'
+			'"Sveta, don''t fuck around with us. Deep inside, you know you need to repay us," said Andrei, grabbing you by the hair.'
 			minut += 5
 			hunter_collective_opinion -= 25
 			hunter_sexual_comfort += 15
@@ -242,8 +242,8 @@ if $ARGS[0] = 'yard_bondage':
 
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
-			'Finally with the hour getting so late, Igor comes to free you from your bounds. You are so drained you almost stumble down as you feel blood rushing back to your hands.'
-			'Even though you are glad to be able to move around again, part of you aches to be tied back and used as a naked and ready sex toy'
+			'Finally, with the hour getting so late, Igor comes to free you from your bounds. You are so drained you almost stumble down as you feel the blood rushing back to your hands.'
+			'Even though you are glad to be able to move around again, part of you aches to be tied back and used as a naked and ready sex toy.'
 
 			act 'Further': gt 'swamp_yard', 'start'
 		end
@@ -253,8 +253,8 @@ if $ARGS[0] = 'yard_bondage':
 		hunter_sexual_comfort  += 1
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors4.jpg"></center>'
-		'You are bound completely naked to some trees by the yard. Just the thought of being so helpless and exposed makes you feel butterflies in your stomach'
-		'Anyone could do anything they wanted with your body right now. You are especially aware of the nakedness of your most intimate areas, and how they are available for the hunters to do anything they might want.'
+		'You are bound entirely naked for some trees by the yard. The thought of being so helpless and exposed makes you feel butterflies in your stomach.'
+		'Anyone could do anything they wanted with your body right now. You are aware of the nakedness of your most intimate areas and how they are available for the hunters to do anything they want.'
 
 		gs 'arousal', 'flash', 5, 'bound', 'exhibitionism', 'sub'
 		gs 'arousal', 'end'
@@ -297,8 +297,8 @@ if $ARGS[0] = 'yard_bondage':
 		gs 'arousal', 'end'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_outdoors2.jpg"></center>'
-		'You let Andrei bind you right by the yard. After he is done, he leaves you hanging there to take care of something'
-		'You are completely helpless and feel your nipples start to harden as you feel the breeze on your bare skin.'
+		'You let Andrei bind you right by the yard. Then, after he is done, he leaves you hanging there to take care of something.'
+		'You are helpless and feel your nipples harden as you feel the breeze on your bare skin.'
 
 		act 'Wait for him to come back': gt 'hunter_favors', 'yard_bondage'
 	end
@@ -314,7 +314,7 @@ if $ARGS[0] = 'yard_bondage':
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth1.jpg"></center>'
 		'You notice <<$boydesc>> walking towards you. Without saying a word, he slackens your ties and pushes you down to your knees before tightening them back.'
 		'He does not waste too much time unzipping his cock and pushing it on your face. You comply and start sucking his dick.'
-		'After a minute grabs your head and starts fucking your mouth. You struggle between trying to breathe and trying not to puke as his cock rams in and out of your throat'
+		'After a minute grabs your head and starts fucking your mouth. You struggle between breathing and trying not to puke as his cock rams in and out of your throat.'
 
 		act 'Try and match his rythm':
 			cla & *clr
@@ -327,15 +327,15 @@ if $ARGS[0] = 'yard_bondage':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth2.jpg"></center>'
-			'You decide to make it some more fun for for him. You start bobbing your head in rhythm with his pumping.'
+			'You decide to make it some more fun for him. You start bobbing your head in rhythm with his pumping.'
 			'Whenever he is all the way down your throat, you swallow to massage his cock.'
 
 			gs 'dinsex', 'bj_random'
 			*nl
-			'Your efforts start paying off pretty quickly as he grabs your head and starts pumping even more quickly before he buries his cock all the way in'
+			'Your efforts start paying off pretty quickly as he grabs your head and starts pumping even more rapidly before he buries his cock all the way in'
 
 			gs 'dinsex', 'bj_swallow_random'
-			'He gives you a pat on the head and says "Now that''s a good girl" before tying you upright and walking off, satisfied and drained.'
+			'He gives you a pat on the head and says, "Now that''s a good girl", before tying you upright and walking off, satisfied and drained.'
 
 			act 'Further': gt 'hunter_favors', 'yard_bondage'
 		end
@@ -351,12 +351,12 @@ if $ARGS[0] = 'yard_bondage':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked_mouth3.jpg"></center>'
-			'You decide if you relax your throat and face it will be easier not to puke all over his dick.'
-			'He strokes your hair as he keeps furiously ramming his cock up and down your throat, fucking your face like as if it was a sex toy.'
+			'You decide that if you relax your throat and face, it will be easier not to puke over his dick.'
+			'He strokes your hair as he keeps furiously ramming his cock up and down your throat, fucking your face as if it was a sex toy.'
 
 			gs 'dinsex', 'bj_random'
 			*nl
-			'After a few minutes he pulls out of your mouth and jerks off to your face, splattering your face and chest with his spunk.'
+			'After a few minutes, he pulls out of your mouth and jerks off, splattering your face and chest with his spunk.'
 			'As you blink the cum off your eyes, he zips up and ties you back upright before walking away without saying anything else.'
 
 			act 'Further': gt 'hunter_favors', 'yard_bondage'
@@ -370,8 +370,8 @@ if $ARGS[0] = 'yard_bondage':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked2.jpg"></center>'
 		'You notice <<$boydesc>> walking towards you. Without saying a word, he unzips and bends you over.'
-		'He rubs the tip of his dick against your already wet pussy lips a few times before pushing all the way in. You cannot help but gasp as <<$boydesc>>''s cock fills your pussy'
-		'After letting you settle in to the sensation for a second he slowly starts pumping your pussy. In a minute you are screaming and moaning as he picks his pace up.'
+		'He rubs the tip of his dick against your wet pussy lips a few times before pushing in. You cannot help but gasp as <<$boydesc>>''s cock fills your pussy.'
+		'After letting you settle into the sensation for a second, he slowly starts pumping your pussy. You are screaming and moaning as he picks his pace up in a minute.'
 
 		gs 'dinsex', 'vaginal_sex', 10, 'bound'
 
@@ -389,10 +389,10 @@ if $ARGS[0] = 'yard_bondage':
 			gs 'stat'
 
 			'<center><video autoplay loop src="images/locations/gadukino/sex/hunter/bound_fucked.mp4"></video></center>'
-			'You cannot get enough of the sensation of <<$boydesc>>''s cock sliding inside you. You start pumping your hips to get more of his cock.'
+			'You cannot get enough of the sensation of <<$boydesc>>''s cock sliding inside you. So you start pumping your hips to get more of his cock.'
 
 			*nl
-			'<<$boydesc>> starts fucking you even harder before he buries his cock all the way to the hilt inside you.'
+			'<<$boydesc>> starts fucking you harder before he buries his cock into the hilt inside you.'
 			gs 'dinsex', 'sexcum'
 			'After catching his breath, <<$boydesc>> gives your ass a fondle before walking away, leaving you hanging.'
 
@@ -412,14 +412,14 @@ if $ARGS[0] = 'yard_bondage':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bound_fucked1.jpg"></center>'
-				'You are pretty much overwhelmed by <<$boydesc>> pumping your pussy while you are bound helpless and naked like this.'
+				'You are overwhelmed by <<$boydesc>> pumping your pussy while you are bound, helpless and naked like this.'
 				'You decide to give in and enjoy the sensation of being casually fucked like a blow-up doll.'
 				*nl
 				'He roughly grabs your ass to brace himself as he picks his pace even further, pounding your pussy with near fury.'
-				'Sounds of his hips rhythmically slamming against your ass fills your surrondings, mixed with the lewd smacking sounds of his cock pumping in your pussy and your loud moans and screams'
+				'Sounds of his hips rhythmically slamming against your ass fills your surroundings, mixed with the lewd smacking sounds of his cock pumping in your pussy and your loud moans and screams.'
 
 				*nl
-				'Just as you start feeling his cock throbbing in your pussy, he pulls out and blows his load all over your ass and pussy.'
+				'As you start feeling his cock throbbing in your pussy, he pulls out and blows his load all over your ass and pussy.'
 				'Without saying anything, <<$boydesc>> zips up and walks away, leaving you with cum running down your legs.'
 
 				act 'Further': gt 'hunter_favors', 'yard_bondage'
@@ -439,10 +439,10 @@ if $ARGS[0] = 'yard_bondage':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps3.jpg"></center>'
-		'You are so proccupied with thinking how you are tied up to some tree completely naked and exposed, you do not hear Andrei approaching from behind.'
-		'Not missing the opportunity, he yanks you by the nipple, making you yelp loudly.'
-		'"Hey now, don''t fall asleep just yet. I have something special for you." he says before showing you a piece of leather strap and a clamp with a weight attached.'
-		'"Hope you are into a bit of fun. Or, at least we will find out." he says. You do not object, having already agreed to ''anything''.'
+		'You are so preoccupied with thinking how you are tied up to some tree, wholly naked and exposed you do not hear Andrei approaching from behind.'
+		'He yanks you by the nipple, not missing the opportunity, making you yelp loudly.'
+		'"Hey now, don''t fall asleep just yet. I have something special for you," he says before showing you a piece of leather strap and a clamp with a weight attached.'
+		'"Hope you are into a bit of fun. Or, at least, we will find out," he says. But, of course, you do not object, having already agreed to "anything".'
 
 		act 'Further':
 			cla & *clr
@@ -452,7 +452,7 @@ if $ARGS[0] = 'yard_bondage':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps2.jpg"></center>'
 			'Andrei does not lose time starting to pay some special attention to your nipples.'
-			'The leather strip really stings and you cannot help but yelp with each hit. But you somehow actually enjoy the sensation.'
+			'The leather strip stings, and you cannot help but yelp with each hit. But you somehow actually enjoy the sensation.'
 
 			act 'Further':
 				cla & *clr
@@ -462,12 +462,12 @@ if $ARGS[0] = 'yard_bondage':
 				gs 'arousal', 'end'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps1.jpg"></center>'
-				'Satisfied with the ''warm-up'', Andrei picks up the clamps and attaches them to your nipples'
+				'Satisfied with the ''warm-up'', Andrei picks up the clamps and attaches them to your nipples.'
 				'The mix of pain and pleasure from the clamps biting on your nipples is almost unbearable.'
-				'It really hurts and you want to shake them off, but yet you feel your pussy throbbing and getting wet the more you think about the pain.'
+				'It hurts, and you want to shake them off, yet you feel your pussy throbbing and getting wet the more you think about the pain.'
 				*nl
 				'"Please, I can''t take it anymore!" you plead.'
-				'"''Please'' what, little princess?" Andrei asks'
+				'"Please" what, little princess?" Andrei asks.'
 
 				gs 'willpower', 'sex', 'resist'
 				if will_cost <= pcs_willpwr:
@@ -481,8 +481,8 @@ if $ARGS[0] = 'yard_bondage':
 						hunter_sexual_comfort -= 15
 
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/released_from_bondage.jpg"></center>'
-						'"Well, alright, you are no fun" says Andrei before releasing you from your bonds.'
-						'You rub your sore breasts for a few seconds before shooing away Andrei staring at you giving him a last show.'
+						'"Well, alright, you are no fun," says Andrei before releasing you from your bonds.'
+						'You rub your sore breasts for a few seconds before shooing Andrei away, staring at you, giving him a final show.'
 						act 'Further': gt 'swamp_yard', 'start'
 					end
 				else
@@ -497,8 +497,8 @@ if $ARGS[0] = 'yard_bondage':
 					gs 'arousal', 'vaginal', 5, 'sub', 'bound', 'masochism', 'humiliation'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/bondage_clamps_fuck.jpg"></center>'
-					'"You really like this don''t you now." says Andrei before roughly penetrating you.'
-					'You let out a loud moan from the relief of finally having your aching pussy filled. It does not take Andrei long to cum with you pumping your hips and doing most of the fucking,'
+					'"You really like this. Don''t you, now?" says Andrei before roughly penetrating you.'
+					'You let out a loud moan from the relief of finally having your aching pussy filled. It does not take Andrei long to cum with you pumping your hips and doing most of the fucking.'
 
 					gs 'arousal', 'end'
 					spafinloc = 0
@@ -509,7 +509,7 @@ if $ARGS[0] = 'yard_bondage':
 					gs 'dinsex', 'sexcum'
 
 					*nl
-					'After catching his breath, Andrei releases you from your bonds. "We should do this again" he says, before walking away.'
+					'After catching his breath, Andrei releases you from your bonds. "We should do this again," he says before walking away.'
 					act 'Further': gt 'swamp_yard', 'start'
 				end
 			end
@@ -531,16 +531,16 @@ if $ARGS[0] = 'yard_bondage':
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked2.jpg"></center>'
 		'You do not notice Igor approaching you from behind before he starts stroking your body as he rubs his cock over your pussy lips.'
-		'"You are driving me crazy, <<$pcs_nickname>>" he says. "I cannot help it any longer, I need to have you."'
-		'You turn your head to give him a kiss as he undoes the last of the ropes'
+		'"You are driving me crazy, <<$pcs_nickname>>," he says. "I cannot help it any longer. I need to have you."'
+		'You turn your head to give him a kiss as he undoes the last of the ropes.'
 
 		act 'Further':
 			cla & *clr
 			gs 'arousal', 'vaginal', 5, 'exhibitionism'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked1.jpg"></center>'
-			'Igor settles on the ground and you settle on his crotch, mounting him.'
-			'You start bouncing up and down, gasping from the feeling of his cock pumping inside you'
+			'Igor settles on the ground, and you settle on his crotch, mounting him.'
+			'You start bouncing up and down, gasping from the feeling of his cock pumping inside you.'
 			gs 'dinsex', 'vaginal_sex', 10, 'exhibitonism'
 
 			act 'Further':
@@ -557,17 +557,17 @@ if $ARGS[0] = 'yard_bondage':
 				gs 'stat'
 
 				*nl
-				'After a few more minutes of railing your pussy, you feel Igor pulling out and cumming all over your ass and back'
+				'After a few more minutes of railing your pussy, you feel Igor pulling out and cumming all over your ass and back.'
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/unbound_fucked_cum.jpg"></center>'
 
 				act 'Further':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/unbound_nude.jpg"></center>'
 					'After a couple of seconds catching your breath, you both get up. Before you walk away, Igor asks:'
-					'"<<$pcs_nickname>>, can I ask you for a favor? All of us have rather gotten used to seeing you in the nude."'
-					'"So," he says "Can you just walk around like that all the time?"'
-					'"You mean, never wear clothes around and stay naked the whole time?" you ask, surprised'
-					'"Yes, at least while it is only us around." he says. "So what do you say?"'
+					'"<<$pcs_nickname>>, can I ask you for a favour? We all have gotten used to seeing you in the nude."'
+					'"So," he says", Can you just walk around like that all the time?"'
+					'"You mean, never wear clothes around and stay naked the whole time?" you ask, surprised.'
+					'"Yes, at least while it is only us around," he says. "So what do you say?"'
 
 					gs 'willpower', 'exhib', 'self', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -583,8 +583,8 @@ if $ARGS[0] = 'yard_bondage':
 							forced_naked_day = 999999999999999
 							gs 'stat'
 
-							'"Well," you respond. "At this point we are well past the point of being shy about a bit of nudity. So sure, why not?" you reply.'
-							'"Thanks <<$pcs_nickname>>" he says, before walking away'
+							'"Well," you respond. "At this point, we are well past the point of being shy about a bit of nudity. So sure, why not?" you reply.'
+							'"Thanks, <<$pcs_nickname>>," he says before walking away'
 							act 'Further': gt 'swamp_yard', 'start'
 						end
 					else
@@ -597,8 +597,8 @@ if $ARGS[0] = 'yard_bondage':
 						hunter_sexual_comfort += 15
 						gs 'stat'
 
-						'"Well," you respond. "Do I look like some sex toy to you?" you reply. "What is next, you just randomly fuck me whenever?"'
-						'"You are not exactly all pure and innocent, <<$pcs_nickname>>" he says. "I think you are just being a bitchy cocktease" and walks away'
+						'"Well," you respond. "Do I look like some sex toy to you?" you reply. "What is next? You just randomly fuck me whenever?"'
+						'"You are not exactly all pure and innocent, Sveta," he says. "I think you are just being a bitchy cocktease", and walks away'
 						act 'Further': gt 'swamp_yard', 'start'
 					end
 				end
@@ -651,7 +651,7 @@ if $ARGS[0] = 'nighttime_entertainment':
 		gs 'stat'
 
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_2.jpg"></center>'
-		'You grab Igor and Sergei''s cocks, jerking them off. You can feel both their dicks engorge, filling out your hands more firmly.'
+		'You grab Igor and Sergei''s cocks, jerking them off. You can feel both their dicks engorge, firmly filling out your hands.'
 
 		act 'Suck Sergei':
 
@@ -661,7 +661,7 @@ if $ARGS[0] = 'nighttime_entertainment':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_3.jpg"></center>'
-			'You take Sergei''s head in your mouth, slowly making your way down his shaft.'
+			'You take Sergei''s head in your mouth, slowly descending his shaft.'
 
 			act 'Continue':
 
@@ -672,7 +672,7 @@ if $ARGS[0] = 'nighttime_entertainment':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_3.5.jpg"></center>'
-				'Meanwhile you feel Igor reaching under your shirt, tweaking and playing with your nipple as you bob up and down Sergei''s cock.'
+				'Meanwhile, you feel Igor reaching under your shirt, tweaking and playing with your nipple as you bob up and down Sergei''s cock.'
 
 				act 'Suck Igor':
 
@@ -682,7 +682,7 @@ if $ARGS[0] = 'nighttime_entertainment':
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_4.jpg"></center>'
-					'You let Sergei''s dick pop out of your mouth and switch to sucking Igor instead. You suck all the way down to the hilt, letting his diamond hard pulsing cock fill your throat.'
+					'You let Sergei''s dick pop out of your mouth and switch to sucking Igor instead. You suck down to the hilt, letting his diamond-hard pulsing cock fill your throat.'
 
 					act 'Continue':
 
@@ -694,7 +694,7 @@ if $ARGS[0] = 'nighttime_entertainment':
 
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/hunter/nighttime_entertainment/buk_tit_expose_3.jpg"></center>'
 						'As you pick up your pace with Igor, Andrei reaches under your shirt, pulling out your tit. You feel your nipple slightly harden at the breeze.'
-						'Meanwhile Igor calls out he is going to cum soon. On cue, you suck him all the way down, milking his violently pulsing cock with your throat.'
+						'Meanwhile, Igor calls out he is going to cum soon. On cue, you suck him down, milking his violently pulsing cock with your throat.'
 
 						gs	'cum_call', 'mouth', 'A173', 1
 

+ 17 - 17
locations/igorhunter.qsrc

@@ -24,9 +24,9 @@ boy_birth_month = 6
 if huntersIgorQw < 10 and huntersIgorLove > 0:
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/brosil.jpg"></center>'
-	'You wanted to talk to Igor, but he cuts you off with an angry look.'
-	'"<<$pcs_nickname>>, I realized that our love wasn''t real and we need to break up," he says. As you try to find words to answer he turns and resolutely walks away.'
-	'"This may well be for the best," you think, as you leave in the other direction.'
+	'You want to talk to Igor, but he cuts you off with an angry look.'
+	'"<<$pcs_nickname>>, I realized that our love wasn''t real, and we need to break up," he says. As you try to find words to answer, he turns and resolutely walks away.'
+	'"This may well be for the best," you think as you leave in the other direction.'
 	minut += 5
 	menu_off = 1
 	huntersIgorLove = 0
@@ -40,7 +40,7 @@ else
 		menu_off = 1
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.4.jpg"></center>'
-		'You walked up to Igor to spend time together, but he suddenly kisses you and whispers,'
+		'You walk up to Igor to spend time together, but he suddenly kisses you and whispers,'
 		'"<<$pcs_nickname>>, let''s make love."'
 		huntersIgorsex += rand(12,36)
 		gs 'arousal', 'foreplay', 5
@@ -49,7 +49,7 @@ else
 		act 'Agree':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(4,6)+'.jpg"></center>'
-			*nl 'Smiling, you wink at Igor. He gets a childlike grin on his face and leads you by the hand to his bed.'
+			*nl 'Smiling, you wink at Igor. He gets a childlike grin and leads you by the hand to his bed.'
 			minut += 5
 			huntersIgorQw += 1
 			gs 'stat'
@@ -61,7 +61,7 @@ else
 			'<center><img <<$set_imgh>> src="images/pc/reactions/speak_to_the_hand.jpg"></center>'
 			*nl
 			'"I can''t right now, Igor," you say'
-			'You see a look of regret on his face as you leave'
+			'You see a look of regret on his face as you leave.'
 			minut += 5
 			huntersIgorQw -= 1
 			gs 'stat'
@@ -73,7 +73,7 @@ else
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
 			'Suddenly Igor kisses you when you didn''t expect it.'
-			'He looks a little nervous before gathering up his courage to ask you, "Will you be my girlfriend?"'
+			'He looks nervous before gathering the courage to ask, "Will you be my girlfriend?"'
 			minut += 1
 			menu_off = 1
 			gs 'arousal', 'foreplay', 1
@@ -118,7 +118,7 @@ else
 					act'Further':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-						*nl '"<<$pcs_nickname>>, Do you want to...?" Igor asked in a whisper, when your lips finally parted. "Yes" you say just as quietly and Igor gently took you by the hand and led inside.'
+						*nl '"<<$pcs_nickname>>, Do you want to...?" Igor asked in a whisper when your lips finally parted. "Yes," you say just as quietly, and Igor gently takes you by the hand and leads you inside.'
 						minut += 5
 						gs 'stat'
 
@@ -128,7 +128,7 @@ else
 					act'Further':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-						*nl '"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered, when your lips finally parted. You melt in his hands and spend a few minutes cuddling together.'
+						*nl '"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered when your lips parted. You melt in his hands and spend a few minutes cuddling together.'
 						minut += 5
 						gs 'stat'
 
@@ -150,9 +150,9 @@ else
 			'<center><b><font color = maroon>Igor Anisimov</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big173.jpg"></center>'
 			*nl
-			'Igor is a hunter along with the Sergei and Andrei and is here visiting Andrei. He''s <<boyage>> years old. He is not married and lives in the City Center...'
+			'Igor is a hunter along with Sergei and Andrei and is here visiting Andrei. He''s <<boyage>> years old. He is not married and lives in the City Center...'
 			if huntersIgorQw < 0:
-				'You and him have a bad relationship, because you offended him in the past.'
+				'You and he have a bad relationship because you''ve offended him in the past.'
 			elseif huntersIgorQw < 10:
 				'You have a normal relationship with him.'
 			elseif huntersIgorQw < 20:
@@ -193,7 +193,7 @@ else
 					act 'Flirt':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt1.'+rand(1,3)+'.jpg"></center>'
-						*nl 'You spend time with Igor, flirting all the while. He flirts back, and blushes when you catch him checking you out.'
+						*nl 'You spend time with Igor, flirting all the while. He flirts back and blushes when you catch him checking you out.'
 						minut += 5
 						menu_off = 1
 						!!not using arousal as no orgasm chance
@@ -207,7 +207,7 @@ else
 							act 'Continue Flirt':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss1.jpg"></center>'
-								*nl 'You smile sweetly at Igor. Suddenly Igor steals a kiss when you didn''t expect it. You can feel his breath on your skin, smell the scent of the soap he used to clean himself. Suddenly, he looks embarrassed by what he just did and waits to see what your response will be.'
+								*nl 'You smile sweetly at Igor. Suddenly Igor steals a kiss when you didn''t expect it. You can feel his breath on your skin and smell the scent of the soap he used to clean himself. Suddenly, he looks embarrassed by what he just did and waits to see what your response will be.'
 								gs 'arousal', 'foreplay', 5
 								gs 'stat'
 
@@ -225,7 +225,7 @@ else
 										act'Continue':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-											*nl '"<<$pcs_nickname>>, Do you want to...?" Igor asked in a whisper, when your lips finally parted. "Yes" you say just as quietly and Igor gently took your hand and led you inside.'
+											*nl '"<<$pcs_nickname>>, Do you want to...?" Igor asked in a whisper when your lips finally parted. "Yes," you say just as quietly, and Igor gently takes your hand and leads you inside.'
 											minut += 5
 											gs 'stat'
 
@@ -235,7 +235,7 @@ else
 										act'Continue':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterkiss3.jpg"></center>'
-											*nl '"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered, when your lips finally parted. You melt in his hands and spend a few minutes cuddling together.'
+											*nl '"It was everything I hoped for, <<$pcs_nickname>>," Igor whispered when your lips parted. You melt in his hands and spend a few minutes cuddling together.'
 											minut += 5
 											gs 'stat'
 
@@ -261,7 +261,7 @@ else
 					act 'Spend time together':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterlove1.'+rand(1,4)+'.jpg"></center>'
-						*nl 'You cuddle up with Igor, and trade gentle kisses with him. He adores you and wishes you were always with him and you wish the same.'
+						*nl 'You cuddle up with Igor and trade gentle kisses with him. He adores you and wishes you were always with him, and you wish the same.'
 						minut += 120
 						menu_off = 1
 						!!not using arousal as no orgasm chance
@@ -279,7 +279,7 @@ else
 						act 'Have sex':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanterflirt2.'+rand(1,6)+'.jpg"></center>'
-							*nl 'You wink seductively at Igor, and look in the direction of his bed. Igor gives you an excited hug before leading the way.'
+							*nl 'You wink seductively at Igor and look in the direction of his bed. Igor gives you an excited hug before leading the way.'
 							menu_off = 1
 							huntersIgorQw += 1
 							huntersIgorsex += rand(12,36)

+ 8 - 9
locations/internet_mobile.qsrc

@@ -147,14 +147,14 @@ if $ARGS[0] = 'renew_subscription':
         karta -= finalfee        
         subscription['<<$ARGS[1]>>-discount'] = rem_discount
         if app_discount > 0: $discounttext = '<<renewfee>>₽ and you had <<acc_discount>><b>₽</b> left on your account. After applying <<app_discount>><b>₽</b> to your monthly fee, your final payable was <b><font color="green"><<finalfee>>₽</b></font>  and you were left with <<rem_discount>><b>₽</b> on your account.'
-        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was' + iif(app_discount > 0, $dicounttext, '<b><font color="green"><<renewfee>>₽</font></b> which was taken from your bank account.')
+        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was' + iif(app_discount > 0, $discounttext, '<b><font color="green"><<renewfee>>₽</font></b> which was taken from your bank account.')
         if subscription['<<$ARGS[1]>>-suspension_month'] > 0: subscription['<<$ARGS[1]>>-suspension_month'] = 0
         if subscription['<<$ARGS[1]>>-suspension_day'] > 0: subscription['<<$ARGS[1]>>-suspension_day'] = 0
     else
         remainingday = 5
         if subscription['<<$ARGS[1]>>-suspension_day'] > 0: remainingday = subscription['<<$ARGS[1]>>-suspension_day'] - day
         if app_discount > 0: $discounttext = ' and you had <<acc_discount>><b>₽</b> left on your account. After applying <<app_discount>><b>₽</b> to your monthly fee, your final payable was <<finalfee>><b>₽</b>  and you were left with <<rem_discount>><b>₽</b> on your account.'
-        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was <<renewfee>><b>₽</b>'+ iif(app_discount >0, $dicounttext,', unfortunately your payment was declined. We will try to take the payment over the next <b><font color="red"><<remainingday>> days</font></b> before suspending services.')
+        $subscription['<<$ARGS[1]>>-contract_message'] = 'Your monthly fee was <<renewfee>><b>₽</b>'+ iif(app_discount >0, $discounttext,', unfortunately your payment was declined. We will try to take the payment over the next <b><font color="red"><<remainingday>> days</font></b> before suspending services.')
         gs 'internet_mobile', 'set_suspension_date', $ARGS[1]
     end
     killvar 'renewfee'
@@ -187,23 +187,22 @@ end
 !! 
 if $ARGS[0] = 'check_allowed_location':
     gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]
-    result = $property['internet_enabled'] = 1
+    result = property['internet_enabled'] = 1
     killvar 'property'
 end
 
-!! $ARGS[1] - this is expected only if the location allows the use of subscription['free']
+!! $ARGS[1] - this is expected only if the location allows the use of subscription['free'], otherwise pass ''
 !! $ARGS[2] - Limitation code: : 'noporn', 'nocamshow'
 !! and on...can be up to 10 arguments.
 if $ARGS[0] = 'get_access':
+    killvar 'access'
     $subsname = iif($ARGS[1] = '', func('homes_properties', 'get_property_code'), func('homes_properties', 'get_property_code', $ARGS[1]))
-    
     if func('homes_properties', 'free_internet_available', $subsname) ! 0:
         $access['subscription'] = 'free'
     elseif $ARGS[1] = 'free':
         $access['subscription'] = 'free'
     elseif subscription[$subsname] = 1:
         $access['subscription'] = $subsname
-        killvar 'subsname'
     elseif subscription['mobile'] = 1:
         $access['subscription'] = 'mobile'
     elseif subscription['metered_mobile'] > 0:
@@ -218,7 +217,7 @@ if $ARGS[0] = 'get_access':
         if count > 2:
             k = 2
             :loop_args
-                access[ARGS[k]] = 1
+                access[$ARGS[k]] = 1
                 k += 1
             if k < count: jump 'loop_args'
         end
@@ -236,7 +235,7 @@ end
 !! $ARGS[2] - Custom message - optional
 if $ARGS[0] = 'add_limitation':
     access[$ARGS[1]] = 1
-    $access[$ARGS[1]] = $ARGS2
+    $access[$ARGS[1]] = $ARGS[2]
 end
 
 !!Remove the limiation passed in $ARGS[1] and set's it's custom message to ''
@@ -252,7 +251,7 @@ end
 !! $ARGS[1] - Limitation code: : 'noporn', 'nocamshow'
 !! $ARGS[2] - Custom message 
 if $ARGS[0] = 'set_limitation_message':
-    if access[$ARGS[1]] = 1: $access[$ARGS[1]] = $ARGS2
+    if access[$ARGS[1]] = 1: $access[$ARGS[1]] = $ARGS[2]
 end
 
 !! Sets the date when the subscription will be cancelled if not paid.

+ 1 - 1
locations/intro_customization.qsrc

@@ -138,7 +138,7 @@ if $ARGS[0] = 'modite':
 		end
 		gt 'intro_customization','modite'
 	end
-	act 'Laptop (<<komp>>/1)':
+	act 'Computer (<<komp>>/1)':
 		if komp = 0:
 			komp = 1
 		else 

+ 1 - 1
locations/journal.qsrc

@@ -518,7 +518,7 @@ end
 
 if $ARGS[0] = 'relindex':
 
-    *pl & gs 'indik', '4', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
+    *pl & gs 'indik', '1', npc_rel['<<$ARGS[1]>>'], npc_rel['<<$ARGS[1]>>'], 100 & '<<$ind>>'
 end
 
 if $ARGS[0] = 'leaveactions':

+ 7 - 5
locations/journal_quests.qsrc

@@ -26,12 +26,14 @@ if $ARGS[0] = 'start':
 		if meadow = 1 or meadow = 2:
 			'You have found a Secret Meadow. Maybe Mira would like to see it.'
 		elseif meadow = 3:
-			'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.' 
 			if npc_QW['A60'] = 0:
+				'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
 				'You could show Mira around, maybe introduce her to some of the local boys...'
 			elseif npc_QW['A60'] = 1:
+				'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
 				'You introduced Mira to Mitka and the boys. Maybe you should ask her what she thinks about them.'
 			elseif npc_QW['A60'] = 2:
+				'You have shown Mira your Secret Meadow and told her she could visit it on her own. You did make her promise not to show anyone else, but maybe you should keep an eye on her, in case she breaks that promise.'
 				'Mira admitted she likes Mitka. Only time will tell what will come from that. In the meantime, you could visit your meadow, from time to time, while you wait to see what happens.'
 			elseif npc_QW['A60'] = 3:
 				'You caught Mira having sex with Mitka, in your meadow after she promised not to show anyone else. You really need to talk to her, and confront her about it.'
@@ -43,18 +45,18 @@ if $ARGS[0] = 'start':
 				'You have watched Mira having anal sex with Mitka and she sucessfully fulfilled her First Wish. You are still thinking on what you want her to do for your Second Wish. You should keep getting her drunk with the boys for now, until something comes to mind.'
 			elseif npc_QW['A60'] = 15 and miraprost = 0:
 				'You have watched Mira having anal sex with Mitka and she sucessfully fulfilled her First Wish. You are still thinking on what you want her to do for your second wish. Maybe a walk through the village will give you some ideas.'
-			elseif (npc_QW['A60'] = 16 or npc_QW['60'] < 20) and miraprost > 0:
+			elseif (npc_QW['A60'] = 16 or npc_QW['A60'] < 20) and miraprost > 0:
 				!! Sveta can make her third wish. Can be raised by either prostitution or having sex with the boys when drunk.
 				'Congratulations, you are now Mira''s pimp, thus fulfilling your Second Wish. You should check up on her at the road in the evenings and make sure she is working for you, until you come up with an idea for your third and Final Wish.'
 			elseif npc_QW['A60'] = 21 and Mira_no > 0:
 				'You have convinced her to walk through town naked, to fufill your Third Wish. She is red with shame and has stayed home. Maybe if you talk to her you can convince her to come out of the house again. It may take a few tries though.'
 			elseif npc_QW['A60'] = 21 and Mira_no = 0:
-				'You have convinced her to walk through town naked, to fufill your Third Wish. She came out of her house and you can continue to pimp her out during the evenings. <b>This is the end of Mira and the Three Wishes/b>'
+				'You have convinced her to walk through town naked, to fufill your Third Wish. She came out of her house and you can continue to pimp her out during the evenings. <b>This is the end of Mira and the Three Wishes</b>'
 			elseif npc_QW['A60'] = 22:
-				'In the end, you couldn''t force Mira to walk through town naked, and let her off the hook and forgave her for breaking her promise. She is happy with your decision and you grow even closer. You are still able to pimp her out in the evenings. <b>This is the end of Mira and the Three Wishes/b>'
+				'In the end, you couldn''t force Mira to walk through town naked, and let her off the hook and forgave her for breaking her promise. She is happy with your decision and you grow even closer. You are still able to pimp her out in the evenings. <b>This is the end of Mira and the Three Wishes</b>'
 			end
 		elseif meadow = 4:
-			'You have found a Secret Meadow and shown Mira, but told her she could not go there without you. <b>This choice blocked Mira and the Three Wishes/b>'
+			'You have found a Secret Meadow and shown Mira, but told her she could not go there without you. <b>This choice blocked Mira and the Three Wishes</b>'
 		end
 	end
 

+ 1 - 1
locations/katja_chat.qsrc

@@ -194,7 +194,7 @@ if $ARGS[0] = 'uni_cafe':
 			end
 		elseif npc_rel['A14'] < 25:
 			'"What are you doing here?" Katja says. "I don''t have time for bullies like you." She then turns around and ignores you.'
-			act 'Leave': 'uni_cafe'
+			act 'Leave': gt 'uni_cafe'
 		else
 			'"Hi <<$pcs_nickname>>," Katja says, looking awkwardly at you, like she is trying to determine why you approached her.'
 			'"Hi Katja," you say. "How are you?"'

+ 223 - 9
locations/katja_city.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"That''s so great!" she says, looking really happy.'
 								money -= price
 								gs 'clothing', 'quick_buy', 'cats_dress', numrand, 3000, 'money'							
-								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						end
 						if karta > price:
@@ -206,21 +206,21 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
 								'"That''s so great!" she says, looking really happy.'
 								gs 'clothing', 'quick_buy', 'cats_dress', numrand, 3000, 'karta'							
-								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						end
 						act 'Say it is too expensive for you':
 							cla
 							'"I wish I could afford to buy it but I don''t have the money right now," you say.'
 							'"That''s totally fine, we didn''t do this to buy stuff, just to have fun trying on new things," Katja says.' 
-							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 						end
 					end
 					act 'Tell her you don''t think the dress is really you':
 						cla
 						'"It''s nice, but I don''t think that this dress is really me," you tell Katja, trying to let her down gently.'
 						'"Well, I had to try," she says, somberly. "You know you should try new things once in a while or else you will miss out on so many great things."'
-						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 					end
 				else
 					jump 'tryclotheswithkatja_pussy_cats'
@@ -260,7 +260,7 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
 								'"That''s so great!" she says, looking really happy.'
 								gs 'clothing', 'quick_buy', 'cats_outfits', numrand, 3000, 'money'							
-								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						end
 						if card >= price:
@@ -269,21 +269,21 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
 								'"That''s so great!" she says, looking really happy.'
 								gs 'clothing', 'quick_buy', 'cats_outfits', numrand, 3000, 'karta'							
-								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						end
 						act 'Say it is too expensive for you':
 							cla
 							'"I wish I could afford to buy it but I don''t have the money right now," you say.'
 							'"That''s totally fine, we didn''t do this to buy stuff, just to have fun trying on new things," Katja says.'  
-							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 						end
 					end
 					act 'Tell her you don''t think the dress is really you':
 						cla
 						'"It''s nice, but I don''t think that this dress is really me," you tell Katja, trying to let her down gently.'
 						'"Well, I had to try," she says, somberly. "You know you should try new things once in a while or else you will miss out on so many great things."'
-						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 					end
 				else
 					jump 'tryclotheswithkatja_pussy_cats'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'pussy_cat_outfit1':
 			'"Come on, turn around and let me see you from behind," you say.'
 			'"No," Katja answers as she start taking the clothes off. "I still don''t know what you were thinking choosing these shorts," she says.'
 			'You let her change clothes in silence. When she is finished, she says, "Well, thanks for this anyway, but next time you should choose some proper clothes for me. Let''s leave the shop."'
-			act 'Leave': gt $loc, $loc_arg
+			act 'Leave': minut += 3 & gt $loc, $loc_arg
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_2.jpg"></center>'
 			'"Come on, turn around and let me see you from behind," you say.'
@@ -521,5 +521,219 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 	end
 end
 
+if $ARGS[0] = 'pussy_cat_outfit2':
+	minut += 5
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_1.jpg"></center>'
+	'While you change back to your original clothes, Katja puts on the white shirt and short skirt you have chosen for her. When she''s finished dressing, she turns around so you can get a good look at her.'
+	if katjaQW['slut'] >= 40:
+		'"This looks good," Katja says when she sees herself in the mirror. "It''s a nice dress for a warm summer night," she continues. "I might buy this."'
+	else
+		'"This looks good," Katja says when she sees herself in the mirror. "But it''s a bit short, and kind of see through. I''m not sure if I''m brave enough to wear this in public," she continues.'
+	end
+	act 'Katja starts to change':
+		*clr & cla
+		minut += 2
+		gs 'stat'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_2.jpg"></center>'
+		'As Katja gets ready to change, she lets the shirt hang loose and it falls around her bra, emphasizing her breasts.' 
+		act 'Ask if her panties match her bra':
+			*clr & cla
+			minut += 3
+			gs 'stat'	
+			if katjaQW['slut'] < 40:
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"So do your panties match the bra?" you ask.'
+				'"What?!" Katja gasps. "Why would you ask me that?!"'
+				'"No reason," you say when it''s clear she''s not comfortable with the question, and you let her change in peace.'
+				'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+				act 'Leave': minut += 2 & gt $loc, $loc_arg
+			else
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_3.jpg"></center>'
+				'"So do your panties match the bra?" you ask.'
+				iif(katjaQW['slut'] >= 80, '"Are you assuming I''m wearing panties?" Katja asks slyly.', '"Really, <<$pcs_nickname>>?! You don''t ask a good girl such a question!" Katja says with a wink')
+				'"Come on, be a really good girl and show me it''s just me," you answer.'
+				'After a moment''s hesitation, she relents. "Okay."'
+				'She slowly pulls up the skirt to reveal her smoothly shaved pussy.'
+				if katjaQW['pantiesQWstage'] >= 5:
+					'"See? My panties always match my bra," she says. "No need for them to match when you don''t wear any."' 
+				else 
+					if katjaQW['pantiesQWstage'] < 4: katjaQW['pantiesQWstage'] += 1
+					'It''s clear from Katja''s reddening face that she is embarrassed by you seeing her without panties.'
+					'"Don''t say anything," she says. "It''s just that all my panties are in the laundry," she says, not sounding very truthful. "I normally never go without panties."'
+					iif($panties_worn = 'nude', '"You should. It is very liberating," you tell her as you flash her your naked pussy', '"Why am I not completely convinced that is the case?" you say')+'  and her head turns even more red.'
+				end
+				'"Well, this was fun but I should change back," Katja says.'
+				if npc_sex['A14'] > 0 and katjaQW['slut'] > 60 and rand(0,3) = 0:
+					'"Why don''t I give you a little show?" Katja says with a mischievous smile.'
+					act 'Enjoy the striptease': gt 'katja_city', 'pussy_cat_outfit2_strip'
+				else
+					if katjaQW['QWstage'] > 2:
+						if katjaQW['slut'] > 60:
+							act 'Ask Katja to put on a show': gt 'katja_city', 'pussy_cat_outfit2_strip'
+						else
+							gs 'willpower', 'misc', 'force', 'easy'
+							if will_cost <= pcs_willpwr:
+								act 'Ask Katja to put on a show (<<will_cost>> Willpower)':
+									gs 'willpower', 'pay'
+									gs 'stat'
+									gt 'katja_city', 'pussy_cat_outfit2_strip'					
+								end
+							else
+								act 'Ask Katja to put on a show (<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
+					act 'Let Katja change clothes in peace':
+						*clr & cla
+						minut += 3
+						gs 'stat'	
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_2.jpg"></center>'
+						'Katja finishes changing and you leave the shop. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+						act 'Leave': minut += 2 & gt $loc, $loc_arg
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'pussy_cat_outfit2_strip':
+	gs 'arousal', 'erotic_nudity', 5
+	katjaQW['horny'] += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_4.jpg"></center>'
+	'Katja starts by moving in a more sensual way while she slowly lets the shirt fall down, still holding up the skirt so you have a full view of her pussy.'
+	if npc_sex['A14'] > 0:
+		if max(katjaQW['horny'],100) > rand(50,150) and katjaQW['slut'] >= 80:
+			act 'Katja makes things more interesting': gt 'katja_city', 'pussy_cat_outfit2_play'
+		else
+			gs 'willpower', 'mast', 'force'
+			if will_cost <= pcs_willpwr:
+				act 'Ask Katja to touch herself (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay'
+					gs 'stat'
+					gt 'katja_city', 'pussy_cat_outfit2_play'					
+				end
+			else
+				act 'Ask Katja to touch herself (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			act 'Let Katja finish the show': gt 'katja_city', 'pussy_cat_outfit2_strip2' 
+		end
+	else
+		act 'Let Katja finish the show': gt 'katja_city', 'pussy_cat_outfit2_strip2'
+	end
+end
+
+if $ARGS[0] = 'pussy_cat_outfit1_strip2':
+	gs 'arousal', 'erotic_nudity', 3
+	gs 'arousal', 'end'
+	katjaQW['horny'] += 5
+	katjaQW['slut'] += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_5a.jpg"></center>'
+	'Katja finally takes the shirt off and throws it over her shoulder, holding it in one hand while she lifts the skirt with the other while looking directly at you . "See something you like?" she asks in a seductive tone.'
+	'"Very nice," you reply.'
+	'"Enough with this," she says with a laugh, and starts to change her clothes normally.'
+	'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+	act 'Leave': minut += 2 & gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'pussy_cat_outfit2_play':
+	gs 'arousal', 'foreplay', 3
+	katjaQW['horny'] += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_5b.jpg"></center>'
+	'Katja stops taking off the shirt and moves her hand to her pussy, slowly starting to play with it. She seems to getting really into it.'
+	if katjaQW['know_butt_plug'] = 0:
+		'Out of your eye, you notice that Katja''s bag is open and see something that surprises you. You open the bag and pull out a butt plug and a vibrator. Seems Katja is more naughty than you knew.'
+		'"Well, well, what do we have here?" you say as you show your findings to Katja. She immediately stops what she''s doing and her face turns as red as a tomato.' 
+		'"I... Vicky gave them to me when I moved to the dorm. It isn''t something I would use," Katja stammers.'
+		'"Then why are they in your bag if you don''t use them?" you ask.'
+		'"Because I don''t want Sofia to find them; that girl gets into all my stuff and if she finds it, she won''t stop asking me about it," Katja answers.'
+		'"So you have never used them?" you ask.'
+		if katjaQW['masturbates'] + npc_ass['A14'] = 0:
+			'"I''ve never used any of them," Katja says.'
+			'"Well, then you''re going to try several new things today," you say and hand her the butt plug.'
+		elseif katjaQW['masturbates'] + npc_ass['A14'] = 1:
+			'"I have never used the '+iif(katjaQW['masturbates'] = 1, 'butt plug', 'vibrator')+'." Katja says.'
+			'"So you have used the '+iif(katjaQW['masturbates'] = 1, 'vibrator', 'butt plug')+'. But you are still going to try something new today," you say and hand her the butt plug.'
+		else
+			'Katja doesn''t say anything, but her face is becoming even more red than before. "So you have been using them, you dirty girl!" you say with a smile. "Show me how you use them," you say as you hand her the butt plug.'
+		end
+	else
+		'You look into Katja''s bag and find her butt plug and vibrator. "Use these to make the show even better," you say as you hand her the butt plug.'
+	end
+	act 'Watch Katja insert the butt plug':
+		*clr & cla
+		gs 'arousal', 'foreplay', 5
+		katjaQW['horny'] += 10
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_6.jpg"></center>'		
+		if npc_ass['A14'] = 0:
+			npc_ass['A14'] = 1
+			'"I''ve never put anything in my butt before!" Katja s.'
+			'"There''s a first time for everything," you say. "Lick it first to lubricate it."'
+			'Katja does as you say and starts licking the butt plug. After a minute, you say "I think it''s wet enough for you to put it in. Lie down in the chair. It''ll make it easier to put it in."'
+			'She takes off the rest of the clothes except her bra and moves to the chair before guiding the butt plug to the opening of her ass. She starts pushing it in, but clearly meets some resistance. "Take you time," you say. But Katja seems determined and after a short while she pushes the butt plug completely into her ass with a slight groan of pain.'
+		else
+			if npc_ass['A14'] < 5: npc_ass['A14'] += 1
+			'Katja takes the butt plug and starts licking it. After a minute or so, she takes off the rest of the clothes except her bra and lies down in the chair before pushing the butt plug into her ass.'+iif(npc_ass['A14'] <= 5, ' You can see that there is some resistance and Katja holds back some near inaudible groans of pain.', 'The butt plug goes in without any resistance, and she pulls it back and forth a little while moaning slightly.')
+		end
+		act 'Watch Katja''s reaction':
+			*clr & cla
+			gs 'arousal', 'foreplay', 2
+			katjaQW['horny'] += 10
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_7.jpg"></center>'		
+			'Katja breathes in and out heavily and opens her eyes to look at you. She then puts the fingers of her right hand to her pussy lips, and starts to gently play with her pussy.'
+			act 'Give her the vibrator':
+				*clr & cla
+				gs 'arousal', 'foreplay', 2
+				katjaQW['horny'] += 10
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_8.jpg"></center>'		
+				'"Here. Use this," you say as you turn on the vibrator and give it to her. '+iif(katjaQW['masturbates'] = 1 or katjaQW['know_butt_plug'] = 1, 'Katja clearly knows what she''s doing and uses one hand to spread her pussy lips, puts the vibrator to her clit with the other and starts to moan.', 'Katja looks at it a little nervously, and then starts putting it around her pussy. You''re just about to give her some pointers when she finally uses one hand to spread her pussy lips and puts the vibrator to her clit with the other, letting out a loud moan.')
+				act 'Masturbate while you watch Katja':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_9.jpg"></center>'		
+					'You put you hand down your '+iif(CloSkirtShortness > 0, 'skirt', 'pants')+' and start to rub your clit while you watch Katja. She starts really getting into it, and seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
+					gs 'arousal', 'foreplay', 3
+					gs 'arousal', 'clit_finger', -3, 'masturbate'
+					gs 'arousal', 'end'
+					if katjaQW['know_butt_plug'] = 0: katjaQW['know_butt_plug'] = 1
+					katjaQW['horny'] = 0
+					katjaQW['slut'] += 4
+					gs 'stat'
+					*nl
+					'After she comes down, she says, "Wow, that was intense!"'
+					'"It was a great show," you tell her.'
+					'"Thanks. I think," she says blushing. "Let me get changed," she says and start taking off the shirt.'
+					'She starts takes out the butt plug when you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
+					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+					act 'Leave': minut += 2 & gt $loc, $loc_arg		
+				end
+				act 'Just watch Katja':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_9.jpg"></center>'		
+					'You intensely watch Katja as she starts really getting into it. She seems to have a hard time keeping her voice down and after a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
+					gs 'arousal', 'foreplay', 3
+					gs 'arousal', 'end'
+					if katjaQW['know_butt_plug'] = 0: katjaQW['know_butt_plug'] = 1
+					katjaQW['horny'] = 0
+					katjaQW['slut'] += 4
+					gs 'stat'
+					*nl
+					'After she comes down, she says, "Wow, that was intense!"'
+					'"It was a great show," you tell her.'
+					'"Thanks. I think," she says blushing. "Let me get changed," she says and start taking off the shirt.'
+					'She starts to take out the butt plug when you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
+					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+					act 'Leave': minut += 2 & gt $loc, $loc_arg		
+				end
+			end
+		end
+	end
+end
+
 --- katja_city ---------------------------------
 

+ 3 - 3
locations/katja_uni.qsrc

@@ -1261,7 +1261,7 @@ if $ARGS[0] = 'experienced_tell':
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		gs 'stat'		
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-		'You move closer to Katja and and slowly put your lips to hers. Your tongue slips into her mouth and finds hers, carefully but eagerly pressing back against yours. You push it further, and you spend the next few minutes playing a full game of tonsil hockey.'
+		'You move closer to Katja and slowly put your lips to hers. Your tongue slips into her mouth and finds hers, carefully but eagerly pressing back against yours. You push it further, and you spend the next few minutes playing a full game of tonsil hockey.'
 		act'Continue':
 			cla & *clr
 			!! IMAGE HERE
@@ -1301,7 +1301,7 @@ if $ARGS[0] = 'inexperienced_tell':
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		gs 'stat'		
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-		'You move closer to Katja and and slowly put your lips to hers. Your tongue slips into her mouth and finds hers. She recoils on instinct but you chase after her, making sure her lips never leave yours. You push it further and end up spending the next few minutes playing a full game of tonsil hockey.'
+		'You move closer to Katja and slowly put your lips to hers. Your tongue slips into her mouth and finds hers. She recoils on instinct but you chase after her, making sure her lips never leave yours. You push it further and end up spending the next few minutes playing a full game of tonsil hockey.'
 		'Eventually, the two of you break apart, a thin trail of saliva trailing between her lips and yours.'
 		*nl
 		'"Whoa..." she murmurs. "That was something else..."'
@@ -1337,7 +1337,7 @@ if $ARGS[0] = 'no_experienced_tell':
 		gs 'npc_relationship', 'modify', 'A14', 'like'
 		gs 'stat'		
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
-		'You move closer to Katja and and slowly put your lips to hers. The two of you awkwardly bump together, feeling the heat of your blushes radiating off each other''s cheeks. Very, very carefully, you experimentally push your tongue into her mouth. As soon as it touches her lips, she flinches but settles into it and clumsily tries to reciprocate, letting her tongue brush against your own.'
+		'You move closer to Katja and slowly put your lips to hers. The two of you awkwardly bump together, feeling the heat of your blushes radiating off each other''s cheeks. Very, very carefully, you experimentally push your tongue into her mouth. As soon as it touches her lips, she flinches but settles into it and clumsily tries to reciprocate, letting her tongue brush against your own.'
 		'Eventually, the two of you break apart, a thin trail of saliva trailing between her lips and yours.'
 		*nl
 		'"Whoa..." she murmurs. "That was something else..."'

+ 1 - 1
locations/katja_uni_sex.qsrc

@@ -448,7 +448,7 @@ if $ARGS[0] = 'library_threesome2':
 						act 'Switch positions':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/library_threesome8.jpg"></center>'
-							'You climb off his dick and and tell Katja that it''s her turn. You then guide his dick into her very wet pussy as she sits down on it. As she starts riding it, you get up and crawl over to <<$npc_nickname[$npclastgenerated]>>''s face before sitting on it and letting him eat your pussy.'
+							'You climb off his dick and tell Katja that it''s her turn. You then guide his dick into her very wet pussy as she sits down on it. As she starts riding it, you get up and crawl over to <<$npc_nickname[$npclastgenerated]>>''s face before sitting on it and letting him eat your pussy.'
 							gs 'arousal', 'cuni', 3, 'group'
 							gs 'stat'
 							act 'Get on all fours':

+ 1 - 1
locations/liames.qsrc

@@ -110,7 +110,7 @@ if rand(1,100) >= 95:
 	act 'Continue': gt'liames'
 end
 
-gs 'music_actions', 'start'
+gs 'music_actions', 'music_icon'
 
 if hour >= 15 and hour <= 22 and tusa = 0:
 	act 'Go to the local hangout':

+ 143 - 143
locations/meadow.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 	*nl
 	'A quiet and deserted open field of grass and wildflowers in the forest, well hidden from civilization.'
-	'There are <a href="exec:gt ''meadow'', ''ruins''">ruins</a> of a long-abandoned house as well as some <a href="exec: gt ''meadow'', ''fruit_trees''">fruit trees</a> hinting at the areas original purpose.'
+	'There are <a href="exec:gt ''meadow'', ''ruins''">ruins</a> of a long-abandoned house and some <a href="exec: gt ''meadow'', ''fruit_trees''">fruit trees</a>  hinting at the area''s original purpose.'
 	
 	!events trigger before everything
 	if (meadow = 3 or meadow = 6) and MiraLoc = 0 and npc_QW['A60'] = 2 and temper >= 12 and sunWeather = 1:gt 'meadow','mira_mitka'
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	if MiraLoc = 2:
 		act 'Talk to Mira': gt 'meadow', 'Mira'
-		'<a href="exec: gt ''meadow'', ''Mira''">Mira</a> is in the meadow and is spinning with a delightful smile and laughing.'
+		'<a href="exec: gt ''meadow'', ''Mira''">Mira</a> is in the meadow, spinning with a delightful smile and laughing.'
 	elseif Mira_no = 0:
 		temp_md = 20
 		if (meadow = 3 or meadow = 6) and sunWeather = 1:temp_md = rand(0,20)
@@ -78,15 +78,15 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		if pcs_stam >= 15 or (pcs_stam >= 10 and bookYog + obruch > 0):
 			if $clothingworntype ! 'danilovich_outfits':
 				*nl
-				'Your meadow is a perfect place to workout if you were wearing exercise clothes'
+				'Your meadow would be a perfect place to workout if you were wearing exercise clothes'
 			   if temper >= 10:
                     *nl
                     gs 'willpower', 'skill', 'pcs_inhib', 'resist'
                     if Miraloc ! 2 or npc_rel['A60'] > 40 or mirasex = 1:
                         if Miraloc = 2:
-                            'Your meadow is a perfect place to exercise. Mira is here but she wouldn''t mind if you exercised for a little bit, even if in the nude.'
+                            'Your meadow is a perfect place to exercise. Mira is here, but she wouldn''t mind if you exercised for a little bit, even if in the nude.'
                         else
-                            'Your meadow is a perfect place to exercise. There is no one around, so you could probably exercise nude if you wanted.'
+                            'Your meadow is a perfect place to exercise. No one is around, so you could probably exercise nude if you wanted.'
                         end
                         if will_cost <= pcs_willpwr:
                             act 'Exercise nude':gt 'meadow', 'workout', 'nude'
@@ -133,14 +133,14 @@ end
 if $ARGS[0] = 'fruit_trees':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_fruit_<<rand(0,1)>>.jpg"></center>'
 	*nl
-	'These fruit trees are flourishing in the undisturbed beauty of the meadow. Unfortunately all the fruit is out of your reach.'
+	'These fruit trees are flourishing in the undisturbed beauty of the meadow. But, unfortunately, all the fruit is out of your reach.'
 	act 'Continue': gt 'meadow', 'start'
 end
 
 if $ARGS[0] = 'ruins':
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_nearby_ruins.jpg"></center>'
 	*nl
-	'The ruins of this old house look intriguing. You wonder how long it has been here.'
+	'The ruins of this old house look intriguing. But, you wonder how long it has been here.'
 	act 'Continue': gt 'meadow', 'start'
 end
 
@@ -151,15 +151,15 @@ if $ARGS[0] = 'Mira':
 	! first time here with Mira
 	if meadow = 2:
 		gs 'miroslava', 'miraclothes'
-		'"Wow! This place is awesome. My family and I have only been in the village a few months, but I have never heard anyone ever talk about this place." Mira tells you. "Now I know where I can come to, when I want to be alone. You don''t mind, do you?"'
+		'"Wow! This place is awesome. My family and I have only been in the village for a few months, but I have never heard anyone talk about this place." Mira tells you. "Now I know where I can come to when I want to be alone. You don''t mind, do you?"'
 		act 'You allow her to come here on her own':
 			*clr & cla
 			meadow = 3
 			minut += 2
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
-			'"I think you are a responsible person, Mira, you can come to the meadow whenever it pleases you. But, I want this place to remain a secret so you can never tell anyone about this place."'
-			'Mira, readily agrees and is as happy as a lark. Mira energetically nodding her head and says, "I''ll take this secret to the grave, I swear. If I don''t, then I''ll grant you three wishes, that I promise I will perform no matter what..."'
+			'"I think you are a responsible person, Mira. So, you can come to the meadow whenever it pleases you. But, I want this place to remain a secret, so you can never tell anyone about this place."'
+			'Mira readily agrees and is as happy as a lark. Mira energetically nods and says, "I''ll take this secret to the grave, I swear. But, if I don''t, I''ll grant you three wishes, which I promise I will perform no matter what..."'
 			act 'Finish': gt 'meadow', 'start'
 		end
 		act 'Sorry, I want to keep this meadow private':
@@ -168,10 +168,10 @@ if $ARGS[0] = 'Mira':
 			minut += 2
 			gs 'stat'
 			gs 'miroslava', 'miraclothes'
-			'You tell her that this is your haven, you would prefer if she wants to come to the meadow that she can only do so with you. Mira looks crestfallen, tears start to well up in her eyes, though she tries not to let you see.'
-			'Mira looks at you seriously, "I will abide by your wishes. I swear. If I don''t, then I''ll grant you three wishes, that I promise I will perform no matter what..."'
+			'You tell her that this is your haven, and you would prefer that if she wants to come to the meadow, she can only do so with you. Mira looks crestfallen. Tears start to well up in her eyes, though she tries not to let you see.'
+			'Mira looks at you seriously, "I will abide by your wishes. I swear. If I don''t, I''ll grant you three wishes that I promise to perform no matter what..."'
 			if npc_QW['A64'] < 15:
-				'You and Mira speak for awhile. Her mood is a little down, but as you chat a smile slowly creeps onto her face.'
+				'You and Mira speak for a while. Her mood is a little down, but a smile slowly creeps onto her face as you chat.'
 				'Mira then asks if you could help cheer up her father. He has been depressed ever since her mother''s death nearly two years ago.'
 				act 'Maybe':
 					*clr & cla
@@ -185,23 +185,23 @@ if $ARGS[0] = 'Mira':
 					else
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira3.jpg"></center>'
 					end
-					'You agree, intrigued. You ask Mira what see has in mind? After a few seconds, she tells you she saw her father masturbating that morning. She doesn''t think her father has been with a woman since her mother passed away. Mira is sorry for her father''s loss, her''s too for that matter, but she has an overwhelming desire to help him. She can''t just do nothing.'
-					'You know Mira loves her father very much, you don''t know what you can do to help. You don''t want or need this drama in your life. You tell her that there is nothing you can do to help with her father''s depression. Mira''s pouts and stands with her arms crossed. Her whole demeanor is one of injured innocence.'
-					'A few minutes later, to your surprise, you feel a bit sorry for the way you snapped Mira. You think to yourself, chatting with her dad couldn''t hurt and it would be a good deed.'
+					'You agree, intrigued. You ask Mira what she has in mind? After a few seconds, she tells you she saw her father masturbating that morning. She doesn''t think her father has been with a woman since her mother died. Mira is sorry for her father''s loss, she''s too, for that matter, but she has an overwhelming desire to help him. She can''t just do nothing.'
+					'You know Mira loves her father very much. But you don''t know what you can do to help. You don''t want or need this drama in your life. So you tell her that there is nothing you can do to help with her father''s depression. Mira pouts and stands with her arms crossed. Her whole demeanour is one of injured innocence.'
+					'A few minutes later, to your surprise, you feel a bit sorry for how you snapped at Mira. But, you think to yourself, chatting with her dad couldn''t hurt, and it would be a good deed.'
 					act 'Leave': gt 'meadow', 'start'
 				end
 				act 'Leave': gt 'meadow', 'start'
 			else
 				meadow = 6
-				'You and Mira speak for awhile. Her mood is a little down, but as you chat a smile slowly creeps onto her face.'
+				'You and Mira speak for a while. Her mood is a little down, but a smile slowly creeps onto her face as you chat.'
 				'"I saw you meeting with my father. I want to thank you for attending to him. He had been depressed since my mother died two years ago. Being with you has really cheered him up."'
 				minut += 2
 				!! If Svetka has some shame left she can blush at being told she was seen with Afanasiy
 				if pcs_inhib <= 30:
 					act 'Blush':
 						cla
-						'You are a bit surprised that Mira must have been spying on you, and even though you two are friends, you are a still bit embarrassed.'
-						'You feel you''re cheeks get warm and quickly say goodbye to Mira.'
+						'You are a bit surprised that Mira must have been spying on you, and even though you two are friends, you are still a bit embarrassed.'
+						'You feel your cheeks get warm and quickly say goodbye to Mira.'
 						pcs_horny += 20
 						inhib_exp -= 2
 						gs 'stat'
@@ -225,7 +225,7 @@ if $ARGS[0] = 'Mira':
 		end
 	elseif MiraLoc = 2:
 		gs 'miroslava', 'miraclothes'
-		'"What a wonderful place you have found, it''s so comfortable and sunny!"'
+		'"What a wonderful place you have found. It''s so comfortable and sunny!"'
 		if pcs_horny >= 60 and npc_QW['A60'] > 15 and temper >= 20 and sunWeather = 1:
 			act 'Mira, come here and stick that tongue of your in my wet pussy!':
 				*clr & cla
@@ -234,21 +234,21 @@ if $ARGS[0] = 'Mira':
 				gs 'stat'
 				if $pantyworntype ! 'none':
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick.jpg"></center>'
-					'Mira immediately sits on the grass and waits until you get undressed. Holding out your hand, you throw caution to the winds and push your panties aside, revealing your already dripping snatch...'
+					'Mira immediately sits on the grass and waits until you get undressed. Then, holding out your hand, you throw caution to the winds and push your panties aside, revealing your already dripping snatch...'
 					gs 'arousal', 'foreplay', 5, 'lesbian'
 					gs 'stat'
 					act 'Continue':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick1.jpg"></center>'
-						'You enjoy, Mira''s gentle touch between your legs. She teases you by gently touching your clit...'
+						'You enjoy Mira''s gentle touch between your legs. Then, she teases you by gently touching your clit...'
 						gs 'arousal', 'vaginal_finger', 5, 'lesbian'
 						gs 'stat'
 						act 'Continue':
 							*clr & cla
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick2.jpg"></center>'
-							'A couple of minutes later you eagerly get rid of your panties, while Mira lowers her mouth to your pussy and lightly nibbles on your clit, suddenly you are in the midst of an orgasm.'
+							'A couple of minutes later, you eagerly get rid of your panties while Mira lowers her mouth to your pussy and lightly nibbles on your clit. Suddenly, you are in the midst of an orgasm.'
 							$orgasm_or = 'yes'
 							gs 'arousal', 'cuni', 5, 'lesbian'
 							gs 'arousal', 'end'
@@ -261,7 +261,7 @@ if $ARGS[0] = 'Mira':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/miralick2.jpg"></center>'
-						'Mira obediently kneels at your feet and starts licking your clit and fingering your pussy. After a few minutes of this treatment, Mira brings you to a blazing orgasm.'
+						'Mira obediently kneels at your feet, licking your clit and fingering your pussy. After a few minutes of this treatment, Mira brings you to a blazing orgasm.'
 						$orgasm_or = 'yes'
 						gs 'arousal', 'cuni', 5, 'lesbian'
 						gs 'arousal', 'vaginal_finger', 5, 'lesbian'
@@ -287,7 +287,7 @@ if $ARGS[0] = '0':
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr1.jpg"></center>'
-			'Mira, pulls up harshly on her panties so that they bite deeply between her labia. Mira looks around again, but you are concealed in the dense thicket thus she fails to spot you watching...'
+			'Mira pulls up harshly on her panties, so they bite deeply between her labia. Mira looks around again, but you are concealed in the dense thicket. Thus, she fails to spot you watching...'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
@@ -299,7 +299,7 @@ if $ARGS[0] = '0':
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr3.jpg"></center>'
-					'Next she pulls down her panties and you can see her wet pussy.'
+					'Next, she pulls down her panties, and you can see her wet pussy.'
 					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
@@ -317,7 +317,7 @@ if $ARGS[0] = '0':
 							act 'Watch':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr6.jpg"></center>'
-								'Finally she leans against the nearest tree as she brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
+								'Finally, she leans against the nearest tree as she brings herself to orgasm. You watch for a couple minutes in hopes of a sequel, but Mira begins to get dressed, so you decide to make a hasty retreat...'
 								gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 								gs 'arousal', 'end'
 								gs 'stat'
@@ -336,13 +336,13 @@ if $ARGS[0] = '0':
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr8.jpg"></center>'
-			'She plays with herself for a few minutes before she stopping to look at a nearby log...'
+			'She plays with herself for a few minutes before stopping to look at a nearby log...'
 			gs 'arousal', 'voyeur_sex', 5, 'lesbian'
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr9.jpg"></center>'
-				'Having made her decision, she walk over to the log and starts to remove her panties.'
+				'Having made her decision, she walks over to the log and starts to remove her panties.'
 				gs 'arousal', 'voyeur', 2
 				gs 'stat'
 				act 'Watch':
@@ -354,7 +354,7 @@ if $ARGS[0] = '0':
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr11.jpg"></center>'
-						'Mira begins to caress herself again and brings herself to orgasm... You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
+						'Mira begins to caress herself again and brings herself to orgasm... You watch for a couple minutes in hopes of a sequel, but Mira starts to get dressed, so you decide to make a hasty retreat...'
 						gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -366,11 +366,11 @@ if $ARGS[0] = '0':
 	else
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr12.jpg"></center>'
-		'You see Mira standing on a tree stump with a hand in her pants and her tits exposed enjoying the cool breeze.'
+		'You see Mira standing on a tree stump with a hand in her pants and her tits exposed, enjoying the cool breeze.'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr13.jpg"></center>'
-			'She soon gets bored and she, as if on purpose, turns her ass towards you and pulls off her skirt.'
+			'She soon gets bored and, as if on purpose, turns her ass towards you and pulls off her skirt.'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
@@ -382,13 +382,13 @@ if $ARGS[0] = '0':
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr15.jpg"></center>'
-					'Getting up from the stump, Mira takes off her top and is now only in her panties.'
+					'After getting up from the stump, Mira takes off her top and is only in her panties.'
 					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr16.jpg"></center>'
-						'Finally she takes off her shirt, squats, and brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
+						'Finally, she takes off her shirt, squats, and brings herself to orgasm. You watch for a couple minutes in hopes of a sequel, but Mira begins to get dressed, so you decide to make a hasty retreat...'
 						gs 'arousal', 'voyeur_sex', 10, 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -406,7 +406,7 @@ if $ARGS[0] = '1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex.jpg"></center>'
-	'You see Mira and Mitka talking to each other. You can''t hear what they are saying from this far away, but they begin to undress in your meadow.'
+	'You see Mira and Mitka talking to each other. You can''t hear what they say from this far away, but they begin to undress in your meadow.'
 	act 'Watch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex1.jpg"></center>'
@@ -431,19 +431,19 @@ if $ARGS[0] = '2':
 	temp_md = RAND(0,1)
 	if temp_md = 0:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal.jpg"></center>'
-		'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound everytime her butt cheeks hit his thighs...'
+		'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound every time her butt cheeks hit his thighs...'
 		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal1.jpg"></center>'
-		'Mira get down on all fours and spreads her ass cheeks wide apart.She moans loudly as Mitka drives his cock into her ass.'
+		'Mira gets down on all fours and spreads her ass cheeks wide apart. She moans loudly as Mitka drives his cock into her ass.'
 		gs 'arousal', 'voyeur_sex', 2
 		gs 'stat'
 	end
 	act 'Watch':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal2.jpg"></center>'
-		'After a couple of minutes Mitka slaps her ass and pulls out of Mira. She gets up on her knees before him and sticks her tongue out as his warm cum shoots all over her face.'
+		'After a couple of minutes, Mitka slaps her ass and pulls out of Mira. She gets up on her knees before him and sticks her tongue out as his warm cum shoots all over her face.'
 		gs 'arousal', 'voyeur_sex', 10
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -462,7 +462,7 @@ if $ARGS[0] = '3':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj1.jpg"></center>'
-			'But, apparently, you''re a little late, because after a couple minutes Kolyamba puts a hand on the back of Mira''s head and holds her while he cums down her throat. At first she gags, but eventually obediently swallows his cum...'
+			'But, apparently, you''re a little late because, after a couple minutes, Kolyamba puts a hand on the back of Mira''s head and holds her while he cums down her throat. At first, she gags but eventually obediently swallows his cum...'
 			gs 'arousal', 'voyeur_sex', 2
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -470,7 +470,7 @@ if $ARGS[0] = '3':
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj2.jpg"></center>'
-		'All Mira has on is some flip-flops with her face in the ground and her ass in the air. She''s moaning loudly as Kolyamba pounds her pussy and cums inside of her...'
+		'All Mira has on is some flip-flops with her face on the ground and her ass in the air. She moans loudly as Kolyamba pounds her pussy and cums inside of her...'
 		gs 'arousal', 'voyeur_sex', 10
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -482,28 +482,28 @@ if $ARGS[0] = '4' or $ARGS[0] = '5':
 	menu_off = 1
 	if temper < 12:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj5.jpg"></center>'
-		'Mira is tied to a tree as Vasyan enthusiastically drives his cock in her mouth. She gags and coughs, but at the same time, she moves her head farther down his member. After a couple of minutes Vasyan tilts back his head and with a blissful roar cums in her mouth...'
+		'Mira is tied to a tree as Vasyan enthusiastically drives his cock in her mouth. She gags and coughs, but simultaneously, she moves her head farther down his member. After a couple of minutes, Vasyan tilts back his head and, with a blissful roar cums in her mouth...'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'meadow'
 	elseif temper >= 12 and temper < 15:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj3.jpg"></center>'
-		'They are both completely naked and Mira is sticking her ass up in the air as she deepthroats Vasyan. After a couple of minutes you see Mira gulp down his sperm without even removing her mouth from his cock.'
+		'They are completely naked, and Mira sticks her ass up in the air as she deepthroats Vasyan. After a few minutes, you see Mira gulp down his sperm without removing her mouth from his cock.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'meadow'
 	elseif temper >= 15 and temper < 20:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj4.jpg"></center>'
-		'They are both completely naked and Mira squeals with joy as she rides on Vasyan''s member. He does not last long and cums all over her butt as soon as he pulls out of her.'
+		'They are completely naked, and Mira squeals joyfully as she rides on Vasyan''s member. Unfortunately, he does not last long and cums all over her butt as soon as he pulls out of her.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Hide until they leave': minut += 10 & gt 'meadow'
 	elseif temper >= 20:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj6.jpg"></center>'
-		'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes he pulls out and sprays cum all over back.'
+		'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes, he pulls and sprays cum over his back.'
 		gs 'arousal', 'voyeur_sex', 5
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -528,11 +528,11 @@ if $ARGS[0] = '6':
 	menu_off = 1
 	if temper < 20:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj7.jpg"></center>'
-		'Mira is kneeling in between the three friends and sucking their cocks with great pleasure. They are all crowded around her so you can''t make out who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
+		'Mira is kneeling between the three friends and sucking their cocks with great pleasure. But, unfortunately, they are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
 		gs 'arousal', 'voyeur_sex', 15
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj8.jpg"></center>'
-		'Mira is kneeling in between the three friends and sucking their cocks with great pleasure. They are all crowded around her so you can''t make out who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
+		'Mira is kneeling between the three friends and sucking their cocks with great pleasure. But, unfortunately, they are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
 		gs 'arousal', 'voyeur_sex', 5
 	end
 	gs 'arousal', 'end'
@@ -549,11 +549,11 @@ if $ARGS[0] = '7':
 		gs 'arousal', 'voyeur_sex', 15
 	elseif temper >= 15 and temper < 25:
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj10.jpg"></center>'
-		'Two boys are fucking Mira in her mouth and pussy at the same time. The whole time they are laughing and talking while Mira moans in between them... Fifteen minutes later they finish with her and leave.'
+		'Two boys are fucking Mira in her mouth and pussy simultaneously. The whole time they are laughing and talking while Mira moans in between them... Fifteen minutes later, they finish with her and leave.'
 		gs 'arousal', 'voyeur_sex', 15
 	else
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj9.jpg"></center>'
-		'Mira and the two boys she is with are all naked. She is sucking one of them while another plays with her breasts and pusy from behind.'
+		'Mira and the two boys she is with are all naked. She is sucking one of them while another plays with her breasts and pussy from behind.'
 		gs 'arousal', 'voyeur_sex', 15
 	end
 	gs 'arousal', 'end'
@@ -565,7 +565,7 @@ if $ARGS[0] = '8':
 	npc_QW['A60'] += 1
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj12.jpg"></center>'
-	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching, as the men take turns fucking Mira until they are all tired out.'
+	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching as the men take turns fucking Mira until they are all tired.'
 	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -575,7 +575,7 @@ end
 if $ARGS[0] = '9':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadows.jpg"></center>'
-	'You see Mira on all fours with her back to you. She is shoving an ear of corn in her ass which looks painful but she is still moaning. Eventually, Mira finishes and tosses the cum covered ear of corn off into the bushes almost hitting you!'
+	'You see Mira on all fours with her back to you. She is shoving an ear of corn in her ass which looks painful, but she is still moaning. Eventually, Mira finishes and tosses the cum covered ear of corn off into the bushes, almost hitting you!'
 	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -589,7 +589,7 @@ if $ARGS[0] = 'mira_mitka':
 	pcs_horny += 15
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex.jpg"></center>'
-	'You see Mira and Mitka talking to each other. You can''t hear what they are saying from this far away, but they begin to undress in your meadow.'
+	'You see Mira and Mitka talking to each other. You can''t hear what they say from this far away, but they begin to undress in your meadow.'
 	gs 'stat'
 	act 'Watch':
 		*clr & cla
@@ -617,7 +617,7 @@ if $ARGS[0] = 'mira_gang':
 	mirasextimes += 1
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj12.jpg"></center>'
-	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching, as the men take turns fucking Mira until they are all tired out.'
+	'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching as the men take turns fucking Mira until they are all tired.'
 	gs 'arousal', 'voyeur_sex', 30
 	gs 'arousal', 'end'
 	gs 'stat'
@@ -633,11 +633,11 @@ if $ARGS[0] = 'miraperversion11':
 
 	gs 'miroslava', 'miraclothes'
 
-	'You don''t know where to begin, so you stay silent just staring at Mira. Mira at the same time is looking at her feet and blushing hard.'
-	'Finally you gather your wits and ask what happened last night? Mira, still not looking you in the eye, stammers out that she doesn''t know why she did it. She says that she was out of control.'
-	'But you were also drunk, and did not do what she did. Her face sinks with shame and she continues to look at the ground.'
-	'You speak with her awhile and somehow manage to soothe her and tell her that, she should just bite the bullet and move on.'
-	'Mira thanks you most sincerely for your support, but her eyes still look down...'
+	'You don''t know where to begin, so you stay silent, staring at Mira. At the same time, Mira is looking at her feet and blushing hard.'
+	'Finally, you gather your wits and ask what happened last night? Still not looking you in the eye, Mira stammers out that she doesn''t know why she did it. She says that she was out of control.'
+	'But you were also drunk and did not do what she did. Her face sinks with shame, and she looks at the ground.'
+	'You speak with her awhile and somehow manage to soothe her and tell her that she should just bite the bullet and move on.'
+	'Mira sincerely thanks you for your support, but her eyes still look down...'
 	act 'Leave': gt $loc, $loc_arg
 end
 
@@ -646,7 +646,7 @@ if $ARGS[0] = 'lesb_mira':
 	miraday = daystart
 	mirahorny = rand(0,80)
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirakiss1.jpg"></center>'
-	'"I''m glad you came Mira" you say.'
+	'"I''m glad you came, Mira," you say.'
 	'You continue, "Mira, I want you," you whispered in her ear and kissed her passionately on the lips.'
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
@@ -659,8 +659,8 @@ if $ARGS[0] = 'mira_lesb':
 	miraday = daystart
 	mirahorny = rand(40,80)
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirakiss4.jpg"></center>'
-	'In the meadow Mira walks up to you, smiling mischievously.'
-	'" - <<$pcs_nickname>>, let me see your pussy" - she whispered in your ear, while pinning you to the tree and kissing your lips.'
+	'In the meadow, Mira walks up to you, smiling mischievously.'
+	'"<<$pcs_nickname>>, let me see your pussy", she whispered in your ear while pinning you to the tree and kissing your lips.'
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 	if pcs_horny < 20:act 'Agree':gt 'mirasex','mirakiss'
@@ -673,8 +673,8 @@ if $ARGS[0] = 'mira_lesb':
 			npc_rel['A60'] -= 1
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk2.jpg"></center>'
 			'You tried hard to break out of her embrace.'
-			'" - Mira, come on now, " you said, seeing the silent question in her eyes. - The mood is not right.'
-			'"- You''re mean, " she sulked at you in response.'
+			'"Mira, come on now, " you said, seeing the silent question in her eyes. The mood isn''t right.'
+			'"You''re mean, " she sulked at you in response.'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Continue':gt $loc, $loc_arg
@@ -688,17 +688,17 @@ if $ARGS[0] = 'lesb_talk_mira1':
 	pcs_horny += 5
 	gs 'miroslava', 'miraclothes'
 
-	'You are a long time silent, looking at Mira, not knowing how to start the conversation. But then still dare.'
-	' - Mira, you let all the boys in our village fuck you. Why?'
-	' - Yeah, so what?, Mira is bit embarrassed as she replies.'
-	' - I was thinking that you served all the boys but you forgot about your best friend.'
-	' - You are not a guy thought so why would want to do that?, Mira answered surprised.'
-	' - Everyone knows girls know the best ways to pleasure other girls, you shoot back.'
-	' - But I don''t do that, I''m not a lesbian said Mira.'
-	'She may not be a lesbian but you can tell by her flushed cheeks and shaky voice that she is finding the idea very arousing.'
-	' - Don''t worry I won''t be mean or rough like Mitka, you continue to push her. We can lick each other or I''m leaving and you can go back to the village boys instead and forget about me.'
-	'Mira thought for a second but it was an easy choice. She didn''t want to lose your friendship.'
-	' - Well <<$pcs_nickname>>, I''ll do it, " she said falling to her knees.'
+	'You are long silent, looking at Mira, not knowing how to start the conversation. But then still dare.'
+	'"Mira, you let all the boys in our village fuck you. Why?"'
+	'"Yeah, so what?" Mira is a bit embarrassed as she replies.'
+	'"I thought; you served all the boys, but you forgot about your best friend."'
+	'"You are not a guy, so why would you want to do that?" Mira answered, surprised.'
+	'"Everyone knows girls know the best ways to pleasure other girls." You shoot back.'
+	'"But I don''t do that. I''m not a lesbian," said Mira.'
+	'She may not be a lesbian, but you can tell by her flushed cheeks and shaky voice that she finds the idea very arousing.'
+	'"Don''t worry, I won''t be mean or rough like Mitka", you continue to push her. "We can lick each other, or I can leave, and you can go back to the village boys instead and forget about me."'
+	'Mira thought for a second, but it was an easy choice. She didn''t want to lose your friendship.'
+	'"Well, <<$pcs_nickname>>, I''ll do it, " she said, falling to her knees.'
 
 	act 'Let Mira lick you':gt 'mirasex','miralick_first'
 end
@@ -711,14 +711,14 @@ if $ARGS[0] = 'lesb_talk_mira2':
 	gs 'miroslava', 'miraclothes'
 	gs 'stat'
 	'You walk up to Mira with a malicious smile on your face.'
-	' - Well, Mira, congratulations, you said. - You are now the same whore as me. All the boys fucked you too.'
-	'She tried to keep silent, but you are not satisfied.'
-	' - So did they or did they not?, - you insist on an answer.'
-	' - Well, yes - she acknowledged.'
-	' - You know what that means?, - you continue.'
-	' - What? - blushing terribly asked Mira, although she already guessed where this is going.'
-	' - It''s time to return the favor, - you replied in a triumphant tone while leaning on a tree, and beckoned her with your finger. - You can start.'
-	'Mira hesitated a couple of moments, as if pondering something, and then sat down in front of you on her knees.'
+	'"Well, Mira, congratulations," you said. "You''re are whore now. The same as me. All the boys fucked you too."'
+	'She tried to keep silent, but you were not satisfied.'
+	'"So, did they or didn''t they? You insist on an answer.'
+	'"Well, yes", she acknowledged.'
+	'"Do you know what that means? You continue.'
+	'"What?" Mira asked, blushing terribly, although she already guessed where this was going.'
+	'"It''s time to return the favour", you replied triumphantly while leaning on a tree and beckoning her with your finger. "You can start."'
+	'Mira hesitated a couple of moments as if pondering something and then sat down in front of you on her knees.'
 	act 'Let Mira lick you':gt 'mirasex','miralick_first'
 end
 
@@ -730,8 +730,8 @@ if $ARGS[0] = 'lesb_talk_mira3':
 	gs 'stat'
 
 	'You leaned on the tree and beckoned Mira the finger.'
-	'" - Get over her Mira. You know what to do"'
-	'She already know what to do and got down on her knees in front of you.'
+	'"Get over her, Mira. You know what to do."'
+	'She already knew what to do and got down on her knees in front of you.'
 
 	act 'Let Mira lick you':gt 'mirasex','miralick_first'
 end
@@ -744,21 +744,21 @@ if $ARGS[0] = 'mira_lesb_talk1':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk.jpg"></center>'
-	if MiraLoc ! 2:'In the clearing you met Mira. Seeing you, she immediately came up with a sly smile on his lips.'
+	if MiraLoc ! 2:'In the clearing, you met Mira. Seeing you, she immediately came up with a sly smile on his lips.'
 	if MiraLoc = 2:'When you came into the clearing, Mira immediately came to you with a sly smile on his lips.'
-	'" - <<$pcs_nickname>>, you fucked all the boys in the village now.'
+	'"<<$pcs_nickname>>, you fucked all the boys in the village now.'
 	'You tried to keep silent, but Mira wouldn''t let it go.'
-	'" - So did they or did they not?," - she insisted you answer.'
-	'" - Well, yeah so?"'
-	'" - I was thinking you served all the boys and forgot about your best friend." Mira said looking you in the eye.'
+	'"So did they or didn''t they?" - she insisted on your answer.'
+	'"Well, yeah, so?"'
+	'"I was thinking about how you served all the boys and forgot about your best friend," Mira said, looking you in the eye.'
 	if lesbian = 0:
-		'" - So you''re not a guy. Do you want to do that?," - you say surprised'
-		'" - Everyone knows girls know the best ways to pleasure girls," she answered you.'
+		'"So you''re not a guy. Do you want to do that?" - you say, surprised'
+		'"Everyone knows girls know the best ways to pleasure girls," she answered.'
 	else
-		'You already guessed where she was going with this, but still hesitated.'
-		'" - Come on, don''t sulk <<$pcs_nickname>>, it doesn''t suit you, " she continued to get comfortable on the nearest stone.'
-		'" - Well Mira, I''ll do it, " you said falling on his knees.'
-		'"In the end, why not make her friend pleased?" - you thought to yourself.'
+		'You already guessed where she was going with this but still hesitated.'
+		'"Come on, don''t sulk, <<$pcs_nickname>>, it doesn''t suit you," she continued to get comfortable on the nearest stone.'
+		'"Well, Mira, I''ll do it, " you said, falling on your knees.'
+		'"In the end, why not please your friend?" you thought.'
 	end
 	if lesbian = 0:
 		act 'Hesitate':
@@ -768,8 +768,8 @@ if $ARGS[0] = 'mira_lesb_talk1':
 			gs 'stat'
 
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk2.jpg"></center>'
-			'After these words, you stared dumbfounded Mira.'
-			'" - But I don''t do that, I''m not a lesbian, " you try to find a way out of this. But the idea that you will go down on a girl right here in the middle of the clearing, makes your pussy soaking wet even if you didn''t want it to.'
+			'After these words, you stared dumbfounded at Mira.'
+			'"But I don''t do that. I''m not a lesbian," you try to find a way out of this. But the idea that you will go down on a girl right here in the middle of the clearing makes your pussy soaking wet, even if you didn''t want it to.'
 			act 'Try to convince Mira':
 				*clr & cla
 				minut += 5
@@ -777,11 +777,11 @@ if $ARGS[0] = 'mira_lesb_talk1':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk3.jpg"></center>'
-				'You still hoped, that you could change Mira''s mind.'
-				'" - Come on, don''t be a prude now <<$pcs_nickname>>," - said Mira, taking you by the shirt and pulling you to the nearest stone. - "Sluts should always pleasure their friends first."'
-				'Sitting on the stone she looked eagerly at you:'
-				'" - Well what are you waiting for, I''m ready."'
-				'" - Well Mira, I''ll do it, " you finally gave in, sinking to his knees. "In the end, why not help Mira out?" - thinking to himself.'
+				'You still hoped that you could change Mira''s mind.'
+				'"Come on, don''t be a prude now, <<$pcs_nickname>>," said Mira, taking you by the shirt and pulling you to the nearest stone. "Sluts should always pleasure their friends first."'
+				'Sitting on the stone, she looked eagerly at you.'
+				'"Well, what are you waiting for? I''m ready."'
+				'"Well, Mira, I''ll do it, " you finally gave in, sinking to your knees. "In the end, why not help Mira out?" thinking to yourself.'
 				act 'Lick Mira':gt 'mirasex','lickmira_start'
 			end
 		end
@@ -800,14 +800,14 @@ if $ARGS[0] = 'mira_lesb_talk2':
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk2.jpg"></center>'
 	'Mira walks up to you with a malicious smile on her face.'
-	' - Well, <<$pcs_nickname>>, congratulations, she said. - You are now the same whore as me. All the boys fucked you too.'
-	'You tried to keep silent, but she is not satisfied.'
-	' - So did they or did they not?, - she insists on an answer.'
-	' - Well, yes - you acknowledged.'
-	' - You know what that means?, - she continues.'
-	' - What? - blushing terribly you ask, although you already guessed where this is going.'
-	' - It''s time to return the favor, - a triumphant tone she replied leaning on a tree, beckoned you with her finger. - You can start.'
-	'You hesitated a couple of moments, as if pondering something, and then sat down in front of her on your knees.'
+	'"Well, <<$pcs_nickname>>," congratulations, she said. "You are now the same whore as me. All the boys fucked you too."'
+	'You tried to keep silent, but she was not satisfied.'
+	'"So, did they or didn''t they?" she insists on an answer.'
+	'"Well, yes", you acknowledged.'
+	'"You know what that means?" she continues.'
+	'"What?"  you ask, blushing terribly, although you already guessed where this is going.'
+	'"It''s time to return the favour, " she said triumphantly, leaning on a tree, beckoning you with her finger. "You can start."'
+	'You hesitated for a couple of moments as if pondering something, and then you knelt down on your knees in front of her.'
 	act 'Lick Mira':gt 'mirasex','lickmira_first'
 end
 
@@ -821,13 +821,13 @@ if $ARGS[0] = 'mira_lesb_talk3':
 
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mira_lesb_talk3.jpg"></center>'
 	if MiraLoc ! 2:
-		'In the clearing you met Mira. Seeing you, she immediately came to you with an excited face.'
-		'" - But where are you <<$pcs_nickname>>, I was looking for you," she said. - Get over here and help me out.'
+		'In the clearing, you meet Mira. Seeing you, she immediately approached you with an excited face.'
+		'"Where were you, <<$pcs_nickname>>? I was looking for you," she said. So get over here and help me out.'
 	else
 		'When you came into the clearing, Mira immediately turned to you with an excited face.'
-		'" - Come help me out, <<$pcs_nickname>>," - she said and started to get comfortable.'
+		'"Come help me out, <<$pcs_nickname>>," she said and started to get comfortable.'
 	end
-	'You are already familiar with how this works and get on your knees before her.'
+	'You are already familiar with this and get on your knees before her.'
 
 	act 'Lick Mira':gt 'mirasex','lickmira_first'
 end
@@ -842,12 +842,12 @@ if $ARGS[0] = 'mira_lesb_talk4':
 
 	gs 'miroslava', 'miraclothes'
 
-	'Walking through the village you meet Mira. Seeing you, she immediately came up to you with an excited face.'
-	'" - But where were you <<$pcs_nickname>>, I was looking for you," she said. - "Let''s go take a walk in our meadow."'
-	'She grabs you by the hand, and literally dragged you behind her. You can hear Mira''s excited breath and know full well why she is taking you to the meadow.'
+	'Walking through the village, you meet Mira. Seeing you, she immediately approaches you with an excited face.'
+	'"Where were you, <<$pcs_nickname>>? I was looking for you," she said. "Let''s go take a walk in our meadow."'
+	'She grabs you by the hand and literally drags you behind her. You can hear Mira''s excited breath and know fully why she is taking you to the meadow.'
 	'When you came into the clearing, Mira immediately turned to you with an excited face.'
-		'" - Come help me out, <<$pcs_nickname>>," - she said and started to get comfortable.'
-	'You are already familiar with how this works and get on your knees before her.'
+		'"Come help me out, <<$pcs_nickname>>," she said and started to get comfortable.'
+	'You are already familiar with this and get on your knees before her.'
 	act 'Lick Mira':gt 'mirasex','lickmira_first'
 end
 
@@ -859,11 +859,11 @@ if $ARGS[0] = 'mirameadow':
 		*clr & cla
 		minut += 2
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr.jpg"></center>'
-		'You were about to approach her, but stop as she undoes her pants. You decide to watch to what she does...'
+		'You were about to approach her but stopped as she undoes her pants. You decide to watch what she does...'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr1.jpg"></center>'
-			'Mira, pulls up harshly on her panties so that they bite deeply between her labia. Mira looks around again, but you are concealed in the dense thicket thus she fails to spot you watching...'
+			'Mira pulls up harshly on her panties, so they bite deeply between her labia. Mira looks around again, but you are concealed in the dense thicket. Thus, she fails to spot you watching...'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
@@ -875,7 +875,7 @@ if $ARGS[0] = 'mirameadow':
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr3.jpg"></center>'
-					'Next she pulls down her panties and you can see her wet pussy.'
+					'Next, she pulls down her panties, and you can see her wet pussy.'
 					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
@@ -893,7 +893,7 @@ if $ARGS[0] = 'mirameadow':
 							act 'Watch':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr6.jpg"></center>'
-								'Finally she leans against the nearest tree as she brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
+								'Finally, she leans against the nearest tree as she brings herself to orgasm. You watch for a couple minutes in hopes of a sequel, but Mira begins to get dressed, so you decide to make a hasty retreat...'
 								gs 'arousal', 'voyeur', 10
 								gs 'arousal', 'end'
 								gs 'stat'
@@ -913,13 +913,13 @@ if $ARGS[0] = 'mirameadow':
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr8.jpg"></center>'
-			'She plays with herself for a few minutes before she stopping to look at a nearby log...'
+			'She plays with herself for a few minutes before she stops to look at a nearby log...'
 			gs 'arousal', 'voyeur', 5
 			gs 'stat'
 			act 'Watch':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr9.jpg"></center>'
-				'Having made her decision, she walk over to the log and starts to remove her panties.'
+				'Having made her decision, she walks over to the log and starts to remove her panties.'
 				gs 'arousal', 'voyeur', 2
 				gs 'stat'
 				act 'Watch':
@@ -931,7 +931,7 @@ if $ARGS[0] = 'mirameadow':
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr11.jpg"></center>'
-						'Mira begins to caress herself again and brings herself to orgasm... You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
+						'Mira begins to caress herself again and brings herself to orgasm... You watch for a couple minutes in hopes of a sequel, but Mira starts to get dressed, so you decide to make a hasty retreat...'
 						gs 'arousal', 'voyeur', 10
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -948,7 +948,7 @@ if $ARGS[0] = 'mirameadow':
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr13.jpg"></center>'
-			'She soon gets bored and she, as if on purpose, turns her ass towards you and pulls off her skirt.'
+			'She soon gets bored and, as if on purpose, turns her ass towards you and pulls off her skirt.'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Watch':
@@ -960,13 +960,13 @@ if $ARGS[0] = 'mirameadow':
 				act 'Watch':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr15.jpg"></center>'
-					'Getting up from the stump, Mira takes off her top and is now only in her panties.'
+					'After getting up from the stump, Mira takes off her top and is only in her panties.'
 					gs 'arousal', 'voyeur', 1
 					gs 'stat'
 					act 'Watch':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowmastr16.jpg"></center>'
-						'Finally she takes off her shirt, squats, and brings herself to orgasm. You watch a couple minutes in hopes of a sequel, but Mira begins to get dressed, so, you decide to make a hasty retreat...'
+						'Finally, she takes off her shirt, squats, and brings herself to orgasm. You watch for a couple minutes in hopes of a sequel, but Mira begins to get dressed, so you decide to make a hasty retreat...'
 						gs 'arousal', 'voyeur', 10
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -982,7 +982,7 @@ if $ARGS[0] = 'mirameadow':
 		pcs_horny += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex.jpg"></center>'
-		'You see Mira and Mitka talking to each other. You can''t hear what they are saying from this far away, but they begin to undress in your meadow.'
+		'You see Mira and Mitka talking to each other. You can''t hear what they say from this far away, but they begin to undress in your meadow.'
 		act 'Watch':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex1.jpg"></center>'
@@ -1008,12 +1008,12 @@ if $ARGS[0] = 'mirameadow':
 		gs 'stat'
 		if temp_md = 0:
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal.jpg"></center>'
-			'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound everytime her butt cheeks hit his thighs...'
+			'You see Mira lower her ass onto Mitka''s member and begin to bounce on top of him. You can hear the sound every time her butt cheeks hit his thighs...'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal1.jpg"></center>'
-			'Mira get down on all fours and spreads her ass cheeks wide apart.She moans loudly as Mitka drives his cock into her ass.'
+			'Mira gets down on all fours and spreads her ass cheeks wide apart. She moans loudly as Mitka drives his cock into her ass.'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 		end
@@ -1021,7 +1021,7 @@ if $ARGS[0] = 'mirameadow':
 			*clr & cla
 			mirasextimes += 1
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal2.jpg"></center>'
-			'After a couple of minutes Mitka slaps her ass and pulls out of Mira. She gets up on her knees before him and sticks her tongue out as his warm cum shoots all over her face.'
+			'After a couple of minutes, Mitka slaps her ass and pulls out of Mira. She gets up on her knees before him and sticks her tongue out as his warm cum shoots all over her face.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'mirameadow':
 				*clr & cla
 				mirasextimes += 1
 				'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj1.jpg"></center>'
-				'But, apparently, you''re a little late, because after a couple minutes Kolyamba puts a hand on the back of Mira''s head and holds her while he cums down her throat. At first she gags, but eventually obediently swallows his cum...'
+				'But, apparently, you''re a little late because, after a couple minutes, Kolyamba puts a hand on the back of Mira''s head and holds her while he cums down her throat. At first, she gags but eventually obediently swallows his cum...'
 				gs 'arousal', 'voyeur', 5
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -1049,7 +1049,7 @@ if $ARGS[0] = 'mirameadow':
 			*clr & cla
 			mirasextimes += 1
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj2.jpg"></center>'
-			'All Mira has on is some flip-flops with her face in the ground and her ass in the air. She''s moaning loudly as Kolyamba pounds her pussy and cums inside of her...'
+			'All Mira has on is some flip-flops with her face on the ground and her ass in the air. She moans loudly as Kolyamba pounds her pussy and cums inside of her...'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1062,7 +1062,7 @@ if $ARGS[0] = 'mirameadow':
 		if temper < 20:
 			mirasextimes += 1
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj5.jpg"></center>'
-			'Mira is tied to a tree as Vasyan enthusiastically drives his cock in her mouth. She gags and coughs, but at the same time, she moves her head farther down his member. After a couple of minutes Vasyan tilts back his head and with a blissful roar cums in her mouth...'
+			'Mira is tied to a tree as Vasyan enthusiastically drives his cock in her mouth. She gags and coughs, but simultaneously, she moves her head farther down his member. Finally, after a couple of minutes, Vasyan tilts back his head and, with a blissful roar cums in her mouth...'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'mirameadow':
 		else
 			mirasextimes += 1
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj6.jpg"></center>'
-			'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes he pulls out and sprays cum all over back.'
+			'Mira is completely naked and bent over in front of Vasyan. She is really enjoying it as he thrusts into her ass. After a few minutes, he pulls out and sprays cum over her back.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1083,14 +1083,14 @@ if $ARGS[0] = 'mirameadow':
 		if temper < 20:
 			mirasextimes += 1
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj3.jpg"></center>'
-			'They are both completely naked and Mira is sticking her ass up in the air as she deepthroats Vasyan. After a couple of minutes you see Mira gulp down his sperm without even removing her mouth from his cock.'
+			'They are completely naked, and Mira sticks her ass up in the air as she deepthroats Vasyan. After a few minutes, you see Mira gulp down his sperm without removing her mouth from his cock.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Hide until they leave': minut += 10 & gt 'meadow'
 		else
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj4.jpg"></center>'
-			'They are both completely naked and Mira squeals with joy as she rides on Vasyan''s member. He does not last long and cums all over her butt as soon as he pulls out of her.'
+			'They are completely naked, and Mira squeals joyfully as she rides on Vasyan''s member. Unfortunately, he does not last long and cums all over her butt as soon as he pulls out of her.'
 			gs 'arousal', 'voyeur', 5
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1102,11 +1102,11 @@ if $ARGS[0] = 'mirameadow':
 		mirasextimes += 1
 		if temper < 20:
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj7.jpg"></center>'
-			'Mira is kneeling in between the three friends and sucking their cocks with great pleasure. They are all crowded around her so you can''t make out who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
+			'Mira is kneeling between the three friends and sucking their cocks with great pleasure. They are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
 			gs 'arousal', 'voyeur', 5
 		else
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj8.jpg"></center>'
-			'Mira is kneeling in between the three friends and sucking their cocks with great pleasure. They are all crowded around her so you can''t make out who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
+			'Mira is kneeling between the three friends and sucking their cocks with great pleasure. They are all crowded around her, so you can''t determine who is in her mouth, who is grabbing her tits, and who is getting a handjob.'
 			gs 'arousal', 'voyeur', 5
 		end
 		gs 'arousal', 'end'
@@ -1122,7 +1122,7 @@ if $ARGS[0] = 'mirameadow':
 			gs 'arousal', 'voyeur', 5
 		elseif temper >= 20 and temper < 25:
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj10.jpg"></center>'
-			'Two boys are fucking Mira in her mouth and pussy at the same time. The whole time they are laughing and talking while Mira moans in between them... Fifteen minutes later they finish with her and leave.'
+			'Two boys are fucking Mira in her mouth and pussy simultaneously. The whole time they are laughing and talking while Mira moans in between them... Fifteen minutes later, they finish with her and leave.'
 			gs 'arousal', 'voyeur', 5
 		else
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj9.jpg"></center>'
@@ -1138,7 +1138,7 @@ if $ARGS[0] = 'mirameadow':
 		npc_QW['A60'] += 1
 		mirasextimes += 1
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowbj12.jpg"></center>'
-		'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching, as the men take turns fucking Mira until they are all tired out.'
+		'Mira is almost invisible with all the bodies around her. You can only see her naked ass and feet swaying in the air. You spend half an hour watching as the men take turns fucking Mira until they are all tired.'
 		gs 'arousal', 'voyeur', 30
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -1147,7 +1147,7 @@ if $ARGS[0] = 'mirameadow':
 	if meadow = 3 and MiraLoc = 0 and npc_QW['A60'] >= 20 and temper >= 15 and sunWeather = 1 and temp_md = 9:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadows.jpg"></center>'
-		'You see Mira on all fours with her back to you. She is shoving an ear of corn in her ass which looks painful but she is still moaning. Eventually, Mira finishes and tosses the cum covered ear of corn off into the bushes almost hitting you!'
+		'You see Mira on all fours with her back to you. She is shoving an ear of corn in her ass which looks painful, but she is still moaning. Eventually, Mira finishes and tosses the cum covered ear of corn off into the bushes, almost hitting you!'
 		gs 'arousal', 'voyeur', 10
 		gs 'arousal', 'end'
 		gs 'stat'

+ 4 - 4
locations/mey_home.qsrc

@@ -229,13 +229,13 @@ if $ARGS[0] = '3':
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt $loc, $loc_arg">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt $loc, $loc_arg">ON</a>.')
 	*nl
 	'A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall near the front door.'
-
+	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	!! Computer and internet use.
 	if komp = 1:
 		!! TODO: for now, if Sveta is at the Meynolds'' she can''t use their internet for porn and camshows. 
 		!! Need an agreement on the final options with everyone
 		gs 'internet_mobile', 'get_access', 'free', 'noporn', 'nocamshow'
-		'Your <a href="exec:gt ''Komp'',''start''">laptop</a> is on the desk.'
+		'Your <a href="exec:gt ''Komp'',''start''">computer</a> is on the desk.'
 	end
 
 	act 'Return to the hallway':
@@ -250,7 +250,7 @@ if $ARGS[0] = '3':
 	end
 
 	gs 'exercise', 'start'
-
+	gs 'music_actions', 'music_icon'
 	if pcs_horny >= 50:	act 'Masturbate':gt 'selfplay', 'start'
 	if pornMagazine > 0:
 		'You hide your porn magazines under the mattress of your bed.'
@@ -386,7 +386,7 @@ end
 
 if $ARGS[0] = 'mey_morning_vomit':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
-	'At that moment, a sharp knocking sounds on the door and and Tamara''s muffled voice comes through the fine wood.'
+	'At that moment, a sharp knocking sounds on the door and Tamara''s muffled voice comes through the fine wood.'
 	'"<<$pcs_nickname>>? Are you all right? I thought I heard you throwing up. Is everything okay?"'
 	
 	act'Everything is fine':

+ 12 - 12
locations/miroslavahome.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'start':
 		end
 	else
 		*nl
-		if hour > 22 or hour < 3: 'It''s too late, most of Mira''s family is asleep, no need to wake them up unnecessarily.' else 'It''s too early, most of Mira''s family is still asleep, no need to wake them up unnecessarily.'
+		if hour > 22 or hour < 3: 'It''s too late. Most of Mira''s family is asleep. No need to wake them up unnecessarily.' else 'It''s too early. Most of Mira''s family is still asleep. No need to wake them up unnecessarily.'
 		act 'Go back to the village center': gt 'gadukino'
 	end
 end
@@ -71,9 +71,9 @@ if $ARGS[0] = 'mirabrother':
 		'You ask Mira''s brother for a ride on his motorcycle.'
 		if hotcat < 5:
 			if npc_rel['A60'] > 20:
-				'He looks you up and down checking you out and says, "Some other time."'
+				'He looks you up and down, checking you out and says, "Some other time."'
 			else
-				'He gazes at you a couple of seconds, and then asks, "Who are you again?"'
+				'He gazes at you for a couple of seconds and then asks, "Who are you again?"'
 			end
 
 			act 'Walk away': gt 'MiroslavaHome', 'start'
@@ -83,11 +83,11 @@ if $ARGS[0] = 'mirabrother':
 				act 'Look at him in disgust and walk away': gt 'MiroslavaHome', 'start'
 				act 'Remove panties':
 					gs 'underwear', 'remove'
-					'You really want a ride on his motorcycle, and quickly slide them down your legs and stuff them in your pocket.'
+					'You really want a ride on his motorcycle and quickly slide them down your legs and stuff them in your pocket.'
 					gt 'MiroslavaHome', 'mirabrother'
 				end
 			else
-				'"No problem", he says to you, and then adds with a mischievous smile, "but first, sit down on him and he''ll check to make sure he likes you. He is a fussy son of a bitch."'
+				'"No problem", he says to you and then adds with a mischievous smile, "but first, sit down on him, and he''ll check to make sure he likes you. He is a fussy son of a bitch."'
 				act 'Get on the bike':
 					*clr & cla
 					pcs_horny += 10
@@ -95,7 +95,7 @@ if $ARGS[0] = 'mirabrother':
 					gs 'stat'
 
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto.jpg"></center>'
-					'You quickly swing your leg up and over the motorcycle, plop your ass down on the padded seat and grab the handlebars. Mira''s brother, with a satisfied smile, never takes his eyes off your crotch. You wiggle your ass on the seat a little giving him a great view of your naked pussy.'
+					'You quickly swing your leg up and over the motorcycle, plop your ass down on the padded seat and grab the handlebars. With a satisfied smile, Mira''s brother never takes his eyes off your crotch. You wiggle your ass on the seat a little giving him a great view of your naked pussy.'
 					'"Fine", he says, still smiling, "Just fine! You have an awesome pussy, and I''m sure my friend," and he slaps the gas tank, "is looking forward to having you ride on him. You know what I mean, yes?" You give him a wicked grin and nod. "We''ll give you a ride to remember, and then you can give me a ride to remember..." You just continue to nod.'
 
 					act 'Change your mind and leave': gt 'MiroslavaHome', 'start'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'mirabrother':
 
 							'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto1.jpg"></center>'
 
-							'You slide your ass back to allow him room to mount the motorcycle. He grabs his helmet from the handlebars and slams it down on his head.'
+							'You slide your ass back to allow him room to mount the motorcycle. But instead, he grabs his helmet from the handlebars and slams it down on his head.'
 
 
 							act 'Wrap your arms around his waist...':
@@ -129,7 +129,7 @@ if $ARGS[0] = 'mirabrother':
 
 								'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto2.jpg"></center>'
 
-								'He guns the engine, which roars and then sets out at furious pace. The rear wheel burns rubber and smokes a little as he rides down the highway. After a few miles, he does a U-turn and heads back towards Gadukino, but does not stop in the village.'
+								'He guns the engine, which roars, then sets out at a furious pace. The rear wheel burns rubber, and smokes a little as he rides down the highway. After a few miles, he does a U-turn and heads back towards Gadukino but does not stop in the village.'
 
 
 								act 'One ride ends and another begins...':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'mirabrother':
 									gs 'stat'
 
 									'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto3.jpg"></center>'
-									'He rolls down the highway another mile before pulling off onto a little side track and parks a couple hundred meters off the road. He jumps off the bike, pulling off his helmet, and turns to you with a "devil may care" attitude. He pulls the helmet of your head and drops it to the ground. He turns you around and begins to feel your bare pussy...'
+									'He rolls down the highway another mile before pulling onto a side track and parks a couple hundred meters off the road. He jumps off the bike, pulls off his helmet, and turns to you with a "devil may care" attitude. He removes the helmet from your head and drops it to the ground. Then, he turns you around and begins to feel your bare pussy...'
 
 									act 'Stand':
 										*clr & cla
@@ -157,7 +157,7 @@ if $ARGS[0] = 'mirabrother':
 											gs 'stat'
 
 											'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto5.jpg"></center>'
-											'You feel his hand rub your crotch, fingering your labia. A minute later he turns you around and presses down on your shoulders...'
+											'You feel his hand rub your crotch, fingering your labia. Then, a minute later, he turns you around and presses down on your shoulders...'
 
 
 											act 'Kneel':
@@ -176,7 +176,7 @@ if $ARGS[0] = 'mirabrother':
 													gs 'stat'
 
 													'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto7.jpg"></center>'
-													'You stare for a few seconds, transfixed, as he grows larger and larger. You take his dick in your mouth and begin to suck on it, caressing his balls with your hands.'
+													'You stare for a few seconds, transfixed, as he grows larger and larger. Then, you take his dick in your mouth and begin to suck on it, caressing his balls with your hands.'
 
 													act 'Swallow':
 														*clr & cla
@@ -188,7 +188,7 @@ if $ARGS[0] = 'mirabrother':
 														if mirabrosextime = 0:mirabrosextime = 1 & guy += 1
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/locations/gadukino/sex/mira/mirabromoto8.jpg"></center>'
-														'After a couple of minutes you feel his warm sticky cum hit the back of your throat and begin to swallow it all down. Mira''s brother stands still for a minute, his eyes closed in bliss. Finally, he takes his cock out of your mouth and zips up his pants. You put your helmets back on, get on the motorcycle once again, and he drives you back to the village...'
+														'After a couple of minutes, you feel his warm sticky cum hit the back of your throat and begin to swallow it all down. Mira''s brother stands still for a minute, eyes closed in bliss. Then, finally, he takes his cock out of your mouth and zips up his pants. You put your helmets back on, get on the motorcycle once again, and he drives you back to the village...'
 
 														act 'Ask him to take you back to Mira''s house': gt 'MiroslavaHome', 'start'
 														if grandmaQW['block'] = 0:act 'Ask him to drop you off at your grandparents house': gt 'gaddvor'

+ 3 - 3
locations/model_mari.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'mari_1':
 							'"Me? Not really," she says, crossing her legs. "I guess when they asked me to strip down during the initial audition I was a little nervous, but that was for a different reason."'
 							'<i>Hmm? What does that mean?</i>'
 							'"But other than that, I don''t mind really. I''ve always been pretty comfortable being naked." And indeed, as the two of you chat, Mari doesn''t appear to be bothered in the slightest that her breasts are completely on display.'
-							act'How long have you been working here?':gs'model_mari','mari1.1'
+							act'How long have you been working here?':gs'model_mari','mari_1.1'
 						end
 					end
 				end
@@ -80,7 +80,7 @@ if $ARGS[0] = 'mari_1':
 						'"Me? Not really," she says, crossing her legs. "I guess when they asked me to strip down during the initial audition I was a little nervous, but that was for a different reason."'
 						'<i>Hmm? What does that mean?</i>'
 						'"But other than that, I don''t mind really. I''ve always been pretty comfortable being naked." And indeed, as the two of you chat, Mari doesn''t appear to be bothered in the slightest that her breasts are completely on display.'
-						act'How long have you been working here?':gs'model_mari','mari1.1'
+						act'How long have you been working here?':gs'model_mari','mari_1.1'
 					end
 				end
 			end
@@ -305,8 +305,8 @@ end
 if $ARGS[0] = 'mari_4':
 	*clr & cla
 	mari['busy'] = rand(1,3)
+	mari['status'] =  rand(3,4)
 	if mari['busy'] = 1:
-		mari['status'] =  rand(3,4)
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/busy.jpg"></center>'
 		'You''re looking for Mari when you hear her name called out from a set.'
 		'Peeking from the shadows, you see her holding up her hair with a smirk on her face while the camera flashes in front of her. The more you look at her, the more you feel like the smile is unconscious and just a byproduct of her genuinely enjoying her job.'

+ 148 - 114
locations/music_actions.qsrc

@@ -1,46 +1,62 @@
 #music_actions
 
+if $ARGS[0] = 'music_icon':
+    !! Everywhere
+    if alko > 5:
+        'You are too drunk to stream or record music without messing up or throwing up into your guitar.'
+    !! $location_type = ''public_outdoors'' means parks, streets. Some event types can be placed in these locations : playing music, recording music - e.g in front of
+    !! the library, or at the church, etc. 
+    elseif $location_type = 'private' or ($location_type = 'public_outdoors' and sunWeather = 1 and temper > 15) and ml_no_music = 0:        
+        if hour < 8: 
+            'It''s too early to do anything noisy like playing the guitar or singing.'
+        elseif hour > 22:
+            'It''s too late to do anything noisy like playing the guitar or singing.'
+        elseif ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
+            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
+        else
+            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+        end
+        if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
+    end
+end
+
 if $ARGS[0] = 'start': 
-    if $access = '': gs 'internet_mobile', 'get_access'
+    cla
+
+    ml_time_left =  ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
+    if $location_type = 'public_outdoors': 
+        !! In public, Sveta is never alone
+        gs 'music_actions', 'not_alone'
+        !! Clear out accidentally stuck $access if Sveta is outdoors.
+        killvar 'access'
+    end
     
+    if ml_not_alone = 0: gs 'music_actions', 'willpower_cost'
+    if $access = '': gs 'internet_mobile', 'get_access'
+
     !! $location_type = ''private'' = these are usually homes. ''indoors'' usually an office, shop or an NPC''s home. Same for ''public_indoors'' For those locations
     !! anything music related should be part of a storyline/quest, or some prewritten scene, like in the room of Anushka
-    if $location_type = 'private' and ml_no_music = 0:
-        if ml_not_alone = 0: gs 'music_actions', 'willpower_cost'
-        gs 'music_actions', 'put_down_pick_up'
-        if hour > 8 and hour < 22 and alko < 5:
-            gs 'music_actions', 'play_something'
-            gs 'music_actions', 'practice_guitar'
-            if pcs_perform > 35 and (instrmusic_lvl >15 or vokal_lvl > 15): gs 'music_actions', 'rehearse_sets'
-            if ml_not_alone = 0 :
-                if $access ! 'denied' and ml_online['account'] = 1 and ml_streaming['lastday'] ! daystart: gs 'music_actions', 'stream_music'
-                gs 'music_actions', 'record_music'
-            end
-        end
-    !! $location_type = ''public_outdoors'' means parks, streets. Some event types can be placed in these locations : playing music, recording music - e.g in front of
-    !! the library, or at the church, etc. 
-    elseif $location_type = 'public_outdoors' and sunWeather = 1 and temper > 15 and alko < 5 and ml_no_music = 0:
-        !! TODO: What can be done publicly? I think streaming with a phone and recording music would fit here. Also just playing something on the guitar, but not busking.
-        !!       They will need some tweaking in the descriptions and photos, videos.
-        !!       Doing things outdoors takes a bit more willpower if inhibition/confidence is not high enough yet, but adds extra exp for that, and also improves 
-        !!       the mood of Sveta.
-        !!       Need to check for the weather, if it''s raining, freezing, etc. nothing can be done outside (at least for now.)
-        gs 'music_actions', 'willpower_cost'        
-        gs 'music_actions', 'play_something'
-        gs 'music_actions', 'practice_guitar'
-        gs 'music_actions', 'busking'
-        gs 'music_actions', 'rehearse_gig'
-        gs 'music_actions', 'record_music'        
-        if $access ! 'denied' and ml_online['account'] = 1 and ml_streaming['lastday'] ! daystart: gs 'music_actions', 'stream_music'
-	end
+    gs 'music_actions', 'play_something'
+    gs 'music_actions', 'practice_guitar'
+    
+    if $location_type = 'public_outdoors': gs 'music_actions', 'busking'
+    gs 'music_actions', 'record_music'
+    gs 'music_actions', 'stream_music'
+
+    !! NOTE: When content gates are added
+    !!if ml_activities['setlist'] = 1: gs 'music_actions', 'rehearse_gig'
+    !!if ml_activities['busking'] = 1: gs 'music_actions', 'busking'
+    !!if ml_activities['streaming'] = 1: gs 'music_actions', 'stream_music'
+    !! if this is done outdoors, any editing, mixing must be dones at home. So 'Record and edit' is not available outdoors.
+    !! Although more accurate would be to check whether Sveta is at home or not, and if she is not home then that option won''t be available.
+    !!if ml_activities['recording'] = 1: gs 'music_actions', 'record_music'
+      
 
     if $access ! 'denied': gs 'music_actions', 'set_up_account'
     if $access ! 'denied': gs 'music_actions', 'upload_music'
     gs 'music_actions', 'delete_music'
-    
-    killvar 'ml_willcost'
-    killvar 'ml_not_alone'
-    killvar 'ml_no_music'
+
+    act 'Finish': gs 'music_actions', 'finish'
 end
 
 if $ARGS[0] = 'put_down_pick_up':
@@ -63,7 +79,7 @@ if $ARGS[0] = 'play_something':
     if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
         if  ml_not_alone = 0 or ml_willcost = 0:
             !! TODO: This should be a new screen with some video or image or something
-            act 'Play something on the guitar':
+            act 'Play something on the guitar (10 minutes)':
                 *clr & cla
                 pcs_mood += 10
                 minut += 10
@@ -71,10 +87,10 @@ if $ARGS[0] = 'play_something':
                 '<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
                 'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
                 'You hum along to the tune, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-                act 'Finish': gt $loc, $loc_arg
+                act 'Finish': gs 'music_actions', 'start' 
             end
         elseif ml_willcost  <= pcs_willpwr:
-            act 'Play something on the guitar (<<will_cost>> Willpower)':
+            act 'Play something on the guitar (10 minutes) (<<will_cost>> Willpower - you are not alone)':
                 *clr & cla
                 inhib_exp += rand(1,2)
                 gs 'willpower', 'pay', 'self'
@@ -85,24 +101,24 @@ if $ARGS[0] = 'play_something':
                 '<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
                 'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
                 'You hum along to the tune, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-                act 'Finish': gt $loc, $loc_arg
+                act 'Finish': gs 'music_actions', 'start' 
             end
         else
-            act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
+            act 'Practice guitar (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
         end
     end
     if  ml_not_alone = 0 or ml_willcost = 0:
-        act 'Sing something':
+        act 'Sing something (10 minutes)':
             *clr & cla
             pcs_mood += 10
             minut += 10
             gs 'stat'
             'You hum a few notes to warm up your throat and start to some some songs you know, just for your own entertainment.'
             'You sway and move your had to keep the temp, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-            act 'Finish': gt $loc, $loc_arg        
+            act 'Finish': gs 'music_actions', 'start'
         end
     elseif ml_willcost  <= pcs_willpwr:
-        act 'Sing something (<<will_cost>> Willpower)':
+        act 'Sing something (10 minutes) (<<will_cost>> Willpower - you are not alone)':
             *clr & cla
             inhib_exp += rand(1,2)
             gs 'willpower', 'pay', 'self'
@@ -113,93 +129,81 @@ if $ARGS[0] = 'play_something':
             gs 'stat'
             'You hum a few notes to warm up your throat and start to some some songs you know, just for your own entertainment.'
             'You sway and move your had to keep the temp, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-            act 'Finish': gt $loc, $loc_arg        
+            act 'Finish': gs 'music_actions', 'start'
         end
     else
-        act 'Sing something (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to sing in front of people</font>'
+        act 'Sing something (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You feel too embarrassed to sing in front of people</font>'
     end
 end
 
 !! NOTE: Having a guitar really matters here
 if $ARGS[0] = 'practice_guitar':
-    if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc) and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0) and (ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] ):
-        !! This is already checked at the beginning.
-        if  ml_not_alone = 0 or ml_willcost = 0:
-            act 'Practice guitar': gt 'music_bedroomPractice', 'guitar'
-        elseif ml_willcost  <= pcs_willpwr:
-            act 'Practice guitar (<<will_cost>> Willpower)':
-                inhib_exp += rand(1,2)
-                gs 'willpower', 'pay', 'self'
-                gs 'stat'
-                gt 'music_bedroomPractice', 'guitar'
+    if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc) and (ml_guitar['chordbook'] = 1 or ml_guitarlesson['lessoncount'] > 0):
+        if ml_time_left < 15:
+            act 'Practice guitar (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today that your brain and hands are too tired to practice any more.</font>'    
+        elseif ml_not_alone ! 0 and ml_willcost ! 0:
+            if pcs_willpwr < ml_willcost:
+                act 'Practice guitar (15 minutes) (<<will_cost>> Willpower - you are not alone)':
+                    inhib_exp += rand(1,2)
+                    gs 'willpower', 'pay', 'self'
+                    gs 'stat'
+                    gt 'music_bedroomPractice', 'guitar'
+                end
+            else
+                act 'Practice guitar (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
             end
         else
-            act 'Practice guitar (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
+            act 'Practice guitar (15 minutes)': gt 'music_bedroomPractice', 'guitar'
         end
     end
 end
 
 if $ARGS[0] = 'busking':
-    if hour >= 8 and hour <= 20 and ml_guitar['carried'] = 1 and ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
-        *nl
-        'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
-        ml_buskingtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), 60)
-        if  ml_not_alone = 0 or ml_willcost = 0:
-            act 'Start busking (<<ml_buskingtime>> minutes)': gs 'music_buskingevents', 'busking'
-        elseif ml_willcost <= pcs_willpwr:
-            act 'Start busking (<<ml_buskingtime>> minutes) (<<will_cost>> Willpower)':
+    *nl
+    'With the weather being pleasant and sunny, there are groups of people moving around the streets. You could play some music, practice performing songs and maybe make some money too.'
+    if ml_time_left < 60:
+        act 'Start busking (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to play a whole stream.</font>'
+    elseif  ml_willcost ! 0:
+        if ml_willcost <= pcs_willpwr:
+            act 'Start busking (60 minutes) (<<will_cost>> Willpower)':
                 inhib_exp += rand(1,3)
                 gs 'willpower', 'pay', 'self'
                 gs 'stat'
                 gs 'music_buskingevents', 'busking'
             end
         else
-            act 'Start busking (<<ml_buskingtime>> minutes) (<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
-
-
-!! TODO: How to differentiate between guitar based and vocal sets? It is possible to rehearse just the singing part of a set, but obviously has to 
-!! practice the guitar parts too.
-if $ARGS[0] = 'rehearse_sets':
-    if  ml_performance['performed_minutes'] < ml_performance['max_perform_minutes']:
-        if  ml_not_alone = 0 or ml_willcost = 0:
-            act 'Rehearse your sets (30 minutes)': gt 'music_bedroompractice', 'rehearse'
-        elseif ml_willcost <= pcs_willpwr:
-            act 'Rehearse your sets (30 minutes) (<<will_cost>> Willpower)':
-                inhib_exp += rand(1,2)
-                gs 'willpower', 'pay', 'self'
-                gs 'stat'
-                gt 'music_bedroompractice', 'rehearse'
-            end
-        else
-            act 'Rehearse your sets (30 minutes) (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+            act 'Start busking (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t feel comfortable enough to play in front of people right now.</font>'
         end
+    else
+        act 'Start busking (60 minutes)': gs 'music_buskingevents', 'busking'
     end
 end
 
-
 if $ARGS[0] = 'stream_music':
     !! Streaming music
-    !! NOTE: The check for guitar is done in the 'liveStream', without a guitar Sveta will sing
-    !! TODO: Some other checks to be added maybe, if she is not 
-    if ml_performance['performed_minutes'] < ml_performance['max_perform_minutes'] and ml_performance['max_perform_minutes'] >= 15:
-        
-        max_stream_time = iif($access['type'] = 2, subscription[$access['subscription']], 60)
-        ml_streamtime =  min((ml_performance['max_perform_minutes']-ml_performance['performed_minutes']), max_stream_time)
-        
+    !! NOTE: The check for guitar is done in the 'live_stream', without a guitar Sveta will sing
+    if ml_online['account'] = 0:
+        act 'Live stream (<font color="red">No online account</font>)': '<br><font color="red">You will have to set up an online account first to stream.</font>'
+    elseif $access = 'denied': 
+        act 'Live stream (<font color="red">No internet access</font>)':  '<br><font color="red">You have no internet access.</font>'
+    elseif ml_streaming['lastday'] = daystart: 
+        act 'Live stream (<font color="red">Already streamed today</font>)': '<br><font color="red">You already streamed today.</font>'
+    elseif ml_not_alone = 1 and location_type = 'private' :
+        act 'Live stream (<font color="red">You are not alone, can''t stream right now</font>)': '<br><font color="red">You are not alone in the room, which makes starting a stream impossible until they leave.</font>'
+    elseif ml_time_left < 60:
+        act 'Live stream (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to play a whole stream.</font>'    
+    else
         if ml_willcost = 0:
-            act 'Live stream (<<ml_streamtime>> minutes)': gt 'music_onlinemusic', 'liveStream'
+            act 'Live stream (60 minutes)': gt 'music_onlinemusic', 'live_stream'
         elseif ml_willcost  <= pcs_willpwr:
-            act 'Live stream (<<ml_streamtime>> minutes) (<<will_cost>> Willpower)':
+            act 'Live stream (60 minutes) (<<will_cost>> Willpower)':
                 inhib_exp += rand(1,3)
                 gs 'willpower', 'pay', 'self'
                 gs 'stat'
-                gt 'music_onlinemusic', 'liveStream'
+                gt 'music_onlinemusic', 'live_stream'
             end
         else
-            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>'
+            act 'Live stream (<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
@@ -210,32 +214,55 @@ end
 !! 2. Edit video/music
 !! 3. Mix if there are several recording - this will need some better recroded music management, but something simple, no one wants to 
 !! click a hundred times to do something. Boring.  
+!! 4. Computer based recording is removed for now, some changes are needed
 if $ARGS[0] = 'record_music':
     !! Recording music
-    if ml_performance['performed_minutes'] < ml_performance['max_perform_minutes']:
-        if ml_willcost = 0:
-            act 'Record a song with your phone': gt 'music_onlinemusic', 'recordSong'
-            if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-                act 'Record and edit a song': gt 'music_onlinemusic', 'recordAndEditSong'
-            end
-        elseif ml_willcost  <= pcs_willpwr:
-            act 'Record a song with your phone (<<will_cost>> Willpower)':
+    
+    if ml_time_left < 30:
+        act 'Record a song (<font color="red">You are too tired</font>)': '<br><font color="red">You have played so much today, that your brain and hands are too tired to record anything right now.</font>'    
+    elseif ml_willcost = 0:
+            act 'Record a song with your phone (30 minutes)': gt 'music_onlinemusic', 'record_song'
+    elseif ml_willcost  <= pcs_willpwr:
+        act 'Record a song with your phone (30 minutes) (<<will_cost>> Willpower - you are not alone)':
+            inhib_exp += rand(1,2)
+            gs 'willpower', 'pay', 'self'
+            gs 'stat'
+            gt 'music_onlinemusic', 'record_song'
+        end
+    else
+        act 'Record a song (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You don''t feel comfortable recording in front of other people right now.</font>'
+    end
+end
+
+!! TODO: Split from recording music, editing is a separate thing
+if $ARGS[0] = 'edit_recording':
+    if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
+        act 'Edit a song (<<will_cost>> Willpower)':
+            inhib_exp += rand(1,2)
+            gs 'willpower', 'pay', 'self'
+            gs 'stat'
+            gt 'music_onlinemusic', 'recordAndEditSong'
+        end
+    end
+end
+
+
+
+!! TODO: How to differentiate between guitar based and vocal sets? It is possible to rehearse just the singing part of a set, but obviously has to 
+!! practice the guitar parts too.
+if $ARGS[0] = 'rehearse_sets':
+    if  ml_performance['performed_minutes'] < ml_performance['max_perform_minutes']:
+        if  ml_not_alone = 0 or ml_willcost = 0:
+            act 'Rehearse your sets (30 minutes)': gt 'music_bedroompractice', 'rehearse'
+        elseif ml_willcost <= pcs_willpwr:
+            act 'Rehearse your sets (30 minutes) (<<will_cost>> Willpower)':
                 inhib_exp += rand(1,2)
                 gs 'willpower', 'pay', 'self'
                 gs 'stat'
-                gt 'music_onlinemusic', 'recordSong'
-            end
-            if komp = 1 and webcamera = 1 and ml_studio['scarlet-3rd-gen'] = 1:
-                act 'Record and edit a song (<<will_cost>> Willpower)':
-                    inhib_exp += rand(1,2)
-                    gs 'willpower', 'pay', 'self'
-                    gs 'stat'
-                    gt 'music_onlinemusic', 'recordAndEditSong'
-                end
+                gt 'music_bedroompractice', 'rehearse'
             end
         else
-            act 'Record a song (<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 (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+            act 'Rehearse your sets (30 minutes) (<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
@@ -296,4 +323,11 @@ if $ARGS[0] = 'willpower_cost':
     end
 end
 
+if $ARGS[0] = 'finish':
+    killvar 'ml_willcost'
+    killvar 'ml_not_alone'
+    killvar 'ml_no_music'
+    killvar 'ml_time_left'
+    gt $loc, $loc_arg
+end
 --- music_actions ---------------------------------

+ 2 - 2
locations/music_bedroompractice.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'guitar':
 		'You pick up you guitar and the lessons from the guitar teacher and start to practice.'
 		gs 'exp_gain', 'instrmusic', rand(2,3)
 	end
-	act 'Finish practice': gt $loc, $loc_arg
+	act 'Finish practice': gs 'music_actions', 'start'
 end
 
 !! TODO: Tie in with the vocal coach at the Industrial Region Community Centre
@@ -69,7 +69,7 @@ if $ARGS[0] = 'rehearse':
 	ml_performance['set_quality'] += rand(1,(pcs_instrmusic + pcs_vokal + pcs_perform)/10)
 	ml_performance['set_lastpracticeday'] = daystart 
 		
-	act 'Finish practice': gt $loc, $loc_arg
+	act 'Finish practice': gs 'music_actions', 'start'
 end
 
 

+ 10 - 4
locations/music_buskingevents.qsrc

@@ -1,6 +1,8 @@
 # music_buskingevents
 
+!! TODO: Add the vocal only scenario
 if $ARGS[0] = 'busking':
+	ml_buskingtime = 60
 	minut += ml_buskingtime
 	gs 'exp_gain', 'instrmusic', rand(1,3)
 	gs 'exp_gain', 'vokal', rand(1,3)
@@ -29,8 +31,11 @@ if $ARGS[0] = 'busking':
 !!	act 'Finish': gt $curloc, 'start'	
 !!  Random events come here. The displayed actions depend on the event
 	act 'Finish': gs 'music_buskingevents', 'finish'
+	killvar 'ml_buskingtime'
 end
 
+
+!! TODO: Add the vocal only scenario
 if $ARGS[0] = 'calculate_tips':
 	
 	if $region = 'city_center' or $region = 'city_park':
@@ -58,6 +63,7 @@ if $ARGS[0] = 'calculate_tips':
 	killvar 'ml_time_loc_mod'
 end
 
+!! TODO: Add the vocal only scenario ??
 if $ARGS[0] = 'anushka':
 	CLOSE ALL
 	*clr & cla
@@ -133,7 +139,7 @@ if $ARGS[0] = 'anushka':
 			'You start losing yourself in the music, occasionally glancing up to look at the people passing by. Most seem to hurry by to try and get away from the racket you''re making as you see some movement that attracts your attention and you spot Anushka watching you play. She seems to have a look of utter pain and disdain on her face; she clearly doesn''t approve of your lack of musical talent. When she sees you looking at her, she scoffs and shakes her head in disgust before walking away.'
 		end
 	end
-	act 'Finish': gt $loc, $loc_arg
+	act 'Finish': gs 'music_actions', 'finish'
 end
 
 if $ARGS[0] = 'lena_and_lera':
@@ -141,14 +147,14 @@ if $ARGS[0] = 'lena_and_lera':
 	pcs_mood -= 10
 	*nl
 	'Lena and Lera harasses <<$pcs_nickname>>'
-	act 'Finish': gt $loc, $loc_arg
+	act 'Finish': gs 'music_actions', 'finish'
 end
 
 if $ARGS[0] = 'finish':
 	ml_rand_event = rand(0,100)
 	if ml_rand_event <= 10 and $region = 'pav' and npc_rel['A144'] > 40: 
 		gs 'music_buskingevents', 'anushka'
-	elseif ml_rand_event <= 30 and $region = 'pav':
+	elseif ml_rand_event <= 30 and $region = 'pav' and ml_delparcoQW['Stage'] = 0:
 		gs 'music_gigstarts', 'zariyah_passing_by'
 !!	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and ((npc_rel['A20'] < 20 or npc_rel['A21'] < 20):
 !! TODO: if the gopniks don''t like the PC and/or her music is awful, there is a chance that Lena and Lera harasses her.
@@ -156,7 +162,7 @@ if $ARGS[0] = 'finish':
 !!	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and ( (npc_rel['A20'] < 40 or npc_rel['A21'] < 40) and (pcs_instrmusic < 30 or pcs_perform < 30 or pcs_vokal < 30) ):
 !!		gs 'music_buskingevents', 'lena_and_lera', 2
 	else
-		gt $loc, $loc_arg
+		gs 'music_actions', 'finish'
 	end
 end
 --- music_buskingevents ---------------------------------

+ 4 - 4
locations/music_gigstarts.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'zariyah_passing_by':
 	if ml_approach:
 		gt 'music_gigstarts', 'delparco_start'
 	else
-		gt $loc, $loc_arg
+		gs 'music_actions', 'finish'
 	end
 	killvar 'ml_approach'
 end
@@ -60,7 +60,7 @@ if $ARGS[0] = 'delparco_start':
 		killvar 'rules'
 		gs 'music_checks', 'reset_checks'
 
-		act 'Leave': gt $loc, $loc_arg
+		act 'Leave': gs 'music_actions', 'finish'
 
 	else
 		if rules = 1:
@@ -105,7 +105,7 @@ if $ARGS[0] = 'delparco_accept':
 	killvar 'rules'
 	gs 'music_checks', 'reset_checks'
 
-	act 'Leave': gt $loc, $loc_arg
+	act 'Leave': gs 'music_actions', 'finish'
 end
 
 if $ARGS[0] = 'delparco_decline':
@@ -130,7 +130,7 @@ if $ARGS[0] = 'delparco_decline':
 	killvar 'rules'
 	gs 'music_checks', 'reset_checks'
 
-	act 'Leave': gt $loc, $loc_arg
+	act 'Leave': gs 'music_actions', 'finish'
 
 end
 

+ 23 - 17
locations/music_onlinemusic.qsrc

@@ -7,31 +7,35 @@ if $ARGS[0] = 'set_up_account':
 	gs 'stat'	
 	'You log into Youtube to set up a channel for your music. You can upload videos or live stream, but you will need to open a bank account if you want to receive any tips from viewers of your stream.'	
 !!	TODO: Ask for a screen name? 
-	act 'Leave': gt $loc, $loc_arg
+	act 'Leave': gs 'music_actions', 'start'
 end
 
 
-if $ARGS[0] = 'liveStream':	
+if $ARGS[0] = 'live_stream':	
 !!	TODO: Much, much better scene needed.
 	ml_streaming['times_streamed'] += 1		
 	gs 'music_onlinemusic', 'stream_interruptions'
 
 	if ml_no_interruption ! 0: 
 		!! TODO: Separate scenes by instrument used, not used
+		ml_streamtime = 60
 		gs 'music_onlinemusic', 'streaming_stats'
-		if komp = 1 and webcamera = 1 and $location_type ! 'public_outdoors':
+		if komp = 1 and webcamera = 1 and $location_type = 'private':
 			'<center><img <<$set_imgh>> src="images/pc/activities/music/gomixer_hero.jpg"/></center>'
-			'You set up your webcamera and start the streaming app on your laptop. After settling down comfortably, you start to stream.'			
+			'You set up your webcamera and start the streaming app on your computer. After settling down comfortably, you start to stream.'			
 			'Your fans tipped you <<ml_superchats>> rubels for your performance.'
 		else		
 			'<center><img <<$set_imgh>> src="images/pc/activities/music/gomixer_hero.jpg"/></center>'
 			'You set up your phone on a little tri-pod and log into your account. After settling down comfortably, you start to stream.'			
 			'Your fans tipped you <<ml_superchats>> rubels for your performance.'
 		end	
+	else
+		!! How many minutes did the stream last.
+		ml_streaming = rand(1,60)
+		gs 'music_onlinemusic', 'streaming_stats'
+		!! TODO: Interruption events and such will come here
 	end
 	
-	killvar 'ml_streamtime'
-	
 	if bankAccount = 0:			
 		*nl
 		'You have earned <b><<ml_streaming[''unclaimed_earnings'']>></b> rubels so far, but you need to open a bank account before you can receive the money.'
@@ -48,9 +52,11 @@ if $ARGS[0] = 'liveStream':
 	act 'Stop the stream':
 		gs 'music_onlinemusic', 'finish', 'streaming'
 	end
+	killvar 'ml_streamtime'
+	killvar 'ml_no_interruption'
 end
 
-if $ARGS[0] = 'recordSong':
+if $ARGS[0] = 'record_song':
 	recording_time = 30
 	performed_minutes = 15
 	gs 'music_onlinemusic', 'recording_interruptions'
@@ -94,11 +100,11 @@ end
 
 !! IMPORTANT 
 !! TODO: Recording and Editing/Mixing needs to be split into two separate activities. So keep ''recrodSong'' as is and make this into purely about editing
-if $ARGS[0] = 'recordAndEditSong':
+if $ARGS[0] = 'edit_song':
 !!	TODO: Write a scene. It should describe that a song is recorded and then edited properly before uploading it to the net.
 !!	'<center><img <<$set_imgh>> src="images/pc/activities/music/editmusic.jpg"/></center>'
 	'<center><video autoplay loop src="images/pc/activities/music/editmusic.mp4"></video></center>'
-	'You open plug in your home studio kit and start up the recording software. After several tries you finally end up with a version you are content with.'
+	'You plug in your home studio kit and start up the recording software. After several tries you finally end up with a version you are content with.'
 	'The next hour just flies by as you edit the video and the audio, trying to increate the quality of the recording as much as you can'
 	minut += 90
 
@@ -145,7 +151,7 @@ if $ARGS[0] = 'recordAndEditSong':
 			act 'Upload music': gt 'music_onlinemusic', 'uploadmusic'
 		end
 	else
-		act 'Leave': gt $loc, $loc_arg
+		act 'Leave': gs 'music_actions', 'finish'
 	end
 
 end
@@ -167,7 +173,7 @@ if $ARGS[0] = 'uploadmusic':
 	if $ARGS[1] = 'recording': 
 		act 'Leave': gs 'music_onlinemusic', 'finish', 'recording'
 	else
-		act 'Leave': gt $loc, $loc_arg
+		act 'Leave': gs 'music_actions', 'start'
 	end
 end
 
@@ -198,14 +204,14 @@ if $ARGS[0] = 'uploadallmusic':
 	if i < ml_onlinesongcount:jump 'uploadallmusic'
 	killvar 'will_cost'
 
-	act 'Leave': gt $loc, $loc_arg
+	act 'Leave': gs 'music_actions', 'start'
 end
 
 if $ARGS[0] = 'deleteoldmusic':
 	'You go through your recorded musics and delete all the old ones where your playing doesn''t really reflect what you can do these days'
 	gs 'music_onlinemusic', 'deleting'
 
-	act 'Leave': gt $loc, $loc_arg
+	act 'Leave': gs 'music_actions', 'start'
 end
 
 !!----------------------------------------------------------------------------------------------------------------------------
@@ -280,11 +286,11 @@ if $ARGS[0] = 'finish':
 		!!	elseif ml_rand_event < 15 and $ARGS[1] = 'pav' and ( (npc_rel['A20'] < 40 or npc_rel['A21'] < 40) and (pcs_instrmusic < 30 or pcs_perform < 30 or pcs_vokal < 30) ):
 		!!		gs 'music_buskingevents', 'lena_and_lera', 2
 		else
-			gt $loc, $loc_arg
+			gs 'music_actions', 'finish'
 		end
 		killvar 'ml_rand_event'
 	else
-		gt $loc, $loc_arg
+		gs 'music_actions', 'finish'
 	end
 end
 
@@ -376,10 +382,10 @@ end
 
 
 if $ARGS[0] = 'anushka_streaming_end':
-	gt $loc, $loc_arg
+	gs 'music_actions', 'finish'
 end
 
 if $ARGS[0] = 'anushka_recording_end':
-	gt $loc, $loc_arg
+	gs 'music_actions', 'finish'
 end
 --- music_onlinemusic ---------------------------------

+ 3 - 2
locations/nichBedroomServant.qsrc

@@ -27,11 +27,12 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/bedroomServant.jpg"></center>'
 
 	'Your bedroom is fairly large, considering you''re only an employee. There is a small <a href="exec:gt ''bed'', ''start''">double bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>.'
+	if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to your bed.'
 	'Half a wall is taken up by an expensive-looking <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing). There''s a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> next to it.'
 	if komp = 1:
 		!! TODO: Sveta can''t do camshows from this place - unless Gala makes her at some point, but unlikely.
 		gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
-		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">laptop</a>.'
+		$komp = ' with your <a href="exec:gt ''Komp'', ''start''">computer</a>.'
 	else
 		$komp = '.'
 	end
@@ -41,7 +42,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	if bookYog > 0:'A yoga mat is rolled up in a corner next to the wardrobe. '
 
 	if mishka > 0:'On one of the shelves, you''ve placed your <<mishka>> teddy bear'+iif(mishka = 1, '', 's')+'.'
-
+	gs 'music_actions', 'music_icon'
 	gs 'exercise', 'start'
 
 	if nichSalaryOutstanding > 0:

+ 7 - 6
locations/npcstatic1.qsrc

@@ -770,10 +770,10 @@ npc_dick['A<<npctemp>>'] = 16
 
 npctemp = 41
 $npc_dna['A<<npctemp>>'] = '1331452063 2012109105 1708557162 1857346873 1496187449 1611414481 1133537624'
-$npc_firstname['A<<npctemp>>'] = 'Givi'
-$npc_lastname['A<<npctemp>>'] = 'Karapetovich'
-$npc_usedname['A<<npctemp>>'] = 'Givi Karapetovich'
-$npc_notes['A<<npctemp>>'] = 'Owner of the Residential Area Cafe.'
+$npc_firstname['A<<npctemp>>'] = 'Fabiyan'
+$npc_lastname['A<<npctemp>>'] = 'Pankratov'
+$npc_usedname['A<<npctemp>>'] = 'Fabi'
+$npc_notes['A<<npctemp>>'] = 'Owner of the Roadhouse Cafe.'
 npc_dob['A<<npctemp>>'] = 19720410
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -786,7 +786,7 @@ $npc_dna['A<<npctemp>>'] = '1684075531 1825751910 1655527813 1683610108 18133757
 $npc_firstname['A<<npctemp>>'] = 'Ashot'
 $npc_lastname['A<<npctemp>>'] = 'Karapetovich'
 $npc_usedname['A<<npctemp>>'] = 'Ashot'
-$npc_notes['A<<npctemp>>'] = 'Givi Karapetovich''s nephew.'
+$npc_notes['A<<npctemp>>'] = 'Fabiyan Pankratov''s nephew.'
 npc_dob['A<<npctemp>>'] = 19970502
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
@@ -796,7 +796,8 @@ npc_dick['A<<npctemp>>'] = 18
 
 npctemp = 43
 $npc_dna['A<<npctemp>>'] = '1707750779 1605673218 1243222430 1619197534 1698231949 1043436410 1967334561'
-$npc_firstname['A<<npctemp>>'] = 'Tamara'
+$npc_firstname['A<<npctemp>>'] = 'Nika'
+$npc_notes['A<<npctemp>>'] = 'Dishwasher at the roadhouse cafe.'
 npc_dob['A<<npctemp>>'] = 19941004
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'

+ 2 - 2
locations/npcstatic2.qsrc

@@ -523,8 +523,8 @@ npc_dick['A<<npctemp>>'] = 18
 
 npctemp = 93
 $npc_dna['A<<npctemp>>'] = '1419539166 1635112879 1449039561 1653076316 1282274667 1815783068 1891294665'
-$npc_firstname['A<<npctemp>>'] = 'Irina'
-$npc_nickname['A<<npctemp>>'] = 'Ira'
+$npc_firstname['A<<npctemp>>'] = 'Marisha'
+$npc_nickname['A<<npctemp>>'] = 'Marisha'
 $npc_notes['A<<npctemp>>'] = 'Bar Waitress at the Residential Area Cafe.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'

+ 1 - 1
locations/pav_clinic.qsrc

@@ -199,7 +199,7 @@ if $ARGS[0] = '':
 						if karta >= zubpay:
 							act 'Sort out your teeth (card)':
 								*clr & cla
-								money -= zubpay
+								karta -= zubpay
 								minut += 60
 								if pcs_missing_teeth > 0:
 									pcs_missing_teeth = 0

+ 1 - 1
locations/pav_commercial.qsrc

@@ -151,7 +151,7 @@ act 'Walk to the train station (0:10)':minut += 10 & gt 'pav_train_hall'
 act 'Walk to the highway (0:15)':minut += 15 & nroad = 20 & gt 'road'
 act 'Walk to Pushkin (0:25)':minut += 25 & nroad = 19 & gt 'liam'
 
-gs 'music_actions', 'start'
+gs 'music_actions', 'music_icon'
 
 act 'Wait':gs 'obj_din', 'wait'
 

+ 18 - 3
locations/pav_disco_coolkids.qsrc

@@ -1377,7 +1377,7 @@ if $ARGS[0] = 'katja_walkhome':
 	katjaQW['drunk_help'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_katja.jpg"></center>'
-	if func('homes_properties', 'has_access', 'parents_home'):
+	if func('homes_properties', 'can_live_here', 'parents_home') ! 0:
 		'Katja takes you by the arm and helps you get home.'
 		act 'Go home': gt 'korrPar'
 	else
@@ -1516,6 +1516,14 @@ if $ARGS[0] = 'sonia_dance':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_sveta_dance.jpg"></center>'
 	'You and Sonia move out onto the dance floor and start dancing together. She seems to be really enjoying herself, laughing and dancing with lots of energy and doesn''t seem to care what anyone thinks. She just wants to have fun.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+	if npc_rel['A139'] >= 50:
+		if soniaQW['homeinvite'] = 0:
+			soniaQW['homeinvite'] = 1
+			'As you dance together, she leans in and says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+			'She quickly tells you her address and you assure her you will stop by sometime before the two of you go back to dancing together.'
+		end
+	end
 	act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 	if hour >= 20:
 		act 'Keep dancing': gt 'pav_disco_coolkids', 'sonia_dance'
@@ -1699,6 +1707,7 @@ if $ARGS[0] = 'sonia_outcast_dance':
 								'You pull back from her to create space as you stop kissing. "Sorry not tonight..."'
 								'You don''t get time to finish your thought, she looks hurt and angry at your words. "Fine!" Then turns and walks away from you.'
 								!!can we code this so if this happens she leave the disco for the night
+								 discobloc['A139'] = daystart
 								act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 							end
 						else
@@ -1716,8 +1725,14 @@ if $ARGS[0] = 'sonia_walkhome':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_sonia.jpg"></center>'
-	'Sonia takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about some fashion magazine she has recently read, but you don''t really remember most of what she said - in fact most of the walk home is a blur. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, well I hope you don''t feel too bad tomorrow." She gives you a quick hug and starts walking back down the stairs.'
-	act 'Go inside': gt 'korrPar'
+	if func('homes_properties', 'can_live_here', 'parents_home') ! 0: 
+		'Sonia takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about some fashion magazine she has recently read, but you don''t really remember most of what she said - in fact most of the walk home is a blur. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, well I hope you don''t feel too bad tomorrow." She gives you a quick hug and starts walking back down the stairs.'
+		act 'Go inside': gt 'korrPar'
+	else
+		!! NOTE: This is a temporary thing, I think if Sveta has been kicked out then Sonja either invites her over for the night or she takes Sveta to the current home, not the appartment
+		'Sonia takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about some fashion magazine she has recently read, but you don''t really remember most of what she said - in fact most of the walk home is a blur. Once you get to the apartment complex, she hugs you ""Okay, well I hope you don''t feel too bad tomorrow." She squeezes you gently and starts walking back home.'
+		act 'Continue': gt 'pav_complex', 'start'
+	end 
 end
 
 if $ARGS[0] = 'natasha':

+ 8 - 1
locations/pav_disco_gopniks.qsrc

@@ -1653,7 +1653,14 @@ if $ARGS[0] = 'anushka_walkhome':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_anushka.jpg"></center>'
 	'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, here we are. Maybe try not to over do it next time?" She gives you a quick hug and starts walking back down the stairs.'
-	act 'Go inside': gt 'korrPar'
+	if func('homes_properties', 'can_live_here', 'parents_home') ! 0: 
+		'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, here we are. Maybe try not to over do it next time?" She gives you a quick hug and starts walking back down the stairs.'
+		act 'Go inside': gt 'korrPar'
+	else
+		!! NOTE: Same as with `sonja_walkhome` this is a temporary thing, I think if Sveta has been kicked out then leaving her in front of the building is just awkward. Should be taken to her current home if that is in Pavlovsk, or Anushka probably would invite her to sleep at their place.`
+		'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she hugs you ""Okay, well I hope you don''t feel too bad tomorrow." She squeezes you gently before releasing you, and starting to walk home.'
+		act 'Continue': gt 'pav_complex', 'start'
+	end	
 end
 
 if $ARGS[0] = 'alyona':

+ 61 - 33
locations/pav_hotelReception.qsrc

@@ -121,7 +121,7 @@ if $ARGS[0] = '':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/resep.girl0,'+rand(0,10)+'.jpg"></center>'
 			'She looks in the computer: "I see you already have a room here. As it is already booked and paid for the only way to change it to a different room, would be to cancel your existing booking. To do so without notice would forfeit your payment, I would advise against this, but you may do so if you wish."'
-			act'Yes, cancel your booking':hotelRoom['pav_hotel'] = 0 & gt'pav_hotel'
+			act'Yes, cancel your booking': hotelRoom['pav_hotel'] = 0 & gt'pav_hotel'
 			act'No':gt'pav_hotel'
 		elseif hotelRoom['pav_hotel'] = 0:
 			act 'Yes':
@@ -130,53 +130,81 @@ if $ARGS[0] = '':
 				'She smiles at you happily: "Excellent! We have the following rooms available right now:"'
 				'Standard room - 500 <b>₽</b> / night;'
 				'Luxury room - 1500 <b>₽</b> / night;'
+				*nl
 				act'Normal room':
-					*clr
-					cla
-					hotelRoomDays['pav_hotel']=input ("For how long would you like to stay?")
-					if hotelRoomDays['pav_hotel']<0:set hotelRoomDays['pav_hotel']=0
-					if hotelRoomDays['pav_hotel']*500>money:msg'You can''t afford to stay in the hotel for that long.'&gt'pav_hotel'
-					if hotelRoomDays['pav_hotel']*500<=money and hotelRoomDays['pav_hotel'] ! 0:
-						money-=hotelRoomDays['pav_hotel']*500
-						hotelRoom['pav_hotel']=1
-						hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
-						if pavHotelMaid = 0:
-							'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
-						else
-							'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you <<$pcs_nickname>>, I hope you enjoy your stay!"'
-						end
-						act'Step away from the reception desk':gt'pav_hotel'
+					cla 
+					hotelRoomDays['pav_hotel'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['pav_hotel'] > 0 : 
+						totalCost = hotelRoomDays['pav_hotel'] * 500
+						'"A normal room for <<hotelRoomDays[''pav_hotel'']>> days, that would be <<totalCost>><b>₽</b> in total." says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'pav_hotelReception', 'pay_the_room', 1
+					else
+						gt'pav_hotel'
 					end
-					if hotelRoomDays['pav_hotel'] = 0:gt'pav_hotel'
 				end
 
 				act'Luxury room':
-					*clr
 					cla
-					hotelRoomDays['pav_hotel']=input ("For how long would you like to stay?")
-					if hotelRoomDays['pav_hotel']<0:set hotelRoomDays['pav_hotel']=0
-					if hotelRoomDays['pav_hotel']*1500>money:msg'You can''t afford to stay in the hotel for that long.'&gt'pav_hotel'
-					if hotelRoomDays['pav_hotel']*1500<=money and hotelRoomDays['pav_hotel'] ! 0:
-						money-=hotelRoomDays['pav_hotel']*1500
-						hotelRoom['pav_hotel']=2
-						hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
-						if pavHotelMaid = 0:
-							'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
-						else
-							'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you <<$pcs_nickname>>, I hope you enjoy your stay!"'
-						end
-						act'Step away from the reception desk':gt'pav_hotel'
+					hotelRoomDays['pav_hotel'] = input ("For how long would you like to stay?")
+					if hotelRoomDays['pav_hotel'] > 0 : 
+						totalCost = hotelRoomDays['pav_hotel'] * 1500
+						'"A luxury room for <<hotelRoomDays[''pav_hotel'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'pav_hotelReception', 'pay_the_room', 2
+					else
+						gt'pav_hotel'
 					end
-					if hotelRoomDays['pav_hotel'] = 0:gt'pav_hotel'
 				end
 
-				act 'Step away from the reception desk':gt'pav_hotel'
+				act 'Step away from the reception desk': gt'pav_hotel'
 			end
 			act'No, thank you':gt'pav_hotel'
 		end
 	end
 end
 
+if $ARGS[0] = 'pay_the_room':
+	hotel_room_id = ARGS[1]
+	if totalCost<=money:
+		act 'Pay with cash':
+			cla
+			money-=totalCost
+			hotelRoom['pav_hotel'] = hotel_room_id
+			hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
+			'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
+			act 'Step away from the reception desk': gt 'pav_hotel'
+			killvar 'totalCost'
+			killvar 'hotel_room_id'
+		end
+	end
+	if totalCost<=karta+bankDebtLimit:
+		act 'Pay with card':
+			cla
+			karta-=totalCost
+			hotelRoom['pav_hotel'] = hotel_room_id
+			hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
+			'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
+			act 'Step away from the reception desk': gt 'pav_hotel'
+			killvar 'totalCost'
+			killvar 'hotel_room_id'
+		end
+	end
+
+	if totalCost > karta+bankDebtLimit and totalCost > money: 
+		act 'You can''t afford to stay in the hotel for that long.': 
+			killvar 'totalCost' 
+			killvar 'hotel_room_id'
+			gt 'pav_hotel'
+		end
+	end
+
+	act 'You change your mind': 
+		killvar 'totalCost' 
+		killvar 'hotel_room_id'
+		gt 'pav_hotel'
+	end
+end
+
+
 if $ARGS[0] = 'pavlbar':
 	menu_off = 1
 	*clr & cla

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác