Browse Source

Merge https://git.tfgames.site/Kevin_Smarts/glife

lagooncompany 2 years ago
parent
commit
5985c7b3d9
100 changed files with 5271 additions and 2292 deletions
  1. 3 0
      .gitignore
  2. 3 4
      LinksToSkip.txt
  3. 5 0
      glife.qproj
  4. 3 2
      locations/BurgerTip.qsrc
  5. 1 1
      locations/Cum_Manage.qsrc
  6. 15 13
      locations/DNA.qsrc
  7. 3 3
      locations/HotelRoom.qsrc
  8. 1 1
      locations/JuliaMilHome.qsrc
  9. 3 3
      locations/KatjaHomeTalk.qsrc
  10. 96 97
      locations/Komp.qsrc
  11. 1 1
      locations/MartinSex2.qsrc
  12. 65 0
      locations/NPCFinder.qsrc
  13. 1 1
      locations/NikoMeyHome.qsrc
  14. 28 0
      locations/TV.qsrc
  15. 1 1
      locations/Zvereva_sub_1.qsrc
  16. 10 0
      locations/_attributes_salacious_dress.qsrc
  17. 4 0
      locations/_attributes_salacious_outfits.qsrc
  18. 32 32
      locations/abduction.qsrc
  19. 6 6
      locations/albina_house_events.qsrc
  20. 4 4
      locations/albina_lazar_sex.qsrc
  21. 14 14
      locations/albina_starlets.qsrc
  22. 4 4
      locations/albina_wine_event.qsrc
  23. 105 105
      locations/albinahome.qsrc
  24. 16 16
      locations/alexandriaSex.qsrc
  25. 2 2
      locations/anush_bedroom.qsrc
  26. 4 4
      locations/anushkachat.qsrc
  27. 22 19
      locations/arousal.qsrc
  28. 149 141
      locations/artem_date_events.qsrc
  29. 97 94
      locations/artem_events.qsrc
  30. 228 226
      locations/artem_sex.qsrc
  31. 240 241
      locations/artemhome.qsrc
  32. 2 2
      locations/audition_sex1.qsrc
  33. 2 2
      locations/bedrPar.qsrc
  34. 1 1
      locations/beg1.qsrc
  35. 2 2
      locations/body_desc.qsrc
  36. 22 4
      locations/booty_call.qsrc
  37. 286 166
      locations/booty_call_after.qsrc
  38. 9 4
      locations/booty_call_condoms.qsrc
  39. 31 33
      locations/booty_call_cowgirl.qsrc
  40. 96 75
      locations/booty_call_cum.qsrc
  41. 8 2
      locations/booty_call_doggy.qsrc
  42. 24 18
      locations/booty_call_miss.qsrc
  43. 369 6
      locations/booty_call_morning.qsrc
  44. 456 12
      locations/booty_call_pillow_talk.qsrc
  45. 897 74
      locations/booty_call_sex.qsrc
  46. 168 5
      locations/booty_call_shower.qsrc
  47. 55 18
      locations/booty_call_start.qsrc
  48. 12 2
      locations/booty_call_stats.qsrc
  49. 395 61
      locations/booty_call_talk.qsrc
  50. 3 3
      locations/brother.qsrc
  51. 1 1
      locations/brother_voyeur.qsrc
  52. 3 3
      locations/brother_voyeur_sex.qsrc
  53. 36 36
      locations/camera.qsrc
  54. 10 10
      locations/city_center.qsrc
  55. 7 8
      locations/city_clinic.qsrc
  56. 17 17
      locations/city_coffee_hole.qsrc
  57. 79 51
      locations/city_kafe.qsrc
  58. 1 1
      locations/city_lake.qsrc
  59. 1 1
      locations/city_mansion_residence_3.qsrc
  60. 6 1
      locations/city_redlight.qsrc
  61. 3 3
      locations/city_suburbs.qsrc
  62. 1 8
      locations/clothing.qsrc
  63. 1 1
      locations/divan.qsrc
  64. 1 1
      locations/dreams.qsrc
  65. 12 12
      locations/drugs.qsrc
  66. 278 0
      locations/emp_functions.qsrc
  67. 124 0
      locations/emp_job_array.qsrc
  68. 102 102
      locations/eugeneev1.qsrc
  69. 8 10
      locations/foto.qsrc
  70. 2 2
      locations/gadhouse.qsrc
  71. 80 80
      locations/gopsex.qsrc
  72. 6 5
      locations/gschool_boys_bathroom.qsrc
  73. 41 42
      locations/gschool_break.qsrc
  74. 1 1
      locations/gschool_events.qsrc
  75. 4 2
      locations/gschool_girls_bathroom.qsrc
  76. 40 45
      locations/gschool_jock_chats.qsrc
  77. 18 18
      locations/gschool_lessons1.qsrc
  78. 24 24
      locations/gschool_lessons2.qsrc
  79. 23 23
      locations/gschool_lessons3.qsrc
  80. 12 12
      locations/gschool_lessons4.qsrc
  81. 2 2
      locations/gschool_lessonsev1.qsrc
  82. 4 2
      locations/gschool_lessonsev3.qsrc
  83. 61 61
      locations/gschool_socialchg.qsrc
  84. 5 5
      locations/homes_properties.qsrc
  85. 66 0
      locations/hookahlounge.qsrc
  86. 9 5
      locations/hookup_morning.qsrc
  87. 1 0
      locations/hookup_virgin.qsrc
  88. 3 3
      locations/hunter_favors.qsrc
  89. 1 1
      locations/hunter_interactions.qsrc
  90. 8 6
      locations/internet_mobile.qsrc
  91. 14 14
      locations/intro_city_select.qsrc
  92. 4 0
      locations/intro_initialization.qsrc
  93. 1 0
      locations/intro_initialization_city.qsrc
  94. 15 15
      locations/intro_sg_select.qsrc
  95. 4 4
      locations/intro_sg_select_custom.qsrc
  96. 18 18
      locations/journal_school.qsrc
  97. 12 14
      locations/journal_work.qsrc
  98. 1 1
      locations/katjaEvDin.qsrc
  99. 30 30
      locations/katja_chat.qsrc
  100. 66 66
      locations/katja_dorm.qsrc

+ 3 - 0
.gitignore

@@ -3,6 +3,7 @@ sound/
 music/
 mod/
 .*
+*.bak
 *.qsp
 *.sav
 *.ini
@@ -38,3 +39,5 @@ images.zip
 !.editorconfig
 
 MakeQSP.bat
+/glife.iml
+/Qqsp-1.9.0-win64/

+ 3 - 4
LinksToSkip.txt

@@ -36,10 +36,8 @@ images/characters/pavlovsk/school/boy/niko/yurikev/bike2.jpg
 images/characters/pavlovsk/school/boy/niko/yurikev/kiss.mp4
 images/characters/pavlovsk/school/girl/albina/albinahome.jpg
 images/characters/pavlovsk/school/girl/albina/albinahome1.jpg
-images/characters/pavlovsk/school/girl/albina/wine_talk.jpg
 images/characters/pavlovsk/school/girl/anushka/'+iif(rand(0,1) = 0, 'weed', 'hiding')+'.jpg
 images/characters/pavlovsk/school/girl/katja/sex/home/bang_katya3.jpg
-images/characters/pavlovsk/school/girl/katja/uni/katja_lickg.jpg
 images/characters/pavlovsk/school/girl/vicky/event/party'+zz_stage+'.jpg
 images/characters/pavlovsk/school/girl/vicky/event/reputation'+zz_stage+'.jpg
 images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip' + zz_stage + '.jpg
@@ -99,7 +97,6 @@ images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_day.jpg
 images/locations/gadukino/hunters/'+iif(DayStage = 2,'campfire_out_day.jpg
 images/locations/gadukino/hunters/'+iif(PCloSkirt > 0,'backwaterundress_ski.jpg
 images/locations/gadukino/hunters/goswamp_nude0.'+swamprand+'.jpg
-images/locations/gadukino/hunters/shooting_strip.jpg
 images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_1.jpg
 images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_2.jpg
 images/locations/gadukino/sex/hunter/nighttime_entertainment/bj_3.5.jpg
@@ -117,6 +114,7 @@ images/locations/gadukino/sex/mitka/mitka_group/mitkabuhgroup0.'+mitkapicrand+'.
 images/locations/gadukino/sex/mitka/mitka_group/mitkabuhgroup1.'+mitkapicrand+'.jpg
 images/locations/gadukino/sex/mitka/mitka_group/mitkabuhoral0.'+mitkapicrand+'.jpg
 images/locations/gadukino/sex/mitka/mitka_group/mitkabuhoralcum0.'+mitkapicrand+'.jpg
+images/locations/highway/gas_station_gp_117/restroom_'+iif(daystage = 5, 'night', 'day')+'.jpg
 images/locations/highway/sex/hj(1).mp4
 images/locations/pavlovsk/pharmacy/apteka_worker_'+pav_pharma_picrand+'.jpg
 images/locations/pavlovsk/pharmacy/apteka_worker_'+pharma_picrand+'.jpg
@@ -204,6 +202,7 @@ images/qwest/alter/boiler/boilerroom1.jpg
 images/qwest/alter/boiler/boilerroom2.jpg
 images/qwest/alter/boiler/boilerroom3.jpg
 images/shared/misc/signature.jpg
+images/shared/prostitution/pavlovsk/street/set_'+iif(prostitute['pav_regular'] = 0, rand(0,3), pro_rand)+'/start.mp4
 images/shared/sex/69/pre1.jpg
 images/system/icons/status/hair_'+pcs_hairbsh+'.png
-images/system/icons/status/makeup_'+pcs_makeup+'.png
+images/system/icons/status/makeup_'+pcs_makeup+'.png

+ 5 - 0
glife.qproj

@@ -558,6 +558,10 @@
 		<Location name="fbGar"/>
 		<Location name="zsoft_gopskverGorSlut"/>
 	</Folder>
+	<Folder name="Employment Systems">
+		<Location name="emp_functions"/>
+		<Location name="emp_job_array"/>
+	</Folder>
 	<Folder name="Fedor">
 		<Location name="FedorEv"/>
 		<Location name="FedorEv2"/>
@@ -934,6 +938,7 @@
 		<Location name="cfnm"/>
 		<Location name="stwork"/>
 		<Location name="stwork2"/>
+		<Location name="hookahlounge"/>	
 	</Folder>
 	<Folder name="City_Island">
 		<Location name="city_island"/>

+ 3 - 2
locations/BurgerTip.qsrc

@@ -248,8 +248,7 @@ if $ARGS[0] = 'work':
 
 				if bburand = 0:
 					'The senior manager Ilyushkin shows up in your office.'
-					gs 'BurgerTip', 'ily_work'
-
+					
 					if $BurgerQW['IlyQWBlackmailPhoto'] = '' or BurgerQW['IlyQWBlackmail'] > 1:
 						'Ilyushkin grins, "Honey, I need you to put your stamp on these papers." You give Ilyushkin a sceptical look, as you find your company stamp. Then you put your stamp on the papers, and hand the back to Ilyushkin.'
 
@@ -258,6 +257,8 @@ if $ARGS[0] = 'work':
 						elseif BurgerQW['WorkShift'] = 2:
 							act 'Leave work': gs 'burgerWork', 'work2'
 						end
+					else
+						gs 'BurgerTip', 'ily_work'
 					end
 
 				elseif bburand = 1:

+ 1 - 1
locations/Cum_Manage.qsrc

@@ -875,7 +875,7 @@ if $ARGS[0] = 'cum_stat_display':
 					end
 				end
 				$icon_txtiscum = $txtiscum
-				if j <= 4 and trait['cumeater'] = 1 and $txtiscum = 'cum': $txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
+				if j <= 4 and pcs_traits['cumeater'] = 1 and $txtiscum = 'cum': $txtiscum = '<a href="exec:gs ''cum_manage'', ''cumeater'', <<i>>"><font color=#0064FF>' + $txtiscum + '</font></a>'
 				if $txtperson ! '':
 					$txtperson = ' from ' + $txtperson
 				end

+ 15 - 13
locations/DNA.qsrc

@@ -41,30 +41,32 @@ if $ARGS[0] = 'relate':
 	!!paternal grandfather ID
 	temp2[6] = $mid ($ARGS[2], 67, 10)
 	
+	killvar 'gen_relationship'
+	
 	if temp1[0] = temp2[1] or temp1[0] = temp2[2] or temp2[0] = temp1[1] or temp2[0] = temp1[2]:
-		'Parent-child relation'
+		$gen_relationship += 'Parent-child relationship. '
 		if temp1[0] = temp2[1] or temp1[0] = temp2[2]:
 			!!temp1 is the parent, temp2 is child
-			if temp2[1] = temp2[5] or temp2[2] = temp2[4]:'Child is the result of incest (parent is also grandparent)'
-			if temp2[3] = temp2[5] and temp2[4] = temp2[6]:'Child is result of incest with close family member (sibling)'
-			if temp2[3] = temp2[5] or temp2[4] = temp2[6]:'Child is result of incest with close family member (half sibling)'
+			if temp2[1] = temp2[5] or temp2[2] = temp2[4]: $gen_relationship += 'Child is the result of incest (parent is also grandparent)'
+			if temp2[3] = temp2[5] and temp2[4] = temp2[6]: $gen_relationship += 'Child is result of incest with close family member (sibling)'
+			if temp2[3] = temp2[5] or temp2[4] = temp2[6]:$gen_relationship += 'Child is result of incest with close family member (half sibling)'
 		elseif temp2[0] = temp1[1] or temp2[0] = temp1[2]:
 			!!temp2 is the parent, temp1 is child
-			if temp1[1] = temp1[5] or temp1[2] = temp1[4]:'Child is the result of incest (parent is also grandparent)'
-			if temp1[3] = temp1[5] and temp1[4] = temp1[6]:'Child is result of incest with close family member (sibling)'
-			if temp1[3] = temp1[5] or temp1[4] = temp1[6]:'Child is result of incest with close family member (half sibling)'
+			if temp1[1] = temp1[5] or temp1[2] = temp1[4]: $gen_relationship += 'Child is the result of incest (parent is also grandparent)'
+			if temp1[3] = temp1[5] and temp1[4] = temp1[6]: $gen_relationship += 'Child is result of incest with close family member (sibling)'
+			if temp1[3] = temp1[5] or temp1[4] = temp1[6]: $gen_relationship += 'Child is result of incest with close family member (half sibling)'
 		end
 	elseif temp1[0] = temp2[3] or temp1[0] = temp2[4] or temp1[0] = temp2[5] or temp1[0] = temp2[6] or temp2[0] = temp1[3] or temp2[0] = temp1[4] or temp2[0] = temp1[5] or temp2[0] = temp1[6]:
-		'Grandparent-grandchild relation'
+		$gen_relationship += 'Grandparent-grandchild relationship.'
 	elseif temp1[1] = temp2[1] or temp1[2] = temp2[2]:
-		'Sibling relation'
-		if temp1[1] = temp2[1] and temp1[2] = temp2[2]:'Full sibling'
-		if temp1[1] ! temp2[1] or temp1[2] ! temp2[2]:'Half sibling'
+		$gen_relationship += 'Sibling relation'
+		if temp1[1] = temp2[1] and temp1[2] = temp2[2]: $gen_relationship += 'Full sibling'
+		if temp1[1] ! temp2[1] or temp1[2] ! temp2[2]: $gen_relationship += 'Half sibling'
 	elseif temp1[1] ! temp2[1] and temp1[2] ! temp2[2]:
 		if temp1[3] = temp2[3] and temp1[4] = temp2[4] or temp1[3] = temp2[5] and temp1[4] = temp2[6]:
-			'first cousins'
+			$gen_relationship += 'first cousins'
 		elseif temp1[3] = temp2[3] or temp1[4] = temp2[4] or temp1[3] = temp2[5] or temp1[4] = temp2[6]:
-			'distand blood relation'
+			$gen_relationship += 'distand blood relation'
 		end
 	end
 	killvar 'temp1'

+ 3 - 3
locations/HotelRoom.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'normal':
 	hotelWiFi = 1
 	gs 'themes', 'indoors'
 	gs 'stat'
-	gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
+	gs 'internet_mobile', 'get_access', 'free'
 
 	'<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>'
@@ -62,7 +62,7 @@ if $ARGS[0] = 'better':
 	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
-	gs 'internet_mobile', 'get_access', 'free', 'nocamshow'
+	gs 'internet_mobile', 'get_access', 'free'
 	'<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>'
@@ -108,7 +108,7 @@ if $ARGS[0] = 'best':
 	$location_type = 'private'
 	gs 'themes', 'indoors'
 	gs 'stat'	
-	gs 'internet_mobile', 'get_access'
+	gs 'internet_mobile', 'get_access', 'free'
 	'<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>'

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -675,7 +675,7 @@ if $ARGS[0] = 'julia_chat':
 				gs 'stat'
 				
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/Julia/Juliacry.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/julia/juliacry.jpg"></center>'
 				'You quietly walk in and sit on the bed next to Julia.'
 				'Julia looks at you questioningly, "<<$pcs_nickname>>..."'
 				'You frown as you look at her. "We need to talk."'

+ 3 - 3
locations/KatjaHomeTalk.qsrc

@@ -139,7 +139,7 @@ if $ARGS[0] = '':
 			
 				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_pussy'] > 0: 
 					!!If Katja have has had her first time wiht Marcus she will discuss this the next time the player talks to her at home
-				gt 'KatjaHomeTalk', 'first_boy_sex_follow_up'
+					gt 'KatjaHomeTalk', 'first_boy_sex_follow_up'
 			
 				elseif katjaQW['QWstage'] = 5 and katjaQW['marcus_asked'] = 1: 
 					!!If Marcus have agreed to be katja''s first, the player will tell this to Katja the next time the talk at home
@@ -1002,7 +1002,7 @@ if $ARGS[0] = 'Sextalk':
 			'"<<$pcs_nickname>>, have you gone down on a girl?"'
 		end
 
-		if stat['cuni'] > 0 or lesbian > 0:
+		if stat['cuni_give'] > 0:
 			act 'Talk about licking pussy':
 				cls
 				katjaQW['horny'] += 5
@@ -1844,7 +1844,7 @@ if $ARGS[0] = 'random_park_sex_talk':
 		katjaQW['horny'] += 5
 		'You tell her that strangers come to the park and look for girls to have fun with, without any commitment, and suggest that you could try to pick up some boys there.'
 		'"Awesome!" she says and looks at you really excitedly. "Why don''t we go right now?"'
-		if katjaQW['birth_control_start_day'] < daystart:
+		if katjaQW['birth_control_start_day'] < daystart and katjaQW['birth_control_start_day'] > 0:
 			act 'Agree':
 				minut += 15
 				katjaQW['horny'] += 5

+ 96 - 97
locations/Komp.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 	'Your computer boots up, and soon you''re looking at your operating system''s main screen.'
 
-	act 'Play Solitaire (0:20)':gt 'komp', 'pasians'
+	act 'Play Solitaire (0:20)': gt 'komp', 'pasians'
 	
 	if AlbinaQW['flashdrive'] = 1:
 		if $loc = 'dachain' or $loc = 'sitr' or $loc = 'bedr' or $loc = 'bedr2x' or ($loc = 'uni_dorm' and $loc_arg = 'dorm_room') or ($loc = 'city_mansion_residence_2' and $loc_arg = 'yoffice') or ($loc = 'pav_shared_apt' and $loc_arg = 'pcsRoom') or ($loc = 'mey_home' and $loc_arg = '3') or ($loc = 'city_house_res_misc' and $loc_arg = 'livroom') or $loc = 'nichBedroomServant' or (locat['Anya_inroom'] = 0 and $loc = 'bedrPar'):
@@ -17,11 +17,11 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if GameCD > 0:act 'Play Disopl':gt 'KGDstart'
-	if GameCD2 > 0:act 'Play Sunset Dead':gt 'KGZstart'
-	if GameCD3 > 0:act 'Play Albido':gt 'FSstart'
+	if GameCD > 0: act 'Play Disopl': gt 'KGDstart'
+	if GameCD2 > 0: act 'Play Sunset Dead': gt 'KGZstart'
+	if GameCD3 > 0: act 'Play Albido': gt 'FSstart'
 
-	!!act 'SunReview of the Dead':gt 'KGZstart'
+	!!act 'SunReview of the Dead': gt 'KGZstart'
 
 	!! If the access uses one of the home connections (i.e. Sveta is at home, or in a location that she owns)
 	!! and the 'internet_enabled' value is 1, the Sveta is paying utlities.
@@ -37,9 +37,9 @@ if $ARGS[0] = 'start':
 	!! Sveta can access the internet if > 0
 	if subscription[$subs] > 0:
 		if access['metered'] = 0: 
-			act 'Browse the internet':gt 'komp', 'browse'
+			act 'Browse the internet': gt 'komp', 'browse'
 		else
-			act 'Browse the internet - You have <<subscription[$subs]>> minutes of access left':gt 'komp', 'browse'
+			act 'Browse the internet - You have <<subscription[$subs]>> minutes of access left': gt 'komp', 'browse'
 		end
 	else
 		'You don''t have internet access here, and you don''t even have mobile internet.'
@@ -75,39 +75,39 @@ if $ARGS[0] = 'browse':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/eror.jpg"></center>'
 		'You have no internet access, '+iif(access['metered'], ' you have to buy more minutes.', ' maybe you forgot to pay the internet bill?')
 		
-		if  camwhore = 1 and access['nocamshow'] = 0: 
+		if  camwhore = 1 and access['nocamshow'] = 0 and webcamera = 1: 
 			'Since MyFreeCams will cover the cost, you can still log on to do a cam show.'
-			act 'Go to MyFreeCams.org':gt 'komp', 'mfc'
+			act 'Go to MyFreeCams.org': gt 'komp', 'mfc'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
-		'You go to your favourite start page, while you try to decide on what you want to see right now.'
+		if access['general-text'] = 1: '<center><h4 style="color: red;"><b><<$access[''general-text'']>></b></h4></center>'
+		'You go to your favourite start page, while you try to decide on what you want to see right now.'		
+		'A blinking banner for a <a href="exec: gt ''komp'',''agent''">Kirsanova Real Estate Agency</a> keeps popping up in the corner.'
 
-		'A blinking banner for a <a href="exec:gt ''komp'',''agent''">Kirsanova Real Estate Agency</a> keeps popping up in the corner.'
-
-		if func('homes_properties', 'is_property_of_status', 'owned', 'city_apartment') and husband = 0: act 'Rent your apartment out':gt 'komp', 'sale'
+		if func('homes_properties', 'is_property_of_status', 'owned', 'city_apartment') and husband = 0: act 'Rent your apartment out': gt 'komp', 'sale'
 
 		if access['noporn'] = 0: act 'Watch porn': gt 'komp', 'porno'
 
-		act 'Browse a dating website (1:00)':gt 'komp', 'znak'
+		act 'Browse a dating website (1:00)': gt 'komp', 'znak'
 
 		if hour < 20 and hour > 7:
 			if $clothingworntype = 'nude':
 				'You need to be dressed before searching jobs.'
 			else
-				act 'Look for a job online':gt 'komp', 'rabota'
+				act 'Look for a job online': gt 'komp', 'rabota'
 			end
 		end
 
-		act 'Search for cable TV services (1:00)':gt 'komp', 'kabtv'
-		act 'Play an online game':gt 'KGstart'
+		act 'Search for cable TV services (1:00)': gt 'komp', 'kabtv'
+		act 'Play an online game': gt 'KGstart'
 		if fuckornot = 3: act 'Visit ''Fuckable or not'' site': $view_location = 'komp' & gt 'komp', 'fuckornot'
 		if hotornot >= 2: act 'Visit ''Hot or not'' site': $view_location = 'komp' & gt 'komp', 'hotornot'
-		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 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 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 camwhore = 1 and access['nocamshow'] = 0 and webcamera = 1: 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
 end
@@ -148,11 +148,11 @@ if $ARGS[0] = 'sale':
 					killvar 'predsum'
 				end
 
-				act 'Leave this website':gt 'komp', 'browse'
+				act 'Leave this website': gt 'komp', 'browse'
 			end
 		end
 	end
-	act 'Leave this website':gt 'komp', 'browse'
+	act 'Leave this website': gt 'komp', 'browse'
 end
 
 if $ARGS[0] = 'porno':
@@ -164,12 +164,12 @@ if $ARGS[0] = 'porno':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/eror.jpg"></center>'
 		'You have no internet access, '+iif(access['metered'], ' you have to buy more minutes.', ' maybe you forgot to pay the internet bill?')
 
-		act '<B>Close the browser</B>':gt 'komp','start'
+		act '<B>Close the browser</B>': gt 'komp','start'
 	elseif access['noporn'] = 1:
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
-		'<<$access[''noporn-message'']>>'
+		'<<$access[''noporn'']>>'
 
-		act 'Leave this website':gt 'komp', 'browse'
+		act 'Leave this website': gt 'komp', 'browse'
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You go to a porn site and browse for a few minutes, trying to find a hot video.'
@@ -188,12 +188,12 @@ if $ARGS[0] = 'porno':
 			minut -= 30
 			gs 'stat'
 
-			act 'The video ends...':gt 'komp', 'porno'
+			act 'The video ends...': gt 'komp', 'porno'
 		end
 
-		if pcs_horny >= 50: act 'Masturbate':gt 'komp', 'masturbate'
+		if pcs_horny >= 50: act 'Masturbate': gt 'komp', 'masturbate'
 
-		act 'Leave this website':gt 'komp', 'browse'
+		act 'Leave this website': gt 'komp', 'browse'
 	end
 end
 
@@ -208,7 +208,6 @@ if $ARGS[0] = 'masturbate':
 
 		if divanmastr = 0:
 			divanmastr = 1
-			stat['mast'] += 1
 			if pcs_inhib < 30:inhib_exp += rand(1,3)
 		end
 
@@ -233,7 +232,7 @@ if $ARGS[0] = 'masturbate':
 		gs 'arousal', 'end'
 		gs 'stat'
 
-		if pcs_horny >= 50:act 'Masturbate some more':gt 'komp', 'masturbate'
+		if pcs_horny >= 50: act 'Masturbate some more': gt 'komp', 'masturbate'
 	end
 end
 
@@ -247,8 +246,8 @@ if $ARGS[0] = 'pasians':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 	'You entertain yourself for about twenty minutes, playing a game of solitaire on the computer.'
 
-	act 'Play for another 20 minutes':gt 'komp', 'pasians'
-	act 'Return to desktop':gt 'komp', 'start'
+	act 'Play for another 20 minutes': gt 'komp', 'pasians'
+	act 'Return to desktop': gt 'komp', 'start'
 end
 
 if $ARGS[0] = 'znak':
@@ -270,7 +269,7 @@ if $ARGS[0] = 'znak':
 			'You click through dozens of profiles, before choosing a guy who you think would be a good match for Eugenia. You send him a message, asking if he wants to meet up somewhere.'
 			'Now the waiting game begins! Let''s hope you picked a nice guy for her...'
 
-			act 'Leave this website':gt 'komp', 'browse'
+			act 'Leave this website': gt 'komp', 'browse'
 		end
 	!! Eligible homes: 1, 2, 3, 4, 5, 7 , 10, 11, 15
 	elseif $home['type'] ! 'permanent_residence':
@@ -286,7 +285,7 @@ if $ARGS[0] = 'znak':
 				haraklover[lover_number] = 0
 				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
 
-				act 'Leave this website':gt 'komp', 'browse'
+				act 'Leave this website': gt 'komp', 'browse'
 			end
 
 			act 'Look for a normal guy':
@@ -296,7 +295,7 @@ if $ARGS[0] = 'znak':
 				haraklover[lover_number] = 1
 				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
 
-				act 'Leave this website':gt 'komp', 'browse'
+				act 'Leave this website': gt 'komp', 'browse'
 			end
 
 			act 'Look for a strong man':
@@ -306,11 +305,11 @@ if $ARGS[0] = 'znak':
 				haraklover[lover_number] = 2
 				'You find a guy named <<$loverdesc[lover_number]>>, and send him your number after checking out his profile. You hope he will call you!'
 
-				act 'Leave this website':gt 'komp', 'browse'
+				act 'Leave this website': gt 'komp', 'browse'
 			end
 		end
 	end
-	act 'Leave this website':gt 'komp', 'browse'
+	act 'Leave this website': gt 'komp', 'browse'
 end
 
 if $ARGS[0] = 'kabtv':
@@ -356,9 +355,9 @@ if $ARGS[0] = 'kabtv':
 		end
 	else
 		'You don''t even have a TV!'
-		act 'Leave this website':gt 'komp', 'browse'
+		act 'Leave this website': gt 'komp', 'browse'
 	end
-	act 'Leave this website':gt 'komp', 'browse'
+	act 'Leave this website': gt 'komp', 'browse'
 end
 
 if $ARGS[0] = 'foto':
@@ -369,7 +368,7 @@ if $ARGS[0] = 'foto':
 		'<center><b>Browser</b></center>'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/eror.jpg"></center>'
 		'You have no internet access, '+iif(access['metered'], ' you have to buy more minutes.', ' maybe you forgot to pay the internet bill?')
-		act '<B>Close the browser</B>':gt 'komp','start'
+		act '<B>Close the browser</B>': gt 'komp','start'
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		'You''re currently on Russia''s biggest social network site, "Assbook". Almost everyone has an account here, probably including the girl you took that photo of the other day!'
@@ -387,7 +386,7 @@ if $ARGS[0] = 'foto':
 				if fotsearchrand <= 7:
 					'Despite your best efforts, you don''t manage to find the girl this time.'
 
-					act 'Go back to the "Assbook" main page':gt 'komp', 'foto'
+					act 'Go back to the "Assbook" main page': gt 'komp', 'foto'
 				end
 
 				if fotsearchrand > 7:
@@ -398,7 +397,7 @@ if $ARGS[0] = 'foto':
 					if gerofotorand > 30:
 						'Your dreams of making a fortune are quickly shattered when you check out her profile. Cheap clothes, few friends, lives in a poor district of the city... this girl is not worth blackmailing.'
 
-						act 'Go back to the "Assbook" main page':gt 'komp', 'foto'
+						act 'Go back to the "Assbook" main page': gt 'komp', 'foto'
 					end
 
 					if gerofotorand >= 5 and gerofotorand <= 30:
@@ -407,7 +406,7 @@ if $ARGS[0] = 'foto':
 						'"Why not make her spend some of it on me?" you laugh to yourself, and begin to write a private message.'
 						'You send her a copy of the photo with the private message, and tell her to transfer a very modest amount of 5,000 <b>₽</b> to your bank account. If she doesn''t want that photo to be sent to her entire friends list (which you secured before sending the message), the money needs to be on your bank account within 48 hours.'
 
-						act 'Go back to the "Assbook" main page':gt 'komp', 'foto'
+						act 'Go back to the "Assbook" main page': gt 'komp', 'foto'
 					end
 
 					if gerofotorand < 5:
@@ -415,13 +414,13 @@ if $ARGS[0] = 'foto':
 						'You can barely believe it when you read her profile, this girl is a celebrity! It would be a major scandal if this photo got published!'
 						'You send her a copy of the photo with a private message, telling her to transfer 30,000 <b>₽</b> to your bank account. If she doesn''t want that photo to be sent to the press, the money needs to be on your bank account within 48 hours.'
 
-						act 'Go back to the "Assbook" main page':gt 'komp', 'foto'
+						act 'Go back to the "Assbook" main page': gt 'komp', 'foto'
 					end
 				end
 			end
 		end
 
-		act 'Leave this website':gt 'komp', 'browse'
+		act 'Leave this website': gt 'komp', 'browse'
 	end
 end
 
@@ -432,7 +431,7 @@ if $ARGS[0] = 'rabota':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/eror.jpg"></center>'
 		'You have no internet access, '+iif(access['metered'], ' you have to buy more minutes.', ' maybe you forgot to pay the internet bill?')
 
-		act '<B>Close the browser</B>':gt 'komp','start'
+		act '<B>Close the browser</B>': gt 'komp','start'
 	else
 		minut += 30
 		elektro += 3
@@ -450,12 +449,12 @@ if $ARGS[0] = 'rabota':
 			if pcs_apprnc < 120:
 				'You consider it for a moment, but decide against it. You''re probably not pretty enough to be an underwear model.'
 			elseif pcs_apprnc >= 120:
-				act 'Accept the job and go there':gt 'qjob', 'var1'
+				act 'Accept the job and go there': gt 'qjob', 'var1'
 			end
 
-			if hour < 20 and hour > 7:act 'Search for more jobs':gt 'komp', 'rabota'
+			if hour < 20 and hour > 7: act 'Search for more jobs': gt 'komp', 'rabota'
 
-			act 'Leave this website':gt 'komp', 'browse'
+			act 'Leave this website': gt 'komp', 'browse'
 		elseif komprabota = 1 and gorodokkomp = 0:
 			'You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Female underwear model, for a photoshoot. Pay: 2000 <b>₽</b> cash."'
 			'The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.'
@@ -463,12 +462,12 @@ if $ARGS[0] = 'rabota':
 			if pcs_apprnc < 120:
 				'You consider it for a moment, but decide against it. You''re probably not pretty enough to be an underwear model.'
 			elseif pcs_apprnc >= 120:
-				act 'Accept the job and go there':gt 'qjob', 'var2'
+				act 'Accept the job and go there': gt 'qjob', 'var2'
 			end
 
-			if hour < 20 and hour > 7:act 'Search for more jobs':gt 'komp', 'rabota'
+			if hour < 20 and hour > 7: act 'Search for more jobs': gt 'komp', 'rabota'
 
-			act 'Leave this website':gt 'komp', 'browse'
+			act 'Leave this website': gt 'komp', 'browse'
 		elseif komprabota > 1 and komprabota < 5 and gorodokkomp = 0:
 			'You find a job vacancy, on a legit looking website. It reads: "Wanted! <b>URGENTLY!</b> Good looking female model, posing for artwork. Must be able to stand still in one pose for a long time. Pay: 1000 <b>₽</b> cash."'
 			'The description explains that they need someone today. If you decide to take this job, you will have to shut down your computer and go there right away.'
@@ -476,12 +475,12 @@ if $ARGS[0] = 'rabota':
 			if pcs_apprnc < 60:
 				'You consider it for a moment, but decide against it. You''re probably not pretty enough to be a model.'
 			elseif pcs_apprnc >= 60:
-				act 'Accept the job and go there':gt 'qjob', 'var3'
+				act 'Accept the job and go there': gt 'qjob', 'var3'
 			end
 
-			if hour < 20 and hour > 7:act 'Search for more jobs':gt 'komp', 'rabota'
+			if hour < 20 and hour > 7: act 'Search for more jobs': gt 'komp', 'rabota'
 
-			act 'Leave this website':gt 'komp', 'browse'
+			act 'Leave this website': gt 'komp', 'browse'
 		elseif komprabota > 4 and komprabota < 8 and camwhore = 0:
 			'You find a job vacancy, on a legit looking website. It reads: "Wanted! Webcam models. Flexible working hours. Click for more info."'
 			act 'Gather more information':
@@ -518,23 +517,23 @@ if $ARGS[0] = 'rabota':
 							end
 							'You fill out the questionnaire and register yourself as a webcam model. Ten minutes later, you have already been approved and you can now earn money as a webcam girl.'
 							'Of course, you will need a functioning webcam to do this! If you don''t have one yet, they are fairly cheap to buy at most local supermarket chains.'
-							act 'Leave this website':gt 'komp','browse'
+							act 'Leave this website': gt 'komp','browse'
 						end
-						act 'Leave this website':gt 'komp','browse'
+						act 'Leave this website': gt 'komp','browse'
 					else
 						*nl
 						'You don''t feel comfortable showing off your body in this way.'
 					end
 				end
 
-				if hour < 20 and hour > 7:act 'Search for more jobs':gt 'komp','rabota'
-				act 'Leave this website':gt 'komp','browse'
+				if hour < 20 and hour > 7: act 'Search for more jobs': gt 'komp','rabota'
+				act 'Leave this website': gt 'komp','browse'
 			end
 		else
 			'Unfortunately, you do not find any jobs you would consider doing.'
 
-			if hour < 20 and hour > 7:act 'Search for more jobs':gt 'komp','rabota'
-			act 'Leave this website':gt 'komp','browse'
+			if hour < 20 and hour > 7: act 'Search for more jobs': gt 'komp','rabota'
+			act 'Leave this website': gt 'komp','browse'
 		end
 	end
 end
@@ -550,10 +549,10 @@ if $ARGS[0] = 'study':
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/study.jpg"></center>'
 	'You spend an hour on the IEM website, reading news articles and educational blogs. You feel a bit smarter afterwards.'
 
-	act 'Leave this website':gt'komp','browse'
+	act 'Leave this website': gt'komp','browse'
 end
 
-if $ARGS[0] = 'agent':
+if $ARGS[0] = 'agent' :
 	*clr & cla
 	minut += 30
 	elektro += 3
@@ -578,12 +577,12 @@ if $ARGS[0] = 'agent':
 				cla
 				gs 'homes_properties', 'pay_rent', 'city_apartment', 'card'
 				'After a very simple procedure, you can now call an apartment in the city residential district home for another month. You have <B><<func(''homes_properties'', ''get_rent_days'', ''city_apartment'')>> days</B> remaining on the rental of your apartment.'
-				act 'Leave this website':gt 'komp','browse'
+				act 'Leave this website': gt 'komp','browse'
 			end
 		end
 	elseif func('homes_properties', 'has_access', 'city_apartment') = 0:
 		'There is an apartment in St. Petersburg residental area available, for rent or puchase.'
-		'Rent is: <<func(''homes_properties'', ''get_rent_amount'', ''city_apartment'')>><b>₽</b> per month. Current sale price is listed at: <<func(''homes_properties'', ''get_price'', ''city_apartment'')>> <b>₽</b>.'
+		'Rent is: <<func(''homes_properties'', ''get_rent_amount'', ''city_apartment'')>><b>₽</b> per month. Current sale price is listed at: <<func(''homes_properties'', ''get_property_sales_price'', ''city_apartment'')>> <b>₽</b>.'
 		*nl
 	end
 
@@ -604,10 +603,10 @@ if $ARGS[0] = 'agent':
 				cla
 				gs 'homes_properties', 'pay_rent', 'old_town_apartment', 'card'
 				'After a very simple procedure, you can now call an apartment in Pushkin home for another month. You have <B><<func(''homes_properties'', ''get_rent_days'', ''old_town_apartment'')>> days</B> remaining on the rental of your apartment.'
-				act 'Leave this website':gt 'komp','browse'
+				act 'Leave this website': gt 'komp','browse'
 			end
 		end
-	elseif func('homes_properties', 'has_access', 'old_town_apartment') = 0
+	elseif func('homes_properties', 'has_access', 'old_town_apartment') = 0:
 		'There is an apartment in Pushkin area (Old Town) available to rent.'
 		'Rent is: <<func(''homes_properties'', ''get_rent_amount'', ''old_town_apartment'')>><b>₽</b> per month.'
 		*nl
@@ -619,7 +618,7 @@ if $ARGS[0] = 'agent':
 		*nl
 	end
 
-	act 'Leave this website':gt 'komp','browse'
+	act 'Leave this website': gt 'komp','browse'
 end
 
 if $ARGS[0] = 'mfc':
@@ -635,7 +634,7 @@ if $ARGS[0] = 'mfc':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
 		'It''s that time of the month! You feel sick to your stomach and the cramps hurt pretty badly from time to time... you''re in no condition to earn money showing off your body.'
-		act 'Leave this website':gt 'komp','browse'
+		act 'Leave this website': gt 'komp','browse'
 	elseif access['nocamshow'] = 1:
 		*clr & cla
 		minut += 2
@@ -646,8 +645,8 @@ if $ARGS[0] = 'mfc':
 		gs 'internet_mobile', 'use_internet', $subs, 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore2.jpg"></center>'
-		'<<$access[''nocamshow-message'']>>'
-		act 'Leave this website':gt 'komp','browse'
+		'<<$access[''nocamshow'']>>'
+		act 'Leave this website': gt 'komp','browse'
 	else
 		act 'Go to your MFC homepage':
 			*clr & cla
@@ -657,7 +656,7 @@ if $ARGS[0] = 'mfc':
 			'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore3.jpg"></center>'
 			'You enter your own chatroom on the website. You currently have <<camclients>> viewers.'
 
-			act 'Continue':gt 'komp','startpagemfc'
+			act 'Continue': gt 'komp','startpagemfc'
 		end
 		act 'Leave this website':
 			*clr & cla
@@ -688,7 +687,7 @@ if $ARGS[0] = 'startpagemfc':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/camwhore3.jpg"></center>'
 		'You casually chat with the <<camclients>> visitors currently in your chatroom. Once you turn on your webcam, things will probably get busier.'
-		act 'Turn on your webcam':gt 'komp','waitclients'
+		act 'Turn on your webcam': gt 'komp','waitclients'
 		act 'Collect your earnings and leave':
 			karta += tokens * 2
 			tokens = 0
@@ -1016,7 +1015,7 @@ if $ARGS[0] = 'waitclients':
 	'You take a moment of rest, and just chat casually with your <<camclients>> visitors.'
 	'You have earned <<tokens>> tokens so far this session, which amounts to <<tokenpay>> <b>₽</b>.'
 
-	act 'Wait for more visitors':gt 'komp','waitclients'
+	act 'Wait for more visitors': gt 'komp','waitclients'
 
 	if topmfc = 1 and clientask >= 91:
 		*clr & cla
@@ -1049,7 +1048,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		act 'Tease instead':
 			*clr & cla
@@ -1075,7 +1074,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 5
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		act 'Give them a brief look':
 			*clr & cla
@@ -1101,7 +1100,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -1146,7 +1145,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		act 'Tease instead':
 			*clr & cla
@@ -1178,7 +1177,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 4
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		act 'Give them a brief look':
 			*clr & cla
@@ -1204,7 +1203,7 @@ if $ARGS[0] = 'waitclients':
 			minut -=2
 			gs 'stat'
 			
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		
 		gs 'willpower', 'exhib', 'resist', 'hard'
@@ -1249,7 +1248,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -1300,7 +1299,7 @@ if $ARGS[0] = 'waitclients':
 				$orgasm_or = 'custom'
 				$orgasm_txt = 'You groan despite yourself, and realize you''re about to have an orgasm on camera! Deciding it''s too late to stop, you flick your fingers over your clit several more times and moan loudly as your whole body begins to tremble. When you look at the chat again, you see a mixture of compliments and lewd comments on your show. Either way: they loved it!'
 			end
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		
 		gs 'willpower', 'exhib', 'resist', 'hard'
@@ -1357,7 +1356,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -1434,7 +1433,7 @@ if $ARGS[0] = 'waitclients':
 				gs 'stat'
 
 			end
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -1586,7 +1585,7 @@ if $ARGS[0] = 'waitclients':
 			gs 'arousal', 'porn', 5
 			minut -= 5
 			gs 'stat'
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 	end	
 
@@ -1614,7 +1613,7 @@ if $ARGS[0] = 'waitclients':
 			gs 'arousal', 'porn', 3
 			minut -= 3
 			gs 'stat'
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 	end	
 
@@ -1640,7 +1639,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 	end
 
@@ -1679,7 +1678,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 	end
 
@@ -1703,7 +1702,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 	end
 	if backmfc = 0 and clientask < 74:
@@ -1748,7 +1747,7 @@ if $ARGS[0] = 'waitclients':
 				$orgasm_or = 'yes'
 				gs 'stat'
 			end
-			act 'Continue':gt 'komp','waitclients'
+			act 'Continue': gt 'komp','waitclients'
 		end
 	end
 	if backmfc = 0 and clientask < 74:
@@ -1793,7 +1792,7 @@ if $ARGS[0] = 'waitclients':
 				$orgasm_txt = 'It feels too good to stop! Before you know it, your fingers are repeatedly penetrating your ass and you moan excitedly, barely keeping yourself from screaming. You just had an anal orgasm in front of <<camclients>> users, completely free of charge! Oops...'
 				gs 'stat'
 			end
-			act'Continue':gt'komp','waitclients'
+			act'Continue': gt'komp','waitclients'
 		end
 	end
 	if topmfc = 0 and pain['nippleR'] < 10 and pain['nippleL'] < 10 and clientask < 74:
@@ -1828,7 +1827,7 @@ if $ARGS[0] = 'waitclients':
 			minut -= 2
 			gs 'stat'
 
-			act'Continue':gt'komp','waitclients'
+			act'Continue': gt'komp','waitclients'
 		end
 	end
 	if locat['Anya_inroom'] = 1 and $loc = 'bedrPar':
@@ -1844,9 +1843,9 @@ if $ARGS[0] = 'waitclients':
 		'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'
+		act 'Continue': gt 'komp','mfc'
 	else
-		act 'Turn off the webcam':gt 'komp','startpagemfc'
+		act 'Turn off the webcam': gt 'komp','startpagemfc'
 	end
 end
 
@@ -1885,7 +1884,7 @@ if $ARGS[0] = 'bank':
 			act 'Continue': gt 'komp', 'bank'
 		end
 	end
-	act 'Close your browser':gt 'komp', 'browse'
+	act 'Close your browser': gt 'komp', 'browse'
 end
 
 if $ARGS[0] = 'fuckornot':

+ 1 - 1
locations/MartinSex2.qsrc

@@ -954,7 +954,7 @@ if $ARGS[0] = 'MartinCumshot_Mouth':
 	*nl
 	$orgasm_txt = 'The taste of Martin''s hot cum on your tongue finally pushes you over the edge, causing you to moan around his cock as you keep pleasing him, both him and you completely taken off-guard by your oral orgasm.'
 	gs 'arousal', 'bj', 1
-	'When his ' + iif(pcs_horny=0,'and your orgasm have','orgasm has') + ' subsided, you release his softening dick from your mouth once more and show Martin his jizz on your tongue before swallowing it' + iif(trait['cumeater']=1,', savoring the taste you come to love as the thick liquid goes down your throat',' reluctantly, knowing that men love it when women do that') + '. The smile he gives you as you show him your clean tongue is simply priceless.'
+	'When his ' + iif(pcs_horny=0,'and your orgasm have','orgasm has') + ' subsided, you release his softening dick from your mouth once more and show Martin his jizz on your tongue before swallowing it' + iif(pcs_traits['cumeater']=1,', savouring the taste you come to love as the thick liquid goes down your throat',' reluctantly, knowing that men love it when women do that') + '. The smile he gives you as you show him your clean tongue is simply priceless.'
 	$orgasm_txt = ''
 	pcs_energy += 5
 	gs 'cum_call', 'mouth', $boy, 1

+ 65 - 0
locations/NPCFinder.qsrc

@@ -0,0 +1,65 @@
+*clr
+'<a href="exec: gt ''NPCFinder'', ''finder''">Enter the ID of the character.</a>'
+if $ARGS[0] = 'finder':
+	$looking = input ('ID (like <i>A17</i>)')
+	gt 'NPCFinder'
+end
+
+if $looking ! '':
+	'<br><br>'
+	'Found character:'
+	'<br>'
+	'<<$npc_pic[''<<looking>>'']>>'
+	'DNA string: <<$npc_dna[''<<$looking>>'']>>'
+	'Name: <<$npc_firstname[''<<$looking>>'']>> "<<$npc_nickname[''<<$looking>>'']>>" <<$npc_lastname[''<<$looking>>'']>> (<<$npc_usedname[''<<$looking>>'']>>)'
+	if npc_dob['<<$looking>>'] ! '': 'Birthday (YYYY-MM-DD): <<mid(npc_dob[''<<$looking>>''],1,4)>>-<<mid(npc_dob[''<<$looking>>''],5,2)>>-<<mid(npc_dob[''<<$looking>>''],7,2)>>'
+	'Intelligence: <<npc_intel[''<<$looking>>'']>>'
+	if npc_grupTipe['<<$looking>>'] ! '': 'Social group: <<npc_grupTipe[''<<$looking>>'']>>'
+	if npc_sexskill['<<$looking>>'] ! '': 'Sex skill: <<npc_sexskill[''<<$looking>>'']>>'
+	if npc_rep['<<$looking>>'] ! '': ' Reputation in school: <<npc_rep[''<<$looking>>'']>>'
+	if npc_haircol['<<$looking>>'] = 0:
+		'Natural hair color: black (<<npc_haircol[''<<$looking>>'']>>)'
+	elseif npc_haircol['<<$looking>>'] = 1:
+		'Natural hair color: brown (<<npc_haircol[''<<$looking>>'']>>)'
+	elseif npc_haircol['<<$looking>>'] = 2:
+		'Natural hair color: read (<<npc_haircol[''<<$looking>>'']>>)'
+	else
+		'Natural hair color: blonde (<<npc_haircol[''<<$looking>>'']>>)'
+	end
+	if hotcat_rating['<<$looking>>'] ! '': 'Hotness rating: <<hotcat_rating[''<<$looking>>'']>>'
+	'Appearance value: <<npc_apprnc[''<<$looking>>'']>>'
+	'Height: <<npc_height[''<<$looking>>'']>>'
+	if npc_gender['<<$looking>>'] = 0:
+		'Gender: male'
+		'Dick thickness: <<$npc_thdick[''<<$looking>>'']>>'
+		'Dick length: <<npc_dick[''<<$looking>>'']>>'
+		'Potential: <<npc_spermpot[''<<$looking>>'']>> (default is 10000)'
+	else
+		'Gender: female'
+		'Breast size: <<npc_bust[''<<$looking>>'']>>'
+	end
+	if npc_herpes['<<$looking>>'] > 0: $npcvendisease += 'herpes; '
+	if npc_syth['<<$looking>>'] > 0: $npcvendisease += 'syphilis; '
+	if npc_gon['<<$looking>>'] > 0: $npcvendisease += 'gonorrhea; '
+	if npc_thrush['<<$looking>>'] > 0: $npcvendisease += 'yeast infection; '
+	if $npcvendisease = '': $npcvendisease = 'none'
+	'Veneral diseases: <<$npcvendisease>>'
+	'Sexual acts with PC: <<npc_sex[''$looking'']>>'
+	'Perversion: <<npc_perv[''$looking'']>>'
+	'Notes: <<$npc_notes[''<<$looking>>'']>>'
+	''
+	'Found relationships:'
+	npctemp = 0
+	:relationshipfinder
+		gs 'DNA','relate', $npc_dna['<<$looking>>'], $npc_dna['A<<npctemp>>']
+		if $gen_relationship ! '' and 'A<<npctemp>>' ! '<<$looking>>':
+			'<br>ID: A<<npctemp>>'
+			'DNA string: <<$npc_dna[''A<<npctemp>>'']>>'
+			'Name: <<$npc_firstname[''A<<npctemp>>'']>> "<<$npc_nickname[''A<<npctemp>>'']>>" <<$npc_lastname[''A<<npctemp>>'']>> (<<$npc_usedname[''A<<npctemp>>'']>>)'
+			'Relationship type: <<$gen_relationship>>'
+		end
+	if npctemp < aarraynumber: npctemp += 1 & jump 'relationshipfinder'
+	killvar 'npctemp'
+	killvar 'npcvendisease'
+	killvar 'looking'
+end

+ 1 - 1
locations/NikoMeyHome.qsrc

@@ -879,7 +879,7 @@ if $ARGS[0] = 'Bathroom':
 		act 'Turn around': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Kat Bath'
 	elseif VKAftermathEvent = 0 and NataliaPavlovaQW >= 20 and VKNatChat = 1:
 		act 'Turn around': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Natalia Bath'
-!!	This used to have the variable that what replaced by katjQW['dom'] in the conditions so this should be acounted when this event is added back in. Remember to also to look at the conditions of the text before this section of if and elseif.
+!!	This used to have the variable that what replaced by katjaQW['dom'] in the conditions so this should be acounted when this event is added back in. Remember to also to look at the conditions of the text before this section of if and elseif.
 !!	elseif VKAftermathEvent = 0 and VKKatjaChat = 1 and VKWip = 100:
 !!		act 'Turn around': VKAftermathEvent = 1 & gt 'NikoMeyHome', 'Katja Bath'
 	elseif VKAftermathEvent = 0:

+ 28 - 0
locations/TV.qsrc

@@ -106,5 +106,33 @@ if $ARGS[0] = 'gad':
 	end
 end
 
+if $ARGS[0] = 'meyhome':
+	if tvtime = 0: 
+		*clr & cla
+		minut += 5
+		tvtime = 1
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tvon.jpg"></center>'
+		'You turn on the TV and settle comfortably on the couch.'
+		'Your huge plasma comes to life, and you hear the crisp sound of some advert. It looks great in HD.'
+		'You have cable TV.'
+		act 'Watch Cable TV': gt 'TV', 'meyhome'
+	elseif tvtime = 1:
+		*clr & cla
+		pcs_mood += 12
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tvon.jpg"></center>'
+		'You watch cable television. It''s really good these days.'
+		act 'Watch TV (1:00)': minut += 60 & gt 'TV', 'meyhome'
+		act 'Turn off the TV and get off the couch': 
+			*clr & cla
+			tvtime = 0 
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/tvoff.jpg"></center>'
+			'You turn off the TV and the image blinks out of existence, while you stand up and stretch your legs.'
+			act 'Continue': gt $loc, $loc_arg
+		end
+	end
+end
+
 --- TV ---------------------------------
 

+ 1 - 1
locations/Zvereva_sub_1.qsrc

@@ -727,7 +727,7 @@ if $ARGS[0] = '12':
 		'After a while, Christina nods. "Alright, that''s enough. You''re turning into a great little locker room whore, <<$pcs_nickname>>. Maybe I should take you to the guys'' locker room next time."'
 
 		$orgasm_or = 'no'
-		gs 'arousal', 'masturbate', 10, 'sub', 'humiliation'
+		gs 'arousal', 'vaginal_finger', 10, 'sub', 'humiliation', 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Continue': gt 'gschool_lessons4', 'postphys2'

+ 10 - 0
locations/_attributes_salacious_dress.qsrc

@@ -15,6 +15,7 @@ elseif ARGS[1] = 2:
 	CloTopCut = 1
 	CloSkirtShortness = 1
 	CloDress = 1
+	CloStyle2 = 1
 
 elseif ARGS[1] = 3:
 	CloQuality = 5
@@ -92,6 +93,7 @@ elseif ARGS[1] = 13:
 	CloTopCut = 2
 	CloSkirtShortness = 2
 	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 14:
 	CloQuality = 3
@@ -113,6 +115,7 @@ elseif ARGS[1] = 16:
 	CloTopCut = 2
 	CloSkirtShortness = 3
 	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 17:
 	CloQuality = 4
@@ -168,6 +171,7 @@ elseif ARGS[1] = 24:
 	CloTopCut = 1
 	CloSkirtShortness = 4
 	CloDress = 1
+	CloBimbo = 1
 
 elseif ARGS[1] = 25:
 	CloQuality = 5
@@ -230,6 +234,7 @@ elseif ARGS[1] = 33:
 	CloThinness = 6
 	CloTopCut = 2
 	CloSkirtShortness = 4
+	CloStyle = 4
 
 elseif ARGS[1] = 34:
 	CloQuality = 4
@@ -305,6 +310,7 @@ elseif ARGS[1] = 44:
 	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 45:
 	CloQuality = 5
@@ -354,6 +360,7 @@ elseif ARGS[1] = 51:
 	CloTopCut = 3
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 52:
 	CloQuality = 4
@@ -368,6 +375,7 @@ elseif ARGS[1] = 53:
 	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloDress = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 54:
 	CloQuality = 5
@@ -389,6 +397,7 @@ elseif ARGS[1] = 56:
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloDress = 1
+	CloBimbo = 1
 
 elseif ARGS[1] = 57:
 	CloQuality = 4
@@ -417,6 +426,7 @@ elseif ARGS[1] = 60:
 	CloTopCut = 2
 	CloSkirtShortness = 6
 	CloDress = 1
+	CloStyle = 4
 
 end
 

+ 4 - 0
locations/_attributes_salacious_outfits.qsrc

@@ -19,6 +19,7 @@ elseif ARGS[1] = 3:
 	CloThinness = 6
 	CloTopCut = 1
 	CloPantsShortness = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 4:
 	CloQuality = 3
@@ -33,6 +34,7 @@ elseif ARGS[1] = 5:
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloOnePiece = 1
+	CloStyle = 4
 
 elseif ARGS[1] = 6:
 	CloQuality = 5
@@ -73,6 +75,7 @@ elseif ARGS[1] = 11:
 	CloTopCut = 1
 	CloPantsShortness = 5
 	CloOnePiece = 1
+	CloBimbo = 1
 
 elseif ARGS[1] = 12:
 	CloQuality = 3
@@ -85,6 +88,7 @@ elseif ARGS[1] = 13:
 	CloThinness = 6
 	CloTopCut = 1
 	CloPantsShortness = 5
+	CloStyle = 4
 	
 elseif ARGS[1] = 14:
 	CloQuality = 4

+ 32 - 32
locations/abduction.qsrc

@@ -1424,7 +1424,7 @@ if $ARGS[0] = 'abdTrainDildosSmall':
 	end
 	act 'Use it':gt 'abduction', 'abdTrainDildosSmallUse'
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosVaginaGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosSmallUse':
@@ -1440,9 +1440,9 @@ if $ARGS[0] = 'abdTrainDildosSmallUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['vaginal'] += 5
 		pcs_vag += 1
-		gs 'stat'
 		gs 'arousal', 'vaginal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosSmall'
 end
 
@@ -1458,7 +1458,7 @@ if $ARGS[0] = 'abdTrainDildosRegular':
 		'You can clearly see that this dildo will tear your pussy apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosVaginaGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosRegularUse':
@@ -1474,9 +1474,9 @@ if $ARGS[0] = 'abdTrainDildosRegularUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['vaginal'] += 5
 		pcs_vag += 1
-		gs 'stat'
 		gs 'arousal', 'vaginal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosRegular'
 end
 
@@ -1492,7 +1492,7 @@ if $ARGS[0] = 'abdTrainDildosBig':
 		'You can clearly see that this dildo will tear your pussy apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosVaginaGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosBigUse':
@@ -1508,9 +1508,9 @@ if $ARGS[0] = 'abdTrainDildosBigUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['vaginal'] += 5
 		pcs_vag += 1
-		gs 'stat'
 		gs 'arousal', 'vaginal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosBig'
 end
 
@@ -1526,7 +1526,7 @@ if $ARGS[0] = 'abdTrainDildosHorse':
 		'You can clearly see that this dildo will tear your pussy apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosVaginaGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosHorseUse':
@@ -1542,9 +1542,9 @@ if $ARGS[0] = 'abdTrainDildosHorseUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['vaginal'] += 5
 		pcs_vag += 1
-		gs 'stat'
 		gs 'arousal', 'vaginal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosHorse'
 end
 
@@ -1558,7 +1558,7 @@ if $ARGS[0] = 'abdTrainDildosAnalSmall':
 	end
 	act 'Use it':gt 'abduction', 'abdTrainDildosAnalSmallUse'
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosAnalGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosAnalSmallUse':
@@ -1574,9 +1574,9 @@ if $ARGS[0] = 'abdTrainDildosAnalSmallUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['asshole'] += 5
 		pcs_ass += 1
-		gs 'stat'
 		gs 'arousal', 'anal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosAnalSmall'
 end
 
@@ -1592,7 +1592,7 @@ if $ARGS[0] = 'abdTrainDildosAnalRegular':
 		'You can clearly see that this dildo will tear your anus apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosAnalGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosAnalRegularUse':
@@ -1608,9 +1608,9 @@ if $ARGS[0] = 'abdTrainDildosAnalRegularUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['asshole'] += 5
 		pcs_ass += 1
-		gs 'stat'
 		gs 'arousal', 'anal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosAnalRegular'
 end
 
@@ -1626,7 +1626,7 @@ if $ARGS[0] = 'abdTrainDildosAnalBig':
 		'You can clearly see that this dildo will tear your anus apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosAnalGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosAnalBigUse':
@@ -1642,9 +1642,9 @@ if $ARGS[0] = 'abdTrainDildosAnalBigUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['asshole'] += 5
 		pcs_ass += 1
-		gs 'stat'
 		gs 'arousal', 'anal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosAnalBig'
 end
 
@@ -1660,7 +1660,7 @@ if $ARGS[0] = 'abdTrainDildosAnalHorse':
 		'You can clearly see that this dildo will tear your anus apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosAnalGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosAnalHorseUse':
@@ -1676,9 +1676,9 @@ if $ARGS[0] = 'abdTrainDildosAnalHorseUse':
 		'It hurts, but you can feel that some progress was made.'
 		pain['asshole'] += 5
 		pcs_ass += 1
-		gs 'stat'
 		gs 'arousal', 'anal_dildo', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosAnalHorse'
 end
 
@@ -1691,7 +1691,7 @@ if $ARGS[0] = 'abdTrainDildosMouthSmall':
 	end
 	act 'Use it':gt 'abduction', 'abdTrainDildosMouthSmallUse'
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosMouthGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthSmallUse':
@@ -1700,16 +1700,16 @@ if $ARGS[0] = 'abdTrainDildosMouthSmallUse':
 	if pcs_throat > dildoSmall:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthsmall.mp4"></video></center>'
 		'You start sucking the dildo with ease as your throat swallows it whole without any problem.'
-		gs 'arousal', 'deepthroat', 60
+		gs 'arousal', 'dildo_suck', 60
 	else
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthsmallhurt.mp4"></video></center>'
 		'You start to suck the dildo, knowing it is bigger than what you can handle and pushing it as deep as possible while trying not to suffocate.'
 		'It hurts, but you can feel that some progress was made.'
 		pain['throat'] += 5
 		pcs_throat += 1
-		gs 'stat'
-		gs 'arousal', 'deepthroat', 60, 'rough'
+		gs 'arousal', 'dildo_suck', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosMouthSmall'
 end
 
@@ -1725,7 +1725,7 @@ if $ARGS[0] = 'abdTrainDildosMouthRegular':
 		'You can clearly see that this dildo will tear your throat apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosMouthGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthRegularUse':
@@ -1734,16 +1734,16 @@ if $ARGS[0] = 'abdTrainDildosMouthRegularUse':
 	if pcs_throat > dildoRegular:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthregular.mp4"></video></center>'
 		'You start sucking the dildo with ease as your throat swallows it whole without any problem.'
-		gs 'arousal', 'deepthroat', 60
+		gs 'arousal', 'dildo_suck', 60
 	else
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthregularhurt.mp4"></video></center>'
 		'You start to suck the dildo, knowing it is bigger than what you can handle and pushing it as deep as possible while trying not to suffocate.'
 		'It hurts but you can feel that some progress was made.'
 		pain['throat'] += 5
 		pcs_throat += 1
-		gs 'stat'
-		gs 'arousal', 'deepthroat', 60, 'rough'
+		gs 'arousal', 'dildo_suck', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosMouthRegular'
 end
 
@@ -1759,7 +1759,7 @@ if $ARGS[0] = 'abdTrainDildosMouthBig':
 		'You can clearly see that this dildo will tear your throat apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosMouthGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthBigUse':
@@ -1768,16 +1768,16 @@ if $ARGS[0] = 'abdTrainDildosMouthBigUse':
 	if pcs_throat > dildoBig:
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthbig.mp4"></video></center>'
 		'You start sucking the dildo with ease as your throat swallows it whole without any problem.'
-		gs 'arousal', 'deepthroat', 60
+		gs 'arousal', 'dildo_suck', 60
 	else
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthbighurt.mp4"></video></center>'
 		'You start to suck the dildo, knowing it is bigger than what you can handle and pushing it as deep as possible while trying not to suffocate.'
 		'It hurts, but you can feel that some progress was made.'
 		pain['throat'] += 5
 		pcs_throat += 1
-		gs 'stat'
-		gs 'arousal', 'deepthroat', 60, 'rough'
+		gs 'arousal', 'dildo_suck', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosMouthBig'
 end
 
@@ -1793,7 +1793,7 @@ if $ARGS[0] = 'abdTrainDildosMouthHorse':
 		'You can clearly see that this dildo will tear your throat apart if it''s inserted all the way in.'
 	end
 	act 'Choose different dildo':gt 'abduction', 'abdTrainDildosMouthGate'
-	act 'Go back to your bed':gt 'abduction', 'abdRoom'
+	act 'Go back to your bed':gs 'arousal', 'end' & gt 'abduction', 'abdRoom'
 end
 
 if $ARGS[0] = 'abdTrainDildosMouthHorseUse':
@@ -1803,16 +1803,16 @@ if $ARGS[0] = 'abdTrainDildosMouthHorseUse':
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorse.mp4"></video></center>'
 		'You start sucking the dildo with ease as your throat swallows it whole without any problem.'
 		gs 'stat'
-		gs 'arousal', 'deepthroat', 60
+		gs 'arousal', 'dildo_suck', 60
 	else
 		'<center><video autoplay loop src="images/locations/shared/abduction/sex/slavewhoredildosmouthhorsehurt.mp4"></video></center>'
 		'You start to suck the dildo, knowing it is bigger than what you can handle and pushing it as deep as possible while trying not to suffocate.'
 		'It hurts, but you can feel that some progress was made.'
 		pain['throat'] += 5
 		pcs_throat += 1
-		gs 'stat'
-		gs 'arousal', 'deepthroat', 60, 'rough'
+		gs 'arousal', 'dildo_suck', 60, 'rough'
 	end
+	gs 'stat'
 	act 'Continue':gt 'abduction', 'abdTrainDildosMouthHorse'
 end
 

+ 6 - 6
locations/albina_house_events.qsrc

@@ -644,9 +644,9 @@ if $ARGS[0] = 'hot_tub_no_panties':
 		'"You already know I don''t wear them," you smirk back.'
 	elseif albina['commando_know'] > 0:
 		'"You already know I consider panties to be optional," you smirk back.'
-	elseif trait['commando_lvl'] = 3:
+	elseif pcs_traits['commando_lvl'] = 3:
 		'"I hate wearing panties," you smirk, stepping into the tub with her.'
-	elseif trait['commando_lvl'] > 0:	
+	elseif pcs_traits['commando_lvl'] > 0:	
 		'"I don''t always wear them," you smirk back, stepping into the tub with her.'
 	else
 		'"I uhh, may have forgotten to wear them today..." you blush, stepping into the tub with her.'
@@ -656,15 +656,15 @@ if $ARGS[0] = 'hot_tub_no_panties':
 	else
 		gs 'albina_house_events', 'hot_tub_no_panties2'
 	end
-	albina['commando_know'] = trait['commando_lvl']
+	albina['commando_know'] = pcs_traits['commando_lvl']
 end
 	
 	
 if $ARGS[0] = 'hot_tub_no_panties2':
 	*nl
-	'She grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she tosses something over her shoulder. Black fabric wetly slaps onto the poolside and peering past her, you realize it''s Albina''s thong. She leans back into the hot tub''s jets just before taking a sharp gasp.'
+	'Albina grins back at you and starts wriggling around beneath the bubbling water. Her knees briefly breach the surface and a moment later, she pulls up a thin, stringy, piece of fabric. She stretches it between her hands and slingshots it past your head, making a wet slapping sound when it lands on the deck. Turning your head to see what it was, you realize as soon as you lay eyes on it: it''s her thong. As you turn around, Albina takes a sharp gasp.'
 	*nl
-	'"Oh <i>fuck...</i>" she moans. "I should do this more often..."'
+	'"Oh <i>fuck...</i>" she moans, leaning further into the water. "I should do this more often..."'
 	*nl
 	gs 'albina_house_events', 'hot_tub_no_panties3'
 end
@@ -719,7 +719,7 @@ if $ARGS[0] = 'goodie_two_shoes':
 		'"Look who''s talking, bitch," you scowl at Albina, making her laugh out loud.'
 		gs 'albina_house_events', 'hot_tub_no_panties2'
 	end
-	if trait['commando_lvl'] > 0:
+	if pcs_traits['commando_lvl'] > 0:
 		albina['goodie_two_shoes_commando'] = 1
 		act 'Guess you didn''t know me':
 			cla & *nl

+ 4 - 4
locations/albina_lazar_sex.qsrc

@@ -68,7 +68,7 @@ if $ARGS[0] = 'watch_porn':
 		else
 			'You''re now feeling extremely horny, and the thought of someone catching you turns you on even more. You put your phone to the side and start fondling away at your engorged clit with one hand while using the other to slide some fingers into your wet hole and start finger banging yourself.'
 		end
-		$orgasm_txt = 'A few minutes of this is enough to bring you to climax and you pull your fingers out and clamp your hand against your mouth as you keeping vigoursly rubbing your clit and bring yourself to orgasm, hoping your muffled cries of pleasure don''t draw any attention.'
+		$orgasm_txt = 'A few minutes of this is enough to bring you to climax and you pull your fingers out and clamp your hand against your mouth as you keeping vigorously rubbing your clit and bring yourself to orgasm, hoping your muffled cries of pleasure don''t draw any attention.'
 		$orgasm_or = 'custom'
 		gs 'arousal', 'clit_finger', 5, 'masturbate'
 		gs 'stat'
@@ -90,9 +90,9 @@ if $ARGS[0] = 'peek':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/lazar/alblaz2.jpg"></center>'
 		'You keep watching as she pulls his dick out of her mouth with a loud slurp, ropes of her saliva covering his shaft as she gasps for air.' 
 		'She grins up at him before standing and wiggling out of her thong. She then climbs onto the bed and gets on her back before leaning her head over the edge. You push the door open just a little more so you can see all the action.' 
-		'Albina smiles and beckons Lazar over before opening her mouth wide. Lazar steps in and shoves his cock down her throat, causing her to gag before he starts face fucking her. He''s somewhat rough, yet Albina seems to be enjoying it. Despite gagging and choking, she vigoursly rubs her clit as he slams his cock in and out of her throat.'
+		'Albina smiles and beckons Lazar over before opening her mouth wide. Lazar steps in and shoves his cock down her throat, causing her to gag before he starts face fucking her. He''s somewhat rough, yet Albina seems to be enjoying it. Despite gagging and choking, she vigorously rubs her clit and fingers herself as he slams his cock in and out of her throat.'
 		*nl
-		'Drool dribbles out of her mouth and runs down her face, getting in her hair as he continues face fucking her. He only stops when it looks like Albina is about to pass out. He pulls out and she splutters a large amount of drool down her face as she gasps for air.'
+		'Drool dribbles out of her mouth and runs down her face, getting in her hair as he continues face fucking her. He only stops when it looks like Albina is about to pass out. He pulls out and she splutters a large amount of drool down her face as she gasps for air before sucking on her soaked fingers.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		act 'Keep watching':
@@ -309,7 +309,7 @@ if $ARGS[0] = 'masturbate':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/masturbate.jpg"></center>'
 	'Having become aroused by what you saw, you quietly close the door and quickly make your way to the bathroom, where you lock the door and sit on the toilet.'
 	'The thought of Albina and Lazar having sex down the hall turns you on, so you pull your panties down and start pleasuring yourself, not caring if anyone catches you. You start fondling away at your clit with one hand while using the other to finger bang yourself.'
-	$orgasm_txt = 'A few minutes of this is enough to bring you to climax and you pull your fingers out and clamp your hand against your mouth as you keeping vigoursly rubbing your clit and bring yourself to orgasm, hoping your muffled cries of pleasure don''t draw any attention.'
+	$orgasm_txt = 'A few minutes of this is enough to bring you to climax and you pull your fingers out and clamp your hand against your mouth as you keeping vigorously rubbing your clit and bring yourself to orgasm, hoping your muffled cries of pleasure don''t draw any attention.'
 	$orgasm_or = 'custom'
 	gs 'arousal', 'clit_finger', 5, 'masturbate'
 	gs 'stat'

+ 14 - 14
locations/albina_starlets.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'albina1':
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 		'You approach and greet Albina, who turns and raises an eyebrow in scornful confusion.'
 		'"Who the fuck are you? Oh, right. <<$pcs_firstname>>. So you''ve taken up dancing, have you?" You nod, confirming the obvious, but Albina just laughs dismissively. "Well, how''s that going for you?"'
-		'"Not bad." you answer coldly. "Not bad at all."'
+		'"Not bad," you answer coldly. "Not bad at all."'
 		'Albina just laughs at you mockingly. "Not bad? Well maybe in comparison to those bowlegged cows of amateurs you train with, but I doubt that you can dance on a <i>professional</i> level like <i>us</i>."'
 
 		act 'I don''t care':
@@ -75,7 +75,7 @@ if $ARGS[0] = 'albina2':
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 		'You approach and greet Albina, who turns to you and smiles.'
 		'"Oh hello <<$pcs_nickname>>. I didn''t know you started dancing. Are you any good?" she asks with interest.'
-		'"I''m pretty good, I think." you reply with a smile. "Even if I do say so myself."'
+		'"I''m pretty good, I think," you reply with a smile. "Even if I do say so myself."'
 		'"Pretty good, huh?" she responds in a condescending tone. "Well, I''ve seen some of the dancers that take lessons here. It wouldn''t take much to be better than those bow-legged cows. I doubt you''re up to any kind of professional standard though."'
 
 		act 'I don''t care':
@@ -95,8 +95,8 @@ if $ARGS[0] = 'albina2':
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-			'You are offended by Albina''s tone. "I can dance just as well as you or any of these girls!" you scornfully reply.'
-			'Albina looks at you in disbelief, seemingly offended by your remark. "You think you can dance better than <i>me</i>? <i>YOU</i>?! You can just sit your amateur ass down and watch how a professional does it. Then we''ll see if you still think you can dance." she says scornfully before forcing you to sit on the bench.'
+			'Her arrogance annoys you. "I can dance just as well as you or any of these girls!" you scornfully reply.'
+			'Albina looks at you in disbelief, seemingly offended by your remark. "You think you can dance better than <i>me</i>? <i>YOU</i>?! You can just sit your amateur ass down and watch how a professional does it. Then we''ll see if you still think you can dance!" she says scornfully before forcing you to sit on the bench.'
 			'Turning to the other girls, she motions for one of them to turn the music on.'
             
 			act 'Watch': 
@@ -132,7 +132,7 @@ if $ARGS[0] = 'albina3':
 		'You approach and greet Albina, who turns to you and smiles, but stops short of hugging you.'
 		'"<<$pcs_nickname>>!! Please tell me you don''t practice with those bow-legged cows who call themselves dancers?" she asks with a smirk.'
 		'"I''m pretty good, but I don''t know if I''m quite on your level just yet," you reply.'
-		'"Hey, don''t sell yourself short <<$pcs_nickname>>." Albina responds with a smile. "Have you seen the people that take lessons here? Please. No amount of teaching will help them reach your skill level. You''ve got talent, which brings me to my next question."'
+		'"Hey, don''t sell yourself short <<$pcs_nickname>>," Albina responds with a smile. "Have you seen the people that take lessons here? Please. No amount of teaching will help them reach your skill level. You''ve got talent, which brings me to my next question."'
 
 		act 'Ask what she means':
 			*clr & cla
@@ -167,16 +167,16 @@ if $ARGS[0] = 'albina4':
 			minut += 5
 			if pcs_inhib < 40:inhib_exp += rand(1,2)
 			gs 'stat'
-			'You get up and begin to dance to the music, trying as hard as you can to impress them. When the music stops, Albina stands and walks up to you.'
-			'"You dance like a country bumpkin, but you do have some potential." Albina muses as you stand panting before her.'
+			'You get up and start dancing to the music, trying as hard as you can to impress them. When the music stops, Albina stands and walks up to you.'
+			'"You dance like a country bumpkin, but you do have some potential..." Albina muses as you stand panting before her.'
 			act 'Can I join?':
 				*clr & cla
 				minut += 5
 				gs 'stat'
 				if hotcat < 6:
 					'"Well, am I good enough to join?" you ask.'
-					'Albina just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, you don''t have the prettiest of faces <<$pcs_nickname>>.'
-					'"Appearances are everything to the Starlets, so try improving your looks first and then get back to us." She turns and leaves with the rest of the troupe, her comments leaving you feeling slightly insulted.'
+					'Albina just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, you don''t have the prettiest of faces <<$pcs_nickname>>. Appearance is everything to the Starlets, so try improving your looks first and then get back to us."' 
+					'She turns and leaves with the rest of the troupe, her comments leaving you feeling slightly insulted.'
 				elseif hotcat >= 6 and stat['think_virgin'] = 1 and stat['vaginal'] = 0:
 					'"Well, am I good enough to join?" you ask.'
 					'Albina thinks about it and looks at the other girls; some nod, others shrug.'
@@ -224,7 +224,7 @@ if $ARGS[0] = 'albina5':
 				if pcs_inhib < 40:inhib_exp += rand(1,2)
 				gs 'stat'
 				'You begin to dance to the music and put very little effort into your moves before the other girls are pointing and talking to each other, intrigued by your skill. When the music stops, Albina walks up to you.'
-				'You stand panting before her as she gleefully claps. "I knew you could it!" she says.'
+				'You stand panting before her as she gleefully claps. "I knew you could it!"'
 				'"Do... what?" you reply.'
 				'"We''ve been dancing together for years <<$pcs_nickname>>, so I had no doubts about you. The others here, they wanted to see you first. They didn''t believe me when I said you were <i>almost</i> as good as me."'
 				act 'You are a Starlet?!':
@@ -264,7 +264,7 @@ if $ARGS[0] = 'starlets':
 	if pcs_dancero < 15:
 		'Your dancing is terrible and Albina constantly yells at you. "Did I make a mistake letting you join <<$pcs_nickname>>?"'
 	elseif pcs_dancero < 30:
-		'You sometimes manage to get the moves right, but most of the time you are out of sync or make the wrong move. Albina constantly yells at you and calls you "a bowlegged cow."'
+		'You sometimes manage to get it right, but you''re largely out of sync with the others or make the wrong move. Albina constantly yells at you and calls you "a bowlegged cow."'
 	elseif pcs_dancero < 45:
 		'You manage to get into the general rhythm and move well with the other girls, but Albina is still not happy. "You''re too sluggish, <<$pcs_nickname>>! Put more life into it!"'
 	elseif pcs_dancero < 55:
@@ -284,8 +284,8 @@ if $ARGS[0] = 'starlets':
 
 		if AlbinaQW['AlbFatherQW'] = 0 and AlbinaQW['StarletsWhore'] >= 8:
 			AlbinaQW['AlbFatherQW'] = 1
-			'At the end of the session, Albina beckons you to her. "I''ve been told to tell you that you''re doing good <<$pcs_nickname>> and that the clients are saying that you''re their new favourite girl. You''re handling it all quite well, but it will all be over soon. He won''t get away with it much longer. I promise."'
-			'You raise an eyebrow at her, but she just pats you on the shoulder and walks away before you can ask her who or what she is talking about.'
+			'At the end of the session, Albina beckons you to her. "I''ve been told to tell you that you''re doing good and that the clients are saying you''re their new favourite girl. You''re handling it all quite well, but it will all be over soon. He won''t get away with it much longer. I promise."'
+			'You raise an eyebrow at her, but she just pats you on the shoulder and walks away before you can ask her who or what she''s talking about.'
 		end
 
 		AlbinaQW['ShowTriggerCount'] = 0
@@ -361,7 +361,7 @@ if $ARGS[0] = 'starlets':
 							end
 
 							if AlbinaQW['StarletCustomer'] <= 8:
-								'Albina walks up to you. "<<$pcs_nickname>>, we... We need to... to talk." she quietly stammers.'
+								'Albina walks up to you. "<<$pcs_nickname>>, we... We need to... to talk..." she quietly stammers.'
 								act 'About what?':
 									*clr & cla
 									minut += 15

+ 4 - 4
locations/albina_wine_event.qsrc

@@ -574,7 +574,7 @@ if $ARGS[0] = 'wine_chat1':
 				albina['wine_convo_7'] = daystart
 			end
 			'"So, you really don''t wear panties?" Albina slurs while turning her head toward your pussy. "Like, ever?"'
-			if trait['commando_lvl'] = 3:
+			if pcs_traits['commando_lvl'] = 3:
 				act 'Only when I have to':
 					cla & *nl
 					'"Only when I have to," you say, wrinkling your nose in annoyance. "Sometimes you just can''t get away with it."'
@@ -627,7 +627,7 @@ if $ARGS[0] = 'wine_chat1':
 					'"What?" Albina looks confused. "That doesn''t make any sense at all..."'
 					gs 'albina_wine_event','wine_chat2'
 				end
-			elseif trait['commando_lvl'] > 0:
+			elseif pcs_traits['commando_lvl'] > 0:
 				act 'I just forget sometimes':
 					cla & *nl
 					'"Not <i>never</i>," you slur. "I just...  forget to put them on sometimes..."'
@@ -671,7 +671,7 @@ if $ARGS[0] = 'wine_chat1':
 					end
 				end
 				
-				if trait['commando_lvl'] = 1:
+				if pcs_traits['commando_lvl'] = 1:
 					act 'Only with skirts':
 						cla & *nl
 						'"Only when I''m wearing skirts," you say. "My pussy gets itchy when it rubs against my pants."'
@@ -760,7 +760,7 @@ if $ARGS[0] = 'wine_chat2':
 			'"Damn straight," Albina says, throwing up her hand and high fiving you.'
 			act 'Continue':gt 'albina_wine_event','wine_chat1'
 		end
-		if trait['cumeater'] > 0:
+		if pcs_traits['cumeater'] > 0:
 			act 'I love the taste':
 				cla & *nl
 				'"Me too," you smile. "I love the way it feels going down my throat. Taste is pretty good too."'

+ 105 - 105
locations/albinahome.qsrc

@@ -9,19 +9,19 @@ if $ARGS[0] = 'gate':
 	act 'Leave':gt 'pav_residential'
 	
     if hour = 23 or hour < 7:
-		'Now isn''t a good time for a house call.'
+		'There are better times for a house call than right now.'
 	elseif hour < 9:
-		'You push a button on the intercom and a female voice blasts through. "What kind of ungodly hour do you call this?! Come back later for a social call!" That must have been her mother.'	
+		'You push a button on the intercom, and a female voice blasts through. "What kind of ungodly hour do you call this?! Come back later for a social call!" That must have been her mother.'	
 	elseif hour <17:
 		if (kanikuli = 0) and (week < 6):
-			'Nobody answers when you buzz the intercom a few times and you decide to leave.'
+			'Nobody answers when you buzz the intercom a few times, and you decide to leave.'
 		else
 			gt 'albinahome', 'mom answers'
 		end
 	elseif hour < 20:
 		gt 'albinahome', 'mom answers'
 	else	
-		if hour >= 9:'You push a button on the intercom and a female voice comes through asking who it is. When you say you''re here to see Albina, she tells you that Albina is currently unavailable and you should come back later.'
+		if hour >= 9:'You push a button on the intercom, and a female voice asks who it is. When you say you''re here to see Albina, she tells you that Albina is unavailable and you should come back later.'
 	end
 	gs 'stat'
 end
@@ -30,12 +30,12 @@ if $ARGS[0] = 'mom answers':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinahome.jpg"></center>'
 	if AlbinaQW['albride'] = 2:
 		AlbinaQW['albride'] = 3
-		'You push a button on the intercom and you''re surprised to hear a somewhat cautious sounding female voice crackle through the speaker as you hear Albina in the background.'
+		'You push a button on the intercom, and you''re surprised to hear a somewhat cautious-sounding female voice crackle through the speaker as you hear Albina in the background.'
 		'The strange voice asks who you are and when she says your name to Albina, Albina gleefully tells you to excuse her mother''s caution and invites you in. The voice apologizes to you as the gate slowly opens.'
 		act 'Walk up the driveway': gt 'albinahome', 'hallway'
 	else
-		'You push a button on the intercom and you hear the familiar voice of Albina''s mother on the other end. You tell her it''s you and she opens the gate.'
-		'"She really enjoys having you come round and visit her you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through." she adds.'
+		'You push a button on the intercom and hear the familiar voice of Albina''s mother on the other end. You tell her it''s you, and she opens the gate.'
+		'"She enjoys having you come round and visit her, you know? It''s good for her to have such a dependable friend to rely on after everything she''s been through," she adds.'
 		act 'Walk up the driveway': gt 'albinahome', 'hallway'
 	end
 end
@@ -56,18 +56,18 @@ if $ARGS[0] = 'hallway':
 		!!First time visiting on your own after she shows you where she lives
 		AlbinaQW['visiting'] = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-		'You walk up the long driveway to the front door and knock. It opens to reveal a woman you estimate to be in her late 30s. She''s very attractive and well dressed, wearing high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
+		'You walk up the long driveway to the front door and knock. It opens to reveal a woman you estimate to be in her late 30s. She''s beautiful and well-dressed. She wears high heels, a pencil skirt, and a partially unbuttoned blouse that gives you a view of her substantial cleavage that bulges against the fabric.'
 		'"You must be <<$pcs_firstname>>!" she smiles. "Albina has told me quite a bit about you. All good things, I assure you," she adds with a laugh.'
-		'The woman holds out her hand for you to shake and you do so tentatively. "I''m sorry, and you are...?"'
-		'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenko." <i>Albina''s mother??</i> you think, shocked by the introduction.'
-		'"It''s a pleasure to meet you!" you blurt out. "Mrs... Ms... Uhh..." you flounder, realizing she didn''t use Albina''s surname and you''re not sure what to do.'
-		'"Doctor actually," she says, handling it with grace. "But," she continues, holding up her hand. "You can just call me Zoya."'
+		'The woman holds her hand for you to shake, and you do so tentatively. "I''m sorry, and you are...?"'
+		'"Oh! Forgive my rudeness. I''m Albina''s mother, Zoya Petrenko." <i>Albina''s mother??</i> You think, shocked by the introduction.'
+		'"It''s a pleasure to meet you!" you blurt out. "Mrs... Ms... Uhh..." you flounder, realizing she didn''t use Albina''s surname, and you''re unsure what to do.'
+		'"Doctor, actually," she says, handling it with grace. "But," she continues, holding up her hand. "You can just call me Zoya."'
 		'"Oh no! I could-"'
 		'"I insist," she smiles warmly. "Would you like to come inside?"'
 		act 'Continue':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-			'"Albina is in her room right now, I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital so I will just have to leave that to my daughter. If you are a frequent visitor, you might not see me a lot, but do come and say hello if I''m ever home when you visit. It was nice meeting you <<$pcs_firstname>>."'
+			'"Albina is in her room right now. I expect the maid has told her of your arrival already." She grabs her coat and clatters her way to the front door. "I wish I could be a more entertaining host, but I have to get to the hospital, so I will just have to leave that to my daughter. If you are a frequent visitor, you might not see me often, but do come and say hello if I''m ever home when you visit. It was nice meeting you, <<$pcs_firstname>>."'
 			'She gives a parting smile and closes the door behind her.'
 			act 'Continue': gt 'albinahome', 'bedroom'
 		end
@@ -110,7 +110,7 @@ if $ARGS[0] = 'hallway':
 					!! maid greeting sveta at front door
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/maid.jpg"></center>'
 					'The maid answers the door with a polite smile.'
-					'"Miss Albina is in her room and said you should meet her there." she says before motioning for you to enter and closing the door behind you before returning to her duties.'
+					'"Miss Albina is in her room and said you should meet her there," she says before motioning for you to enter and closing the door before returning to her duties.'
 					act 'Continue': gt 'albinahome', 'bedroom'
 				end
 			else
@@ -118,13 +118,13 @@ if $ARGS[0] = 'hallway':
 				if temp = 1:
 					!! Zoya greets you
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/zoya.jpg"></center>'
-					'The door opens and you see that it''s Zoya, who smiles at you.'
+					'The door opens, and you see that it''s Zoya, who smiles at you.'
 					'"Please make yourself at home <<$pcs_nickname>>. Albina is up in her room. I''m sure she''ll be thrilled to see you."'
 					act 'Continue': gt 'albinahome', 'bedroom'
 				else
 					!! Albina greets you
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-					'The door flies open and Albina greets you with a rather tight hug.'
+					'The door flies open, and Albina greets you with a tight hug.'
 					'"<<$pcs_nickname>>! Come in, come in," she says while dragging you inside and closing the door.'
 					act 'Continue': gt 'albinahome', 'bedroom'
 				end
@@ -133,7 +133,7 @@ if $ARGS[0] = 'hallway':
 	else
 		!! For leaving the house or going to the bathroom, no random event chances
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/hallway.jpg"></center>'
-		'The foyer is well appointed with hardwood flooring, numerous arches and tasteful decor. Lighting is sunk into the exquisite staircase that features wraparound balconies on either side.'
+		'The foyer is well-appointed with hardwood flooring, numerous arches and tasteful decor. Lighting is sunk into the exquisite staircase with wraparound balconies on either side.'
 		'You have been asked not to wander around the house alone, so you''re limited in where you can go.'
 		act 'Go back to town':
 			AlbinaQW['visiting'] = 0
@@ -216,12 +216,12 @@ if $ARGS[0] = 'bedroom':
 	if AlbinaQW['albride'] = 3:
 		AlbinaQW['albride'] = 4
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-		'You head up to Albina''s room and she smiles at you when you walk in. "So you met my mother then? Don''t worry, she''s <i>mostly</i> harmless and actually likes you. So what do you want to do?"'
+		'You head up to Albina''s room, and she smiles at you when you walk in. "So you met my mother then? Don''t worry. She''s <i>mostly</i> harmless and actually likes you. So what do you want to do?"'
 		act 'Hang out': gt $loc, $loc_arg
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-		'You are impressed at how nice Albina''s bedroom looks, the centrepiece being a large double bed covered in soft pillows. A door at the back of the room leads to her en-suite bathroom and she even has a sliding door leading to a balcony that overlooks the nearby lake. A closet full of expensive looking clothes is built into one of the walls.'
-		'By the bed is a small <a href="exec:gt ''albina_house_events'',''night_stand''">night stand</a>, and on a desk is a <a href="exec:gt ''albina_house_events'',''computer''">laptop</a>'
+		'You are impressed at how nice Albina''s bedroom looks, the centrepiece being a large double bed covered in soft pillows. A door at the back of the room leads to her en-suite bathroom, and she even has a sliding door leading to a balcony that overlooks the nearby lake. A closet full of expensive-looking clothes is built into one of the walls.'
+		'By the bed is a small <a href="exec:gt ''albina_house_events'',''night_stand''">nightstand</a>, and on a desk is a <a href="exec:gt ''albina_house_events'',''computer''">laptop</a>'
 		act 'Return to the hallway': gt 'albinahome', 'hallway'
 		act 'Chat with Albina': gt 'albina_chat', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
@@ -239,7 +239,7 @@ if $ARGS[0] = 'dancing':
 	if AlbinaQW['SportHome']  = 0:
 		'<center><video autoplay loop src="images/locations/pavlovsk/resident/albinahome/train.mp4"></video></center>'
 		'Albina is training in her room, doing some stretching exercises.'
-		'She''s wearing a pair of skin tight yoga pants that show off her toned body quite well.'
+		'She''s wearing skin-tight yoga pants that show off her toned body quite well.'
 		act 'Ask why she doesn''t train at the gym':
 			*clr & cla
 			AlbinaQW['SportHome']  = 1
@@ -247,8 +247,8 @@ if $ARGS[0] = 'dancing':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			'"I don''t like the sweaty perverts at the gym staring at my ass, so I prefer training at home instead," she replies.'
-			'You can''t help but stare at her firm, shapely rear as she says that and she grins at you.'
-			'"Eyes up here <<$pcs_nickname>>! Anyway, I could teach you about stripping and poledancing if you want?"'
+			'You can''t help but stare at her firm, shapely rear as she says that, and she grins at you.'
+			'"Eyes up here, <<$pcs_nickname>>! Anyway, if you want, I could teach you about stripping and pole dancing?"'
 			act 'No thanks': AlbinaQW['SportDay'] = daystart & gt 'albinahome', 'bedroom'
 			act 'Teach me stripping': gt 'albinahome', 'stripping'
 			act 'Teach me poledancing': gt 'albinahome', 'poledancing'
@@ -275,7 +275,7 @@ if $ARGS[0] = 'stripping':
 		gs 'stat'
 		'"Okay, we need some space. Follow me." She leads you down to the home gym, where she teaches you how to passionately dance to the music while stripping.'
 
-		if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
+		if pcs_dancero >= 100:'You don''t learn anything new since you already know everything she can teach you.'
 	else
 		gs 'exercise', 'tier3', 120, 'agil', 'danc'
 		gs 'stat'
@@ -294,21 +294,21 @@ if $ARGS[0] = 'poledancing':
 		gs 'exercise', 'tier2', 120, 'stren', 'vital', 'dancpol'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/poledance.jpg"></center>'
-		'Albina leads you down to the home gym, where she teaches you various acrobatic moves on the pole there and the two of you greatly enjoy yourselves.'
+		'Albina leads you to the home gym, where she teaches various acrobatic moves on the pole. The two of you greatly enjoy yourselves.'
 		if pcs_dancpol >= 100: 'You didn''t learn anything new since you already know everything she can teach you.'
 		gs 'albinahome', 'post_workout_shower'
 		act 'Rest':gt 'albinahome', 'bedroom'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
-		'You try your best to follow Albina''s instructions, but you end up smacking your head on the pole instead and fall to the floor.'
-		'You are flat on your back and see Albina kneeling over you. "Are you okay <<$pcs_nickname>>? It looks like you''re still too weak for poledancing, so we need to develop your strength instead."'
-		'You nod at her and she pulls you to your feet before checking your head. "It might bruise, but otherwise you look fine."'
+		'You try your best to follow Albina''s instructions but end up smacking your head on the pole instead and falling to the floor.'
+		'You are flat on your back and see Albina kneeling over you. "Are you okay, <<$pcs_nickname>>? You''re still too weak for pole dancing, so we need to develop your strength instead."'
+		'You nod at her, and she pulls you to your feet before checking your head. "It might bruise, but otherwise, you look fine."'
 		act 'Develop strength (2:00)':
 			*clr & cla
 			gs 'exercise', 'tier2', 120, 'stren', 'vital'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
-			'You silently wonder if these exercises are how she has such a great looking ass.'
+			'You wonder if these exercises are how she has such a great-looking ass.'
 			gs 'albinahome', 'post_workout_shower'
 			act 'Rest':gt 'albinahome', 'bedroom'
 		end
@@ -316,13 +316,13 @@ if $ARGS[0] = 'poledancing':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/stripdance.jpg"></center>'
 		if pcs_inhib < 60:inhib_exp += rand(2,3)
-		'Albina grins. "You still can''t strip well enough for poledancing. We should practice that first."'
+		'Albina grins. "You still can''t strip well enough for pole dancing. We should practice that first."'
 		if pcs_danc >= 40:
 			gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 			gs 'stat'
 			'Albina teaches you how to passionately dance to the music while stripping.'
 
-			if pcs_dancero >= 100:'You didn''t learn anything new since you already know everything she can teach you.'
+			if pcs_dancero >= 100:'You don''t learn anything new since you already know everything she can teach you.'
 		else
 			gs 'exercise', 'tier3', 120, 'agil', 'danc'
 			gs 'stat'
@@ -346,8 +346,8 @@ if $ARGS[0] = 'dressing':
 		pcs_mood += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/dressing.jpg"></center>'
-		'You and Albina open her huge wardrobe and begin digging into her various clothes.'
-		'As you rummage around in her wardrobe, you are amazed by how many different clothes she owns. It feels like her wardrobe is a bottomless pit filled with dresses, skirts, leggings, jeans and all kinds of other expensive looking clothes.'
+		'You and Albina open her vast wardrobe and begin digging into her various clothes.'
+		'As you rummage around in her wardrobe, you are amazed by how many different clothes she owns. Her wardrobe seems like a bottomless pit filled with dresses, skirts, leggings, jeans and other expensive-looking clothes.'
 		'The two of you end up spending an hour trying on various different outfits.'
 		act 'Finish': gt 'albinahome', 'bedroom'
 	end
@@ -359,8 +359,8 @@ if $ARGS[0] = 'game':
 	minut += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-	'You notice the flat screen TV and a games console sitting in front of it. A row of various Tekken and Mortal Kombat games sit underneath them.' 
-	'"I wish I could afford a console..." you mumble out loud.'
+	'You notice the flat-screen TV and a games console sitting in front of it. A row of various Tekken and Mortal Kombat games sit underneath them.' 
+	'"I wish I could afford a console..." you mumble.'
 	'She smiles at you. "You want to play a few games?"'
 	act 'No':
 		*clr & cla
@@ -368,7 +368,7 @@ if $ARGS[0] = 'game':
 		minut += 2
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-		'You shake your head. "Not right now thanks. I just noticed them is all, maybe some other time."'
+		'You shake your head. "Not right now, thanks. I just noticed them, is all. Maybe some other time."'
 		'She shrugs. "Sure. If you ever want to play, all you have to do is ask."'
 		act 'Do something else': gt 'albinahome', 'bedroom'
 	end
@@ -398,7 +398,7 @@ if $ARGS[0] = 'game':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'You shake your head. "Not this time."'
-					'You can tell she is a little disappointed, but she turns her attention to the game. "You are so going to lose!" she laughs. You play games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well I had fun, but there is some stuff I need to take care of." she says as she turns the console off.'
+					'She is a little disappointed but turns her attention to the game. "You are so going to lose!" she laughs. You play games for a while, although things are a little awkward between you. Eventually, Albina stops. "Well, I had fun, but there is some stuff I need to take care of," she says as she turns the console off.'
 					'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 					act 'Say goodbye and go home':
 						AlbinaQW['visiting'] = 0
@@ -410,7 +410,7 @@ if $ARGS[0] = 'game':
 				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
-			'You and Albina lie down in front of the TV after picking one of the games. You play while chatting about various things and trash talking each other, although neither of you are giving your full attention to the game. You''re just having fun together.'
+			'You and Albina lie down in front of the TV after picking one of the games. You play while chatting about various things and trash-talking each other. However, neither of you are giving your full attention to the game. Instead, you''re just having fun together.'
 			act 'Finish playing': gt 'albinahome', 'bedroom'
 			act 'Keep playing': gt 'albinahome', 'playgame'
 		end
@@ -427,11 +427,11 @@ if $ARGS[0] = 'playgame':
 	npc_rel['A23'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-	'The two of you keep playing video games and trash talking each other, even bumping each other to try and screw each other up, but neither of you are taking it seriously. You mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
+	'The two of you keep playing video games and trash-talking, even bumping each other to try and screw each other up. Still, neither of you are taking it seriously. Instead, you mostly just laugh at the silly mistakes you both make while only partially paying attention to the game.'
 	if hotcat >= 5:
 		'Once you finish the game, Albina turns to you instead of starting another one. "How about we see who actually <i>is</i> the better gamer?" she asks with a confident smile.'
 		'You laugh and nod. "Sure, but you''re so going down!"'
-		'She laughs in response. "You''re that sure? Then how about we make it a bit more interesting then?"'
+		'She laughs in response. "You''re that sure? So, how about we make it a bit more interesting then?"'
 		'You arch your brow curiously. "What do you have in mind?"'
 		'She grins at you, gets up and walks over to her dresser. She rummages around in it before pulling out a strapon harness with a large black dildo attached. "The winner gets to use this on the loser... However. They. Want," she says with a smirk.'
 
@@ -448,7 +448,7 @@ if $ARGS[0] = 'playgame':
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'You shake your head. "Uhhh... I''m really not interested in doing that."'
-				'Albina puts the strapon away and you can tell she is a little disappointed as she comes back over and lies down beside you again. "You are so going to lose!" she laughs. You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well I had fun, but there''s some stuff I need to take care of." she says as she turns the console off.'
+				'Albina puts the strapon away, and you can tell she is a little disappointed as she comes back over and lies down beside you again. "You are so going to lose!" she laughs. You continue to play games for a while, although things are awkward between you. Eventually, Albina stops. "Well, I had fun, but there''s some stuff I need to take care of," she says as she turns the console off.'
 				'Getting the hint, you get up as well. "Yeah, I should probably get going myself." You exchange a brief hug before you leave.'
 				act 'Say goodbye and go home':
 					AlbinaQW['visiting'] = 0
@@ -480,8 +480,8 @@ if $ARGS[0] = 'game_bet':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 	'You stare at the size of the attached dildo. It''s almost as long and thick as your forearm. "Where did you get that?!" you laugh. "Whatever, you''re on. You''re so going to get fucked!"'
-	'Albina laughs as she brings the strapon over with a bottle of lube and tosses them on the bed next to you before she lies back down beside you and picks her controller up. "Please! You''re so going to lose."' 
-	'She starts the game and you both fall silent, your focus only on winning.'
+	'Albina laughs as she brings the strapon over with a bottle of lube and tosses them on the bed before she lies back beside you and picks her controller up. "Please! You''re so going to lose."' 
+	'She starts the game, and you both fall silent, your focus only on winning.'
 	act 'Play until someone wins':
 		*clr & cla
 		menu_off = 1
@@ -498,16 +498,16 @@ if $ARGS[0] = 'game_bet':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
 		if albplay = 3:
-			'She doesn''t even come close to beating you. Before the game can end, she lets out an exacerbated sigh and tosses her controller down in defeat, knowing she has no chance. You give her a gloating smirk as she reaches over and grabs the strapon harness before handing it to you. You both undress and you grin as you slide the harness on.'
+			'She doesn''t even come close to beating you. Before the game can end, she lets out an exacerbated sigh and tosses her controller down in defeat, knowing she has no chance. You give her a gloating smirk as she reaches over and grabs the strapon harness before handing it to you. You both undress, and you grin as you slide the harness on.'
 			act 'Continue': gt 'albinahome', 'wear_strapon'
 		elseif albplay = 2:
-			'It''s close, but in the end you just manage to win the game. "Yes!" you exclaim triumphantly, and she laughs as she grabs the strapon harness and hands it to you. You both undress and you grin as you slide the harness on.'
+			'It''s close, but in the end, you just manage to win the game. "Yes!" you exclaim triumphantly, and she laughs as she grabs the strapon harness and hands it to you. You both undress, and you grin as you slide the harness on.'
 			act 'Continue': gt 'albinahome', 'wear_strapon'
 		elseif albplay = 1:
-			'Although you try your best, Albina proves a worthy opponent and manages to just barely defeat you. Laughing in a mocking and villianous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina proves a worthy opponent and barely defeats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 		elseif albplay = 0:
-			'Although you try your best, Albina simply outplays you at every turn. You stand no chance and she easily beats you. Laughing in a mocking and villianous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress and Albina slides the harness on with a smirk on her face.'
+			'Although you try your best, Albina simply outplays you at every turn. You stand no chance, and she easily beats you. Laughing in a mocking and villainous tone, she slaps you on the ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 			act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 		end
 		killvar 'gameresult'
@@ -518,7 +518,7 @@ if $ARGS[0] = 'game_bet':
 		menu_off = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/game.jpg"></center>'
-		'You''re not sure why, but part of you <i>wants</i> her to use the strapon on you, so you purposefully lose the game. Albina looks at you suspiciously with a raised brow, but smiles and smacks your ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress and Albina slides the harness on with a smirk on her face.'
+		'You''re not sure why, but part of you <i>wants</i> her to use the strap-on on you, so you purposefully lose the game. Albina looks at you suspiciously with a raised brow but smiles and smacks your ass. "Show me your ass <<$pcs_nickname>>! You''re my bitch now!" You both undress, and Albina slides the harness on with a smirk on her face.'
 		act 'Get fucked with the strapon': gt 'albinahome', 'receive_strapon'
 	end
 end
@@ -527,10 +527,10 @@ if $ARGS[0] = 'wear_strapon':
 	*clr & cla
 	menu_off = 1
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/albina/sex/game/spank.mp4"></video></center>'
-	'Before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
+	'Before you can begin, Albina smirks at you while wiggling her ass. "I need to be punished for losing first. Spank me, <<$pcs_nickname>>, and don''t stop until my pussy is wet and my ass is red and stinging!"'
 	'She pushes you down onto the bed and lays across your lap before looking up at you. "Don''t make me beg, <<$pcs_nickname>>."'
-	'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
-	'You continue spanking her as hard as you can until the stinging in your hand becomes too much and you have to stop. "That was fucking amazing <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you and you stand to adjust the harness around your hips.' 
+	'You smile at her before raising your hand and giving her a firm smack on the ass. "Harder!" she blurts out, and you respond by delivering a hard smack that leaves both her ass and your hand red and stinging. "Oh FUCK, <i>yeeesss</i>! Do that again!" she moans in an almost orgasmic tone.'
+	'You continue spanking her as hard as you can until the stinging in your hand becomes too much, and you have to stop. "That was fucking amazing, <<$pcs_nickname>>! I''m so fucking wet after that!" True to her word, you can feel her juices trickling down your leg. "I need you to fuck me just as hard now. Pound me until I cum!" She climbs off of you, and you stand to adjust the harness around your hips.' 
 	gs 'arousal', 'BDSM_give', 8, 'dom', 'lesbian'
 	gs 'stat'
 
@@ -539,7 +539,7 @@ if $ARGS[0] = 'wear_strapon':
 		lesbian += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-		'With the strapon firmly in place, you stand next to the bed and pull her head down to the dildo. "Suck my dick loser!" you giggle.'
+		'With the strapon firmly in place, you stand next to the bed and pull her head down to the dildo. "Suck my dick, loser!" you giggle.'
 		'She laughs before she takes the dildo in her mouth and starts sucking while stroking the shaft with one hand. You spend several minutes making her suck on the dildo, getting it wet with her drool.'
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'stat'
@@ -548,14 +548,14 @@ if $ARGS[0] = 'wear_strapon':
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
-			'You pull away until the dildo slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it cowgirl!" you laugh. She straddles you and lowers herself down until the dildo slides easily inside of her wet pussy, causing her to moan in pleasure. She starts riding you slowly, but picks up speed, moaning louder and louder.'
+			'You pull away until the dildo slides out of her mouth, climb onto the bed next to her and lie on your back. "Come and ride it, cowgirl!" you laugh. She straddles you and lowers herself down until the dildo slides easily inside her wet pussy, causing her to moan in pleasure. She starts riding you slowly but picks up speed, moaning louder and louder.'
 			gs 'arousal', 'vaginal_strap_give', 8, 'lesbian'
 			gs 'stat'
 			act 'Fuck her faster':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/givevag.jpg"></center>'
-				'You slap her on the ass. "Come on Albina! Ride it like you mean it!" With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before she slides off the dildo, which glistens with her juices, and collapses on the bed next to you. She looks at you with an appreciative smile on her face before she leans over and whispers in your ear.'
+				'You slap her on the ass. "Come on, Albina! Ride it like you mean it!" With your encouragement, she starts really riding you hard and fast, her ass slapping against your thighs as she takes the whole length inside her. She rides you for several minutes before she slides off the dildo, glistens with her juices, and collapses on the bed next to you. She looks at you with an appreciative smile before she leans over and whispers in your ear.'
 				'"I want you to fuck my ass now..."' 
 				'You grin as she giggles and gets on all fours to wiggle her bubble butt at you.'
 				gs 'arousal', 'vaginal_strap_give', 7, 'lesbian'
@@ -575,18 +575,18 @@ if $ARGS[0] = 'fuck_albina_ass':
 	gs 'boyStat', 'D3'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-	'You grab the bottle of lube and squirt some onto the dildo, rubbing it up and down the shaft until it is very slick before spreading her ass cheeks and applying a generous amount onto her asshole. You grab her ass in your hand and appreciate how firms it feels in your grip.'
-	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the huge dildo slides into her ass with ease, causing her to moan in pleasure as you go deeper and faster. You look down and admit that her ass is amazing, the dildo being enveloped by her huge, firm cheeks as you thrust in and out of her back door.' 
-	'You wonder what the guys in your class would do to be in your position right now as you continue fucking her ass. After a few minutes, you pull out of her and she looks back over her shoulder at you.'
+	'You grab the bottle of lube and squirt some onto the dildo. You rub it up and down the shaft until it is very slick before spreading her ass cheeks and applying a generous amount onto her asshole. You grab her ass in your hand and appreciate how firm it feels in your grip.'
+	'"Like what you see?" she giggles. You kneel down behind her, line the head of the dildo up with her asshole and slowly push forward. There is little resistance, and the large dildo slides into her ass easily, causing her to moan as you go deeper and faster. You look down and admit that her ass is fantastic, the dildo enveloping her huge, firm cheeks as you thrust in and out of her back door.' 
+	'You wonder what the guys in your class would do to be in your position as you continue fucking her ass. Finally, after a few minutes, you pull out of her, and she looks back over her shoulder at you.'
 	gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 	gs 'stat'
 	act 'Keep fucking her ass':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-		'"Come on <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. You grab onto her hips and start fucking her balls deep, filling her ass with the entire dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock and she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
-		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices continue leaking from her pussy. "Oh fuck yes <<$pcs_nickname>>! That was fucking amazing!"'
-		'"Fucking such a nice looking ass was amazing!" you reply and you both laugh.'
+		'"Come on, <<$pcs_nickname>>. Put it back in and fuck me... hard," she says while wiggling her hips. You smile at her and slide the dildo back into her hole with ease, making her moan in pleasure. Next, you grab onto her hips and start fucking her balls deep, filling her ass with the dildo as she reaches back and starts rubbing her clit. After several minutes, you feel her ass tighten around your fake cock. Finally, she cries out as her body is rocked by an intense orgasm and juices squirt from her pussy, soaking the sheets beneath her. You keep fucking her throughout her orgasm, only pulling out once her shudders have passed.'
+		'After you''ve pulled out, she inserts a few fingers into her gaping hole as juices leak from her pussy. "Oh fuck yes, <<$pcs_nickname>>! That was fucking amazing!"'
+		'"Fucking such a nice-looking ass was amazing!" you reply, and you both laugh.'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 		gs 'stat'
 		act 'Finish': gt 'albinahome', 'strapon_finish'
@@ -600,8 +600,8 @@ if $ARGS[0] = 'receive_strapon':
 	lesbian += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-	'You slide your panties off as she tightens the strapon firmly in place while standing next to the bed. You lie down next to her and she pulls your head down to the dildo. "Suck my dick loser!" she says with a giggle.'
-	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
+	'You slide your panties off as she tightens the strapon firmly while standing next to the bed. You lie next to her, and she pulls your head down to the dildo. "Suck my dick, loser!" she says with a giggle.'
+	'You take the dildo into your mouth and start sucking on it while stroking the shaft with one hand. "Yeah, just like that, <<$pcs_nickname>>!" she moans as she reaches between the straps and gently rubs her pussy. You spend several minutes sucking on the dildo, getting it wet with your drool before she pulls it out of your mouth. "I''m so going to enjoy fucking you!"'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	if stat['think_virgin'] = 1:
@@ -609,7 +609,7 @@ if $ARGS[0] = 'receive_strapon':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/bj.jpg"></center>'
-			'You blush deeply and she looks at you. "Oh, right. You haven''t done this before," she says, remembering that you''re still pure.'
+			'You blush deeply, and she looks at you. "Oh, right. You haven''t done this before," she says, remembering that you''re still pure.'
 			'You blush even more. "Yes, I''m... still a virgin..." you reply.'
 			'"Well, I can just fuck your ass if you want?" She then gives you a small smile. "Unless you want me to pop your cherry?"'
 			act 'Just fuck my ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -618,18 +618,18 @@ if $ARGS[0] = 'receive_strapon':
 				gs 'boyStat', 'D3'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-				'You give her an awkward smile in return. "I... I want you to... take me. My... virginity, that is..." you tell her as your cheeks burn bright red.' 
-				'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands and she climbs onto the bed and scoots in between your legs. She rubs your pussy with her fingers to make sure it''s wet enough, but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.' 
-				'It''s both painful and pleasurable at the same time and you moan softly as she slowly starts to fuck you. After a few minutes, it starts to hurt less and you find yourself moaning louder.'
+				'You give her an awkward smile in return. "I... I want you to... take me. My... virginity that is..." you tell her as your cheeks burn bright red.' 
+				'She smiles back. "Okay, don''t worry. I''ll be gentle since it''s your first time. Just lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs your pussy with her fingers to make sure it''s wet enough but adds some lube to the dildo anyway. You feel it rubbing against your slit before she slowly slides it into your virgin pussy.' 
+				'It''s both painful and pleasurable, and you moan softly as she starts to fuck you. After a few minutes, it starts to hurt less, and you find yourself moaning louder.'
 				*nl
-				'After a few more minutes, Albina starts growing tired and pulls out, leaving you feeling a little empty. "So how was that for your first time?" she asks with a smile.'
-				'"It was amazing! I''m glad it was you I shared it with, you were so gentle and considerate," you reply and Albina smiles even wider.'
+				'After a few more minutes, Albina starts growing tired and pulls out, leaving you empty. "So how was that for your first time?" she asks with a smile.'
+				'"It was amazing! I''m glad it was you I shared it with. You were so gentle and considerate," you reply, and Albina smiles even wider.'
 				'"I couldn''t have your first time being a shitty experience like mine...." she replies, but gasps and looks away when she realises what she said.'
 				*nl
 				'You quickly sit up next to her and give her a hug. "Hey, it''s okay. This was the best thing I could hope for when losing my virginity."'
-				'She looks at you as tears well up in her eyes, the memories of what were clearly a traumatic event flooding back to her. "Really? I wanted it to be good for you because-"'
-				'You can see this is a painful memory for her and pull her into another hug. "I know..." you gently reassure her and you both sit in silence for a few minutes before she gets up and pulls the harness off before cleaning the dildo and tossing it back in the drawer.'
-				'"This is supposed to be your happy memory and I don''t want to ruin it for you. Let''s do something fun!" She clearly needs a distraction, so you nod in agreement.'
+				'She looks at you as tears well up in her eyes, the memories of a traumatic event flooding her. "Really? I wanted it to be good for you because-"'
+				'You can see this is a painful memory for her, and pull her into another hug. "I know..." you gently reassure her, and you both sit silently for a few minutes. Finally, she gets up, takes the harness off, cleans the dildo and tosses it back in the drawer.'
+				'"This is supposed to be your happy memory, and I don''t want to ruin it for you. So let''s do something fun!" She clearly needs a distraction, so you nod in agreement.'
 				gs 'arousal', 'vaginal_strap', 5, 'lesbian'
 				gs 'stat'
 				act 'Continue': gt 'albinahome', 'bedroom'
@@ -641,14 +641,14 @@ if $ARGS[0] = 'receive_strapon':
 			gs 'boyStat', 'D3'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag1.jpg"></center>'
-			'"Lie on your back and spread your legs." You do as she commands and she climbs onto the bed and scoots in between your legs. She rubs the head of the dildo against your pussy before she pushes it inside you. You moan as she slowly starts fucking your pussy, going a little faster the louder you moan.'
+			'"Lie on your back and spread your legs." You do as she commands, and she climbs onto the bed and scoots between your legs. She rubs the head of the dildo against your pussy before she pushes it inside you. You moan as she slowly starts fucking your pussy, going a little faster the louder you moan.'
 			gs 'arousal', 'vaginal_strap', 8, 'lesbian'
 			gs 'stat'
 			act 'Keep getting your pussy fucked':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/getvag2.jpg"></center>'
-				'She proceeds to fuck you hard, but not too hard, settling into a near perfect thrusting rhythm that you enjoy, feeling youself slowly getting wetter. She seems to be enjoying it as much as you, moaning softly as she fucks you. She leans in and kisses you before suddenly stopping and pulling out. "Okay, that''s enough of that, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
+				'She proceeds to fuck you hard, but not too hard, settling into a near-perfect thrusting rhythm that you enjoy, feeling yourself slowly getting wetter. She seems to enjoy it as much as you, moaning softly as she fucks you. Finally, she leans in and kisses you before suddenly stopping and pulling out. "Okay, that''s enough, but I''m not finished with you just yet. Roll over so I can fuck that tight little ass of yours."'
 				gs 'arousal', 'vaginal_strap', 7, 'lesbian'
 				gs 'stat'
 				act 'Take it up the ass': gt 'albinahome', 'albina_ass_fucks_you'
@@ -665,7 +665,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-				'Thoughts race through your head as you look at the huge dildo, and Albina notices your hesitation.'
+				'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
 				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
 				'You shake your head as you feel your cheeks burning bright red. "Uhh... No, I haven''t..."'
 				'She places a hand on your shoulder. "Hey, it''s nothing to be embarrassed about. Plenty of girls don''t do anal."'
@@ -684,9 +684,9 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
 				'You feel your cheeks burning bright red. "Well, I''ve managed to take a fist..."'
 				*nl
-				'Albina looks at you in what you can only describe as awe. "God damn <<$pcs_nickname>>, even I''ve never taken a fist up my ass and I''m the queen of butt stuff!"'
+				'Albina looks at you in what you can only describe as awe. "God damn, <<$pcs_nickname>>, even I''ve never taken a fist up my ass, and I''m the queen of butt stuff!"'
 				'"Is it weird to do that?" you ask with concern.'
-				'"No, not at all! To be honest, I''ve always wanted to try it, but I''ve never found anyone interested in doing it. Maybe that''s about to change..."'
+				'"No, not at all! I''ve always wanted to try it, but I''ve never found anyone interested in it. But, maybe that''s about to change..."'
 				'She looks you over with lustful desire before continuing. "Practicing with a dildo makes your first butt fuck easier, but a whole fucking hand?! A cock or dildo would be a breeze for you!"'
 				'She then places a hand on your shoulder. "<<$pcs_nickname>>, be honest with me. Do you want me to fuck your ass? I''ll be as gentle as you want."'
 				act 'Yes': gt 'albinahome', 'first_anal1'
@@ -699,7 +699,7 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-				'Thoughts race through your head as you look at the huge dildo, and Albina notices your hesitation.'
+				'Thoughts race through your head as you look at the massive dildo, and Albina notices your hesitation.'
 				'"<<$pcs_nickname>>, have you ever been fucked in the ass before?"'
 				'You feel your cheeks burning bright red. "Well, I''ve used a dildo..."'
 				*nl
@@ -717,14 +717,14 @@ if $ARGS[0] = 'albina_ass_fucks_you':
 			lesbian += 1
 			gs 'boyStat', 'D3'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-			'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts some on the dildo and strokes the shaft with it before she massages a generous amount into your asshole with her fingers. You and the dildo now lubed up, she moves behind you and you feel the dildo pressing against your asshole, the pressure building until the tip pops into your ass, causing you to groan slightly in pain. She slowly starts to slide the dildo up your ass, steadily working it deeper.'
+			'As you get on all fours, you glance back and see her applying lube to the dildo. She squirts some on the dildo and strokes the shaft with it before she massages a generous amount into your asshole with her fingers. You and the dildo now lubed up, she moves behind you, and you feel the dildo pressing against your asshole, the pressure building until the tip pops into your ass, causing you to groan slightly in pain. Next, she slowly slips the dildo up your ass, steadily working it deeper.'
 			gs 'arousal', 'anal_strap', 5, 'lesbian'
 			gs 'stat'
 
 			act 'Get your ass hammered':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal2.jpg"></center>'
-				'Once you''re comfortable with her in your ass, she stands up over you. "Get ready, because now I''m <i>really</i> going to fuck your ass!" she laughs before she starts slamming the full length of the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.' 
+				'Once you''re comfortable with her in your ass, she stands up over you. "Get ready because now I''m really going to fuck your ass!" she laughs before slamming the dildo in and out of your ass, causing you to grip the sheets tightly. Despite this, she isn''t too rough, and you start enjoying the pleasurable sensation. Albina seemingly grows more aroused the more she fucks you.' 
 				'Just as it''s starting to hurt, she lets out a loud, pleasured scream as you feel her juices spraying across your legs. You then feel the dildo slide out of you and turn to see Albina sprawled out on the bed in orgasmic bliss, her juices slowly trickling out of her soaking wet pussy as a huge wet patch soaks into the sheets. "You were such a good little buttslut, <<$pcs_nickname>>..." she says softly.'
 				'After riding through her orgasm, she pulls the harness off and tosses it aside.'
 				gs 'arousal', 'anal_strap', 10, 'lesbian'
@@ -742,28 +742,28 @@ if $ARGS[0] = 'first_anal':
 	lesbian += 1
 	gs 'boyStat', 'D3'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-	'"Y-yes, I would. Just promise you''ll be gentle," you reply and Albina smiles.'
-	'"I will. Now get on all fours and bring your ass up as high as you can."'
-	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole and Albina starts massaging it in before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
+	'"Y-yes, I would. Just promise you''ll be gentle," you reply, and Albina smiles.'
+	'"I will. Get on all fours and bring your ass up as high as possible."'
+	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
 	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
-	'You stare at the dildo hanging between her legs, but steel yourself and nod. "Yes, I want to do this. Just go slow please?"'
+	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this. Just go slow, please?"'
 	gs 'arousal', 'anal_finger', 5, 'lesbian'
 	gs 'stat'
 
 	act 'Get your ass fucked':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you, and you grip the sheets tightly as you do what she says.' 
-		'You feel her start slowly pushing and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation and you instinctively feel the urge to pull yourself free. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
-		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her and she nods.'
+		'Your heart races as you feel Albina moving in behind you. You instinctively tense up when you feel the head of the dildo pressing against your asshole. "Okay, <<$pcs_nickname>>, this is going to feel strange and definitely hurt a little, but you''re going to have to try and relax as best as you can for me," Albina tells you. You grip the sheets tightly as you do what she says.' 
+		'You feel her start slowly pushing, and the pressure builds until the tip of the dildo suddenly pops into your ass, causing you to groan and grit your teeth while gripping the sheets even tighter. It''s a painful sensation, and you instinctively feel the urge to free yourself. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks as you feel a stinging pain shooting through you.'
+		'Remembering what she said, you fight the urge to pull away and try to relax. "No, I just need a second," you reply as you look back at her, and she nods.'
 		*nl
-		'After taking a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the already slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
-		'You nod and prepare yourself as you feel Albina start slowly pushing the dildo deeper into your ass. You feel yourself being stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
-		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes and you ask her to pull out. You sit up on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
+		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just keep your ass relaxed and tell me if it gets too painful. I don''t want you hurting yourself trying to impress me. Got it?"'
+		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass. You feel stretched out as she reaches a depth she feels you''ll be comfortable with and starts gently thrusting.'
+		'Despite the shallow depth and Albina being gentle, the pain becomes too much after a few minutes, and you ask her to pull out. You sit on your knees and clutch your ass cheeks in your hands as pain pulses through your stretched asshole.'
 		'"You lasted longer than I thought you would. Not bad for your first go, <<$pcs_nickname>>," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
 		*nl
-		'You slowly get dressed as the stinging pain continues to pulse through your ass. Albina watches with an amused grin. "Don''t worry, it gets less painful the more you do it."'
-		'"You would know," you reply with a smirk and she laughs.'
+		'As the stinging pain continues to pulse through your ass, you slowly get dressed. Albina watches with an amused grin. "Don''t worry. It gets less painful the more you do it."'
+		'"You would know," you reply with a smirk, and she laughs.'
 		gs 'arousal', 'anal_strap', 10, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -778,22 +778,22 @@ if $ARGS[0] = 'first_anal1':
 	lesbian += 1
 	gs 'boyStat', 'D3'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
-	'"Yes, I would," you reply and Albina smiles.'
-	'"Okay, get on all fours and bring your ass up as high as you can."'
-	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole and Albina starts massaging it in before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
+	'"Yes, I would," you reply, and Albina smiles.'
+	'"Okay, get on all fours and bring your ass up as high as possible."'
+	'As you get on all fours, you glance back and see her squirting lube onto her fingers. You shiver when you feel the cold liquid being applied to your asshole. Albina starts massaging it before you feel her slowly pushing a finger inside you. You moan softly at the sensation as you feel her finger curling up inside you.'
 	'After spending a few minutes fingering you, she pulls her finger out. "Okay, that should be enough. Are you sure you want to do this, <<$pcs_nickname>>? Just because I''m a buttslut doesn''t mean you have to be one too."'
-	'You stare at the dildo hanging between her legs, but steel yourself and nod. "Yes, I want to do this."'
+	'You stare at the dildo hanging between her legs but steel yourself and nod. "Yes, I want to do this."'
 	gs 'arousal', 'anal_finger', 5, 'lesbian'
 	gs 'stat'
 
 	act 'Get your ass fucked':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/anal1.jpg"></center>'
-		'Your heart is racing even though you know what to expect. Albina presses the tip of the dildo against your asshole and you feel the familiar sensation of the pressure building as she pushes forward until the tip of the dildo suddenly pops into your ass, causing you to groan. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks.'
+		'Your heart is racing even though you know what to expect. Albina presses the tip of the dildo against your asshole, and you feel the familiar sensation of the pressure building as she pushes forward until the dildo suddenly pops into your ass, causing you to groan. "You okay, <<$pcs_nickname>>? I can take it out if you want?" Albina asks.'
 		*nl
-		'After taking a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the already slick dildo before placing her hands on your hips. "Okay, just tell me if it gets too painful for you."'
-		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass and starts thrusting.'
-		'Having had your ass penetrated before, Albina goes a little faster and deeper than you think she normally would have. However, the sensation of actually being buttfucked is still new to you and you soon ask her to stop when it becomes too much.'
+		'After a few seconds to adjust to the sensation, you nod at Albina. She squirts more lube onto the slick dildo before placing her hands on your hips. "Okay, just tell me if it gets too painful for you."'
+		'You nod and prepare yourself as you feel Albina slowly push the dildo deeper into your ass and start thrusting.'
+		'Having had your ass penetrated before, Albina goes faster and deeper than you think she usually would have. However, the sensation of being buttfucked is still new to you, and you soon ask her to stop when it becomes too much.'
 		*nl
 		'"Not bad for your first go, <<$pcs_nickname>>. I bet the prior ''practice'' helped," Albina says as she hands you some wipes to clean yourself up. "Next time you lose, maybe we can go deeper and... harder," she adds with a teasing grin as she cleans the dildo and puts it away.'
 		'You slowly get dressed as Albina watches with an amused grin. "It feels great, doesn''t it? It gets better the more you do it."'
@@ -812,9 +812,9 @@ if ARGS[0] = 'anal_refuse':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/albinaroom.jpg"></center>'
 	'You shake your head. "No, I don''t think I''m ready for that yet."'
-	'Albina smiles. "That''s okay, but if you do want to do it with me or just want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
+	'Albina smiles. "That''s okay, but if you want to do it with me or want some advice, then just ask. It''s best to get help from someone with... experience on the matter," she says with a grin.'
 	'You grin back. "I''ll be sure to ask the master buttslut for any of her wisdom."'
-	'She punches you on the arm. "Damn right you will."'
+	'She punches you in the arm. "Damn right, you will."'
 	act 'Do something else' :gt 'albinahome', 'bedroom'
 end
 
@@ -826,17 +826,17 @@ if $ARGS[0] = 'strapon_finish':
 	gs 'stat'
 	if rand(0,3) = 0:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes and she looks at it before frowning in disappointment. "Sorry, but I need to go <<$pcs_nickname>>. I''ll see later?"'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she gives you a sly smile and moves into position to start scissoring you. Before she can, her phone buzzes, and she looks at it before frowning in disappointment. "Sorry, but I need to go, <<$pcs_nickname>>. I''ll see you later?"'
 		'You nod in understanding. "Sure, not a problem. I had fun."'
-		'You share a final kiss with each other before you both quickly get dressed. She wipes the dildo clean and shoves it back in the drawer before ushering you out of her room. She walks with you into town before leaving you to attend to her business.'
+		'You finally kiss each other before you both quickly get dressed. She wipes the dildo clean and shoves it back in the drawer before ushering you out of her room. She walks with you into town before leaving you to attend to her business.'
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Finish':gt 'pav_residential'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/sex/game/aftermath.jpg"></center>'
-		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she collapses next to you and you both just lie naked on her bed in silence. She eventually gets up and cleans the dildo before shoving it back in the drawer and getting dressed.'
-		'You get dressed yourself and when you finish, she smiles at you. "Okay, what do you want to do now?" she asks.'
+		'Albina pushes you down onto the bed and climbs on top of you. You spend the next few minutes passionately making out while fondling each other before she collapses next to you, and you both just lie naked on her bed in silence. She eventually gets up and cleans the dildo before shoving it back in the drawer and getting dressed.'
+		'You get dressed, and when you finish, she smiles at you. "Okay, what do you want to do now?" she asks.'
 		gs 'arousal', 'foreplay', 5, 'lesbian'
 		gs 'arousal', 'end'
 		gs 'stat'

+ 16 - 16
locations/alexandriaSex.qsrc

@@ -6,6 +6,7 @@ $location_type = 'indoors'
 
 if $ARGS[0] = 'nice1':
 	*clr & cla
+	$orgasm_or = 'no'
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N1.jpg"></center>'
@@ -18,7 +19,7 @@ if $ARGS[0] = 'nice1':
 
 	act '"Your turn Aleksei"':
 		*clr & cla
-		gs 'arousal', 'clit_finger', 5
+		gs 'arousal', 'clit_finger', 5, 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N2.jpg"></center>'
 		'He only answers with a raised eyebrow and an amused half-smile before taking your dominant hand towards his lips, lightly kissing your fingers.'
@@ -29,8 +30,9 @@ if $ARGS[0] = 'nice1':
 
 		act '"Stop teasing me!"':
 			*clr & cla
-			gs 'arousal', 'foreplay', 5
-			gs 'arousal', 'cuni', 5
+			gs 'arousal', 'foreplay', 5, 'lesbian'
+			$orgasm_or = 'yes'
+			gs 'arousal', 'cuni', 5, 'lesbian', 'no_orgasm_msg'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N3.jpg"></center>'
 			'When you try to play with your trapped cunt, he slaps your hand and forcefully takes it away.'
@@ -53,7 +55,7 @@ if $ARGS[0] = 'nice1':
 
                 act 'It''s his turn':
 					*clr & cla
-					gs 'arousal', 'cuni_give', 10
+					gs 'arousal', 'cuni_give', 10, 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/N5.jpg"></center>'
@@ -74,8 +76,6 @@ if $ARGS[0] = 'nice1':
 						pcs_sweat = 0
 						pcs_breath = 1
 						girl += 1
-						lesbian += 1
-						orgasm += 1
 						if succubusflag = 1:
 							scfeed = succublvl + rand(1,4)
 							sexnutrition += 100 * scfeed
@@ -103,8 +103,9 @@ end
 
 if $ARGS[0] = 'grumpy1':
 	*clr & cla
-	gs 'arousal', 'massage', 5, 'sub'
-	gs 'arousal', 'BDSM', 5, 'sub'
+	$orgasm_or 'no'
+	gs 'arousal', 'massage', 5, 'sub', 'lesbian'
+	gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G1.jpg"></center>'
 	'You find yourself tied in bondage gear with a ball gag in your mouth kneeling in the center of a bare-bones room, looking directly at assorted tools that you can barely recognize. Some are piercing equipment that are used for body modification, others seem surgical and the rest look like they were taken from a toolbox.'
@@ -116,8 +117,8 @@ if $ARGS[0] = 'grumpy1':
 
 	act 'He slaps you':
 		*clr & cla
-		gs 'arousal', 'massage', 5, 'sub'
-		gs 'arousal', 'BDSM', 5, 'sub'
+		gs 'arousal', 'massage', 5, 'sub', 'lesbian'
+		gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G2.jpg"></center>'
 		'You are quivering under Aleksei ministrations when the strike comes. He smacks your exposed breasts several times, turning your gagged moans into silent screams. When you instinctively try to get away from him, one of his hands darts towards your hair, locking you painfully in position.'
@@ -128,8 +129,9 @@ if $ARGS[0] = 'grumpy1':
 
 		act 'The torture continues':
 			*clr & cla
-			gs 'arousal', 'vaginal_finger', 5, 'sub'
-			gs 'arousal', 'BDSM', 5, 'sub'
+			gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
+			$orgasm_or 'yes'
+			gs 'arousal', 'vaginal_finger', 5, 'sub', 'lesbian', 'no_orgasm_msg'
 			'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G3.jpg"></center>'
 			'Finally, after who knows how long, Aleksei breaks away from you and stands up, looking down at you with a critical eye as he drags slowly on a cigarette, the silence eternalizing as you kneel before him.'
 			'"You have done well, my new pet."'
@@ -153,8 +155,8 @@ if $ARGS[0] = 'grumpy1':
 
                 act 'It''s his turn':
 					*clr & cla
-					gs 'arousal', 'cuni_give', 10, 'sub'
-					gs 'arousal', 'BDSM', 5, 'sub'
+					gs 'arousal', 'BDSM', 5, 'sub', 'lesbian'
+					gs 'arousal', 'cuni_give', 10, 'sub', 'lesbian'
 					gs 'arousal', 'end'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/alexandria/sex/G5.jpg"></center>'
@@ -180,8 +182,6 @@ if $ARGS[0] = 'grumpy1':
 						pain['wrists'] +=5
 						pain['ankles'] +=5
 						girl += 1
-						lesbian += 1
-						orgasm += 1
 						if succubusflag = 1:
 							scfeed = succublvl + rand(1,4)
 							sexnutrition += 50 * scfeed

+ 2 - 2
locations/anush_bedroom.qsrc

@@ -78,7 +78,7 @@ if $ARGS[0] = 'the_pretty_reckless':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/anushroom/the_pretty_reckless_poster.jpg"></center>'
-	'You look over the bands'' posters; most posters are of bands with a few models, and the only band with more than one poster is The Pretty Reckless. The poster that seems to be most prominently displayed in her room is one of the lead singers for The Pretty Reckless, lying naked on a stone coffin. The poster right next to it is, similar one but without the band name and the <a href="exec:gt ''anush_bedroom'',''taylor_momsen''">Taylor''s</a> breasts on full display.'
+	'You look over the bands'' posters; most posters are of bands with a few models, and the only band with more than one poster is The Pretty Reckless. The poster that seems to be most prominently displayed in her room is one of the lead singers for The Pretty Reckless, lying naked on a stone coffin. The poster right next to it is, similar one but without the band name and <a href="exec:gt ''anush_bedroom'',''taylor_momsen''">Taylor''s</a> breasts on full display.'
 	act 'Find something else to look at':gt 'anush_bedroom','anushroom'
 end
 
@@ -530,7 +530,7 @@ if $ARGS[0] = 'computer':
 						else
 							'You lean back in the chair and spread your legs wider apart as you feel your climax approaching. You turn and bury your mouth into your shoulder to keep from screaming as your orgasm rocks your body. It takes you a few moments to recover once it''s over. You straighten everything up and wonder what you can do next to kill some time.'
 							$orgasm_or = 'yes'
-							gs 'arousal', 'clit_finger', 'masturbate', 10
+							gs 'arousal', 'clit_finger', 10, 'masturbate'
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Find something else to do':gt 'anush_bedroom','anushroom'

+ 4 - 4
locations/anushkachat.qsrc

@@ -618,7 +618,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					act 'Maybe':
 						*clr & cla
 						minut += 5
-						anushkaQW['fedor_3some']
+						anushkaQW['fedor_3some'] = 1
 						npc_rel['A144'] += 1
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					act 'I will ask him':
 						*clr & cla
 						minut += 5
-						anushkaQW['fedor_3some']
+						anushkaQW['fedor_3some'] = 1
 						npc_rel['A144'] += 1
 						'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
@@ -698,7 +698,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					*clr & cla
 					minut += 5
 					npc_rel['A144'] += 1
-					artemQW['nush3some_ask'] += 1
+					artemQW['nush3some_ask'] = 1
 					gs 'stat'
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'
@@ -713,7 +713,7 @@ if $ARGS[0] = 'boyfriend_chat':
 					*clr & cla
 					minut += 5
 					npc_rel['A144'] += 1
-					artemQW['nush3some_ask'] += 1
+					artemQW['nush3some_ask'] = 1
 					gs 'stat'
 					'<center><h4><font color="maroon">Anushka''s Room</font></h4></center>'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/bedroom/bedroomtalk.jpg"></center>'

+ 22 - 19
locations/arousal.qsrc

@@ -68,6 +68,7 @@ $orgasm_or = 'custom' to force orgasm and use custom text set as $orgasm_txt - *
 $orgasm_or = 'yes' and 'custom' require that the first arousal call is a call that can trigger an orgasm, the following arousal calls can trigger it: clit_finger, clit_vibe, cuni, rimming, trib, anal, anal_finger, anal_fist, anal_dildo, anal_strap, anal_vibe, vaginal, vaginal_finger, vaginal_fist, vaginal_dildo, vaginal_strap, vaginal_vibe, self_fisting and self_fisting_anal.
 $orgasm_or = 'no' to prevent orgasm, it will remain in place until manually changed, or if end is called.
 $orgasm_txt is used to add custom text that will be called if Sveta orgasms in the next arousal call. It will remain until cleared or orgasm so you must clear it if not forcing orgasm and don''t want it to be used on next orgasm.
+You can also add 'no_orgasm_msg' to the list of themes to prevent any orgasm message from being shown
 }
  
 !!------------------------------------Virginity checks----------------------------------
@@ -187,10 +188,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['rimming'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 2
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 4
 			stim['act'] = 80
 		end
@@ -207,9 +208,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		else
 			count['anal'] = 1
 		end
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 3
 		end
 		if pcs_ass < temp_dick:pcs_ass += 1
@@ -242,10 +243,10 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['anal_finger'] = 1
 		stim['act'] = 40
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
 			stim['act'] = 60
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 			stim['act'] = 80
 		end
@@ -253,9 +254,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['anal_fist'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
 		if pcs_ass + anal_slip < 30:
@@ -267,9 +268,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		orgasm_flag['anal'] = 1
 		count['self_fisting_anal'] = 1
 		stim['act'] = 30
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] = 50
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['act'] = 70
 		end
 		if pcs_ass + anal_slip < 30:
@@ -291,9 +292,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] += 10
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 		end
 		if agrdif < 0: agrdif = 0
@@ -315,9 +316,9 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		if agrdif > anal_slip: agrdif = agrdif - anal_slip else if agrdif > 0: agrdif = 0
 		if -agrdif > anal_slip: agrdif = agrdif + anal_slip else if agrdif < 0: agrdif = 0
 		stim['act'] = 80 - (iif(altdif>0,altdif,-altdif) + iif(agrdif >0,agrdif,-agrdif)) + temp_silavag*8
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['act'] += 10
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 1
 		end
 		if agrdif < 0: agrdif = 0
@@ -330,16 +331,16 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 		count['anal_vibe'] = 1
 		stim['mag'] += 1
 		stim['act'] = 60
-		if traits['buttslut_lvl'] = 1:
+		if pcs_traits['buttslut_lvl'] = 1:
 			stim['mag'] += 1
 			stim['act'] = 70
-		elseif traits['buttslut_lvl'] >= 2:
+		elseif pcs_traits['buttslut_lvl'] >= 2:
 			stim['mag'] += 2
 			stim['act'] = 90
 		end
 	elseif $ARGS[0] = 'vaginal':
+		
 		orgasm_flag['vaginal'] = 1
-
 		!! pre-cum check
 		if rand(0,120) < ARGS[1]: cumprecheck = 1 & gs 'cum_manage'
 		
@@ -551,7 +552,7 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 
 	!! anal acts
 	if (mid($ARGS[0],1,4) = 'anal' and mid($ARGS[0],len($ARGS[0])-3,len($ARGS[0])) ! 'give') or $ARGS[0] = 'rimming':
-		if traits['buttslut_lvl'] = 3:
+		if pcs_traits['buttslut_lvl'] = 3:
 			stim['act'] += 20
 		end
 	end
@@ -704,7 +705,8 @@ if $ARGS[0] ! 'end' and $ARGS[0] ! 'checks' and $ARGS[0] ! 'count' and $ARGS[0]
 				stim['kink'] += rape['exp']
 				stim['pref'] += rape['pref']
 				stim['kinkno'] += 1
-				rape['day'] = daystart
+				!! used to track if Sveta has been raped for reactions with mum and Luda
+				rape[1] = daystart
 				if temp_unaware = 1:
 					stim['hidden_rape'] = 1
 				else
@@ -840,6 +842,7 @@ if $ARGS[0] = 'end':
 	if stim['hidden_futa'] = 1: hidden_futa += 1
 	if stim['prostitution'] = 1: slutty += 1
 	if stim['hidden_prostitution'] = 1: hidden_slutty += 1
+	if stim['masturbate'] = 1: stat['mast'] += 1
 	
 	killvar 'anal_slip'
 	killvar 'ar_anal_lube'

+ 149 - 141
locations/artem_date_events.qsrc

@@ -23,54 +23,54 @@ if $ARGS[0] = 'firstdate':
 	npc_rel['A2'] += 1
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
-	'You enjoy a pleasant walk in the park, sharing all kinds of small talks with Artem.'
-	'After a while you end up near the movie theater. When Artem sees it, he suggests: "Hey, let''s go see a movie!"'
+	'You enjoy a pleasant walk in the park while making small talk with Artem.'
+	'After a while, you end up near the movie theater. Artem''s eyes light up when he sees it. "Hey, let''s go see a movie!"'
 	minut += 15
 	gs 'stat'
-	act 'A movie sounds like fun!':
+	act 'Sounds like fun':
 		*clr & cla
 		npc_rel['A2'] += 1
 		minut += 120
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/cinema/kino_<<rand(1,3)>>.jpg"></center>'
-		'You enter the movie theater with Artem. After he buys tickets for the both of you, he buys some popcorn, candy and soda for the both of you. After he pays for the items the two of you head into the dark theater and you find some nice seats in the back row and watch the movie.'
+		'You enter the movie theater with Artem. After he buys the tickets and some popcorn, candy and soda for the two of you, you head into the dark theater and find some seats in the back row to watch the movie.'
 		act 'Leave the theater':
 			*clr & cla
 			minut += 10
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
 			if rand(1,5) = 1 and hour >= 20:
-				'When the movie ends, you and Artem leave the theater and he offers to walk you home. The two of you head back through the park as you walk. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from where you are, they are obviously already a bit drunk.'
+				'When the movie ends, you and Artem leave the theater and he offers to walk you home. The two of you head back through the park, but see a group of older gopniks hanging out around a bench just up ahead. They''re drinking and are a little rowdy.'
 				act 'Just walk past them': gt 'artem_date_events','artemGopSkver'
 			else
-				'When the movie ends, you and Artem leave the theater and he offers to walk you home. The two of you head back through the park as you walk.'
-				'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
-				'You smile to him. "I had fun too, Artem."'
-				'His smiles widely. "Great, I''m glad you had fun, maybe we can do it again some time?"'
-				'You nod a bit. "Sure, maybe. We''ll see."'
-				'He smiles and nods. "Ok. Well, I better get home. Talk to you later."'
-				'"Bye Artem, I had a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
+				'When the movie ends, you and Artem leave the theater and he offers to walk you home.'
+				'Arriving outside your apartment door, Artem stops and looks at you. "I had fun, <<$pcs_nickname>>."'
+				'You smile at him. "Me too."'
+				'He smiles widely. "Great! Maybe we can do it again some time?"'
+				'You nod. "Maybe. We''ll see."'
+				'He smiles and nods. "Okay, I better get home. Talk to you later."'
+				'"Bye Artem," you reply and he walks back down the stairs to his apartment.'
 				act 'Go home': gt 'pod_ezd', 'etaj_2'
 			end
 		end
 	end
-	act 'Let''s just keep walking':
+	act 'Just keep walking':
 		*clr & cla
 		minut += 30
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
-		'You don''t really feel like going the cinema, and tell him: "Nah, let''s just enjoy the walk we''re on."'
+		'You don''t really feel like going to the cinema. "Let''s just enjoy the walk we''re on."'
 		if rand(1,5) = 1 and hour >= 20:
-			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for awhile, you see a group of older gopniks hanging out around a bench just ahead. They are drinking and you can hear them from here, they are obviously already a bit drunk.'
+			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After walking for a while, you see a group of older gopniks hanging out around a bench just up ahead. They''re drinking and are a little rowdy.'
 			act 'Just walk past them': gt 'artem_date_events','artemGopSkver'
 		else
-			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After the two of you walk for a while talking, he checks his watch and says, "We should be getting back, I will walk you to your door."'
-			'Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>."'
-			'You smile at him. "I had fun too Artem."'
-			'His smiles widely. "Great, I''m glad you had fun, maybe we can do it again some time."'
-			'You nod a bit. "Sure, maybe. We''ll see."'
-			'He smiles and nods. "Ok well I better get home, talk to you later."'
-			'"Bye Artem, I had a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
+			'Artem is happy enough to just spend time with you, regardless of what the two of you are doing. He nods as you continue on your walk, talking about everyday things. After a while, he checks his watch. "We should be getting back. I''ll walk you to your door."'
+			'Once you''re outside your apartment door, Artem stops and looks at you. "I had fun, <<$pcs_nickname>>."'
+			'You smile at him. "Me too."'
+			'He smiles widely. "Great! Maybe we can do it again some time?"'
+			'You nod. "Maybe. We''ll see."'
+			'He smiles and nods. "Okay, I better get home. Talk to you later."'
+			'"Bye Artem," you reply and he walks back down the stairs to his apartment.'
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
 	end
@@ -106,44 +106,47 @@ if $ARGS[0] = 'artemGopSkver':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop.jpg"></center>'
 	if grupTipe = 4:
-		'Just as you are about to make it past them, several of the gopniks get in your way, they make somewhat of a circle around you and Artem. You have seen them around before but you don''t really know them.'
-		'Somehow, one of them knows your name. They look at you with disdain and the leader of their group says: "<<$pcs_nickname>>? What are you doing with this bitch?"'
+		'Just as you''re about to make it past them, several of the gopniks get in your way, making a circle around you. You''ve seen them around before, but don''t really know them.'
+		'Somehow, one of them knows your name. They look at you with disdain and the leader of their group says "<<$pcs_nickname>>? What are you doing with this bitch?"'
 		act 'Tell them to mind their own business':
 			*clr & cla
 			minut += 15
 			grupvalue[4] += 1
 			npc_rel['A2'] += 1
 			'<center><img <<$set_imgh>> src="images/pc/reactions/fuckoff1.jpg"></center>'
-			'You give them a look of disdain showing you are not impressed. "Mind your own fucking business." Artem tenses up besides you obviously afraid of what they might do after you said that.'
-			'The leader of this little group laughs. "Come on, don''t be like that, dump this loser and have some fun with us, girly."'
-			'You push your way past him and as you get clear of them you flip them the bird. Fortunately they leave you alone, other than a few taunting calls directed at you and Artem. Once you make it further away from them, Artem relaxes a little. Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks, I can''t believe you said that."'
-			'You smile to him. "They respect strength and attitude, don''t take their shit and they will respect you for it, just be willing to back it up if you have to. Anyways I had fun as well Artem."'
-			'His smiles widely. "Great, I''m glad you had fun, maybe we can do it again some time?"'
-			'You nod a bit. "Sure, maybe. We''ll see."'
-			'He smiles and nods. "Ok, well. I better get home, talk to you later."'
-			'"Bye Artem, I had a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
+			'You give them a look of disdain showing you''re not impressed. "Mind your own fucking business," you reply and Artem tenses up beside you.'
+			'The leader laughs. "Come on, don''t be like that. Dump this loser and have some fun with us, girl."'
+			'You push your way past him and flip them the bird. Fortunately, other than throwing a few taunting remarks at you, they leave you alone. Once you make it away from them, Artem relaxes a little and walks you home.' 
+			*nl
+			'Arriving at your apartment, Artem smiles. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks. I can''t believe you said that!"'
+			'You smile back at him. "They respect strength and attitude. Don''t take their shit and they will respect you for it, just be willing to back it up if you have to. Anyway, I had fun too."'
+			'He smiles widely. "Great! I''m glad you had fun, maybe we can do it again some time?"'
+			'You nod. "Maybe. We''ll see."'
+			'He smiles and nods. "Okay, I better get home. Talk to you later."'
+			'"Bye Artem," you reply and he walks back down the stairs to his apartment.'
 			act 'Go home': gt 'pod_ezd', 'etaj_2'
 		end
 	else
-		'Just as you are about to make it past them several of the gopniks get in your way, they make somewhat of a circle around you and Artem. They don''t look familiar to you.'
-		'Somehow, one of them knows your name. They look at you with disdain and the leader of their group says: "<<$pcs_nickname>>? What are you doing with this bitch?"'
+		'Just as you''re about to make it past them, several of the gopniks get in your way, making a circle around you and Artem.'
+		'You don''t recognize them, yet one of them knows your name. They look at you with disdain and the leader of their group says "<<$pcs_nickname>>? What are you doing with this bitch?"'
 		act 'Ignore them and keep walking':
 			*clr & cla
 			gopniktrouble = rand(1,2)
 			if gopniktrouble = 1:
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop.jpg"></center>'
-				'The leader steps directly in front of Artem and the others close in giving you nowhere to go to without running into them. The leader speaks to Artem. "This is our part of the park, you owe us a toll for using it, give us all your money you have, and your girl can pass, bitch."'
-				'You can tell Artem is scared and will likely do what they ask. But you don''t want him to lose all his money, though if you say something, it could make things worse.'
+				'The leader steps directly in front of Artem and the others close in, giving you nowhere to go as the leader speaks to Artem. "This is our part of the park and you owe us a toll for using it. Pay it and your girl can pass, bitch."'
+				'You can tell Artem is scared and will likely do what they ask. You don''t want him to lose all his money, but saying something could make things worse.'
 				act 'Say nothing':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop.jpg"></center>'
-					'Artem glances at you, then reaches into his pocket and pulls out his wallet. The leader snatches it away and pulls out all the money and throws the empty wallet back at Artems face. "God, what a bitch. Come on guys drinks are on this bitch." He says with a laugh and then they all walk off. Artem blushes and picks up his wallet before he walks you back to your apartment. He doesn''t say anything until you reach your door. Once you are just outside your apartment door, he stops and looks at you. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks."'
-					'You smile at him. "Yeah it was a little scary, sorry they took all your money. Anyways, I had fun as well Artem."'
+					'Artem glances at you, then reaches into his pocket and pulls out his wallet. The leader snatches it away and pulls out all the money before throwing the empty wallet back at Artem''s face. "God, what a bitch. Come on guys, drinks are on this loser!" he says with a laugh and they all walk away. Artem blushes and picks up his wallet before he walks you back to your apartment. He doesn''t say anything until you reach your door.'
+					'"I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks."'
+					'You smile at him. "Yeah, it was a little scary. Sorry they took all your money, but I had fun too."'
 					*nl
-					'His smiles and says, "Don''t worry about it, I keep most of my money in the bank, so they didn''t get much. I''m glad you had fun though, maybe we can do it again some time."'
-					'You nod a bit. "Sure maybe, we''ll see."'
-					'He smiles and nods. "Ok well I better get home, talk to you later."'
-					'"Bye Artem, I had a wonderful time." You tell him, and with that he walks back down the stairs to the first floor and presumably his apartment.'
+					'He smiles. "Don''t worry about it. I keep most of my money in the bank, so they didn''t get much. I''m glad you had fun though. Maybe we can do it again some time?"'
+					'You nod. "Maybe. We''ll see."'
+					'He smiles and nods. "Okay, I better get home. Talk to you later."'
+					'"Bye Artem," you reply and he walks back down the stairs to his apartment.'
 					act 'Go home': gt 'pod_ezd', 'etaj_2'
 				end
 				gs 'willpower', 'misc', 'self', 'hard'
@@ -157,12 +160,13 @@ if $ARGS[0] = 'artemGopSkver':
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
-				'You hold Artem''s hand tightly and pick up the pace, pretending you didn''t hear the Gopniks as you quickly walk away from them. Fortunately they leave you alone, other than a few taunting calls directed at you and Artem. Once you make it further away from them Artem relaxes a little. Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks."'
-				'You smile to him. "Yeah it was a little scary. Anyways I had fun as well Artem."'
-				'His smiles widely. "Great, I''m glad you had fun, maybe we can do it again some time."'
-				'You nod a bit. "Sure maybe, we''ll see."'
-				'He smiles and nods. "Ok well I better get home, talk to you later."'
-				'"Bye Artem, I have a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
+				'You hold Artem''s hand tightly and pick up the pace, pretending you didn''t hear the gopniks as you quickly walk away from them. Fortunately, other throwing a few taunting remarks at you, they leave you alone. Once you make it away from them, Artem relaxes a little and walks you home.'
+				'Arriving at your apartment, Artem smiles. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks."'
+				'You smile back at him. "Yeah, it was a little scary. I had fun too though."'
+				'He smiles widely. "Great! Maybe we can do it again some time?"'
+				'You nod. "Maybe. We''ll see."'
+				'He smiles and nods. "Okay, I better get home. Talk to you later."'
+				'"Bye Artem," you reply and he walks back down the stairs to his apartment.'
 				act 'Go home': gt 'pod_ezd', 'etaj_2'
 			end
 		end
@@ -177,12 +181,12 @@ if $ARGS[0] = 'artemGopSkver':
 		act 'Stand up to them (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 end
-			
+
 if $ARGS[0] = 'stand_up':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop.jpg"></center>'
-	'You indignantly reply: "He''s not a bitch, Artem is my friend!"'
-	'The Gopnik walks up to Artem, and pokes him in the chest with his finger. He asks: "Oh really...? What do you think, bitch? Are you a bitch or what?"'
+	'"He''s not a bitch! Artem is my friend!" you indignantly reply'
+	'The gopnik walks up to Artem and pokes him in the chest. "Oh really?" he asks. "What do you think, bitch? Are you a bitch or what?"'
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
 		act 'Get between them (<<will_cost>> Willpower)':
@@ -193,21 +197,22 @@ if $ARGS[0] = 'stand_up':
 			npc_rel['A2'] += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_knee.jpg"></center>'
-			'You quickly get in-between Artem and the Gopnik, shielding him with your body. You threaten them: Don''t touch him! I''ll call the police!"'
-			'The Gopnik is not impressed. He pulls out a knife and puts it against your throat: "Why are you wasting your time with this loser, <<$pcs_nickname>>?"'
+			'You quickly get inbetween Artem and the gopnik, shielding him with your body. "Don''t touch him or I''ll call the police!" you say in your most threatening manner.'
+			'The gopnik isn''t impressed. He pulls out a knife and puts it against your throat. "Why are you wasting your time with this loser, <<$pcs_nickname>>?"'
 			'You can see his friends slowly encroaching around you. There''s no way you can run away now.'
-			'You look into his eyes and sigh: "Come on... just let us leave. Please? You can take my money."'
-			'The Gopnik is satisfied with that prospect, and lowers the knife. After you give him all your money, he lets you and Artem leave. You feel bad for getting robbed like that, but you still feel you did the right thing. Who knows what they would''ve done to Artem, if you didn''t get involved!'
+			'You look into his eyes and sigh. "Come on, just let us leave. Please? You can take my money."'
+			'The gopnik is satisfied with that prospect, and lowers the knife. After you give him all your money, he lets you and Artem leave. You feel bad for getting robbed like that, but you still feel you did the right thing. Who knows what they would''ve done to Artem if you didn''t get involved?'
 			act 'Go home':
 				*clr & cla
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/locations/shared/park/walk_<<rand(1,2)>>.jpg"></center>'
-				'Once you make it further away from them Artem relaxes a little. Artem walks you back to your apartment door. Once you are just outside your apartment door he stops and looks at you. "I had fun <<$pcs_nickname>>, you know, other than when we ran into those gopniks."'
-				'You smile to him. "Yeah it was a little scary. Anyways I had fun as well Artem."'
-				'His smiles widely. "Great, I''m glad you had fun, maybe we can do it again some time."'
-				'You nod a bit. "Sure maybe, we''ll see."'
-				'He smiles and nods. "Ok, well. I better get home, talk to you later."'
-				'"Bye Artem, I had a wonderful time." You tell him and with that he walks back down the stairs to the first floor and presumably his apartment.'
+				'Once you make it away from them, Artem relaxes a little. Artem walks you back home.' 
+				'Arriving at your apartment, Artem smiles. "I had fun <<$pcs_nickname>>, you know other than when we ran into those gopniks."'
+				'You smile back at him. "Yeah, it was a little scary, but I had fun too."'
+				'He smiles widely. "Great! Maybe we can do it again some time?"'
+				'You nod. "Maybe. We''ll see."'
+				'He smiles and nods. "Okay, I better get home. Talk to you later."'
+				'"Bye Artem," you reply and he walks back down the stairs to his apartment.'
 				act 'Go home': gt 'pod_ezd', 'etaj_2'
 			end
 		end
@@ -217,12 +222,11 @@ if $ARGS[0] = 'stand_up':
 	act 'Watch in silence':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar.jpg"></center>'
-		'"I''m not a bitch", Artem says quietly.'
-		'The Gopnik grins: "We''ll see about that!"'
-		'He hits Artem hard in the stomach. Artem buckles over and falls to his knees. The Gopnik and his friends laugh while Artem lies groaning on the ground.'
-		'He turns to you: "Everyone can see he''s a bitch, <<$pcs_nickname>>. What do you even see him him? Seriously..."'
-		'Then he continues, with an evil smirk on his face: "So... you really like him? Enough to help him out of this mess he talked himself into? There is one thing you could do..."'
-		'The other Gopniks are all laughing when their leader suggests: "Do a striptease! If it''s a good one, we''ll leave him alone. Someone, play some music."'
+		'"I''m not a bitch...", Artem says quietly.'
+		'The gopnik grins. "We''ll see about that!"'
+		'He hits Artem hard in the stomach, causing him to buckle over and fall to his knees. The gopnik and his friends laugh while Artem lies groaning on the ground.'
+		'He then turns to you. "Everyone can see he''s a bitch, <<$pcs_nickname>>. What do you even see him him? Seriously..." An evil smirk then appears on his face. "So... you really like him? Enough to help him out of this mess he talked himself into?"'
+		'He places a hand on your shoulder. "There is something you can do... A striptease! If it''s a good one, we''ll leave him alone. Someone play some music." The other gopniks all laugh.'
 		minut += 5
 		gs 'stat'
 		gs 'willpower', 'humiliation', 'resist', 'hard'
@@ -232,12 +236,12 @@ if $ARGS[0] = 'stand_up':
 				*clr & cla
 				npc_rel['A2'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop_udar2.jpg"></center>'
-				'Wait, what!?'
-				'You answer: "No way, you perverts! Just leave us alone!"'
-				'The Gopnik walks back over to Artem and kicks him in the face. A few seconds later, one of his friends also kicks Artem in the back, soon they all join in kicking him. You can''t take it anymore and quickly throw yourself on top of Artem, so they can''t kick him any more.'
-				'The Gopnik looks down at the two of you, and spits on the ground. He sighs: "Whatever..."'
-				'The Gopniks leave you alone and go deeper into the park, probably to go drink some beer or something. You help Artem up on his feet, carefully.'
-				'Artem wipes the blood from his face, deeply embarrassed that you had to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. He thanks you but asks you to go. Not sure what to say you do as he asks and leave.'
+				'"Wait, what!?" you answer. "No way, you perverts! Just leave us alone!"'
+				'The gopnik walks back over to Artem and kicks him in the face. A few seconds later, one of his friends also kicks Artem in the back and they''re all soon kicking him. You can''t take it anymore and quickly throw yourself on top of Artem so they can''t continue.'
+				'The gopnik looks down at the two of you and spits on the ground. "Fucking bitch needs his girl to save him. What a loser!"'
+				'The gopniks leave you alone and go deeper into the park as you carefully help Artem to his feet.'
+				'He wipes the blood from his face, deeply embarrassed that you had to see him like this. You walk in silence as you help him get home.'
+				'"Thanks <<$pcs_nickname>>, but you can go now." Not sure what to say, you do as he asks and leave.'
 				minut += 5
 				gs 'stat'
 				act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -249,13 +253,11 @@ if $ARGS[0] = 'stand_up':
 			*clr & cla
 			inhib_exp += rand(0,1)
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/strip1.jpg"></center>'
-			'Well, if that''s what you have to do to get out of here...'
-			'You begin to dance to the music a bit awkwardly, and immediately get boo''d.'
-			'The Gopnik threatens: "We said striptease, <<$pcs_nickname>>! Not dance!"'
-			'You nod and slowly begin to undress to the music, trying to avoid their greedy looks.'
-			'Artem noticed their looks as well and shouts: "<<$pcs_nickname>>, stop! You don''t have to do this!"'
-			'The Gopnik kicks him in the ribs and tells him: "Shut up, bitch! She''s saving your ass, show some respect."'
-			'Artem is too afraid to argue with them, and you awkwardly remove your top showing off your breasts which finally gets them hooting, hollering, and laughing instead of booing.'
+			'You start awkwardly dancing to the music and are immediately chastised. "We said striptease, <<$pcs_nickname>>! Not dance!"'
+			'You nod and slowly start slowly undressing to the music while trying to avoid their greedy looks.'
+			'Artem notices what''s happening. "<<$pcs_nickname>>, stop! You don''t have to do this!"'
+			'The gopnik kicks him in the ribs. "Shut up, bitch! She''s saving your ass, so show some respect!"'
+			'Artem is too afraid to argue with them as you awkwardly remove your top, showing off your breasts which finally gets them hooting, hollering and laughing.'
 			act 'Strip naked':
 				*clr & cla
 				inhib_exp += rand(0,1)
@@ -264,13 +266,15 @@ if $ARGS[0] = 'stand_up':
 				minut += 5
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/strip2.jpg"></center>'
 				if hotcat <= 4:
-					'You slowly remove all of your clothes until you are completely naked in front of them, with that they turn off the music. The leader walks up to you and say. "Fuck you are even uglier naked. I didn''t think that was even possible. Put some clothes on before I throw up." The others all burst out laughing at that. Then they all walk off laughing apparently done with their fun, you quickly get dressed again as Artem struggles to his feet. Artem wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "You didn''t have to do that."'
-					'You smile to him. "I couldn''t let them hurt you like that."'
-					'He frowns. "I would have healed, anyways I could use some rest, so see you later ok." He rolls over obviously not wanting to talk anymore. So you get up and leave.'
+					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. The leader walks up to you with a scowl. "Fuck, you''re even uglier naked. I didn''t think that was even possible. Put some clothes on before I throw up." The others all burst out laughing before they all walk away laughing. You quickly get dressed as Artem struggles to his feet and wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home.' 
+					'Once you get him home, you help him to bed. "You didn''t have to do that."'
+					'You smile at him. "I couldn''t let them hurt you like that."'
+					'He frowns. "I would have healed! Anyway, I could use some rest, so see you later okay?" He rolls over, obviously not wanting to talk anymore, so you get up and leave.'
 					gs 'stat'
 					act 'Leave': gt 'pod_ezd', 'etaj_1'
 				else
-					'You slowly remove all of your clothes until you are completely naked in front of them, with that they turn off the music. All of the Gopniks gather around you and their leader grins and gives you a choice: "Not bad <<$pcs_nickname>>, nice tits. It''s a shame you''re wasting them on him. And now, you''re going to suck all us off. If you do a good job, we''ll let you go." You know you have no chance to run away, so you either have to do what they ask or you could try your luck at fighting them, but betting against six men? Most likely all that good that would do is getting the shit beat out of you and then raped. Maybe if you distract them you could run away.'
+					'You slowly remove all of your clothes until you''re completely naked in front of them and they turn off the music. They all gather round you as the leader grins. "Not bad, <<$pcs_nickname>>. You''ve got nice tits, just a shame that you''re wasting them on him. Now you''re going to suck all us off. If you do a good job, we''ll let you go."' 
+					'Trying to fight them all would most likely result in you getting the shit beat out of you and raped. Maybe you can make a run for it if you distract them first?'
 					act 'Get down on your knees': gt 'artem_date_events', 'blow_bang'
 					gs 'willpower', 'misc', 'self', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -303,17 +307,19 @@ if $ARGS[0] = 'stand_up':
 							if artemRand = 1:
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
-								'You look around you, and suddenly shout in a random direction: "Dad, I''m over here!"'
-								'As the Gopniks turn around to see who you''re shouting at, you quickly grab Artem by the arm and start running. When you''re satisfied the Gopniks are no longer following you, you find a quiet area and put your clothes back on. Artem wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "You didn''t have to do that."'
-								'You smile to him. "I couldn''t let them hurt you like that."'
-								'He frowns. "I would have healed, anyways I could use some rest, so see you later ok." He rolls over obviously not wanting to talk anymore. So you get up and leave.'
+								'You look around and suddenly shout in a random direction. "Dad, I''m over here!"'
+								'As the gopniks turn to see who you''re shouting at, you quickly grab Artem by the arm and start running. When you''re sure the gopniks are no longer following you, you find a quiet area and put your clothes back on as Artem wipes the blood from his face, deeply embarrassed you had to see him like this. You walk in silence as you help him get home.'
+								'Once you get him home, you help him to bed. "You didn''t have to do that," he remarks.'
+								'You smile at him. "I couldn''t let them hurt you like that."'
+								'He frowns. "I would have healed! Anyway, I could use some rest, so see you later okay?" He rolls over, obviously not wanting to talk anymore, so you get up and leave.'
 								minut += 5
 								gs 'stat'
 								act 'Leave': gt 'pod_ezd', 'etaj_1'
 							else
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/run.jpg"></center>'
-								'You look around you, and suddenly shout: "Dad, I''m over here!"'
-								'As the Gopniks turn around to see who you''re shouting at, you quickly grab Artem by the arm and start running. Unfortunately, one of the Gopniks wasn''t fooled by your diversion, and grabs Artem and then shoves him hard to the ground. Artem yells at you. "Run!" You try to run, you can hear the sounds of them hitting Artem and someone chasing you.'
+								'You look around you and suddenly shout "Dad, I''m over here!"'
+								'As the gopniks turn to see who you''re shouting at, you quickly grab Artem by the arm and start running. Unfortunately, one of the gopniks wasn''t fooled by your diversion, and grabs Artem before shoving him hard to the ground.'
+								'"Run, <<$pcs_nickname>>!" Artem shouts behind you. You hear them beating Artem as someone chases you.'
 								act 'Try to escape':
 									*clr & cla
 									gs 'stat'
@@ -321,47 +327,46 @@ if $ARGS[0] = 'stand_up':
 									if escape >= 80:
 										minut += 5
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/run.jpg"></center>'
-										'Thanks to your natural aptitude and practice at running you manage to finally get away, several times it sounded like they were about to catch you, only to hear someone breathing heavy right behind you and then start to fade away. After what seems like forever, you suddenly hear nothing behind you. You glance back and see no one, you stop long enough to put your cloths on before you jog to the edge of the park where there is several other people that look at you funny. You stop and catch you breath looking back for Artem.'
+										'Thanks to your natural aptitude and practice at running, you manage to get away. After what seems like forever, you suddenly hear nothing behind you. You glance back and see no one, stopping long enough to put your clothes on before you jog to the edge of the park where several people give you funny looks. You stop and catch your breath while looking back for Artem.'
 										act 'Run home':
 											*clr & cla
 											minut += 10
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/run.jpg"></center>'
-											'After catching your breath a moment and not seeing Artem you run the rest of the way home. You don''t stop for anyone or anything, until you are safely inside your apartment.'
+											'After catching your breath and not seeing Artem anywhere, you run the rest of the way home. You don''t stop for anyone or anything until you''re safely inside your apartment.'
 											act 'Home': gt 'korrPar'
 										end
 										act 'Wait for Artem': 
 											*clr & cla
-											 artemQW['waited'] = 1
+											artemQW['waited'] = 1
 											minut += 60
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
-											'After awhile you finally see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder. Artem wipes the blood from his face, deeply embarrassed you had to see him like this. "I''m glad you got away, they said they were going to rape you if they caught you." He says as he hugs you obviously not made you ran and left him. He seems genuinely glad you are safe. You walk in silence as you help him get home.'
+											'After a while, you finally see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder as he wipes the blood from his face, deeply embarrassed you had to see him like this. "I''m glad you got away. They said they were going to rape you if they caught you," he says as he hugs you. He seems genuinely glad you''re safe as you walk in silence helping him home.'
 											*nl
-											'Once you get him home, you help him to bed and then clean up his wounds and tend to him as best you can. "Thank you <<$pcs_nickname>> for everything. For helping me home, for going out with me and for helping me now. I just wish it could have been a better date."'
-											'You smile to him and place a finger on his lips. "Shhh, it''s fine, I am just sorry you got hurt."'
-											'He smiles. "Yeah well maybe our next date won''t be so exciting. The pain meds are kicking in, I could really use some sleep, see you later ok." He rolls over obviously not wanting to talk anymore and in obvious pain. So you get up and leave him to rest.'
+											'Once you get him home, you help him to bed and tend to him as best as you can. "Thank you <<$pcs_nickname>>. For everything. For helping me home, for going out with me and for helping me now. I just wish it could have been a better date."'
+											'You smile at him and place a finger on his lips. "Shhh, it''s fine. I''m just sorry you got hurt."'
+											'He smiles. "Yeah? Well maybe our next date won''t be so exciting. The pain meds are kicking in and I could really use some sleep, so I''ll see you later, okay?" You get up and leave him to rest.'
 											act 'Leave': gt 'pod_ezd', 'etaj_1'
 										end
-										act 'Call the Police': 
+										act 'Call the police': 
 											*clr & cla
 											minut += 60
-											 artemQW['called_police'] = 1
+											artemQW['called_police'] = 1
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/locations/shared/police/patrol.jpg"></center>'
-											'Once you are safe you pull out your cell phone and call the police. You tell them the gopniks are assaulting Artem and tried to attack you as well. After you give them all the details you hang up, the dispatcher said a car would be right there. Almost half a hour later a police car pulls up slowly at the entrance of the park and two officers get out. You hurry over to them. You tell them you called and try and get them to hurry, but they write down your information and ask you several questions like what Artem looks like, where it happened, what the attackers look like. They won''t be hurried and each time you try, they just tell you to calm down and answer their questions. In frustration, you finally answer all their questions while they write it all down.'
-											*nl
-											'By the time they finish you see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder. Artem wipes the blood from his face, deeply embarrassed you have to see him like this. "I''m glad you got away, they said they were going to rape you if they caught you." Before you can help him more the police walk over and help Artem over to their car and start asking him questions. They tell you to leave and go home, you try and resist but they warn you this is no place for a young lady and you can tell you will just make things worse if you stay so you walk home.'
+											'Once you''re safe, you pull out your phone and call the police, telling them that the gopniks are assaulting Artem and tried to attack you as well. After you give them all the details you can, you hang up. Almost half an hour later, a police car pulls up at the entrance of the park and two officers get out. You hurry over to them and try and get them to hurry, but they write down your information and ask you several questions. They won''t be hurried and each time you try, they just tell you to calm down and answer their questions. In frustration, you finally answer all their questions while they write it all down.'
+											'By the time they finish, you see Artem limping towards you. He smiles through busted bloody lips when he sees you. You rush over to him and help him walk, putting one of his arms over your shoulder as he wipes the blood from his face, deeply embarrassed you have to see him like this. "I''m glad you got away. They said they were going to rape you if they caught you."' 
+											'Before you can help him, the police walk over and help Artem over to their car before they start asking him questions. They tell you go home, warning you that this is no place for a young lady such as yourself.'
 											act 'Home': gt 'korrPar'
 										end
 									else
 										minut += 10
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/caught.jpg"></center>'
-										'You are not in great shape and you are not good at running, you don''t make it very far when one of them tackles you to the ground knocking the wind out of you. Leaving you gasping for breath on the ground under him.'
-										'By now the other gopniks have caught up and now you are surrounded again, except now they are pissed off as well.'
-										'The leader drops to his knees and grabs you by the hair while you lie flat on your stomach: "We warned you, <<$pcs_nickname>>. Since you made us work for it, we are just going to take what we want."'
-										'You know your choices are limited, get raped or fight back and likely get the shit beat out of you and raped anyways.'
+										'You''re not in great shape and aren''t good at running, so you don''t make it very far when one of them tackles you to the ground, knocking the wind out of you.'
+										'By now, the other gopniks have caught up and you''re surrounded again. The leader drops to his knees and grabs you by the hair while you lie flat on your stomach. "We warned you, <<$pcs_nickname>>. Since you made us work for it, we''re just going to take what we want."'
+										'You could try and fight them off, but you''re likely to just be beaten and raped anyway...'
 										act 'Get raped': gt 'artem_date_events', 'gang_rape'
 										gs 'willpower', 'misc', 'self', 'hard'
 										if will_cost <= pcs_willpwr:
@@ -390,8 +395,8 @@ if $ARGS[0] = 'blow_bang':
 	*clr & cla
 	gs 'fame', 'pav', 'sex', 20
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggbj1.jpg"></center>'
-	'You quickly glance around you and realize there''s no way you can get past them and outrun them all. With a deep sigh, you drop to your knees and reach out for one of the exposed cocks the Gopniks are already shoving in your face.'
-	'Two of the Gopniks leave you and go away to keep an eye out, satisfied that you can''t run away from this position without their friends easily stopping you. The other four all offer you their cocks, you start sucking on one and jerking two more off. The other one pulls out his phone and starts filming it.'
+	'You quickly glance around and realize there''s no way you can get past them and outrun them all. With a deep sigh, you drop to your knees and reach out for one of the exposed cocks the gopniks are already shoving in your face.'
+	'Two of the gopniks leave to keep an eye out, satisfied that you can''t run away without their friends stopping you. The other four all offer you their cocks, so you start sucking on one and jerking off two while the last guy pulls out his phone and starts filming you.'
 	gs 'pain', 3, 'hair', 'pull'
 	gs 'pain', 6, 'jaw', 'ache'
 	gs 'boystat', $boy1
@@ -402,7 +407,7 @@ if $ARGS[0] = 'blow_bang':
 	act 'Get face fucked':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggbj2.jpg"></center>'
-		'For a few seconds you try to give the first guy a blowjob, but it''s quite obvious they don''t need your cooperation. Another guy roughly grabs you buy the hair and pulls your head towards his dick and roughly shoves his dick down your throat and then begins to thrust his hips against your face, roughly fucking your throat while he keeps your head in place by holding onto your hair. They take turns on who is filming.'
+		'You try giving the first guy a blowjob, but it''s quite obvious they don''t need your cooperation. Another guy roughly grabs you by the hair and pulls your head towards his dick, roughly shoving it down your throat before he starts roughly fucking your mouth. They take turns filming as they pass you around.'
 		gs 'pain', 3, 'hair', 'pull'
 		gs 'pain', 6, 'jaw', 'ache'
 		gs 'pain', 6, 'throat', 'stretch'
@@ -414,7 +419,7 @@ if $ARGS[0] = 'blow_bang':
 		act 'Swallow it':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggcum1.jpg"></center>'
-			'Suddenly you feel his cum splashing against the back of your mouth, he doesn''t stop face fucking you until he stops coming, you don''t have time to catch your breath, as soon as he pulls his dick out, another one is shoved back in your mouth.'
+			'After a while, you suddenly feel cum splashing against the back of your mouth, but he doesn''t stop face fucking you until he stops. You don''t have time to catch your breath because as soon as he pulls his dick out, another is shoved in your mouth.'
 			gs 'pain', 3, 'hair', 'pull'
 			gs 'pain', 6, 'jaw', 'ache'
 			gs 'pain', 6, 'throat', 'stretch'
@@ -427,7 +432,7 @@ if $ARGS[0] = 'blow_bang':
 			act 'Keep swallowing':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggcum2.jpg"></center>'
-				'They run a train on your face, and you''re never without a cock in your mouth for long. As soon as one guy finishes, shoots his load in your mouth, the next one takes over. After what feels like forever the third guy finally finishes, the two that went to keep watch have come over and have their dicks out now, apparently the first two finished and went and relieved them.'
+				'As soon as one guy finishes, the next one takes over. After what feels like forever, the third guy finally finishes, and the two that went to keep watch have come over and have their their dicks out.'
 				gs 'pain', 3, 'hair', 'pull'
 				gs 'pain', 6, 'jaw', 'ache'
 				gs 'pain', 6, 'throat', 'stretch'
@@ -441,7 +446,7 @@ if $ARGS[0] = 'blow_bang':
 				act 'Blowbang':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggbj3.jpg"></center>'
-					'They keep pulling a train on your face, and you''re never without a cock in your mouth for long. As soon as one guy finishes, shoots his load in your mouth, the next one takes over, you never have time to spit their cum out so you have no choice but to swallow. After what feels like forever the fourth and fifth guy finally finishes, your throat feels sore. The rest have put their dicks away and the last guy who was relieved from keeping watch fucks your mouth.'
+					'The fourth and fifth guy take their turns with you, leaving your throat feeling sore.'
 					gs 'pain', 3, 'hair', 'pull'
 					gs 'pain', 6, 'jaw', 'ache'
 					gs 'pain', 6, 'throat', 'stretch'
@@ -455,7 +460,7 @@ if $ARGS[0] = 'blow_bang':
 					act 'Last one':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/ggcum3.jpg"></center>'
-						'With finally just one left, you can finally stop also giving hand jobs, your hands feel like they are cramped up from the all the hand jobs you have given and your throat feels raw. The last one unlike his friends pulls his dick out just as he starts to cum and spurts her sperm all over you nose and lips. As it drips down onto your chin, the one currently filming gets a close up of your cum covered face as the Gopniks all gather around for one last laugh. Then they leave you and Artem be. Artem quietly helps you put your clothes back on before walking you home.'
+						'With just one left, you can finally stop giving handjobs, your hands having cramped up. The last one, unlike his friends, pulls his dick out just as he starts to cum and spurts his cum all over your face. As it drips down onto your chin, the one currently filming gets a close up of you as the gopniks all gather round for one last laugh before they leave you and Artem be.'
 						gs 'pain', 3, 'hair', 'pull'
 						gs 'pain', 6, 'jaw', 'ache'
 						gs 'pain', 6, 'throat', 'stretch'
@@ -467,9 +472,10 @@ if $ARGS[0] = 'blow_bang':
 						act 'Go home':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
-							'As the Gopniks leave you put your clothes back on. Artem gets up slowly and wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "You shouldn''t have done that, it was disgusting."'
-							'You smile to him. "I couldn''t let them hurt you like that."'
-							'He frowns. "I would have healed, anyways I could use some rest, so can you please leave." He rolls over obviously not wanting to talk anymore. So you get up and leave.'
+							'As the gopniks leave you put your clothes back on, Artem slowly gets up and wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.'
+							'Once you get him home, you help him to bed. "You shouldn''t have done that, <<$pcs_nickname>>. It was disgusting."'
+							'You smile at him. "I couldn''t let them hurt you like that."'
+							'He frowns. "I would have healed! Anyway, I could use some rest, so can you please leave?" He rolls over, obviously not wanting to talk anymore, so you get up and leave.'
 							minut += 5
 							gs 'stat'
 							act 'Leave': gt 'pod_ezd', 'etaj_1'
@@ -485,21 +491,22 @@ if $ARGS[0] = 'fight_gang':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/walkgop.jpg"></center>'
 	'You glare at them. "Fuck you, I''ll kill any of you that touch me."'
-	'They all laugh at that and obviously don''t believe you, as one of them reaches out to grab you. You quickly punch him in the stomach which causes him to oof and step back, obviously surprised you are actually willing to fight back. Artem seeing this gets up and says. "Leave her alone!" It was a chivalrous effort but one in vain. He never even makes it back full standing when two of the gopniks start wailing on him and he goes down in a heap where they start kicking him. The rest come for you.'
+	'They all laugh as one of them reaches out to grab you. You quickly punch him in the stomach, which causes him to step back, surprised you''re actually willing to fight back. Seeing this, Artem gets up. "Leave her alone!" It was a chivalrous effort, but one in vain. He never even makes it onto his feet before two of the gopniks start beating him and he goes down in a heap, where they start kicking him as the rest come for you.'
 !!fight code goes here, it is 6 adult men vs Sveta. I don''t see any way she could win, but I wanted to give the players the option, plus with magic that could change things. Below I am doing a version of if she wins and if she loses. 
 	if win = 1:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/walk_save.jpg"></center>'
-		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others ways, then taking your shots in their confusion. It took awhile and they got in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. First one, then another just turn and run off and that is all it took. Soon, the rest turned tail and ran off as well. Leaving you huffing and puffing, still naked. You check on Artem who is barely conscious and moaning, then you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home. Once you get him home, you help him to bed. "I can''t believe you won."'
-		'You laugh and say. "I can''t either, but I couldn''t let them hurt you like that."'
-		'He shakes his head and seems to have mixed feelings on the subject. "Thanks, anyways I could use some rest, so see you later ok." He rolls over obviously not wanting to talk anymore. So you get up and leave.'
+		'You put on a demonstration of how to fight against several opponents at once. You use their numbers against them, constantly moving so they get in each others way, then taking your shots in their confusion. It takes a while and they get in some hits of their own, but in the end you finally put enough of a beat down on them for them to give up. They all turn tail and flee, leaving you huffing and puffing, still naked. You check on Artem, who''s barely conscious, before you get dressed. You help Artem up as he wipes the blood from his face, deeply embarrassed you have to see him like this. You walk in silence as you help him get home.' 
+		'Once you get him home, you help him to bed. "I can''t believe you won!"'
+		'You laugh. "I can''t either, but I couldn''t let them hurt you like that."'
+		'He shakes his head and seems to have mixed feelings on the subject. "Thanks anyway, but I could use some rest. See you later, okay?" He rolls over, so you get up and leave.'
 		minut += 5
 		gs 'stat'
 		act 'Leave': gt 'pod_ezd', 'etaj_1'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/fail.jpg"></center>'
-		'You do your best, but their are too many of them. The blows start coming and never stop, and soon you feel yourself dazed and unable to fight anymore. With the fight now over, you find yourself laying naked on the ground, flat on your stomach. The leader drops to his knees and grabs you by the hair while. "We warned you, <<$pcs_nickname>>. You''re all ours now."'
-		'Several of them start to take off their pants as one of them threatens: "Open up whore, or we''ll be spilling your guts all over the ground."'
-		'Two of them go stand watch, while the other four gather around you, you know they are going to rape you but their is nothing more you can do about it. You silent pray someone would come by and save you as you start to cry.'
+		'You do your best, but there''s too many of them. The blows start coming and never stop, and you''re soon dazed and unable to fight anymore. The fight over, you find yourself laying naked on the ground, flat on your stomach as the leader drops to his knees and grabs you by the hair. "We warned you, <<$pcs_nickname>>. You''re all ours now."'
+		'Several of them start taking off their pants. "Open up whore, or we''ll be spilling your guts all over the ground!" one of them threatens.'
+		'Two of them stand watch while the others gather round you. There''s nothing you can do but hope that someone will come by and save you as you start to cry.'
 		act 'Get raped': gt 'artem_date_events', 'gang_rape'
 	end
 end
@@ -525,38 +532,38 @@ if $ARGS[0] = 'gang_rape':
 	gs 'artem_date_events', 'generatgopniks'
 
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/stripped.jpg"></center>'
-	'They grab you and lift you off the ground, one covering your mouth as some others carry you. They drag you off deeper into the park into the woods far away from any of the paths. You see two others are dragging the unconscious Artem along. When they get to a place they seem to like, where there is some old dirty mattress laying on the ground, they start ripping your clothes off. It hurts as they do and you can hear your clothes ripping and tearing, they seem to be intentionally destroying your clothes at this point. They keep ripping and tearing at your clothes until you are completely naked. Two of them drop Artem nearby and then go stand watch.' 
+	'They lift you off the ground, one covering your mouth as they drag you off deeper into the park far away from any of the paths. You see two others are dragging the unconscious Artem along. You eventually arrive in a clearing with a dirty old mattress laying on the ground, where they start ripping your clothes off. Artem is dumped nearby and the two gopniks go to stand watch as you hear your clothes ripping and tearing, which they seem to be doing intentionally. They keep ripping and tearing at your clothes until you''re completely naked.' 
 	gs 'arousal', 'flash', 5, 'gangbang', 'rape', 'rough'
 	gs 'stat'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/bound.jpg"></center>'
-		'Two of them drop Artem nearby and then go stand watch, while the other four gather around you. The leader holds you down and puts a knees on your head. The second one helps holding you down, while the third watches and the last one ties your hands behind your back. By this point you''re too tired to resist and just let them have their way with you as they tie your hands tightly behind your back.'
+		'The leader holds you down and puts a knee on your head as another gopnik ties your hands tightly behind your back. By this point, you''re too tired to resist and just let them have their way with you.'
 		gs 'pain', 2, 'wrists', 'bind'
 		gs 'arousal', 'BDSM', 5, 'gangbang', 'rape', 'rough', 'bound'
 		gs 'stat'
 		act 'The nightmare begins':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape1.jpg"></center>'
-			'Two of them hold you down, while a third watches and the fourth pulls his dick out and shoves it in your pussy and starts hammering away not caring if you are wet or if you enjoy it. Hell, by what they are saying you think the more you struggle or cry out the more they are enjoying this.'
+			'Two of them hold you down while one pulls his dick out, shoves it in your pussy and starts hammering away, not caring if you enjoy it or not. The more you struggle or cry out, the more they seem to enjoy it.'
 			gs 'pain', 2, 'wrists', 'bind'
 			gs 'boystat', $boy1
 			gs 'arousal', 'vaginal', 5, 'gangbang', 'rape', 'rough', 'bound'
 			pcs_horny = 0
 			gs 'stat'
-			act 'Next':
+			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape2.jpg"></center>'
-				'The one watching finally has had enough and pulls the one raping you off, he then forces his dick inside of you instead, while the guy that was raping you stands up and just watches as he jerks off.'
+				'The one watching takes his turn and forces his dick inside you while the first one just watches as he jerks off.'
 				gs 'pain', 2, 'wrists', 'bind'
 				gs 'boystat', $boy2
 				gs 'arousal', 'vaginal', 5, 'gangbang', 'rape', 'rough', 'bound'
 				pcs_horny = 0
 				gs 'stat'
-				act 'Too loose':
+				act 'Continue':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape3.jpg"></center>'
-					'You hear the leader say. "Alright my turn. Roll her over onto her hands and knees." You are roughly forced into a kneeling position on the nasty old mattress, with your face forced against it. You feel someone spit on your asshole and then a dick gets shoves up your ass causing you to cry out in pain, as he starts pounding your ass balls deep. "Much tighter than that gaping twat would be after you guys ripped it up." He laughs and the others join in.'
+					'"Alright, my turn," the leader says. "Roll her over onto her hands and knees." You''re roughly forced into a kneeling position on the nasty old mattress, with your face forced against it. You feel someone spit on your asshole before a dick is shoved inside, causing you to cry out in pain as he starts pounding you balls deep. "Much tighter than that gaping pussy after you guys ripped it up!" He laughs and the others join in.'
 					gs 'pain', 2, 'wrists', 'bind'
 					gs 'boystat', $boy3
 					gs 'arousal', 'anal', 5, 'gangbang', 'rape', 'rough', 'bound'
@@ -565,7 +572,7 @@ if $ARGS[0] = 'gang_rape':
 					act 'Two at a time':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape4.jpg"></center>'
-						'The leader pulls out of your ass and then lays in front of you on his side as someone else starts roughly fucking your ass now. Once he is next to your head the leader shoves his dick in your mouth and makes you suck his dick, as the other three take turns fucking your ass. You can feel one of them cumming in your ass. While another one of the them speaks up. "Come on she has other holes I am tired of waiting."'
+						'The leader pulls out of your ass and lies in front of you on his side as someone else starts roughly fucking your ass. Once he''s next to your head, the leader shoves his dick in your mouth and makes you suck his dick as the other three take turns fucking your ass. You soon feel one of them cumming in your ass as another speaks up. "Come on, she has other holes! I''m tired of waiting!"'
 						gs 'pain', 2, 'wrists', 'bind'
 						gs 'pain', 6, 'jaw', 'ache'
 						gs 'boystat', $boy4
@@ -575,10 +582,10 @@ if $ARGS[0] = 'gang_rape':
 						gs 'cum_call', 'anus', 'Gopnik rapist 1', 0, 0, 10000, 40
 						pcs_horny = 0
 						gs 'stat'
-						act 'Airtight':
+						act 'Continue':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rape5.jpg"></center>'
-							'With that, one of them lays down on the mattress and they force you to straddle and mount him, his cock sliding into your battered pussy, another cock is shoved into your mouth and a third back in your ass. As the two that has already came inside of you leaves, the ones who were on watch comes over and joins in, taking their turns. You feel one of them cumming in your twat.'
+							'With that, one of them lies down on the mattress and they force you to straddle and mount him, his cock sliding into your battered pussy as another cock is shoved into your mouth and a third back in your ass. The ones who were on watch come over to take their turns as you feel one of them cumming in your pussy.'
 							gs 'pain', 2, 'wrists', 'bind'
 							gs 'pain', 6, 'jaw', 'ache'
 							gs 'boystat', $boy4
@@ -590,10 +597,10 @@ if $ARGS[0] = 'gang_rape':
 							gs 'cum_call', '', 'Gopnik rapist 2', 0, 0, 10000, 40
 							pcs_horny = 0
 							gs 'stat'
-							act 'Overflowing with cum':
+							act 'Continue':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum1.jpg"></center>'
-								'The four left take turns fucking all three of your holes, so much you lose count and it seems like a lot more than six guys have taken turns on you, two more cum inside of you, one in your pussy and another in your ass. With them pulling out your feel the cum leaking out of both of your holes as they are over flowing with cum. Just as one of the other guys cums in your mouth.'
+								'The remaining ones take turns fucking all three of your holes so much that you lose count as two of them cum inside you. When they pull out, you feel the cum leaking out of both of your holes as one of the other guys cums in your mouth.'
 								gs 'pain', 2, 'wrists', 'bind'
 								gs 'pain', 6, 'jaw', 'ache'
 								gs 'boystat', $boy3
@@ -610,7 +617,7 @@ if $ARGS[0] = 'gang_rape':
 								act 'Last one':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/rapecum2.jpg"></center>'
-									'With only one left he starts fucking your throat, as he turns you onto your back. Before too long he starts to cum as well. He holds your mouth open with one hand and jerks off with the other cumming into your mouth and milking every last drop of cum until it falls into your mouth.'
+									'The last one starts fucking your throat. Before too long, he starts cumming as well, holding your mouth open with one hand as he jerks off with the other, milking every last drop of cum into your mouth.'
 									gs 'pain', 2, 'wrists', 'bind'
 									gs 'pain', 6, 'jaw', 'ache'
 									gs 'pain', 6, 'throat', 'stretch'
@@ -622,14 +629,15 @@ if $ARGS[0] = 'gang_rape':
 									act 'Aftermath':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/park/aftermath.jpg"></center>'
-										'They laugh as they get dressed again, and their leader grins wickedly: "Go home and get cleaned up. We have nothing against you, but remember this lesson, <<$pcs_nickname>>... it is better to know your place and do what you''re told, than to try and be something you''re not. All that does is piss people off and make them teach you a lesson." Then they leave.'
+										'They laugh as they get dressed again, and their leader grins wickedly. "Go home and get cleaned up. We have nothing against you, but remember this lesson, <<$pcs_nickname>>... It''s better to know your place and do what you''re told, than to try and be something you''re not. All that does is piss people off and make them teach you a lesson."'
 										*nl
 !! Artem doesn''t seem like the type to just leave Sveta at her door. Maybe this should be rewritten and Artem has Julia''s mom check her out (she''s a nurse). Something like Artem suggesting going to the hospital but Sveta not wanting to be known as the girl who got raped.
-										'You lay there naked for several minutes in pain, crying, after some time you feel someone grabbing your hands and you scream, trying to scoot away. Only to turn and see Artem behind you untying your hands. He takes off his jacket and gives it to you to wear, as your clothes are totally ruined. Then he quietly walks you home. Every step sends a spike of agony through your body but you keep going. Wanting to get away from the place where it happened.'
-										'When you get to just outside the apartment complex he stops. "Maybe we should call the police." You shake your head know, you know they wouldn''t care and just blame you and then everyone would know. He sighs. "At least go to the hospital." He says in a pleasing voice.'
+										'You lay naked on the dirty mattress for several minutes crying in pain before you feel someone grabbing your hands. You scream and try to scoot away, only to turn and see Artem untying your hands. He takes off his jacket and gives it to you to wear before he quietly walks you home. Every step sends a spike of agony through your body, but you keep going, wanting to get away from the place where it happened.'
+										'When you get to just outside the apartment complex, he stops. "Maybe we should call the police?" he asks, but you shake your head. You know they wouldn''t care and would just blame you, then everyone would know. He sighs. "At least go to the hospital?" he asks in a pleading voice.'
 										*nl
-										'Again you shake your head no, you don''t want anyone to know, you just want to go to your room and curl up in your bed. "No please just take me home." You plead with him.'
-										'He sighs and nods, then walks you inside and up the stairs to your door. When you get home he finally says something: "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you." You don''t know what to say so you just nod and go into your apartment.'
+										'You shake your head again. You don''t want anyone to know, you just want to go to your room and curl up in your bed. "Just take me home, Artem!"'
+										'He sighs and nods before walking you inside and up the stairs to your door. When you get there, he finally says something. "<<$pcs_nickname>>, I''m so sorry. I know what you did for me and... I owe you. Big time. I don''t know what I can do to repay you, but if you ever need anything... please. I''m there for you."' 
+										'You don''t know what to say, so you just nod and go into your apartment.'
 										gs 'arousal', 'end'
 										gs 'stat'
 										act 'Home': gt 'korrPar'

+ 97 - 94
locations/artem_events.qsrc

@@ -27,43 +27,42 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon"><<$npc_firstname[''A2'']>> <<$npc_lastname[''A2'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big2.jpg"></center>'
 	if kotovLoveQW > 0 and artemVitokQW = 0:
-		'You walk across the school courtyard to meet up with Artem. He gives you a friendly nod as you approach, and asks: "You ready to go?"'
-		'Just when you leave the courtyard with Artem to go study at his house, you run into Vitek Kotov. He doesn''t look pleased.'
-		'Vitek looks at Artem disdainfully and sneers: "Where are you going with that four-eyed loser, <<$pcs_nickname>>?"'
-		'You smile at him and reassure him: "Relax Vitek, Artem is tutoring me a bit after class. My school performance needs a boost, and he kindly offered to help me out."'
-		'Vitek frowns though, and says: "He ''kindly offered''... right. I don''t trust that freak! Just look at him, he''s eyeing you up and down constantly!"'
-		'Artem is getting quite nervous, and tries to appease Vitek: "Vitek, come on man! You know I would never do that! I''m only helping <<$pcs_nickname>> out with her studies, I swear!"'
-		'You can see Vitek''s body tense. He''s not buying Artem''s story at all, and looks at Artem with distrust.'
+		'You walk across the school courtyard to meet up with Artem. He gives you a friendly nod as you approach. "You ready to go?"'
+		'Just as you''re about to leave the courtyard with Artem, you run into Vitek, who doesn''t look pleased.'
+		*nl
+		'Vitek looks at Artem disdainfully. "Where are you going with this four-eyed loser, <<$pcs_nickname>>?" he sneers.'
+		'You smile at him. "Relax Vitek, Artem is just tutoring me after class. My school performance needs a boost and he kindly offered to help me out," you reassure him.'
+		'Vitek frowns. "He ''kindly offered''? Right.... I don''t trust this freak! Just look at him, he''s eyeing you up and down constantly!"'
+		'Artem is getting quite nervous, and tries to appease Vitek. "Vitek, come on man! You know I would never do that! I''m only helping <<$pcs_nickname>> out with her studies, I swear!"'
+		'You can see Vitek''s body tense up. He''s not buying Artem''s story at all, and looks at him with distrust.'
 		gs 'willpower', 'skill', 'force', 'chrsm_lvl'
 		if will_cost <= pcs_willpwr:
-			act 'Reassure Vitek he can trust you (<<will_cost>> Willpower)':
-				! I think passing this warrants some chrsm_exp. If you dont think so just remove this line
+			act 'Reassure Vitek (<<will_cost>> Willpower)':
 				gs 'exp_gain', 'chrsm', rand(0,will_cost)
 				gs 'willpower', 'pay', 'force'
 				cla
 				artemVitokQW = 1
 				gs 'stat'
-				'You decide that you should step up for Artem, but also reassure Vitek you''re still with him. You need to be delicate about it, though.'
-				'You know Vitek well enough to know that he''s seething right now, so you try to placate him: "Come on baby, don''t you trust me? You know I''m your girl... Artem is only helping me get better grades, that''s all. We can still hang out later?"'
-				'That makes Vitek feel a bit better, and you can see his body relax a little.'
-				'Still, he drives his point home by punching Artem in the shoulder. He sneers: "You''re lucky, four-eyes. Still... if I even suspect that you''ve laid a finger on <<$pcs_nickname>>, I''ll put you in a wheelchair and have you pissing blood for the rest of your life! Got that?"'
-				'Artem is terrified, and quickly nods while he rubs his painful shoulder: "Yes, yes! I understand!"'
-				'Vitek leaves you be, and you go to Artem''s home with him to study. You can see Artem''s body still trembling as you walk down the streets.'
+				'You decide that you should step up for Artem, but also reassure Vitek you''re still with him. You need to be delicate about it though.'
+				'You know Vitek well enough to know that he''s seething right now, so you try to placate him. "Come on baby, don''t you trust me? You know I''m your girl... Artem is only helping me get better grades, that''s all. We can still hang out later?"'
+				'This seems to calm him a little, and you can see his body relax, but he still drives his point home by punching Artem in the shoulder.'
+				'"You''re lucky, four-eyes. If I even suspect that you''ve laid a finger on <<$pcs_nickname>>, I''ll put you in a wheelchair and have you pissing blood for the rest of your life! Got that?"'
+				'Artem is terrified, and quickly nods while he rubbing his shoulder. "Yes, yes! I understand!"'
+				'Vitek leaves you be and you leave with Artem. You can see Artem''s body still trembling as you walk down the streets.'
 				act 'Go with Artem': ArtemLoc = 2 & gt 'artemhome', 'artemroom'
 			end
 		else
-			act 'Reassure Vitek he can trust you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Reassure Vitek (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Say nothing':
 			cla
 			artemVitokQW = 2
-			'You silently watch the two of them, and wonder if you should help Artem.'
-			'Suddenly, Vitek punches Artem in the chest, knocking the wind out of him.'
-			'Artem curls up into a ball and squeals like a girl: "Vitek, please! Don''t hit me again, please!"'
-			'Vitek leans over Artem''s prone body and scoffs: "Walk away, now. If I ever see you near <<$pcs_nickname>> again, I''m knocking your teeth out! Got that?"'
-			'Artem, still curled up on the ground, wails: "Okay, okay! I''ll leave her alone! Just please, let me go!"'
-			'Vitek gives him one more kick in the ass, just as Artem gets up. He growls: "Now get the fuck out of here, freak... before I change my mind!"'
-			'The terrified Artem quickly gathers his things and runs away from you, deciding it''s not worth the risk to help you. Vitek spits on the ground with a pleased grin on his face, and walks away.'
+			'You silently watch the two of them, and wonder if you should help Artem when suddenly Vitek punches him in the chest, knocking the wind out of him.'
+			'Artem curls up into a ball and squeals like a girl. "Vitek, please! Don''t hit me again, please!"'
+			'Vitek leans over Artem''s prone body and scoffs. "Walk away, now. If I ever see you near <<$pcs_nickname>> again, I''m knocking your teeth out! Got that?"'
+			'Artem, still curled up on the ground, wails "Okay, okay! I''ll leave her alone! Just please, let me go!"'
+			'Vitek gives him one more kick in the ass as he gets up. "Now get the fuck out of here before I change my mind, freak!"'
+			'The terrified Artem quickly gathers his things and runs away from you, deciding it''s not worth the risk to help you. Vitek spits on the ground with a satisfied grin on his face before walking away.'
 			gs 'stat'
 
 			act 'Continue': gs 'gschool_grounds', 'main'
@@ -71,18 +70,17 @@ if $ARGS[0] = 'start':
 	elseif fedorKozlovQW >= 10 and FedorArtemTalk = 0:
 		cla
 		FedorArtemTalk = 1
-		'As you leave the school courtyard with Artem to go study, Fedor stops you.'
-		'He looks questioningly at Artem and asks: "Artem, what''s going on? Are you taking <<$pcs_nickname>> somewhere? She''s with me, you know..."'
-		'Artem blushes, and says: "I know she is, Fedor. We''re just going to do our homework together. I''m tutoring <<$pcs_nickname>>, to help her school performance a little. She asked me to help her, by the way!"'
-		'You smile at Fedor, and pitch in: "I did ask him, Fedor. I really need the help for school, and Artem was friendly enough to help me out. We''re just studying together, nothing more."'
-		'Fedor sighs, but concedes: "Well... alright, <<$pcs_nickname>>. I don''t like you going with <b>him</b>, but I trust you."'
+		'As you leave the school courtyard with Artem, Fedor stops you. He looks questioningly at Artem. "Artem, what''s going on? Are you taking <<$pcs_nickname>> somewhere? She''s with me, you know..."'
+		'Artem blushes. "I know she is, Fedor. We''re just going to do our homework together. I''m tutoring <<$pcs_nickname>> to help her school performance a little. She asked me to help her, by the way!"'
+		'You smile at Fedor. "I did ask him, Fedor. I really need the help for school, and Artem was friendly enough to help me out. We''re just studying together, nothing more."'
+		'Fedor sighs, but concedes. "Well... alright, <<$pcs_nickname>>. I don''t like you going with <i>him</i>, but I trust you."'
 		'After that he walks away, and you and Artem leave the schoolyard.'
 		gs 'stat'
 		act 'Go with Artem': ArtemLoc = 2 & gt 'artemhome','artemroom'
 	else 
 		cla
-		'You walk across the school courtyard to meet up with Artem and go study at his place. He gives you a friendly nod as you approach, and asks: "You ready to go?"'
-		'You smile: "Let''s go study!"'
+		'You walk across the school courtyard to meet up with Artem. He gives you a friendly nod as you approach. "You ready to go?"'
+		'You smile. "Let''s go study!"'
 		'The two of you don''t have much to talk about on the way there, and after a few minutes just decide to walk in silence.'
 		gs 'stat'
 		act 'Go to Artem''s home': ArtemLoc = 2 & gt 'artemhome','artemroom'
@@ -93,7 +91,7 @@ if $ARGS[0] = 'learn':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/study.jpg"></center>'
-	'You spend an hour doing your homework together with Artem. He''s a very smart guy, and explains several things to you. At the end of the hour, you feel like you had a very productive homework session, and that you learned a lot from Artem''s tutoring.'
+	'You spend an hour doing your homework together with Artem. Being rather smart, he explains several things to you. At the end of the hour, you feel like you had a very productive session, and that you learned a lot from Artem''s tutoring.'
 	minut += 60
 	if lernHome > 1:
 		gs 'grades', 'homework', 'school', 'yes', 2, 1, 'A2'
@@ -110,7 +108,7 @@ if $ARGS[0] = 'learn':
 !!this triggers instead of the two above if pav slut is high enough
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
-		'After you finish your homework, Artem has a serious look on his face when he says: "<<$pcs_nickname>>, everyone in the school is talking about how much of a slut you are. With how much I''ve been helping you... I think it''s only fair you give me a little something in return."'
+		'After you finish your homework, Artem has a serious look on his face. "<<$pcs_nickname>>, everyone in the school is talking about how much of a slut you are. With how much I''ve been helping you... I think it''s only fair you give me a little something in return..."'
 		'You frown at him. "What did you have in mind?"'
 		act 'Continue':
 			if artemQW['anal'] > 0:
@@ -118,8 +116,8 @@ if $ARGS[0] = 'learn':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
 				artemslut = rand(1,5)
 				if artemslut <= 2:
-					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
-					'He looks at you expectantly: "Time for my payment, today I want a blowjob."'
+					'Artem stands and unbuttons his pants, pulling his stiff erection from his pants.'
+					'He looks at you expectantly. "Time for my payment. Today, I want a blowjob."'
 					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act '"No way!" (<<will_cost>> Willpower)':
@@ -128,8 +126,8 @@ if $ARGS[0] = 'learn':
 							npc_rel['A2'] -= 25
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-							'You decline. "I am not a whore that earns her way with sex."'
-							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+							'You decline. "I''m not a whore that earns her way with sex!"'
+							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 							act 'Refuse': gt 'artem_events', 'finalrefuse'
 							act 'Agree to suck him off': gt 'artem_sex', 'slut_bj'
@@ -139,8 +137,8 @@ if $ARGS[0] = 'learn':
 					end
 					act 'Suck him off': gt 'artem_sex', 'slut_bj'
 				elseif artemslut <= 4:
-					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
-					'He looks at you expectantly: "If you still want my help, I want more, I want to fuck you."'
+					'Artem stands and unbuttons his pants, pulling his stiff erection from his pants.'
+					'He looks at you expectantly. "If you still want my help, I want more. I want to fuck you."'
 					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act '"No way!" (<<will_cost>> Willpower)':
@@ -149,8 +147,8 @@ if $ARGS[0] = 'learn':
 							npc_rel['A2'] -= 25
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-							'You decline. "I am not a whore that earns her way with sex."'
-							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+							'You decline. "I''m not a whore that earns her way with sex!"'
+							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 							act 'Refuse': gt 'artem_events', 'finalrefuse'
 							act 'Let him fuck you': gt 'artem_sex', 'slut_fuck'
@@ -160,8 +158,8 @@ if $ARGS[0] = 'learn':
 					end
 					act 'Let him fuck you': gt 'artem_sex', 'slut_fuck'
 				else
-					'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
-					'He looks at you expectantly: "I seen something in a porno I want to try, I want to stick it in your ass now."'
+					'Artem stands and unbuttons his pants, pulling his stiff erection from his pants.'
+					'He looks at you expectantly. "I seen something in a porno I want to try. I want to stick it in your ass now."'
 					gs 'willpower', 'exhib', 'resist'
 					if will_cost <= pcs_willpwr:
 						act '"No way!" (<<will_cost>> Willpower)':
@@ -170,8 +168,8 @@ if $ARGS[0] = 'learn':
 							npc_rel['A2'] -= 25
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-							'You decline. "I am not a whore that earns her way with sex."'
-							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+							'You decline. "I''m not a whore that earns her way with sex!"'
+							'"Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me when I need it? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 							act 'Refuse': gt 'artem_events', 'finalrefuse'
 							act 'Let him fuck your ass': gt 'artem_sex', 'slut_anal'
@@ -184,8 +182,8 @@ if $ARGS[0] = 'learn':
 			elseif artemQW['sex'] >= 5:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-				'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
-				'He looks at you expectantly: "I seen something in a porno I want to try, I want to stick it in your ass now."'
+				'Artem stands and unbuttons his pants, pulling his stiff erection from his pants.'
+				'He looks at you expectantly. "I seen something in a porno I want to try. I want to stick it in your ass now."'
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act '"No way!" (<<will_cost>> Willpower)':
@@ -194,7 +192,7 @@ if $ARGS[0] = 'learn':
 						npc_rel['A2'] -= 25
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already let me fuck you. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck your ass and you turn into a prude? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+						'You decline, and he''s very offended by that. "Look <<$pcs_nickname>>, you''ve already let me fuck you. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck your ass and you turn into a prude? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 						act 'Refuse': gt 'artem_events', 'finalrefuse'
 						act 'Let him fuck your ass': gt 'artem_sex', 'slut_anal'
@@ -206,11 +204,11 @@ if $ARGS[0] = 'learn':
 			elseif artemQW['bj'] >= 5:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-				'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
-				'He looks at you expectantly: "If you still want my help, I want more, I want to fuck you."'
+				'Artem stands and unbuttons his pants, pulling his stiff erection from his pants.'
+				'He looks at you expectantly. "If you still want my help, I want more. I want to fuck you."'
 				if mesec > 0:
-					'You shake your head and quickly tell him: "Sorry Artem... it''s that time of the month, we can''t."'
-					'He blushes a moment and then smiles a little. "That''s ok I can just fuck your ass then <<$pcs_nickname>>."'
+					'You shake your head. "Sorry Artem... It''s that time of the month, we can''t."'
+					'He blushes, then smiles. "That''s okay. I can just fuck your ass then."'
 					gs 'stat'
 					act 'Agree to have anal sex instead': gt 'artem_sex', 'slut_anal'
 					gs 'willpower', 'exhib', 'resist'
@@ -221,7 +219,7 @@ if $ARGS[0] = 'learn':
 							npc_rel['A2'] -= 25
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-							'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+							'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 							act 'Refuse': gt 'artem_events', 'finalrefuse'
 							act 'Let him butt fuck you': gt 'artem_sex', 'slut_anal'
@@ -238,7 +236,7 @@ if $ARGS[0] = 'learn':
 							npc_rel['A2'] -= 25
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-							'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+							'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, you''ve already sucked my dick. Meanwhile, you... fuck pretty much everyone who asks! But now I can''t fuck you? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 							'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 							act 'Refuse': gt 'artem_events', 'finalrefuse'
 							act 'Let him fuck you': gt 'artem_sex', 'slut_fuck'
@@ -251,9 +249,9 @@ if $ARGS[0] = 'learn':
 			elseif artemQW['stripsee'] < 3:
 				cla
 				if artemQW['stripsee'] = 0:
-					'Artem says a little shyly: "You know... I''ve never seen a girl naked before. Only on pictures. Maybe you could..."'
+					'"You know... I''ve never seen a girl naked before. Only on pictures. Maybe you could..." he asks shyly.'
 				else
-					'Artem says a little shyly: "I enjoyed seeing your naked last time, I want you to strip for me again but can you make a bit more of a show of it this time?"'
+					'"I enjoyed seeing you naked last time. I want you to strip for me again, but can you make a bit more of a show of it this time?" he asks shyly.'
 				end
 
 				gs 'willpower', 'exhib', 'resist'
@@ -264,19 +262,20 @@ if $ARGS[0] = 'learn':
 						npc_rel['A2'] -= 25
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
-						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 						act 'Refuse': gt 'artem_events', 'finalrefuse'
 						act 'Agree to strip':
 							*clr & cla
-							 artemQW['stripsee'] += 1
+							artemQW['stripsee'] += 1
 							gs 'fame', 'pav', 'sex', 1
 							minut += 5
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip1.jpg"></center>'
-							'You give him a serious look when you say. "Ok ok, you want me to get naked for you that badly?"'
-							'He blushes but then he nods. "Yes I do, I think it is the least you can do for me."'
-							'You think it over for a moment and then figure why not, it isn''t like a boy has never seen you naked before. "Ok fine." With those words he grins hugely. You start stripping out of your clothes slowly teasing him as you do, you might as well have some fun with this.'
+							'You give him a serious look. "Okay, okay. You want me to get naked for you that badly?"'
+							'He blushes, then nods. "I do. I think it''s the least you can do for me."'
+							'You think it over for a moment. "Okay, fine."'
+							'He grins widely as you start stripping out of your clothes, slowly teasing him as you do. You might as well have some fun with this yourself.'
 							act 'Start stripping': gt 'artem_events', 'striptease'
 						end
 					end
@@ -285,20 +284,21 @@ if $ARGS[0] = 'learn':
 				end
 				act 'Agree to strip':
 					*clr & cla
-					 artemQW['stripsee'] += 1
+					artemQW['stripsee'] += 1
 					gs 'fame', 'pav', 'sex', 1
 					minut += 5
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip1.jpg"></center>'
-					'You give him a serious look when you say. "You want me to get naked for you?"'
-					'You see him visible swallow but then he nods. "Yes I do, I think it is the least you can do for me."'
-					'You think it over for a moment and then figure why not, it isn''t like a boy has never seen you naked before. "Ok fine." With those words he grins hugely. You start stripping out of your clothes slowly teasing him as you do, you might as well have some fun with this.'
+					'You give him a serious look. "You want me to get <i>naked</i> for you?"'
+					'You see him visibly swallow before he nods. "Yes. I think it''s the least you can do for me."'
+					'You think it over for a moment. "Okay, fine."'
+					'He grins widely as you start stripping out of your clothes, slowly teasing him as you do. You might as well have some fun with this yourself.'
 					act 'Start stripping': gt 'artem_events', 'striptease'
 				end
 			else
 				cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-				'Artem stands up and unbuttons his pants, pulling his stiff erection from his pants.'
-				'He looks at you expectantly: "If you want my help, I want your mouth."'
+				'Artem stands and unbuttons his pants, pulling his stiff erection from his pants.'
+				'He looks at you expectantly. "If you want my help, I want your mouth."'
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act '"No way!" (<<will_cost>> Willpower)':
@@ -307,7 +307,7 @@ if $ARGS[0] = 'learn':
 						npc_rel['A2'] -= 25
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/bj1.jpg"></center>'
-						'You decline, and he''s very offended by that: "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... find someone else to help you. Good luck, with that attitude."'
+						'You decline, and he''s very offended by that. "Look <<$pcs_nickname>>, I spent a lot of time and effort helping you out. Meanwhile, you... you suck off or fuck pretty much everyone who asks! But you won''t touch me? That''s so not fair! We''re done... Find someone else to help you. Good luck with that attitude."'
 						'You can tell Artem is seriously offended by your refusal, and won''t help you any further. Hopefully someone else can help you with your homework.'
 						act 'Refuse': gt 'artem_events', 'finalrefuse'
 						act 'Agree to suck him off': gt 'artem_sex', 'slut_bj'
@@ -321,17 +321,19 @@ if $ARGS[0] = 'learn':
 	else
 		*nl
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk.jpg"></center>'
-		'After you finish doing your homework with Artem, you both put your books aside and relax for a few moments on his bed.'
-		act 'Talk for a bit': gt 'artemhome', 'chat'
+		'After you finish doing your homework with Artem, you put your books aside and relax for a few minutes on his bed.'
+		act 'Talk': gt 'artemhome', 'chat'
 		act 'Explore his room': gt 'artemhome', 'artemroom'
 	end
 end
 
 if $ARGS[0] = 'finalrefuse':
 	*clr & cla
-	 artemQW['artemblok'] = 1
+	artemQW['artemblok'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/talk3.jpg"></center>'
-	'You shake your head. "Fine if that is the way you want to be." With that you get up and grab your stuff and head for his door. Just as you walk out his door he says. "I never want to see you again." You walk out of his room and down the hall to his front door.'
+	'You shake your head. "Fine, if that''s the way you want it to be."' 
+	'You get up and grab your stuff before heading for the door. "I never want to see you again!" he says as you head out.' 
+	'You walk out of his room and down the hall to the front door.'
 	act 'Leave': gt 'pod_ezd', 'etaj_1'
 end
 
@@ -339,26 +341,27 @@ if $ARGS[0] = 'striptease':
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip2.jpg"></center>'
-	'You do a little dance on your knees as you slowly undo your bottoms. Ever so slowly teasing him with out showing him anything yet but the hint of your panties. Then you slowly take your bottoms till you only have your top and panties on.'
+	'You do a little dance on your knees as you slowly undress, teasing him without showing him anything but the hint of your panties. You then slowly remove your bottoms, leaving you with only your top and panties on.'
 	gs 'arousal', 'flashlite', 2
 	gs 'stat'
 	act 'Remove your top':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip3.jpg"></center>'
-		'Next you start to slowly undo your top, you turn you back before he can see your tits, then with your top still partially obscuring your breasts you turn back around, moving the top around giving him glimpses of your nipples until you finally remove your top, showing off your tits in all their glory.'
+		'Next, you start to slowly undo your top, turning your back before he can see your breasts. With your top still partially obscuring your breasts, you turn back round, giving him glimpses of your nipples until you finally remove your top, showing off your breasts in all their glory.'
 		gs 'arousal', 'flash', 2
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip4.jpg"></center>'
-			'Next you start to slowly pull your panties down, almost to the point your clit is visible. Then you pull them up a little teasing him, while your panties just barely obscure your pussy. Finally you pull your panties down to your mid thighs, showing off your pussy in all its glory.'
+			'Next, you start to slowly pull your panties down, almost to the point your clit is visible before you pull them up a little, teasing him as your panties just barely obscure your pussy. You then pull your panties down to your mid thighs, showing off your pussy.'
 			gs 'arousal', 'flash', 2
 			gs 'stat'
 			act 'Get naked':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/strip5.jpg"></center>'
-				'You pull your panties all the way off until you are completely naked, you dance around a bit before you finally face away from him on your knees. Then you slowly bend over with your legs spread about, getting down on all fours. Giving a perfect look at your pretty pussy.'
-				'He looks like he is about to start drooling as he stares at your pussy, you give him a few more moments and then you get up and start getting dressed again. Once you finish dressing he says. "Thank you, but I need to do a few things, so perhaps you should go for now." You just smile as you can likely guess what he needs to do, but you respect his wishes and leave.'
+				'You pull your panties all the way off and dance around naked before you finally face away from him on your knees. You then slowly bend over with your legs spread apart, getting down on all fours and giving him a perfect look at your pussy.'
+				'He looks like he''s about to start drooling as he stares at your pussy. You give him a few more seconds before you get up and start getting dressed again.'
+				'"Thank you, but I need to do a few things, so perhaps you should go," he says. You just smile as you can likely guess what he needs to do, but you respect his wishes and leave.'
 				gs 'arousal', 'flash', 2
 				gs 'arousal', 'end'
 				gs 'stat'
@@ -370,18 +373,18 @@ end
 
 if $ARGS[0] = 'artemdryhump':
 	*clr & cla
-	 artemQW['dryhump'] += 1
+	artemQW['dryhump'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/assjobc.jpg"></center>'
-	'You turn around in front of Artem, so he has a nice view of your butt. Artem carefully runs his hands over your ass cheeks, and you can feel him hesitating for a second. The he starts squeezing your butt and rubbing it with his hands. After a couple of minutes of this he places one of his hands on your shoulder and pushes you forward, you go with it and bend over. He grabs onto you and you can feel something hard pressing between your ass cheeks. When you glance back over your shoulder, you see him rubbing his erect cock against your clothes, at the crack of your ass.'
+	'You turn so he has a nice view of your ass. He carefully runs his hands over your ass cheeks, and you can feel him hesitating for a second before he starts squeezing your ass and rubbing it with his hands. After a few minutes of this, he places one of his hands on your shoulder and pushes you forward, bending you over. He then grabs onto you and you feel something hard pressing between your ass cheeks. When you glance back over your shoulder, you see him rubbing his erect cock against your clothes.'
 	gs 'arousal', 'foreplay',3
 	gs 'stat'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/buttcumc.jpg"></center>'
-		'Mere moments later, you see him cum all over your butt, on your clothes! After he finishes, you can tell he is embarrassed by it, as he apologizes: "I''m sorry <<$pcs_nickname>>, I didn''t mean to soil your clothes. It felt so good I just couldn''t stop." He turns red he blushes so hard.'
-		'Just then you hear his mothers voice out in the hall, just outside his door. "Artem I need you to run a errand into town for me."'
-		'Artem freaks out and starts to panic. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught dry humping a girl in his room. "I should really go do what my mom wants, see you tomorrow?"'
-		'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
+		'Mere moments later, you see him cum over your ass, on your clothes! Once he finishes, you can tell he''s embarrassed. "I''m sorry <<$pcs_nickname>>, I didn''t mean to soil your clothes. It felt so good, I just couldn''t stop!" He blushes so hard that he turns red.'
+		'You then hear his mother''s voice out in the hall, just outside his door. "Artem, I need you to run an errand into town for me."'
+		'Artem freaks out and starts to panic. "Um yes mom, I will!" He looks at you with a panicked stare, his mother having almost caught him dry humping a girl in his room. "I should really go do what my mom wants. See you tomorrow?"'
+		'You smile at him. "Maybe. I''ll have to see what''s going on." With that, you gather up your stuff and leave.'
 		gs 'arousal', 'foreplay', 2
 		gs 'cum_call','clothes', 'A2', 1
 		gs 'arousal', 'end'
@@ -392,18 +395,18 @@ end
 
 if $ARGS[0] = 'artemdryhump1':
 	*clr & cla
-	 artemQW['dryhump'] += 1
+	artemQW['dryhump'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/assjobp.jpg"></center>'
-	'You turn around in front of Artem, so he has a nice view of your butt. Artem carefully runs his hands over your ass cheeks, as he does you pull your clothes off until you only wearing your panties from the waste down. You bend over for him and you can feel his hard cock pressed up against your butt crack. When you glance back over your shoulder, you see him rubbing his erect cock against your panties, at the crack of your ass.'
+	'You turn so he has a nice view of your ass. He carefully runs his hands over your ass cheeks while pulling your clothes off until you''re wearing only your panties from the waist down. You bend over for him and feel his hard cock pressed against your ass. When you glance back over your shoulder, you see him rubbing his erect cock against your panties.'
 	gs 'arousal', 'foreplay',3
 	gs 'stat'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/buttcump.jpg"></center>'
-		'Mere moments later, you see him cum all over your butt, all over your panties, you can feel the wetness through them as his cum soaks into them. After he finishes, you can tell he is embarrassed by it: "That was great <<$pcs_nickname>>, it felt so good." He turns red he blushes so hard.'
-		'Just then you hear his mothers voice out in the hall, just outside his door. "Artem I need you to run a errand into town for me."'
-		'Artem freaks out and starts to panic. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught him dry humping a girl in his room. "I should really go do what my mom wants, see you tomorrow?"'
-		'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
+		'Mere moments later, you see him cum over your panties; you can feel the sticky wetness through them as his cum soaks into them. He seems pleased once he finishes. "That was great <<$pcs_nickname>>, it felt so good!"'
+		'You then hear his mother''s voice out in the hall, just outside his door. "Artem, I need you to run an errand into town for me."'
+		'Artem freaks out and starts to panic. "Um yes mom, I will!" He looks at you with a panicked stare, his mother having almost caught him dry humping a girl in his room. "I should really go do what my mom wants. See you tomorrow?"'
+		'You smile at him. "Maybe. I''ll have to see what''s going on." With that, you gather up your stuff and leave.'
 		gs 'arousal', 'foreplay', 2
 		gs 'cum_call','pantyrear', 'A2', 1
 		gs 'arousal', 'end'
@@ -414,18 +417,18 @@ end
 
 if $ARGS[0] = 'artemdryhump2':
 	*clr & cla
-	 artemQW['dryhump'] += 1
+	artemQW['dryhump'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/assjobn.jpg"></center>'
-	'You turn around in front of Artem, so he has a nice view of your butt. Artem carefully runs his hands over your ass cheeks, as he does you pull your clothes off until you''re naked from the waste down. You bend over for him and you can feel his hard cock pressed between your butt cheeks. When you glance back over your shoulder, you see him rubbing his erect cock between your ass cheeks as he pushes them together.'
+	'You turn so he has a nice view of your ass. He carefully runs his hands over your ass cheeks while pulling your clothes off until you''re naked from the waist down. You bend over for him and feel his hard cock pressed between your ass cheeks. When you glance back over your shoulder, you see him rubbing his erect cock between your ass cheeks as he pushes them together.'
 	gs 'arousal', 'foreplay', 3
 	gs 'stat'
 	act 'Continue':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/artem/sex/buttcumn.jpg"></center>'
-		'Mere moments later, you see him cum all over your naked butt and lower back. After he finishes, you can tell he is embarrassed by it: "That was great <<$pcs_nickname>>, it felt so good." He turns red he blushes so hard.'
-		'Just then you hear his mothers voice out in the hall, just outside his door. "Artem I need you to run a errand into town for me."'
-		'Artem freaks out and starts to panic. "Um yes mom, I will." He looks at you with a panicked looked, obviously afraid his mom almost caught dry humping a girl in his room. "I should really go do what my mom wants, see you tomorrow?"'
-		'You smile at him. "Maybe, I will have to see whats going on." With that you gather up your stuff and leave.'
+		'Mere moments later, you see him cum over your naked ass and lower back. He seems pleased once he finishes. "That was great <<$pcs_nickname>>, it felt so good!"'
+		'You then hear his mother''s voice out in the hall, just outside his door. "Artem, I need you to run an errand into town for me."'
+		'Artem freaks out and starts to panic. "Um yes mom, I will!" He looks at you with a panicked stare, his mother having almost caught him dry humping a half naked girl in his room. "I should really go do what my mom wants. See you tomorrow?"'
+		'You smile at him. "Maybe. I''ll have to see what''s going on." With that, you gather up your stuff and leave.'
 		gs 'arousal', 'foreplay', 2
 		gs 'cum_call','butt', 'A2', 1
 		gs 'arousal', 'end'

File diff suppressed because it is too large
+ 228 - 226
locations/artem_sex.qsrc


File diff suppressed because it is too large
+ 240 - 241
locations/artemhome.qsrc


+ 2 - 2
locations/audition_sex1.qsrc

@@ -338,7 +338,7 @@ if $ARGS[0] = 'reluctant_bj2':
 						cla & *clr
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/gag1.mp4"></video></center>'
 						'With a deep breath through your nose, you try to swallow but just feel too disgusted to do it. You gag hard and cough it all back up. Instinctively, you put your hands up to catch some but the most spatters all down your neck and across your breasts.'
-						if trait['cumeater'] = 1:
+						if pcs_traits['cumeater'] = 1:
 							'It''s not that you''re unaccustomed to swallowing cum or even mind most of the time, you just don''t want to do it <i>this</i> time. Everything about this situation turns you off.'
 						elseif swallow > 0:
 							'You''ve swallowed a few times before but it''s still gross. <i>Ugh.</i> Even after spitting it out, the aftertaste still lingers.'
@@ -388,7 +388,7 @@ if $ARGS[0] = 'reluctant_bj2':
 						'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow2.mp4"></video></center>'
 						audition['cast_couch'] = 1
 						swallow += 1
-						if trait['cumeater'] = 1:
+						if pcs_traits['cumeater'] = 1:
 							'You swallow pretty regularly, so it''s not like this is any real big ask for you to do.'
 						elseif swallow > 0:
 							'You''ve swallowed a few times before but... this is still kind of...'

+ 2 - 2
locations/bedrPar.qsrc

@@ -272,8 +272,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 			if sisboytrio = 0: access['noporn'] = 1
 			access['nocamshow'] = 1
-			$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!'
+			$access['noporn'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
+			$access['nocamshow'] ='You can''t do any webcam activities with your sister in the room!'
 		else
 			gs 'music_actions', 'clear_restrictions'
 		end

+ 1 - 1
locations/beg1.qsrc

@@ -384,7 +384,7 @@ if $ARGS[0] = 'evro':
 end
 
 if $ARGS[0] = 'Family extension':
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/St_Petersburg_run_win.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/race/run_win.jpg"></center>'
 	if $home['current'] = 'parents_home':
 		minut += 10
 		gs 'stat'

+ 2 - 2
locations/body_desc.qsrc

@@ -99,13 +99,13 @@ if $ARGS[0] = 'pussy':
 		$pc_descWordy['pussy'] = 'gaping and well used'
 		$vaginatipe = 'gaping'
 	elseif vgape = 2:
-		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage3/' + rand(1,5) + '.jpg''">vagina</a> looks like ir has seen some action, ' + iif(stat['think_virgin'] = 0,'which it totally has.','which doesn''t make sense. You''re still a virgin.')
+		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage3/' + rand(1,5) + '.jpg''">vagina</a> looks like it has seen some action, ' + iif(stat['think_virgin'] = 0,'which it totally has.','which doesn''t make sense. You''re still a virgin.')
 		$pcs_vag_image = 'images/pc/body/pussy/stage3/' + rand(1,5) + '.jpg'
 		$pc_desc['pussy'] = func($this, 'ChooseDescWord', 'recovering', 'recently used', 'welcoming')
 		$pc_descWordy['pussy'] = 'experienced, welcoming'
 		$vaginatipe = 'welcoming'
 	elseif vgape = 1 or pcs_vag > 10:
-		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg''">pussy</a> looks like has been used recently or is just well worn in, ' + iif(stat['think_virgin'] = 0,'maybe you''ve been over doing it?','which seems unfair for a virgin like yourself.')
+		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg''">pussy</a> looks like it has been used recently or is just well worn in, ' + iif(stat['think_virgin'] = 0,'maybe you''ve been over doing it?','which seems unfair for a virgin like yourself.')
 		$pcs_vag_image = 'images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg'
 		$pc_desc['pussy'] = func($this, 'ChooseDescWord', 'pliable', 'used')
 		$pc_descWordy['pussy'] = 'worn in'

+ 22 - 4
locations/booty_call.qsrc

@@ -6,30 +6,48 @@ if $ARGS[0] = 'scheduler':
 	i = 0
 	:booty_call_time_sched_loop
 	if i < ARRSIZE('$FuckBuddy'):
-		if (((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]]) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) or npc_booty_call[$FuckBuddy[i]] = daystart) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
+		if ((rand(1,10) <= npc_sexdrive[$FuckBuddy[i]] or npc_booty_call[$FuckBuddy[i]] = daystart) and (rand(1,npc_rel[$FuckBuddy[i]]) > 0)) and npc_no_booty_call[$FuckBuddy[i]] ! daystart and npc_big_fight[$FuckBuddy[i]] < daystart - 7:
 			if npc_start_free_time[$FuckBuddy[i]] = 0: 
 				$boy = $FuckBuddy[i]
 				gs 'saveupdater', 'npc_stat_update'
 			end
 			if npc_booty_call[$FuckBuddy[i]] = daystart:
-				npc_booty_call_time[$FuckBuddy[i]] = hour * 60
+				npc_booty_call_time[$FuckBuddy[i]] = hour * 60 + rand(0,120)
 			elseif week = npc_day_off[$FuckBuddy[i]]:
 				booty_call_time[$FuckBuddy[i]] = 600 + rand(0,720)
 			elseif week ! npc_day_off[$FuckBuddy[i]]:
 				booty_call_time[$FuckBuddy[i]] = rand((npc_start_free_time[$FuckBuddy[i]] * 60), (npc_end_free_time[$FuckBuddy[i]] - 1) * 60)
+			else
+				booty_call_time[$FuckBuddy[i]] = 2000
 !!			elseif week < 6:
 !!				booty_call_time[$FuckBuddy[i]] = 900 + rand(0,210)
 !!			else
 !!				booty_call_time[$FuckBuddy[i]] = 600 + rand(0,720)
 			end
-		else
-			booty_call_time[$FuckBuddy[i]] = 2000
 		end
 		i += 1
 		jump 'booty_call_time_sched_loop'
 	end
 end
 
+if $ARGS[0] = 'set_booty_call_date':
+	if booty_call['sleepover'] = 1:
+		npc_booty_call[$boy] = daystart
+	else
+		npc_booty_call[$boy] = daystart + 1
+	end
+	npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+end
+
+if $ARGS[0] = 'block_booty_calls':
+	if booty_call['sleepover'] = 1:
+		npc_booty_call[$boy] = 0
+		npc_no_booty_call[$boy] = daystart
+	else
+		npc_no_booty_call[$boy] = daystart + 1
+	end
+end
+
 if $ARGS[0] = 'SMS raiser':
 	i = 0
 	:booty_call_sms_raiser_loop

+ 286 - 166
locations/booty_call_after.qsrc

@@ -78,14 +78,23 @@ end
 
 if $ARGS[0] = 'stop_here':
 	act'Finish here?':
-		cla & *clr
-		if booty_call['blowjob_continue_ask'] = 1:
+		if booty_call['sleep_fuck'] > 0:
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"Satisfied?" you ask sleepily.'
+		elseif booty_call['blowjob_continue_ask'] = 1:
+			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
 			'"There, happy now?" you ask, playing with his cock.'
 		elseif booty_call['keep_going_continue'] > 0:
+			cla & *clr
 			$npc_apt_bedroom[$boy]
 			'"Is that good enough for you now?" you ask.'
+		elseif booty_call['first_break'] = 1:
+			cla & *nl
+			'"Actually," you say. "I think I might be happy just to finish here. How about you?"'
 		else
+			cla & *clr
 			$npc_apt_bedroom[$boy]
 			'"I think I''m good here," you say. "How about you?"'
 		end
@@ -95,9 +104,16 @@ if $ARGS[0] = 'stop_here':
 			elseif booty_call['keep_going_continue'] > 0:
 				'"Just a couple more times?" <<$npc_firstname[$boy]>> begs. "I still want to get off a few more times with you."'
 				gs'booty_call_after', 'stop_here_options'
-			else
+			elseif npc_abusive[$boy] = 1 or npc_selfish[$boy] = 1 or (npc_caretaker[$boy] ! 1 and rand(1,3)):
 				'"You''re done already?" <<$npc_firstname[$boy]>> complains. "I still want to get off a few more times with you."'
 				gs'booty_call_after', 'stop_here_options'
+			elseif npc_caretaker[$boy] = 1:
+				'"I was actually hoping to go a few more times," <<$npc_firstname[$boy]>> says a bit wistfully. "But if you want to stop, that''s all right."'
+				gs'booty_call_after', 'stop_here_options'
+			elseif npc_caretaker[$boy] = 1:
+				
+				gs'booty_call_after', 'stop_here_options'
+				
 			end
 			
 		else
@@ -236,17 +252,42 @@ end
 if $ARGS[0] = 'well_continue':
 	act'Well...':
 		booty_call['blue_ball'] = 0
-		cla & *nl
-		if booty_call['no_time'] > 0:
-			'"Well... Maybe I could be a <i>little</i> late..." you say with a soft smile.'
-		else
+		cla
+		act'We can''t have that':
+			cla & *nl
+			'"Well, we can''t have you going unsatisfied now can we?" you say with a teasing smile.'
+			booty_call['keep_going_continue'] += 1
+			gs'booty_call_after', 'well_continue2'
+		end
+		
+		act'I have a <i>little</i> more time':
+			cla & *nl
 			'"Well... I guess I might be able to keep going a <i>little</i> longer," you say with a soft smile.'
+			gs'booty_call_after', 'well_continue2'
+		end
+		if booty_call['no_time'] = 0:
+			act'I can be late':
+				cla & *nl
+				'"Well... Maybe I could be a <i>little</i> late..." you say with a soft smile.'
+				gs'booty_call_after', 'well_continue2'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'well_continue2':
+	booty_call['keep_going_continue'] += 1
+	gs'booty_call_sex', 'reset'
+	act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+	act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+	act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+	if booty_call['cock_remove'] = 0:
+		act'Keep fucking':
+			cla
+			gs 'booty_call_sex', 'reset'
+			gs 'booty_call_condoms', 'condoms'
+			gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
 		end
-		booty_call['keep_going_continue'] += 1
-		gs'booty_call_sex', 'reset'
-		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 	end
 end
 
@@ -267,19 +308,7 @@ if $ARGS[0] = 'keep_going':
 				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
 				act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
 			else
-				cla & *nl
-				$booty_call['reset_pos'] = $booty_call['position']
-				minut += rand(1,2)
-				'"Think you can keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before. "That feels like a yes," you grin.'
-				gs'booty_call_sex', 'reset'
-				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
-				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
-				act'Keep fucking':
-					cla
-					gs 'booty_call_sex', 'reset'
-					gs 'booty_call_condoms', 'condoms'
-					gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
-				end
+				
 			end
 		else
 			cla & *clr
@@ -374,6 +403,7 @@ if $ARGS[0] = 'fucked_out':
 	else
 		'You realize with a start that he''s already going soft inside you.'
 	end
+	'"I think I might be all fucked out for the day..."'
 	act'Ugh':
 		cla & *clr
 		$booty_call['end_comment'] = '"Ugh..." you groan with a roll of your eyes.'
@@ -383,6 +413,7 @@ if $ARGS[0] = 'fucked_out':
 			gs'booty_call_after', 'after_sex1'
 		else
 			gs'booty_call_after', 'pull_apart'
+			gs'booty_call_after', 'after_sex2'
 		end
 	end
 	
@@ -415,6 +446,15 @@ if $ARGS[0] = 'fucked_out':
 			gs'booty_call_after', 'after_sex2'
 		end
 	end
+	if booty_call['force_harden'] = 0:
+		act'No you''re not':
+			cla
+			booty_call['force_harden'] = 1
+			booty_call['not_done'] = 1
+			gs'booty_call_sex', 'harden_hand'
+			gs'booty_call_sex', 'harden_mouth'
+		end
+	end
 	if booty_call['cum_count'] < 3:
 		act'"Seriously?"':
 			cla & *clr
@@ -582,8 +622,16 @@ if $ARGS[0] = 'wipe_tits':
 end
 
 if $ARGS[0] = 'finish':
+	$loc = 'booty_call_after'
+	$loc_arg = 'after_sex2'
 	if booty_call['orgasm_count'] = 0 and booty_call['fake_orgasm_count'] = 0 and booty_call['fuck'] = 0 and npc_selfish[$boy] = 0 and (npc_caretaker[$boy] = 1 or rand(0,1) = 1):
 		gs'booty_call_after', 'no_cum_end'
+	elseif booty_call['force_harden'] = 2:
+		booty_call['force_harden'] = 3
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"I really can''t... keep going... <<$npc_firstname[$boy]>> huffs exhaustedly.'
+		gs'booty_call_after', 'after_sex1'
 	elseif booty_call['cum_count'] >= npc_sexdrive[$boy]:
 		booty_call['sex_end'] = 1
 		'"Yeah," <<$npc_firstname[$boy]>> pants. "I''m totally tapped out."'
@@ -715,22 +763,22 @@ if $ARGS[0] = 'black_out':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
 			'Your simultaneous orgasm was too much to handle and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you''re aware of is <<$npc_firstname[$boy]>>''s cock stuffed inside you, his cum filling your pussy to the brim, and then...'
 		elseif $booty_call['position'] = 'doggy':
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy1.jpg"></center>'
 			'Your simultaneous orgasm was too much to handle and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you''re aware of is <<$npc_firstname[$boy]>>''s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...'
 		elseif $booty_call['position'] = 'cowgirl':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
-			'Your simultaneous orgasm was too much to handle and you collapse onto <<$npc_firstname[$boy]>>''s chest, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...'
+			'Your simultaneous orgasm was too much to handle and you collapse, no strength left to stay upright and your vision begins to blur. At the back of your mind, you realize that your body is succumbing to exhaustion. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock stuffed inside you and cum filling your pussy to the brim, and then...'
 		end
 	elseif $booty_call['last_cum'] = 'creampie':
 		if $booty_call['position'] = 'miss':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
-			'Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you''re aware of is <<$npc_firstname[$boy]>>''s inside you, his cock and cum filling your pussy to the brim, and then...'
+			'Exhaustion hits you in a sudden wave and your vision begins to blur. The last thing you''re aware of is <<$npc_firstname[$boy]>> inside you, his cock and cum filling your pussy to the brim, and then...'
 		elseif $booty_call['position'] = 'doggy':
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy/1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy1.jpg"></center>'
 			'Exhaustion hits you in a sudden wave and your knees give out underneath you, collapsing onto the bed in exhaustion as your vision begins to blur and fade. The last thing you''re aware of is <<$npc_firstname[$boy]>>''s cock slipping from your pussy, the tickling sensation of his cum leaking from your snatch, and then...'
 		elseif $booty_call['position'] = 'cowgirl':
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
-			'Exhaustion hits you in a sudden wave and you collapse onto <<$npc_firstname[$boy]>>''s chest, no strength left to stay upright and your vision begins to blur. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock and cum filling your pussy to the brim, and then...'
+			'Exhaustion hits you in a sudden wave and you collapse, no strength left to stay upright and your vision begins to blur. The last thing you''re aware of is your breasts pressed up against <<$npc_firstname[$boy]>>''s chest, his cock and cum filling your pussy to the brim, and then...'
 		end
 	elseif $booty_call['last_cum'] = 'facial':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
@@ -768,6 +816,8 @@ if $ARGS[0] = 'black_out':
 			gs'stat'
 			!! eventually code in an option where girlfriend comes home and catches you in her boyfriend''s bed
 			gt'booty_call_after', 'black_out_wake'
+		elseif rand(1,10) < npc_sexdrive[$boy] - (booty_call['cum_count']/2) and (stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0) and booty_call['sleep_fuck'] = 0:
+			gt'booty_call_sex', 'sleep_sex'
 		else
 			if alko > 6:
 				booty_call['hangover'] = 1
@@ -909,8 +959,7 @@ if $ARGS[0] = 'cum_clean':
 			gs 'cum_cleanup', 'cleanloc'
 			stat['swallow'] += 1
 			cla & *clr
-			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
-			$npc_apt_bedroom[$boy]
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/lick_fingers.jpg"></center>'
 			'Briefly making eye contact with <<$npc_firstname[$boy]>>, you use your fingers to gather up all the loose cum on you and stick out your tongue, running it up your hand, licking every drop from it and into your mouth. You give your hand a thorough tongue bath, sucking your fingers clean at the end. Once finished, you smack your lips, smiling at <<$npc_firstname[$boy]>> who stared at you the whole time.'
 			if booty_call['he_cleaned'] = 0:
 				'"Any chance I could get one of those?" he gestures towards his cock.'
@@ -1062,60 +1111,70 @@ if $ARGS[0] = 'pull_apart':
 end
 
 if $ARGS[0] = 'after_sex2':
-	act'Get dressed':gt'booty_call_after', 'dressing1'
-
-	if booty_call['shower'] = 0:
-		act'Take a shower':
+	if booty_call['sleep_fuck'] > 0:
+		act'Go back to sleep':
 			cla & *clr
-			NoShampoo = 1
-			$npc_apt_bedroom[$boy]
-			'"I''m gonna borrow your shower," you say, sliding out of the bed and padding towards the bathroom.'
-			if rand(1,10) < npc_sexdrive[$boy]:
-				'"Why don''t I join you?" <<$npc_firstname[$boy]>> says, a glimmer in his eyes that lets you know he wants to do more than just "join" you.'
-				act'I''d rather not':
-					cla & *nl
-					'"No thanks," you say, smiling back wryly as you keep going. "I like my alone time," you say, just before you shut the door behind you.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
-				act'Sounds nice':
-					cla & *nl
-					'"That sounds like nice," you smile and you let him lead you into the bathroom.'
-					act'Go shower':gt'booty_call_shower', 'after_shower_together'
-				end
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle2.jpg"></center>'
+			'Your midnight fuck over, you and <<$npc_firstname[$boy]>> cuddle up together and fall asleep again.'
+			act'Sleep':gt'booty_call_after', 'sleep_function'
+		end
+	else
+		act'Get dressed':gt'booty_call_after', 'dressing1'
+	end
+	
+	if booty_call['relax_after'] = 0:
+		act'Relax together':
+			cla & *clr
+			if npc_smoker[$boy] < 1:
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'You and <<$npc_firstname[$boy]>> both lay back, quietly relaxing together in the still bliss of your love-making.'
 			else
-				'"Sure thing. Don''t use up all my soap."'
-				act'Okay':
-					cla & *nl
-					'"Okay. I won''t," you promise and head into the bathroom.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
-
-				act'I''ll try':
-					cla & *nl
-					'"I''ll try not to," you smile, padding your way into the bathroom.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
-
-				act'We''ll see':
-					cla & *nl
-					'"We''ll see about that," you smirk and pad your way into the bathroom.'
-					act'Shower':gt'booty_call_shower', 'after_alone'
-				end
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
+				'You lay back, quietly relaxing beside <<$npc_firstname[$boy]>> in the still bliss of your love-making as he puffs away on his cigarette.'
 			end
+			gs'booty_call_after', 'relax_together'
+		end
+	end
+	
+	if booty_call['sleep_fuck'] = 0:
+		if booty_call['shower'] = 0:
+			act'Take a shower':gs'booty_call_shower', 'after_borrow_shower'
 		end
 	end
 
-	if booty_call['phone'] = 0 and booty_call['angry_after'] = 0:
-		act'Play with your phone':
-			booty_call['phone'] = 1
-			cla & *clr
-			minut += rand(2,5)
-			'<center><img <<$set_imgh>> src="images/shared/sex/after/phone.jpg"></center>'
-			'You play with your phone.'
-			gs'booty_call_after', 'after_sex2'
+	if $stat_cum_msg ! '':
+		if salfetka > 0:
+			act'Clean yourself up (use your own wipes)':
+				booty_call['wipes'] = 1
+				salfetka -= 1
+				gt'booty_call_after', 'wipes'
+			end
+		end
+
+		act'Clean yourself up (ask him for wipes)':
+			booty_call['wipes'] = 2
+			gt'booty_call_after', 'wipes'
 		end
 	end
+	
+	gs'booty_call_after', 'plan_b'
+	gs'booty_call_after', 'birth_control_pill_take'
+	gs'booty_call_after', 'spend_night_ask'
+end
 
+if $ARGS[0] = 'relax_together':
+	cla
+	booty_call['relax_after'] = 1
+	act'Stop relaxing':cla & gs'booty_call_after', 'after_sex2'
+	
+	if booty_call['after_kiss'] = 0:
+		act'Kiss <<$npc_firstname[$boy]>>':gt 'booty_call_after', 'kiss'
+	end
+	
+	if booty_call['pillow_talk'] = 0:
+		act'Pillow talk':gt'booty_call_pillow_talk', 'start'
+	end
+	
 	if siga > 0 and booty_call['cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
 		act'Have a smoke':booty_call['cigarette'] = 1 & gt'booty_call_after', 'smoke'
 
@@ -1126,7 +1185,7 @@ if $ARGS[0] = 'after_sex2':
 		end
 	end
 
-	if npc_smoker[$boy] > 0 and booty_call['annoyed'] = 0 and booty_call['bum_cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
+	if npc_smoker[$boy] > 0 and booty_call['annoyed'] = 0 and booty_call['bum_cigarette'] = 0 and booty_call['cigarette'] = 0 and booty_call['pillow_talk'] = 0 and booty_call['angry_after'] = 0:
 		act'Bum a cigarette':
 			booty_call['bum_cigarette'] = 1
 			siga += 1
@@ -1141,78 +1200,61 @@ if $ARGS[0] = 'after_sex2':
 			gt'booty_call_after', 'smoke'
 		end
 	end
-
-	if $stat_cum_msg ! '':
-		if salfetka > 0:
-			act'Clean yourself up (use your own wipes)':
-				booty_call['wipes'] = 1
-				salfetka -= 1
-				gt'booty_call_after', 'wipes'
-			end
-		end
-
-		act'Clean yourself up (ask him for wipes)':
-			booty_call['wipes'] = 2
-			gt'booty_call_after', 'wipes'
-		end
-	end
-
-	if booty_call['pillow_talk'] = 0:
-		act'Pillow talk':gt'booty_call_pillow_talk', 'start'
+	
+	if booty_call['sleep_fuck'] > 0:
+!!		gs'booty_call_pillow_talk', 'sleep_fucking_talk'
+	elseif pcs_sleep < 30 and booty_call['get_up'] = 0 and booty_call['angry_after'] = 0:
+		act'Rest your eyes':gt'booty_call_after', 'bed'
 	end
+	
+end
 
-	if (hour >= 20 or hour < 5) and booty_call['spend_night'] = 0 and booty_call['mom_kill'] = 0 and booty_call['no_time'] = 0 and booty_call['angry_after'] = 0:
-		act'Ask to spend the night':
-			booty_call['spend_night'] = 1
-			cla & *clr
-			$npc_apt_bedroom[$boy]
-			'"Mind if I spend the night?" you ask.'
-			
-			act'I don''t feel like going home':
+if $ARGS[0] = 'kiss':
+	cla & *clr
+	if cum_loc['face'] <= 0:
+		npc_rel[$boy] += 2
+		$orgasm_or = 'no'
+		booty_call['after_kiss'] = 1
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/kiss1.jpg"></center>'
+		if npc_rel[$boy] < 50:
+			gs 'arousal', 'kiss', -2
+			'You lean over to kiss <<$npc_firstname[$boy]>>, gently pressing your lips against his.'
+			'"What was that for?" <<$npc_firstname[$boy]>> asks.'
+			act'Just felt like it':
 				cla & *clr
-				$npc_apt_bedroom[$boy]
-				'"Mind if I spend the night?" you ask. "I don''t feel like going home tonight."'
-				gs'booty_call_after', 'spend_night'
-			end
-
-			if mid($start_type,1,2) = 'sg':
-				act'I''m sick of my mom':
-					cla & *clr
-					$npc_apt_bedroom[$boy]
-					'"Mind if I spend the night?" you ask. "My mom has been such a bitch lately and I don''t want to see her."'
-					gs'booty_call_after', 'spend_night'
-				end
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'"I just felt like it," you shrug, giving <<$npc_firstname[$boy]>> a pleasant smile.'
+				gs 'booty_call_after', 'relax_together'
 			end
-			
-			if hour >= 22 or hour < 5:
-				act'It''s late':
-					cla & *clr
-					$npc_apt_bedroom[$boy]
-					'"Mind if I spend the night?" you ask. "It''s late and I don''t want to go."'
-					gs'booty_call_after', 'spend_night'
-				end
+			act'Cause I like you':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+				'"Cause I like you," you say, giving <<$npc_firstname[$boy]>> a pleasant smile.'
+				gs 'booty_call_after', 'relax_together'
 			end
-			
-			if pcs_lovers - pcs_girlfriends > 0 and living_with_npc > 0:
-				act'I don''t want to see my boyfriend(annoyed)':
+			if booty_call['orgasm_count'] > 0:
+				act'For making me come':
 					cla & *clr
-					$npc_apt_bedroom[$boy]
-					'"Mind if I spend the night?" you ask. "My boyfriend''s been pissing me off lately and I don''t want to go home to that."'
-					gs'booty_call_after', 'spend_night'
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+					'"A thank you," you smile gratefully. "For making me come."'
+					gs 'booty_call_after', 'relax_together'
 				end
-
-!!{				act'I don''t want to see my boyfriend(guilt)':
-
-
-				end}
 			end
+		else
+			gs 'arousal', 'kiss', -10, 'no_orgasm_msg'
+			gs 'arousal', 'kiss', rand(2,3)
+			'You lean over to kiss <<$npc_firstname[$boy]>>, gently pressing your lips against his. Instantly, it sparks something within you and the kiss takes on a passion of its own and you find yourself drinking him in; his taste, his scent, his tongue, feverishly pressing your faces together as if you might die at any second.'
+			*nl
+			'It''s several minutes before you finally break apart, panting breathlessly as you stare into each others eyes.'
+			gs 'booty_call_after', 'relax_together'
 		end
+		$orgasm_or = ''
+	else
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+		'You lean over to kiss <<$npc_firstname[$boy]>> before his eyes widen and he shies away. It puzzles you for a moment before he draws a finger around his face in a circle.'
+		'"You''ve still got..." You blink before remembering. The cum. Right. He probably doesn''t want to kiss you with his own load blown all over your face.'
+		gs 'booty_call_after', 'relax_together'
 	end
-	if pcs_sleep < 30 and booty_call['get_up'] = 0 and booty_call['angry_after'] = 0:
-		act'Rest your eyes':gt'booty_call_after', 'bed'
-	end
-	gs'booty_call_after', 'plan_b'
-	gs'booty_call_after', 'birth_control_pill_take'
 end
 
 if $ARGS[0] = 'plan_b':
@@ -1350,7 +1392,7 @@ if $ARGS[0] = 'smoke':
 	elseif npc_smoker[$boy] > 0:
 		'Seeing <<$npc_firstname[$boy]>> grab a pack, you reach for your purse and pull out your own cigarettes and both of you light up together.'
 	else
-		'You pull a cigarette from your purse and place it in your mouth, sparking it with your lighter while you inhale deeply.'
+		'You pull a cigarette from your purse and place it in your mouth, sparking it with your lighter while inhaling deeply.'
 	end
 
 	act'Smoke':
@@ -1359,12 +1401,12 @@ if $ARGS[0] = 'smoke':
 		cla & *clr
 		if npc_smoker[$boy] > 0:
 			'<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. <<$npc_firstname[$boy]>> does the same and you both enjoy your post-fuck smokes, winding down together.'
+			'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. <<$npc_firstname[$boy]>> does the same beside you.'
 		else
 			'<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.'
 		end
-		gs'booty_call_after', 'after_sex2'
+		gs'booty_call_after', 'relax_together'
 	end
 end
 
@@ -1377,7 +1419,57 @@ if $ARGS[0] = 'smoke_phone':
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/phone_smoke.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, reaching for your phone before relaxing into the bed. You spend some time scrolling through feeds while you puff your way through the cigarette, fully unwinding.'
 	end
-	gs'booty_call_after', 'after_sex2'
+	gs'booty_call_after', 'relax_together'
+end
+
+if $ARGS[0] = 'spend_night_ask':
+	if (hour >= 20 or hour < 5) and booty_call['spend_night'] = 0 and booty_call['mom_kill'] = 0 and booty_call['no_time'] = 0 and booty_call['angry_after'] = 0:
+		act'Ask to spend the night':
+			booty_call['spend_night'] = 1
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"Mind if I spend the night?" you ask.'
+			
+			act'I don''t feel like going home':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				'"Mind if I spend the night?" you ask. "I don''t feel like going home tonight."'
+				gs'booty_call_after', 'spend_night'
+			end
+
+			if mid($start_type,1,2) = 'sg':
+				act'I''m sick of my mom':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'"Mind if I spend the night?" you ask. "My mom has been such a bitch lately and I don''t want to see her."'
+					gs'booty_call_after', 'spend_night'
+				end
+			end
+			
+			if hour >= 22 or hour < 5:
+				act'It''s late':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'"Mind if I spend the night?" you ask. "It''s late and I don''t want to go."'
+					gs'booty_call_after', 'spend_night'
+				end
+			end
+			
+			if pcs_lovers - pcs_girlfriends > 0 and living_with_npc > 0:
+				act'I don''t want to see my boyfriend(annoyed)':
+					cla & *clr
+					$npc_apt_bedroom[$boy]
+					'"Mind if I spend the night?" you ask. "My boyfriend''s been pissing me off lately and I don''t want to go home to that."'
+					gs'booty_call_after', 'spend_night'
+				end
+
+!!{				act'I don''t want to see my boyfriend(guilt)':
+
+
+				end}
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'spend_night':
@@ -1482,6 +1574,7 @@ end
 
 if $ARGS[0] = 'leaving_soon':
 	act'Yeah':
+		booty_call['leaving'] = 1
 		cla & *nl
 		'"Yeah," you say, <<$booty_call[''dress_describe'']>>.'
 		gs 'booty_call_after', 'dressing2'
@@ -1773,7 +1866,7 @@ if $ARGS[0] = 'after_sex_dressed':
 
 		act'See ya':
 			cla & *nl
-			'"See you later," you wink and head out the door.'
+			'"See ya," you wink and head out the door.'
 			act'Leave':gt'booty_call_after', 'exit'
 		end
 		
@@ -1790,7 +1883,9 @@ if $ARGS[0] = 'after_sex_dressed':
 			act'Leave':gt'booty_call_after', 'exit'
 		end
 	end
-	act'Hang out':msg 'Work in progress! To be continued!'
+	if booty_call['leaving'] ! 1:
+		act'Hang out':msg 'Work in progress! To be continued!'
+	end
 	act'Break things off':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
@@ -1822,6 +1917,10 @@ if $ARGS[0] = 'after_sex_dressed':
 end
 
 
+if $ARGS[0] = 'leaving_action':
+
+end
+
 if $ARGS[0] = 'unsatisfied_breakup':
 	act'You don''t satisfy me':
 		cla & *clr
@@ -2092,13 +2191,23 @@ if $ARGS[0] = 'npc_booty_call_invite':
 	if booty_call['dress_talk1'] = 0:
 		booty_call['dress_talk1'] = 1
 		if npc_day_off[$boy] = week + 1:
+			booty_call['tomorrow_invite'] = 1
 			if npc_girlfriend[$boy] = 1:
 				pc_know_npc_has_girlfriend[$boy] = 1
-				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''s my day off tomorrow and my girlfriend won''t be around. Want to come over and do this again?"'
+				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''ll be my day off and my girlfriend won''t be around. Want to come over and do this again?"'
 			else
-				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''s my day off tomorrow. Want to come by and do this again?"'
+				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''ll be my day off. Want to come by and do this again?"'
+			end
+		elseif npc_day_off[$boy] = week and (booty_call['sleepover'] = 1 or hour < 5):
+			booty_call['later_today_invite'] = 1
+			if npc_girlfriend[$boy] = 1:
+				pc_know_npc_has_girlfriend[$boy] = 1
+				'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "Today''s my day off and my girlfriend won''t be around. Want to come over and do this again?"'
+			else
+				'"You busy later?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "It''s my day off. Want to come by and do this again?"'
 			end
 		else
+			booty_call['tomorrow_invite'] = 1
 			if npc_girlfriend[$boy] = 1:
 				pc_know_npc_has_girlfriend[$boy] = 1
 				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "My girlfriend won''t be around. Want to come over and do this again?"'
@@ -2123,9 +2232,13 @@ end
 
 if $ARGS[0] = 'busy_tomorrow':
 	act'I''m busy':
-		npc_no_booty_call[$boy] = daystart + 1
+		gs 'booty_call', 'block_booty_calls'
 		cla & *nl
-		'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I''m busy tomorrow."'
+		if booty_call['tomorrow_invite'] = 1:
+			'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I''m busy tomorrow."'
+		else
+			'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I''m busy."'
+		end
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
 		gs 'booty_call_after', 'dress_talk'
 	end
@@ -2133,7 +2246,7 @@ end
 
 if $ARGS[0] = 'busy_time':
 	act'I''m busy':
-		npc_no_booty_call[$boy] = daystart + 1
+		gs 'booty_call', 'block_booty_calls'
 		cla & *nl
 		'"I can''t, sorry," you say, <<$booty_call[''dress_describe'']>>. "I have something to do then."'
 		'"Damn," <<$npc_firstname[$boy]>> says disappointedly.'
@@ -2143,8 +2256,7 @@ end
 
 if $ARGS[0] = 'booty_call_plan':
 	act'Sounds good':
-		npc_booty_call[$boy] = daystart + 1
-		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
 		'"Sounds good," you grin, <<$booty_call[''dress_describe'']>>. "I''ll see you then."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
@@ -2152,8 +2264,7 @@ if $ARGS[0] = 'booty_call_plan':
 	end
 	
 	act'I''ve got nothing better to do':
-		npc_booty_call[$boy] = daystart + 1
-		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
 		'"Sure," you smirk, <<$booty_call[''dress_describe'']>>. "I got nothing better to do."'
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
@@ -2161,8 +2272,7 @@ if $ARGS[0] = 'booty_call_plan':
 	end
 	
 	act'I could fit it in':
-		npc_booty_call[$boy] = daystart + 1
-		npc_booty_call_time[$boy] = npc_start_free_time[$boy]
+		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
 		'"I think I can fit that in," you smirk, <<$booty_call[''dress_describe'']>>.'
 		if npc_humor[$boy] = 2:
@@ -2235,16 +2345,26 @@ if $ARGS[0] = 'sleep':
 end
 
 if $ARGS[0] = 'sleep_function':
-	booty_call['sleepover'] = 1
-	if alko > 6:
-		booty_call['hangover'] = 1
-		gs'sleep', 'simple'
-		gs'pain', 3, 'head', 'ache'
+	if rand(1,10) < npc_sexdrive[$boy] - (booty_call['cum_count']/2) and (stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0) and booty_call['sleep_fuck'] = 0:
+		booty_call['extra_cum'] += npc_sexdrive[$boy]/2
+		booty_call['sleep_time'] = rand(1,3)
+		minut += 60*booty_call['sleep_time']
+		pcs_sleep += 15*booty_call['sleep_time']
+		pcs_health += 5*booty_call['sleep_time']
+		gs'stat'
+		gt'booty_call_sex', 'sleep_sex'
 	else
-		gs'sleep', 'simple'
-	end
+		booty_call['sleepover'] = 1
+		if alko > 6:
+			booty_call['hangover'] = 1
+			gs'sleep', 'simple'
+			gs'pain', 3, 'head', 'ache'
+		else
+			gs'sleep', 'simple'
+		end
 
-	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): sveta_punishment['no_come_home'] = 1
-	gt'booty_call_morning', 'morning'
+		if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): sveta_punishment['no_come_home'] = 1
+		gt'booty_call_morning', 'morning'
+	end
 end
 --- booty_call_after ---------------------------------

+ 9 - 4
locations/booty_call_condoms.qsrc

@@ -163,6 +163,7 @@ if $ARGS[0] = 'pc_condom_ask':
 	act'Don''t say anything':
 		cla & *nl
 		booty_call['no_condom'] = 1
+		'<<$npc_firstname[$boy]>> takes your silence as consent and begins manuevering into position.'
 		gs 'booty_call_sex', 'position_choose'
 	end
 	act'Ask him to put on a condom':
@@ -745,7 +746,7 @@ if $ARGS[0] = 'temp_disable_condoms':
 			act'It''ll feel better':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
-				'"Let''s skip the condom today," you smile. "It''ll feel good without the rubber."'
+				'"Let''s skip the condom today," you smile. "It''ll feel better without it."'
 				gs 'booty_call_condoms', 'npc_temp_no_condom_react'
 			end
 			
@@ -758,21 +759,23 @@ if $ARGS[0] = 'temp_disable_condoms':
 				end
 			elseif stat['safe_day'] = 1:
 				act'It''s a safe day':
+					booty_call['safe_day'] = 1
 					cla & *clr
 					$npc_apt_bedroom[$boy]
-					'"Let''s skip the condom today," you smile. "It''s a safe day for me. I won''t get pregnant."'
+					'"Let''s skip the condom," you smile. "It''s a safe day for me. I won''t get pregnant."'
 					gs 'booty_call_condoms', 'npc_temp_no_condom_react'
 				end
 			elseif stat['probably_safe_day'] = 1:
 				act'It''s probably safe day':
+					booty_call['probably_safe_day'] = 1
 					cla & *clr
 					$npc_apt_bedroom[$boy]
-					'"Let''s skip the condom today," you smile. "It should be a safe day for me. I won''t get pregnant."'
+					'"Let''s skip the condom," you smile. "It should be a safe day for me. I won''t get pregnant."'
 !!					if npc_childfree[$boy] = 1:
 !!						gs 'booty_call_condoms', 'npc_hesitate_childfree'
 !!					else
 						*nl
-						'<i>Probably...</i> you think guiltily to yourself.'
+						'<i>Probably...</i> you think quietly to yourself.'
 						gs 'booty_call_condoms', 'npc_temp_no_condom_react'
 !!					end
 				end
@@ -952,6 +955,8 @@ if $ARGS[0] = 'pc_safe_day':
 				if mesec > 0:
 					'"You can come inside me today," you smile at <<$npc_firstname[$boy]>>. "I don''t think I can get pregnant on my period."'
 				else
+					if stat['safe_day'] = 1:booty_call['safe_day'] = 1
+					if stat['probably_safe_day'] = 1:booty_call['probably_safe_day'] = 1
 					'"<<$booty_call[''safe_day_desc1'']>>," you smile at <<$npc_firstname[$boy]>>. "<<$booty_call[''safe_day_creampie_desc'']>>."'
 				end
 	!!				if stat['probably_safe_day'] = 1 and npc_childfree[$boy] = 1:

+ 31 - 33
locations/booty_call_cowgirl.qsrc

@@ -86,6 +86,8 @@ if $ARGS[0] = 'cowgirl1':
 	booty_call['speed'] = 1
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl1'
+	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
+	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -185,6 +187,8 @@ if $ARGS[0] = 'cowgirl2':
 	booty_call['speed'] = 2
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl2'
+	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
+	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -283,6 +287,8 @@ if $ARGS[0] = 'cowgirl3':
 	booty_call['speed'] = 3
 	$booty_call['position'] = 'cowgirl'
 	$booty_call['pos_speed'] = 'cowgirl3'
+	!! booty_call['cowgirl_fuck'] tracks if you fuck in this position
+	booty_call['cowgirl_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'cowgirl_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -401,21 +407,21 @@ end
 if $ARGS[0] = 'cowgirl_change_pace':
 	cla
 	if booty_call['speed'] = 1:
-		act'Pick up the pace a little': gt 'booty_call_cowgirl', 'cowgirl2'
+		act'Pick up the pace a little': gt 'booty_call_cowgirl', 'cowgirl2.1'
 
-		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3'
+		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3.1'
 	end
 
 	if booty_call['speed'] = 2:
-		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1'
+		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1.1'
 
-		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3'
+		act'Ride ''em cowgirl!': gt 'booty_call_cowgirl', 'cowgirl3.1'
 	end
 
 	if booty_call['speed'] = 3:
-		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1'
+		act'Ride him gently': gt 'booty_call_cowgirl', 'cowgirl1.1'
 
-		act'Slow it down a little': gt 'booty_call_cowgirl', 'cowgirl2'
+		act'Slow it down a little': gt 'booty_call_cowgirl', 'cowgirl2.1'
 	end
 end
 
@@ -471,7 +477,7 @@ end
 if $ARGS[0] = 'cowgirl1_start_desc':
 !!	'You gently roll your hips over his, grinding against his cock inside your pussy.'
 	if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-		'You gently roll your hips over his, grinding his tiny dick against the inside your pussy..'
+		'You gently roll your hips over his, grinding his tiny dick against the inside your pussy.'
 	elseif $npc_dick_desc[$boy] = 'chode':
 		'You gently roll your hips over his, grinding his fat chode against the inside your pussy.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
@@ -551,35 +557,31 @@ end
 if $ARGS[0] = 'cowgirl1.1_desc':
 !!	'<<$npc_firstname[$boy]>> slows down, pulling out of you until only his tip is still inside of you before smoothly pushing himself back in, filling you to your deepest depths.'
 	if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only the tip of his tiny dick is still inside of you before smoothly pushing himself back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing hard on making sure the feel of his tiny dick isn''t lost in the pounding of your bodies.'
 	elseif $npc_dick_desc[$boy] = 'chode':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his thick chode back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing hard on making sure the feel of his thick chode isn''t lost in the pounding of your bodies.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his skinny dick back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing hard on making sure the feel of his skinny dick isn''t lost in the pounding of your bodies.'
 	elseif $npc_dick_desc[$boy] = 'normal':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, pressing his hips against your ass.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing on feeling the full shape of his dick inside you.'
 	elseif $npc_dick_desc[$boy] = 'thick':
 		if pcs_vag <= 10:
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his cock back into your tight pussy, his thick girth forcing gasps from your mouth.'
+			'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, feeling every contour and vein of his thick cock inside your tight pussy.'
 		else
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his cock back into your pussy, his thick girth <i>filling</i> you from wall to wall.'
+			'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing on feeling every contour and vein of his thick cock inside your pussy.'
 		end
 	elseif $npc_dick_desc[$boy] = 'long':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, filling you from end to end with his long shaft.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, focusing depth of his cock inside you, grinding its length up against your cervix.'
 	elseif $npc_dick_desc[$boy] = 'huge':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into your pussy, eliciting mews of pleasure as his huge shaft <i>fills</i> you from end to end.'
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, grinding yourself against the huge cock that fills you.'
 	elseif $npc_dick_desc[$boy] = 'enormous':
-		if pcs_vag <= 15:
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you, eliciting groans of pleasure as the length and girth of his enormous shaft <i>fills</i> you up, stretching your tight pussy in every conceivable manner.'
-		else
-			'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you, eliciting moans of pleasure as the length and girth of his enormous shaft <i>fills</i> you.'
-		end
+		'You slow down to a to a crawl, gently rolling your hips over <<$npc_firstname[$boy]>>''s, grinding yourself against the enormous cock that stretches your pussy in both width and length.'
 	elseif $npc_dick_desc[$boy] = 'lengthy':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you. His manhood is so insanely long that the time between those two moments is measured in seconds and goosebumps wash over your skin as you feel each centimeter of his magnificent length slide in until he bumps against your cervix.'
+		'You slow down to a to a crawl, carefully bouncing your hips up and down on <<$npc_firstname[$boy]>>''s cock, so lengthy that you feel it bounce off your cervix without ever being able to reach its base.'
 	elseif $npc_dick_desc[$boy] = 'gigantic':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you. His manhood is so insanely long that the time between those two moments is measured in seconds and goosebumps wash over your skin as you feel each centimeter of his gigantic cock slide in until he bumps against your cervix and you feel full of dick.'
+		'You slow down to a to a crawl, carefully bouncing your hips up and down on <<$npc_firstname[$boy]>>''s gigantic cock, so big that you feel it bounce off your cervix without ever being able to reach its base.'
 	elseif $npc_dick_desc[$boy] = 'monster':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently, pulling out of you until only his tip is still inside of you before smoothly pushing his dick back into you. His manhood is so insanely huge that the time between those two moments is measured in seconds and goosebumps wash over your skin as you feel each centimeter of his monstrous cock slide in, forcing your walls to stretch to accomodate it, until he bumps against your cervix and you feel <i>stuffed</i> with dick.'
+		'You slow down to a to a crawl, carefully bouncing your hips up and down on <<$npc_firstname[$boy]>>''s monstrous cock, so big that you feel it bounce off your cervix without ever being able to reach the bottom of its thick trunk.'
 	end
 end
 
@@ -589,21 +591,17 @@ if $ARGS[0] = 'cowgirl1.2_moan_desc':
 		'"<i>Mm~! Mn~! Mmm~! Nnn~!</i>"'
 		*nl
 		if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His tiny dick driving as deep as it can inside you, finding the hidden secrets of your pussy that make you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s tiny dick inside you, unable to keep your voice contained as it rubs up against your g-spot <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'chode':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His fat chode driving as deep as it can inside you, forcing you to feel his girth, making you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s thick chode inside you, unable to keep your voice contained as it stretches your pussy <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'skinny':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His skinny dick driving as deep as it can inside you, finding the hidden secrets of your pussy that make you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s skinny dick inside you, unable to keep your voice contained as it rubs up against your g-spot <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'normal':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His cock driving deep inside you, <i>filling</i> you, making you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s dick inside you, unable to keep your voice contained as it rubs up against your g-spot <i>just</i> right.'
 		elseif $npc_dick_desc[$boy] = 'thick':
-			if pcs_vag <= 10:
-				'Tiny mews escape your lips as <<$npc_firstname[$boy]>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>stretching</i> your tight pussy with its exceptional girth, making you wetter and wetter with every thrust.'
-			else
-				'Soft moans escape your lips as <<$npc_firstname[$boy]>> continues to fuck you with his thick cock. Slowly. Gently. He drives it deep inside you, <i>filling</i> you with its exceptional girth, making you wetter and wetter with every thrust.'
-			end
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s thick cock inside you, unable to keep your voice contained as it rubs up against your g-spot and stretches you out in the most satisfying way.'
 		elseif $npc_dick_desc[$boy] = 'long':
-			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His long cock driving deep inside you until it''s plunged to the hilt, its presence felt even in the deepest parts of your pussy, making you wetter and wetter with every thrust.'
+			'You mew softly as you keep grinding against <<$npc_firstname[$boy]>>''s cock inside you, unable to keep your voice contained as it rubs up against your cervix in the most satisfying way.'
 		elseif $npc_dick_desc[$boy] = 'huge':
 			'You mew softly as <<$npc_firstname[$boy]>> continues to fuck you. Slowly. Gently. His huge cock driving deep inside you until it''s plunged to the hilt, its presence felt even in the deepest parts of your pussy, <i>filling</i> you, making you wetter and wetter with every thrust.'
 		elseif $npc_dick_desc[$boy] = 'enormous':

+ 96 - 75
locations/booty_call_cum.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'miss_cum':
 			end
 		end
 	end
-	gs'booty_call_cum', 'fuck_continue'
+	gs'booty_call_sex', 'fuck_continue'
 end
 
 if $ARGS[0] = 'doggy_cum':
@@ -82,14 +82,13 @@ if $ARGS[0] = 'doggy_cum':
 			'You groan loudly as your arms give out from underneath you. Your pussy spasms around the cock inside it <<$npc_firstname[$boy]>> shoves your head down into the mattress, fucking you head down, ass up, through the entirety of your orgasm.'
 		end
 	else
-		'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
+		cla & *clr
 		if booty_call['consecutive_orgasm'] > 1:
 			'"<i>Nmmnnghhhaaaaaaaaaa!</i>"'
-			*nl
 			if booty_call['consecutive_orgasm'] < 5:
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
 				'<<$npc_firstname[$boy]>> keeps hitting all the right spots inside you, forcing your orgasm to keep going. You give a wordless groan, struggling to stay upright as he continues to fuck you from behind.'
 			else
-				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm_rough1.mp4"></video></center>'
 				'You''ve been coming for so long now, it''s a wonder how you''re still managing to stay on your kne-'
 				'Oh. That''s funny.'
@@ -98,12 +97,21 @@ if $ARGS[0] = 'doggy_cum':
 				'<i>I wonder if I might</i> actually <i>die?</i> the last conscious part of your mind wonders...'
 			end
 		else
-			'"<i>Ah~!</i> I''m-! I''m gonna-"'
-			*nl
-			'You can''t even finish the sentence before you come. Your entire body convulses around <<$npc_firstname[$boy]>>''s cock, still sliding in and out of you even as you are caught in the throes of orgasm.'
+			if npc_spanker[$boy] = 1:
+				booty_call['spank'] += 1
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm_spank1.mp4"></video></center>'
+				'"<i>Ah~! Ah~!</i> I''m-! I''m gonna-!"'
+				*nl
+				'You can''t even finish the sentence before you come. Your entire body convulses, barely able to breathe as your pussy clamps down on <<$npc_firstname[$boy]>>''s <<$npc_dick_desc[$boy]>> cock. Even as you shudder in orgasm, <<$npc_firstname[$boy]>> mercilessly spanks your ass, drawing cries of pain or pleasure from your lips. Which one, even you''re not completely sure.'
+			else
+				'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm2.mp4"></video></center>'
+				'"<i>Ah~! Ah~!</i> I''m-! I''m gonna-!"'
+				*nl
+				'You can''t even finish the sentence before you come. Your entire body convulses, barely able to breathe as you shudder uncontrollably and your pussy clamps down on <<$npc_firstname[$boy]>>''s <<$npc_dick_desc[$boy]>> cock.'
+			end
 		end
 	end
-	gs'booty_call_cum', 'fuck_continue'
+	gs'booty_call_sex', 'fuck_continue'
 end
 
 if $ARGS[0] = 'cowgirl_cum':
@@ -120,7 +128,7 @@ if $ARGS[0] = 'cowgirl_cum':
 	else
 		'The buildup of pressure inside you crashes over the edge. Your body goes taut, your pussy clenches tight, and you quiver on top of <<$npc_firstname[$boy]>>''s cock as waves of orgasm wash over you.'
 	end
-	gs'booty_call_cum', 'fuck_continue'
+	gs'booty_call_sex', 'fuck_continue'
 end
 
 if $ARGS[0] = 'fuck_cum_random':
@@ -136,6 +144,7 @@ if $ARGS[0] = 'fuck_cum_random':
 	end
 !!	if npc_generous[$boy] = 1 and booty_call['cum_choice'] <= 9:
 	if booty_call['cum_choice'] > 1 and booty_call['cum_choice'] < 10: booty_call['cum_warn'] = 1
+	
 	if booty_call['cum_choice'] = 10 and booty_call['extra_caution'] = 0:
 		$booty_call['cum_choice'] = 'creampie_surprise'
 	elseif booty_call['cum_choice'] > 7:
@@ -144,6 +153,12 @@ if $ARGS[0] = 'fuck_cum_random':
 		booty_call['cum_where'] = 1
 	elseif booty_call['cum_choice'] > 1:
 		$booty_call['cum_choice'] = $npc_cum_pref[$boy]
+		if $booty_call['cum_choice'] = 'creampie':
+			if (npc_free_creampies[$boy] = 1 and (booty_call['safe_day'] = 1 or booty_call['probably_safe_day'] = 1)) or npc_free_creampies[$boy] = 2 or npc_know_bc[$boy] = 1:
+				booty_call['cum_warn'] = 0
+				$booty_call['cum_choice'] = 'creampie_surprise'
+			end
+		end
 	else
 		booty_call['his_choice'] = 1
 		if rand(1,10) >= 9:
@@ -162,7 +177,12 @@ end
 
 if $ARGS[0] = 'random_cum_choice':
 	if rand(1,5) = 1 and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
-		$booty_call['cum_choice'] = 'creampie'
+		if (npc_free_creampies[$boy] = 1 and (booty_call['safe_day'] = 1 or booty_call['probably_safe_day'] = 1)) or npc_free_creampies[$boy] = 2:
+			booty_call['cum_warn'] = 0
+			$booty_call['cum_choice'] = 'creampie_surprise'
+		else
+			$booty_call['cum_choice'] = 'creampie'
+		end
 	elseif rand(1,4) = 1:
 		$booty_call['cum_choice'] = 'mouth'
 	elseif rand(1,3) = 1:
@@ -175,6 +195,10 @@ if $ARGS[0] = 'random_cum_choice':
 end
 
 if $ARGS[0] = 'fuck_cum':
+	!! flags to remember what kind of fucking happened during sex
+	if booty_call['speed'] = 1: booty_call['gentle_fuck'] = 1
+	if booty_call['speed'] = 2: booty_call['steady_fuck'] = 1
+	if booty_call['speed'] = 3: booty_call['rough_fuck'] = 1
 	gs 'booty_call_sex', 'pain'
 	if booty_call['dirty_talk'] = 1: booty_call['dirty_talk_talk'] = 1
 	if booty_call['boy_cum'] < 1:booty_call['boy_cum'] = rand(-1,1)
@@ -187,7 +211,7 @@ if $ARGS[0] = 'fuck_cum':
 		else
 			booty_call['consecutive_orgasm'] = 0
 		end
-		gs'booty_call_cum', 'fuck_continue'
+		gs'booty_call_sex', 'fuck_continue'
 	end
 	
 	if booty_call['cum_warn'] = 1:
@@ -217,10 +241,12 @@ if $ARGS[0] = 'fuck_cum':
 		elseif $booty_call['cum_choice'] = 'creampie':
 			booty_call['he_ask'] = 1
 			booty_call['he_ask_creampie'] = 1
-			if booty_call['orgasm'] < orgasm:
+			if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0:
+				'"Can I come inside you? Is it safe today?" <<$npc_firstname[$boy]>> whimpers almost pleadingly.'
+			elseif booty_call['orgasm'] < orgasm:
 				'"Let''s come together," <<$npc_firstname[$boy]>> says, smiling at you.'
 			else
-				'"I wanna come inside you so bad," <<$npc_firstname[$boy]>> says'
+				'"I wanna come inside you so bad," <<$npc_firstname[$boy]>> says.'
 			end
 		elseif $booty_call['cum_choice'] = 'mouth':
 			booty_call['he_ask'] = 1
@@ -306,15 +332,50 @@ if $ARGS[0] = 'fuck_cum':
 					act'Let''s come together':booty_call['creampie_ask'] = 1 & gs 'booty_call_cum', 'cum_together'
 				end
 			elseif booty_call['he_ask_creampie'] = 1:
-				act'Let him come inside you':
-					booty_call['he_ask_creampie_yes'] = 1
-					npc_creampie_okay[$boy] = 1
-					gt 'booty_call_cum', 'cum_inside'
+				if npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0:
+					if stat['safe_day'] = 1:
+						act'It''s a safe day':
+							cla & *nl
+							booty_call['safe_day'] = 1
+							npc_creampie_okay[$boy] = 1
+							'"It''s a safe day," you smile at him. "Go ahead."'
+							act'Continue':gt 'booty_call_cum', 'cum_inside'
+						end
+					elseif stat['probably_safe_day'] = 1:
+						act'It''s probably a safe day':
+							cla & *nl
+							booty_call['probably_safe_day'] = 1
+							npc_creampie_okay[$boy] = 1
+							'"It should be," you smile at him. "Go ahead."'
+							act'Continue':gt 'booty_call_cum', 'cum_inside'
+						end
+					else
+						act'It''s a safe day (lie)':
+							cla & *nl
+							booty_call['safe_day'] = 1
+							npc_creampie_okay[$boy] = 1
+							'"It''s a safe day," you say with a deceitful smile. "Go ahead."'
+							act'Continue':gt 'booty_call_cum', 'cum_inside'
+						end
+					end
+				else
+					act'Let him come inside you':
+						cla & *nl
+						booty_call['he_ask_creampie_yes'] = 1
+						npc_creampie_okay[$boy] = 1
+						'"Go ahead," you smile. "Fill me up."'
+						act'Continue':gt 'booty_call_cum', 'cum_inside'
+					end
+					
+					act'Let''s come together (fake orgasm)':gs 'booty_call_cum', 'cum_together_fake'
 				end
-				
-				act'Let''s come together (fake orgasm)':gs 'booty_call_cum', 'cum_together_fake'
 			else
-				act'Come inside me!':booty_call['creampie_ask'] = 1 & gt 'booty_call_cum', 'cum_inside'
+				act'Come inside me!':
+					cla & *nl
+					booty_call['creampie_ask'] = 1
+					'"Come inside me!" you cry. "Fill me up!"'
+					act'Continue':gt 'booty_call_cum', 'cum_inside'
+				end
 				
 				act'Let''s come together (fake orgasm)':gs 'booty_call_cum', 'cum_together_fake'
 			end
@@ -1103,7 +1164,9 @@ end
 if $ARGS[0] = 'creampie_code':
 	if (pcs_cp_safe_known + pcs_cp_notsafe_known + pcs_cp_risky_known) = 0:booty_call['first_creampie'] = 1
 	booty_call['creampie_count'] += 1
+	if booty_call['creampie_surprise'] = 1: booty_call['surprise_creampie_count'] += 1
 	booty_call['cum_pussy'] += 1
+	
 	if birth_control['think_safe'] = 0 and stat['dangerous_day'] = 1: booty_call['risky_creampie'] = 1
 !!	if birth_control['think_safe'] = 0: booty_call['risky_creampie'] = 1
 	
@@ -1120,19 +1183,13 @@ if $ARGS[0] = 'cum_inside':
 	!! differing descriptions based on position
 	if $booty_call['position'] = 'miss':
 		'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie1.mp4"></video></center>'
-		if booty_call['creampie_ask'] = 1:
-			'"Come inside me!" you cry. "Fill me up!"'
-			*nl
-		elseif booty_call['he_ask_creampie'] = 1:
-			'"Go ahead," you smile.'
-			*nl
-		end
 		if pcs_horny > 90:
 			$orgasm_or = 'yes'
 			gs 'arousal', 'vaginal', 1, 'no_orgasm_msg'
 			gs'stat'
 			booty_call['came_together'] = 2
 			booty_call['orgasm_count'] += 1
+			booty_call['simultaneous_orgasm_count'] += 1
 			'<<$npc_firstname[$boy]>> drives himself inside you with a grunt and you feel cum spurting out inside you. The sensation pushes you over the edge, gasping as waves of orgasm wash through you. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course, and both of you are breathing hard.'
 			gs 'booty_call_cum', 'cum_inside_pull_away'
 			gs 'booty_call_talk', 'creampie_react'
@@ -1161,7 +1218,7 @@ if $ARGS[0] = 'cum_inside':
 				gs'stat'
 				booty_call['came_together'] = 2
 				booty_call['orgasm_count'] += 1
-				booty_call['creampie_orgasm'] += 1
+				booty_call['simultaneous_orgasm_count'] += 1
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you lay there panting.'
 				act'Continue':cla & gs'booty_call_sex', 'sex_end'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
@@ -1207,7 +1264,7 @@ if $ARGS[0] = 'cum_inside':
 				gs'stat'
 				booty_call['came_together'] = 2
 				booty_call['orgasm_count'] += 1
-				booty_call['creampie_orgasm'] += 1
+				booty_call['simultaneous_orgasm_count'] += 1
 				'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
 				gs 'booty_call_cum', 'cum_inside_pull_away'
 				gs 'booty_call_talk', 'creampie_react'
@@ -1263,7 +1320,7 @@ if $ARGS[0] = 'cum_inside':
 					gs'stat'
 					booty_call['came_together'] = 2
 					booty_call['orgasm_count'] += 1
-					booty_call['creampie_orgasm'] += 1
+					booty_call['simultaneous_orgasm_count'] += 1
 					'You gasp, the sensation triggering your own climax, and get sent over the edge yourself. The two of come together, each of your orgasms fueling the other''s until eventually they''ve run their course and both of you collapse.'
 					gs 'booty_call_cum', 'cum_inside_pull_away'
 					gs 'booty_call_talk', 'creampie_react'
@@ -1343,7 +1400,7 @@ if $ARGS[0] = 'cum_together':
 	end
 	act'Orgasm':
 		booty_call['orgasm_count'] += 1
-		booty_call['creampie_orgasm'] += 1
+		booty_call['simultaneous_orgasm_count'] += 1
 		cla & *clr
 		if $booty_call['position'] = 'miss':
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/creampie1.mp4"></video></center>'
@@ -1405,7 +1462,7 @@ if $ARGS[0] = 'cum_force':
 			gs'stat'
 			booty_call['came_together'] = 1
 			booty_call['orgasm_count'] += 1
-			booty_call['creampie_orgasm'] += 1
+			booty_call['simultaneous_orgasm_count'] += 1
 			'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
 			'With a devilish grin, you suddenly speed up your movements, riding <<$npc_firstname[$boy]>> as hard as you can. Seconds later, you feel him come inside the condom, pulsing within you, and it sends you over the edge. The two of come together, holding each other tight, both of your orgasms fueling the other''s. After some time, your orgasm fades, leaving both of you panting.'
 		else
@@ -1601,7 +1658,7 @@ if $ARGS[0] = 'creampie_surprise_react':
 	if orgasm = booty_call['orgasm']:
 		act'Creampie induced orgasm':
 			booty_call['orgasm_count'] += 1
-			booty_call['creampie_orgasm'] += 1
+			booty_call['simultaneous_orgasm_count'] += 1
 			booty_call['came_together'] = 2
 			$orgasm_or = 'yes'
 			gs'arousal', 'vaginal',-1,'no_orgasm_msg'
@@ -1667,7 +1724,8 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 	else
 		'"Did... did we... did you...?" he pants.'
 	end
-
+	
+	gs'booty_call_talk', 'bask_satisfaction'
 	gs'booty_call_talk', 'cum_together_yeah'
 	gs'booty_call_talk', 'feel_full'
 	gs'booty_call_talk', 'love_creampies'
@@ -1750,18 +1808,18 @@ if $ARGS[0] = 'cum_condom':
 	$booty_call['cum_choice'] = 'condom'
 	$booty_call['last_cum'] = 'condom'
 	!! remove later when reactions are written
-	booty_call['react'] = 1
+!!	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.'
+		$booty_call['cum_describe2'] = 'looking between your legs as he removes his cock, the rubber casing around it bulging with liquid'
 		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'doggy':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum71.jpg"></center>'
-		$booty_call['cum_describe2'] = 'looking over your shoulder as you let his rubber encased cock slip from your pussy.'
+		$booty_call['cum_describe2'] = 'looking over your shoulder as you let his rubber encased cock slip from your pussy'
 		booty_call['cock_remove'] = 1
 	elseif $booty_call['position'] = 'cowgirl':
 		'<center><video autoplay loop src="images/shared/sex/cum/vagcreampie/cumvaginal.mp4"></video></center>'
-		$booty_call['cum_describe2'] = 'settling your self down onto his rubber encased cock.'
+		$booty_call['cum_describe2'] = 'settling your self down onto his rubber encased cock'
 	end
 	if condom_break > 0:
 		booty_call['broken_condom'] = 1
@@ -1885,43 +1943,6 @@ if $ARGS[0] = 'girl_cum_condom_react':
 
 end
 
-if $ARGS[0] = 'fuck_continue':
-	if booty_call['bored'] = 1:
-		act'Keep going':gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.bored'
-	elseif booty_call['virgin_enjoyment'] = -1:
-		if $booty_call['pos_speed'] = 'miss3' or $booty_call['pos_speed'] = 'doggy3':
-			act'Sob':booty_call['virgin_pain'] = 4 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-			act'Try to hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		else
-			act'Hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		end
-		act'Perservere':booty_call['virgin_pain'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'The pain is fading':booty_call['virgin_pain'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-	elseif booty_call['virgin_enjoyment'] = 1:
-		act'Just keep fucking':booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Fake some moans':booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Starting to feel good':booty_call['virgin_feel_good'] = 1 & $orgasm_or = '' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-	else
-		act'Focus on the sensations':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 0 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Moan softly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Moan loudly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		act'Talk dirty':$orgasm_or = '' & booty_call['moan'] = 0 & booty_call['dirty_talk'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		if booty_call['virgin_enjoyment'] ! 2:
-			act'Fake enjoyment':booty_call['bored'] = 1 & booty_call['moan'] = 3 & $orgasm_or = 'no' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
-		end
-	end
-	
-	act'Change position':
-		cla
-		booty_call['change_pos'] = 1
-		gs 'booty_call_sex', 'position_change'
-	end
-	
-	if $booty_call['position'] = 'cowgirl':
-		act'Change pace':gs 'booty_call_cowgirl', 'cowgirl_change_pace'
-	end
-end
-
 if $ARGS[0] = 'orgasm_check':
 
 end

+ 8 - 2
locations/booty_call_doggy.qsrc

@@ -19,8 +19,8 @@ if $ARGS[0] = 'doggy_start':
 	elseif booty_call['force_initiative'] = 2:
 		gs 'booty_call_sex', 'speed_select'
 		if $booty_call['position'] = 'miss':
-			'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/dog1.jpg"></center>'
-			'You''ve barely finished your orgasm when he rolls you onto your knees and pulls your hips back towards him. With one swift thrust, he plunges his cock into your still-quivering pussy, earning him an involuntary gasp before he begins fucking you again.'
+			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
+			'You''ve barely finished your orgasm when he rolls you onto your knees and pulls your hips back towards him. With one swift thrust, he plunges his cock into your still-quivering pussy, earning him an involuntary gasp as he begins fucking you again.'
 		elseif $booty_call['position'] = 'doggy':
 			'<center><video autoplay loop src="images/shared/sex/vag/doggy/orgasm1.mp4"></video></center>'
 			'<<$npc_firstname[$boy]>> doesn''t give you a moment to rest, continuing to fuck you all the way through your orgasm. You quiver, your sensitive pussy spasming around his cock, driving your insane even after you''ve finished.'
@@ -67,6 +67,8 @@ if $ARGS[0] = 'doggy1':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy1'
+	!! booty_call['doggy_fuck'] tracks if you fuck in this position
+	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -207,6 +209,8 @@ if $ARGS[0] = 'doggy2':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy2'
+	!! booty_call['doggy_fuck'] tracks if you fuck in this position
+	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -349,6 +353,8 @@ if $ARGS[0] = 'doggy3':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'doggy'
 	$booty_call['pos_speed'] = 'doggy3'
+	!! booty_call['doggy_fuck'] tracks if you fuck in this position
+	booty_call['doggy_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'doggy_virg_norm1'
 	gs 'arousal', 'vaginal',1,'no_orgasm_msg', 'rough'
 	gs 'stat'

+ 24 - 18
locations/booty_call_miss.qsrc

@@ -66,6 +66,8 @@ if $ARGS[0] = 'miss1':
 	if booty_call['condom'] ! 1: booty_call['no_condom'] = 1
 	$booty_call['position'] = 'miss'
 	$booty_call['pos_speed'] = 'miss1'
+	!! booty_call['missionary_fuck'] tracks if you fuck in this position
+	booty_call['missionary_fuck'] = 1
 	booty_call['kiss'] = 0
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
@@ -92,7 +94,7 @@ if $ARGS[0] = 'miss1':
 !!		'You moan beneath <<$npc_firstname[$boy]>>, your breath hitching with every thrust. You love the way his cock stretches you out, how it makes you feel <i>full</i> when he''s inside you, and your hips buck every time he draws his away.'
 		gs 'booty_call_miss', 'miss1_enjoy_desc'
 		
-		if rand(0,2) = 2 and booty_call['kiss_skip'] = 0:
+		if rand(0,2) = 2 and booty_call['kiss_skip'] = 1 and cum_loc['face'] <= 0:
 			gs 'booty_call_miss', 'miss_kiss'
 		else
 			gs 'booty_call_cum', 'fuck_cum'
@@ -243,6 +245,8 @@ if $ARGS[0] = 'miss2':
 	booty_call['kiss'] = 0
 	$booty_call['position'] = 'miss'
 	$booty_call['pos_speed'] = 'miss2'
+	!! booty_call['missionary_fuck'] tracks if you fuck in this position
+	booty_call['missionary_fuck'] = 1
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal', rand(4,8),'no_orgasm_msg'
 	gs 'stat'
@@ -330,7 +334,7 @@ if $ARGS[0] = 'miss2.1':
 	if $booty_call['pos_speed'] = 'miss1':
 		'With the new and improved pace, you find yourself enjoying it a lot more. Wet slapping sounds fill the room and you can''t help but giggle at how good it feels.'
 	elseif $booty_call['pos_speed'] = 'miss3':
-		'<<$npc_firstname[$boy]>> ramps down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more.'
+		'<<$npc_firstname[$boy]>> ramps down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more.'
 	end
 	$booty_call['pos_speed'] = 'miss2'
 	gs 'booty_call_miss', 'miss2.1_desc'
@@ -407,6 +411,8 @@ if $ARGS[0] = 'miss3':
 	!! fast/rough pace
 	$booty_call['position'] = 'miss'
 	$booty_call['pos_speed'] = 'miss3'
+	!! booty_call['missionary_fuck'] tracks if you fuck in this position
+	booty_call['missionary_fuck'] = 1
 	booty_call['kiss'] = 0
 !!	if pcs_vag = 0:gt 'booty_call_virgin', 'miss_virg_norm1'
 	gs 'arousal', 'vaginal',1,'no_orgasm_msg', 'rough'
@@ -635,7 +641,7 @@ if $ARGS[0] = 'miss_kiss':
 			'<i>At least this part feels good,</i> you think to yourself, allowing a small smile to break through.'
 		elseif booty_call['orgasm'] < orgasm:
 			if npc_smoker[$boy] > 0:
-				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tabacco, spreads them apart to push up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
+				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. His tongue, tasting vaguely of smoke and tabacco, pushes up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
 			else
 				'You smile up at <<$npc_firstname[$boy]>> as his lips meet yours. They press softly together and his tongue spreads them apart to push up against yours, gently complimenting the pleasure of his cock inside you. You close your eyes, letting them roll back in your head, knowing that he''s about to make you come.'
 			end
@@ -835,7 +841,7 @@ if $ARGS[0] = 'miss1.1_desc':
 	if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
 		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his small dick. The result is gratifying, allowing you to feel more of his meager length, no longer lost in the pounding of your hips together.'
 	elseif $npc_dick_desc[$boy] = 'chode':
-		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his small dick. The result is gratifying, allowing you to savor the way his thick chode strethes your pussy, rather than getting lost in constant pounding.'
+		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his small dick. The result is gratifying, allowing you to savour the way his thick chode stretches your pussy, rather than getting lost in constant pounding.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
 		'<<$npc_firstname[$boy]>> slows down, fucking you more gently with his skinny dick. The result is gratifying, allowing you concentrate on his length instead of slipping in and out of you like a hotdog in a hallway.'
 	elseif $npc_dick_desc[$boy] = 'normal':
@@ -888,7 +894,7 @@ if $ARGS[0] = 'miss1.2_moan_desc':
 		'You moan softly as <<$npc_firstname[$boy]>> continues to pump his cock between your legs. Slowly. Gently. It reaches deep inside you, hitting pleasure points you didn''t even know could be hit with a dick. Your breath hitches with every thrust and it feels wonderful.'
 	elseif $npc_dick_desc[$boy] = 'huge':
 		if pcs_vag <= 15:
-			'You moan softly as <<$npc_firstname[$boy]>> continues to pump his huge cock between your legs. Slowly. Gently. Stretching your snug pussy in all the best ways and <i>filling</i> you with it. It''s so tight inside you that you literally <i>squeeze</i> plesaure from it and your breath hitches with every thrust.'
+			'You moan softly as <<$npc_firstname[$boy]>> continues to pump his huge cock between your legs. Slowly. Gently. Stretching your snug pussy in all the best ways and <i>filling</i> you with it. It''s so tight inside you that you literally <i>squeeze</i> pleasure from it and your breath hitches with every thrust.'
 		else
 			'You moan softly as <<$npc_firstname[$boy]>> continues to pump his huge cock between your legs. Slowly. Gently. It <i>fills</i> you time and time again and you can''t get enough, your breath hitching with every thrust.'
 		end
@@ -943,9 +949,9 @@ if $ARGS[0] = 'miss1.2_sensation_desc':
 	elseif $npc_dick_desc[$boy] = 'chode':
 		'His cock, small but thick, stretching your lips and rubbing directly against your g-spot, massaging the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'skinny':
-		'His skinny cock slipping in and out of your pussy with tantalizing ease, enflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
+		'His skinny cock slipping in and out of your pussy with tantalizing ease, inflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'normal':
-		'His cock, thrusting deep inside you. How perfectly fills you, enflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
+		'His cock, thrusting deep inside you. How perfectly fills you, inflaming the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'thick':
 		'His thick cock, thrusting deep inside you, stretching your walls till <i>just</i> before the point of pain, a massage against the aching need of your pussy. You can feel your wetness spreading, heat radiating from your sex and from his. You breathe deeply as you sink further and further into the feelings of your own arousal.'
 	elseif $npc_dick_desc[$boy] = 'long':
@@ -1071,27 +1077,27 @@ if $ARGS[0] = 'miss2.1_desc':
 		end
 	elseif $booty_call['pos_speed'] = 'miss3':
 		if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his tiny dick. Wet slapping sounds fill the room and you can''t help but giggle at how good it feels.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his tiny dick. Wet slapping sounds fill the room and you can''t help but giggle at how good it feels.'
 		elseif $npc_dick_desc[$boy] = 'chode':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his thick chode.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his thick chode.'
 		elseif $npc_dick_desc[$boy] = 'skinny':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his skinny dick.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, unceasingly thrusting into you with his skinny dick.'
 		elseif $npc_dick_desc[$boy] = 'normal':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room with every thrust and <<$npc_firstname[$boy]>> drives his cock deep as deep as he can every time.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room with every thrust and <<$npc_firstname[$boy]>> drives his cock deep as deep as he can every time.'
 		elseif $npc_dick_desc[$boy] = 'thick':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, the sloppy squelching sounds of your pussy fucked by his thick shaft.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust, but not so hard that he''s jackhammering you. Wet slaps echo around the room as <<$npc_firstname[$boy]>>''s hips crash into yours, the sloppy squelching sounds of your pussy fucked by his thick shaft.'
 		elseif $npc_dick_desc[$boy] = 'long':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s long dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around his long shaft.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s long dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around his long shaft.'
 		elseif $npc_dick_desc[$boy] = 'huge':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the huge size of his cock forcing squelches from your cunt.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s dick hammers deep inside you. Wet slaps echo around the room as his hips collide with yours, the huge size of his cock forcing squelches from your cunt.'
 		elseif $npc_dick_desc[$boy] = 'enormous':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s enormous dick fills you to the brim. Wet slaps echo around the room as his hips collide with yours, forcing loud squelches from your snatch with his long girthy cock.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and <<$npc_firstname[$boy]>>''s enormous dick fills you to the brim. Wet slaps echo around the room as his hips collide with yours, forcing loud squelches from your snatch with his long girthy cock.'
 		elseif $npc_dick_desc[$boy] = 'lengthy':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his dick batters your insides with its exceptional length. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around <<$npc_firstname[$boy]>>''s lengthy shaft.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his dick batters your insides with its exceptional length. Wet slaps echo around the room as his hips collide with yours, the sloppy sounds of your pussy squelching around <<$npc_firstname[$boy]>>''s lengthy shaft.'
 		elseif $npc_dick_desc[$boy] = 'gigantic':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his gigantic dick fills you to the brim. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> batters your pussy with his long hard cock.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust and his gigantic dick fills you to the brim. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> batters your pussy with his long hard cock.'
 		elseif $npc_dick_desc[$boy] = 'monster':
-			'<<$npc_firstname[$boy]>> slows down to a more managable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust. His dick fills you completely and then some, forcing your pussy to strain and stretch around his long, girthy shaft. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> repeatedly batters your pussy with his monstrous cock.'
+			'<<$npc_firstname[$boy]>> slows down to a more manageable pace and you breathe a sigh of relief. With your pussy no longer feeling like it''s being hammered numb, you start to enjoy this a lot more. It''s hard enough that your breasts jiggle with every thrust. His dick fills you completely and then some, forcing your pussy to strain and stretch around his long, girthy shaft. Sloppy wet slaps echo around the room as <<$npc_firstname[$boy]>> repeatedly batters your pussy with his monstrous cock.'
 		end
 	end
 end

+ 369 - 6
locations/booty_call_morning.qsrc

@@ -1,6 +1,8 @@
 # booty_call_morning
 
 if $ARGS[0] = 'morning':
+	if booty_call['sleep_fuck'] = 1:gt'booty_call_morning', 'sleep_fuck_wake'
+	if (npc_earlyriser[$boy] = 1 or hour >= 7) and (npc_humor[$boy] = 2 or $npc_cum_pref[$boy] = 'facial') and (rand(1,10) < npc_sexdrive[$boy] or ($npc_cum_pref[$boy] = 'facial' and rand(1,5) < npc_sexdrive[$boy])):gt'booty_call_morning', 'cumshot_wakeup1'
 	'<center><video autoplay loop src="images/shared/romance/misc/wakeup1.mp4"></video></center>'
 !!{	if hangover = daystart:
 		'A sharp lance of pain pierces your consciousness, bringing you out of sleep. You wake up blearily, head <i>pounding</i> with an awful hangover.'
@@ -20,7 +22,123 @@ if $ARGS[0] = 'morning':
 	if booty_call['pass_out'] = 1:
 		
 	end
-!!	if pcs_lovers > 0:act'Guilt':gt'booty_call_morning', 'guilt'
+	if booty_call['sleep_fuck'] = 2:
+		act'Nice night':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk4.jpg"></center>'
+			'"That was nice," you smile sleepily at <<$npc_firstname[$boy]>>. "Our little mid-night romp I mean. Slept like a baby after. How about you?"'
+			if npc_humor[$boy] = 3:
+				'"I would say that fucking you always puts me to sleep, but that feels like sending the wrong message," he smiles back.'
+			else
+				'"I sleep better after a good fuck too," he grins.'
+			end
+			gs'booty_call_morning', 'wakeup1'
+		end
+	end
+	if pcs_lovers > 0:act'Guilt':gt'booty_call_morning', 'guilt1'
+end
+
+if $ARGS[0] = 'sleep_fuck_wake':
+	'<center><video autoplay loop src="images/shared/romance/misc/wakeup1.mp4"></video></center>'
+	'Your mind stirs and you slowly come to consciousness. The first thing you notice...'
+	*nl
+	if cum_loc['vagina'] > booty_call['sleep_cum_vagina']:
+		'<i>Is that cum leaking out of your pussy?</i>'
+	elseif cum_loc['face'] > booty_call['sleep_cum_face']:
+		'<i>Is there cum on my face?</i>'
+	elseif cum_loc['tits'] > booty_call['sleep_cum_tits']:
+		'<i>Is there cum on my tits?</i>'
+	elseif cum_loc['stomach'] > booty_call['sleep_cum_stomach']:
+		'<i>Is that cum on me?</i>'
+!!	else
+!!		'<i>Was <<$npc_firstname[$boy]>> wearing a condom when you went to sleep last night?</i>'
+	end
+	act'Continue':
+		cla & *clr
+		if cum_loc['vagina'] > booty_call['sleep_cum_vagina']:
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
+			'You pull aside the covers and discover, yes, it is indeed fresh cum dripping from your pussy.'
+		elseif cum_loc['face'] > booty_call['sleep_cum_face']:
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+			'You blink carefully, running your hand across your cheek to discover, yes, there is indeed fresh cum on your face.'
+		elseif cum_loc['tits'] > booty_call['sleep_cum_tits']:
+			'<center><img <<$set_imgh>> src="images/pc/body/cum/cumtits/cumtits8.jpg"></center>'
+			'You sit up, looking down to discover, yes, there is indeed fresh cum on your tits.'
+		elseif cum_loc['stomach'] > booty_call['sleep_cum_stomach']:
+			'<center><img <<$set_imgh>> src="images/pc/body/cum/cumbelly/cumbelly10.jpg"></center>'
+			'You sit up, looking down to discover, yes, there is indeed fresh cum on your belly.'
+!!		else
+!!			'<i>Was <<$npc_firstname[$boy]>> wearing a condom when you went to sleep last night?</i>'
+		end
+		
+		act'Someone had fun last night':
+		
+		end
+		
+		act'Someone had fun last night':
+			cla & *nl
+			'"Somebody had fun last night," you muse, looking over at <<$npc_firstname[$boy]>> who is also waking.'
+			if npc_sleep_sex_okay[$boy] = 0:
+				'"Yeah. Got horny while you were asleep. Is that okay?"'
+				act'Ask next time':
+					cla & *nl
+					npc_sleep_sex_okay[$boy] = 1
+					'"Just ask next time," you smirk.'
+					gs'booty_call_morning', 'wakeup1'
+				end
+				
+				act'That''s fine':
+					cla & *nl
+					npc_sleep_sex_okay[$boy] = 2
+					'"That''s fine," you smirk. "A guy''s gotta take care of his needs, doesn''t he?"'
+					gs'booty_call_morning', 'wakeup1'
+				end
+				
+				act'Sleep orgasms are the best':
+					cla & *nl
+					npc_sleep_sex_okay[$boy] = 2
+					'"Feel free to do it again," you grin. "I have the best orgasms when I''m sleeping."'
+					gs'booty_call_morning', 'wakeup1'
+				end
+			else
+				'"Yeah," he grins. "That okay?"'
+				if npc_sleep_sex_okay[$boy] = -1:
+					act'Get mad':
+						cla & *nl
+						'"No," you say, glaring daggers at him. "If I weren''t in a rush to get up, I''d rip your head off."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+					
+					act'Let it slide':
+						cla & *nl
+						'"No," you say irritably. "But I can''t do much about it now."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+				else
+					act'Of course':
+						cla & *nl
+						'"Of course it is," you smile. "I said you could."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+					
+					act'Sleep orgasms are the best':
+						cla & *nl
+						npc_sleep_sex_okay[$boy] = 2
+						'"Feel free to do it again," you grin. "I have the best orgasms when I''m sleeping."'
+						gs'booty_call_morning', 'wakeup1'
+					end
+				end
+			end
+		end
+		
+		act'Thanks for not waking me':
+			cla & *nl
+			'"Thanks for not waking me," you yawn pleasantly. You roll your hips as you do, noting that your pussy <i>definitely</i> feels used. "I really needed the sleep."'
+			'"Thanks for letting me fuck you," he grins.'
+			'"Any time," you smile.'
+			gs'booty_call_morning', 'wakeup1'
+		end
+	end
 end
 
 if $ARGS[0] = 'late_for_school':
@@ -133,7 +251,9 @@ if $ARGS[0] = 'yawn_wake':
 end
 
 if $ARGS[0] = 'wakeup1':
-!!	if npc_earlyriser = 1:
+
+!!	if npc_earlyriser[$boy] = 1 and npc_caretaker[$boy] = 1:
+!!		making breakfast? making coffee?
 !!		gt'booty_call_morning', 'earlyriser1'
 !!	elseif npc_latesleeper = 1:
 !!		gt'booty_call_morning', 'latesleeper'
@@ -150,7 +270,9 @@ if $ARGS[0] = 'wakeup1':
 	end
 
 	if booty_call['morning_shower'] = 0:
-		act'Head to the shower':gt'booty_call_morning', 'shower'
+		act'Take a shower':gt'booty_call_morning', 'shower'
+	elseif npc_earlyriser[$boy] = 1 and booty_call['npc_morning_shower'] = 1:
+		act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_morning', 'shower'
 	end
 
 !!	act'Snuggle back into bed':
@@ -201,9 +323,29 @@ if $ARGS[0] = 'head_out':
 	else
 		cla & *clr
 		$npc_apt_hall[$boy]
-		'"Bye then."'
-		'You gather your things and give him a wave and head out the door.'
-		act'Leave':gt'booty_call_after', 'exit'
+		act'Bye':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Bye then."'
+			'You gather your things and give him a wave and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+
+		act'See ya':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Well, see ya."'
+			'You gather your things and give him a wave and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+
+		act'Blow him a kiss':
+			cla & *clr
+			$npc_apt_hall[$boy]
+			'"Until next time."'
+			'You give him a wink and blow him a kiss and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
 	end
 end
 
@@ -416,10 +558,231 @@ end
 
 !! ------------------------------------ Morning Sex Stuff -------------------------------------------------------
 
+if $ARGS[0] = 'cumshot_wakeup1':
+	'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake1.mp4"></video></center>'
+	'You gasp as you are suddenly awakened by the shock of liquid splashing across your skin. Your eyes flutter open just in time to see another spurt of cum exit <<$npc_firstname[$boy]>>''s cock and hit you square in the face.'
+	act'What the fuck!':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
+		'"What the fuck are you doing?!" you exclaim, sputtering as strands of semen dribble last your lips.'
+		'"You were so hot lying there," <<$npc_firstname[$boy]>> snickers, a lewd grin smeared across his face. "I got hard just looking at you."'
+		'"So you thought it would be a good idea to cum on my face?!"'
+		'"Come on, don''t be like that. Here, clean me off. Get the rest out." He lowers his cock, pushing it towards your lips.'
+		gs'booty_call_morning', 'cumshot_wakeup_clean1'
+	end
+	
+	act'Take it in stride':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
+		'You sputter briefly as some of the salty sperm slips past your lips, but can''t help but feel amusement when you see the lewd satisfaction on <<$npc_firstname[$boy]>>''s face.'
+		act'Guess that means no morning BJ':
+			cla & *nl
+			'"Guess that means it''s too late for a morning blowjob," you snicker.'
+			'"No it''s not," he grins back and pushes his cock towards your lips.'
+			gs'booty_call_morning', 'cumshot_wakeup_clean2'
+		end
+		
+		act'At least I haven''t put on makeup':
+			cla & *nl
+			'"At least I haven''t put on my makeup yet," you giggle.'
+			'"Clean me off too," he insists, pushing his cock towards your lips.'
+			gs'booty_call_morning', 'cumshot_wakeup_clean2'
+		end
+	end
+	
+	if npc_cumshot_wake[$boy] > 0:
+		act'Again?! (annoyed)':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake2.mp4"></video></center>'
+			'"Ugh, again?!" you moan, allowing the salty sperm to slip into your mouth.'
+			'"You know you love it. Come here, clean me off," he says, pushing his cock towards your lips.'
+			gs'booty_call_morning', 'cumshot_wakeup_clean1'
+		end
+	end
+	npc_cumshot_wake[$boy] += 1
+end
+
+if $ARGS[0] = 'cumshot_wakeup_clean1':
+	act'No way':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"Ugh!" you grimace, turning your head away from the offending cock. "No way. I''m not giving you a blowjob as a reward for being a pervert."'
+		gs'booty_call_morning', 'wakeup1'
+	end
+	
+	act'Acquiesce':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
+		gs 'arousal', 'bj', 1, 'sub'
+		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
+		'Before you can make any more protest, <<$npc_firstname[$boy]>>''s cock pushes into your mouth. Your eyes accuse him of being a jerk but your lips suck obediently, drawing the last drops of cum from his shaft.'
+		gs'booty_call_morning', 'wakeup1'
+	end
+end
+
+if $ARGS[0] = 'cumshot_wakeup_clean2':
+	act'No way':
+		cla & *clr
+		$npc_apt_bedroom[$boy]
+		'"Nuh uh!" you giggle, turning your head away from his tip. "One face shot is all you get No double dipping."'
+		gs'booty_call_morning', 'wakeup1'
+	end
+	
+	act'Acquiesce':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
+		gs 'arousal', 'bj', 1, 'sub'
+		gs 'cum_call', 'mouth_swallow', $boy, 1, 0, 5
+		'"Oh fiiiine," you say, mock frowning as <<$npc_firstname[$boy]>>''s cock pushes past your lips and you subserviently suck out the last drops of cum from it.'
+		gs'booty_call_morning', 'wakeup1'
+	end
+end
 
 
 !! ------------------------------------ Misc Stuff -------------------------------------------------------
 
+if $ARGS[0] = 'guilt1':
+	cla & *clr
+	booty_call['guilt'] = 1
+	if stat['bf_cheated_on'] <= 10:
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock1.mp4"></video></center>'
+		'You bolt upright as a lance of guilt pierces through you.'
+		'<i>My <<$booty_call[''cheat'']>>...</i> you think.'
+		act'Wallow':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+			'Throwing your legs over the side of the bed, you sit up, hands on your knees, breathing hard in your guilt-driven panic.'
+			*nl
+			'<i>I just cheated on my <<$booty_call[''cheat'']>>...</i>'
+			*nl
+			'Your thoughts wander through your night with <<$npc_firstname[$boy]>>...'
+			*nl
+			if booty_call['bj'] > 0:'<i>Sucking his cock...</i>'
+			if booty_call['fuck'] > 0:'<i>Fucking him on his bed...</i>'
+			if booty_call['orgasm_count'] > 5:
+				'<i>He made you come so many times...</i>'
+			elseif booty_call['orgasm_count'] > 0:
+				'<i>How he made you come...</i>'
+			end
+			
+			if booty_call['creampie_orgasm'] > 0:
+				'<i>You came together, orgasming as he filled you with his cum...</i>'
+			elseif booty_call['creampie_count'] > 3:
+				'<i>He filled you with his cum...</i>'
+			elseif booty_call['creampie_count'] > 0:
+				'<i>And he came inside you...</i>'
+			end
+			
+			if $booty_call['cum_choice'] = 'face': '<i>And he came on your face...</i>'
+			if $booty_call['cum_choice'] = 'mouth': 
+				'<i>And he came in your mouth...</i>'
+				if booty_call['swallow'] = 1:'<i>You even swallowed...</i>'
+			end
+			*nl
+			'You feel sick to your stomach...'
+			gs'booty_call_morning','guilt_excuses'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/wakeup1.jpg"></center>'
+		'Your eyes snap open as your thoughts settle on one thing.'
+		'<i>My <<$booty_call[''cheat'']>>...</i> you think.'
+		act'Wallow':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+			'You sit up, throwing your legs over the side of the bed as the shame flows through you.'
+			'It''s nothing you haven''t felt before. This isn''t the first time you''ve cheated. It''s not the second time. It''s not even the tenth time. You''ve lost count by now. But somehow, the crippling guilt always feels the same.'
+			gs'booty_call_morning','guilt_excuses'
+		end
+	end
+end
+
+if $ARGS[0] = 'guilt_excuses':
+	act'It''s not your fault':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+		'<i>It''s not my fault,</i> you try to rationalize. <i>I have needs. Sexual needs. He preyed on that. He seduced me. I''m a victim here...</i>'
+		*nl
+		'They ring hollow in your ears.'
+		gs'booty_call_morning','guilt2'
+	end
+	
+	act'It''s just sex':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+		'<i>It''s just sex,</i> you try to rationalize. <i>It''s not like I''m falling in love with <<$npc_firstname[$boy]>> or anything. It''s not cheating. It''s just sex..</i>.'
+		gs'booty_call_morning','guilt2'
+	end
+	
+	act'You''re a whore':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock3.mp4"></video></center>'
+		'You scold yourself internally, screaming insults that impale your own soul.'
+		*nl
+		'<i>You slut! Jumping any random cock that comes your way. You''re nothing but a filthy whore...</i>'
+		*nl
+		if stat['bf_cheated_on'] > 10:
+			'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
+		end
+		act'Continue':gt'booty_call_morning','guilt3'
+	end
+end
+
+if $ARGS[0] = 'guilt2':
+	*nl
+	if stat['bf_cheated_on'] <= 10:
+		'The guilt continues to lance through you anyway.'
+	else
+		'You breathe deeply, letting the pain take its course, waiting for it to subside. It''s nothing you haven''t felt before...'
+	end
+	act'Continue':gt'booty_call_morning','guilt3'
+end
+
+if $ARGS[0] = 'guilt3':
+	'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
+!!{	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.'
+		elseif npc_apt_type[$boy] = 3:
+			booty_call['npc_morning_shower'] = 1
+			'The bed next to you is empty but you can hear water running through the wall. He must be in the shower.'
+		else
+			'The bed next to you is empty. The man you were with last night, nowhere to be found.'
+		end
+		gs'booty_call_morning','wakeup1'
+	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.'
+		gs'booty_call_morning','wakeup1'
+	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 yawns, glancing over at you before blinking, a look of concern on his face. "What''s up? Something wrong?"'
+			act'It''s nothing':
+				cla & *nl
+				'"It''s nothing," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
+				gs'booty_call_morning','wakeup1'
+			end
+			
+			if npc_know_cheat[$boy] = 0:
+				act'Tell him you''re cheating':
+				
+				end
+			elseif npc_know_cheat[$boy] = 1:
+				act'Thinking about your <<$booty_call[''cheat'']>>':
+				
+				end
+			end
+		else
+			'"Hey," he stretches, looking over at you. "You just wake up too?"'
+			act'Yeah':
+				cla & *nl
+				'"Yeah," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
+				gs'booty_call_morning','wakeup'
+			end
+		end
+!!	end
+end
+
 if $ARGS[0] = 'give_lift':
 	!! add in option later to give road head along the way
 	if booty_call['give_lift'] = 2:

+ 456 - 12
locations/booty_call_pillow_talk.qsrc

@@ -14,11 +14,12 @@ end
 
 if $ARGS[0] = 'topics':
 	act'Stop talking':cla & gs'booty_call_after', 'after_sex2'
-	if booty_call['angry_after'] = 0:
+!!	if booty_call['angry_after'] = 0:
 !!		act'Small talk':cla & gs'booty_call_pillow_talk', 'small_talk'
 		act'Talk about the sex':cla & gs'booty_call_pillow_talk', 'sex_talk'
 !!		act'Play with his cock':cla & gs'booty_call_pillow_talk', 'dick_talk'
-	end
+		if booty_call['creampie_count'] > 0 and npc_free_creampies[$boy] < 1: gs'booty_call_pillow_talk', 'free_creampies'
+!!	end
 end
 
 
@@ -47,7 +48,7 @@ if $ARGS[0] = 'good_for_you':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			minut += 1
-			'"Was it good for you?" you ask pleasantly.'	
+			'"Was it good for you?" you ask pleasantly.'
 			if booty_call['virgin'] ! 1:
 				if booty_call['cum_count'] = npc_sexdrive[$boy]:
 					'"Yeah, you were great" he says. "You practically drained my balls. I might not be able to come again for a week. What about you?"'
@@ -69,6 +70,276 @@ if $ARGS[0] = 'good_for_you':
 	end
 end
 
+if $ARGS[0] = 'good_for_you_WIP':
+	if booty_call['good_for_you'] = 0 and booty_call['mad'] ! 1 and booty_call['blue_ball'] ! 1:
+		act'Was it good for you?':
+			booty_call['good_for_you'] = 1
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+			minut += 1
+			'"Was it good for you?" you ask pleasantly.'
+!!{			if rand(0,1) = 1 and $npc_cum_pref[$boy] = 'creampie' and booty_call['creampie_count'] > 0:
+				$booty_call['boy_favorite'] = 'creampie'
+				gs'booty_call_pillow_talk', 'creampie_favorite'
+			elseif rand(0,1) = 1 and $npc_cum_pref[$boy] = 'mouth' and booty_call['mouth_cum'] > 0:
+				gs'booty_call_pillow_talk', 'cum_mouth_favorite'
+			elseif rand(0,1) = 1 and $npc_cum_pref[$boy] = 'face' and booty_call['facial'] > 0:
+				
+			elseif rand(0,1) = 1 and $npc_cum_pref[$boy] = 'tits' and booty_call['tit_cum'] > 0:
+				
+			else}
+				if booty_call['virgin'] ! 1:
+					if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+						'"My dick hurts," he says grinning. "You drained my balls. So yeah, it was good. What about you?"'
+					elseif booty_call['cum_count'] < npc_sexdrive[$boy]/2:
+						'"I could''ve gone a few more times," he says. "But it wasn''t bad. How about you?"'
+					else
+						'"Yeah, it was," he says. "How about you?"'
+					end
+					gs'booty_call_pillow_talk', 'good_for_you_too'
+				else
+					if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+						'"My dick hurts," he says grinning. "You drained my balls. So yeah, it was good."'
+					else
+						'"I could''ve gone a few more times," he says. "But it wasn''t bad."'
+					end
+					gs'booty_call_pillow_talk', 'topics'
+				end
+!!			end
+		end
+	end
+end
+
+if $ARGS[0] = 'creampie_favorite':
+	act'Glad you enjoyed it':
+		cla & *nl
+		'"I''m glad you found my pussy so satisfying," you smirk amusedly.'
+		'"What about you?" he asks. "What about you? What was your favorite part?"'
+		gs'booty_call_pillow_talk', 'pc_favorite_part'
+	end
+	
+	act'I liked it too':
+		cla & *nl
+		if booty_call['creampie_count'] = booty_call['simultaneous_orgasm_count']:
+			'"I liked it too," you say, beaming at him. "Your cock throbbing, your cum filling my pussy up, I could <i>feel</i> all of it. I think we came together every time."'
+		elseif booty_call['simultaneous_orgasm_count'] > 0:
+			'"I liked it too," you say, beaming at him. "Your cock throbbing, your cum filling my pussy up, I could <i>feel</i> all of it. It was so good I couldn''t help but come too."'
+		else
+			'"I liked it too," you say, beaming at him. "Every time you came, I could <i>feel</i> it inside me. Your cock throbbing, your cum filling my pussy up. It felt really good."'
+		end
+		gs'booty_call_pillow_talk', 'topics'
+	end
+	if booty_call['surprise_creampie_count'] >= 3:
+		'"Your pussy is amazing," <<$npc_firstname[$boy]>> says. "It''s like you were sucking me in, I couldn''t stop coming inside you."'
+		if npc_free_creampies[$boy] < 1:
+			act'Ask next time (tease)':
+				cla
+				'"It would be nice if you would ask before you do," you smile teasingly. "I''m not just a cum receptacle you know."'
+				'"Sorry," he replies, though he doesn''t look it. "What about you? What was your favorite part?"'
+				gs'booty_call_pillow_talk', 'pc_favorite_part'
+			end	
+			
+			act'Ask next time (annoyed)':
+				cla
+				'"It would be nice if you would ask first," you frown in annoyance. "I''m not just a cum receptacle you know."'
+				'"Sorry," he replies, though he doesn''t look it. "What about you? What was your favorite part?"'
+				gs'booty_call_pillow_talk', 'pc_favorite_part'
+			end
+		end
+	else
+		if npc_rel[$boy] < 100:
+			'"I loved coming inside you," <<$npc_firstname[$boy]>> says. "There''s just something hot about filling a girl with cum."'
+		else
+			'"I loved coming inside you," <<$npc_firstname[$boy]>> says. "There''s just something hot about filling a girl with cum. Especially you."'
+		end
+	end	
+end
+
+if $ARGS[0] = 'cum_mouth_favorite':
+	if booty_call['swallow_count'] > 0:
+		$booty_call['boy_favorite'] = 'swallowing'
+		'"It was so hot watching you swallow," <<$npc_firstname[$boy]>> says.'
+		act'I aim to please':
+			cla & *nl
+			'"Glad you liked it," you smile pleasantly. "I aim to please."'
+			'"So what about you? What did you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		act'Not my favorite':
+			cla & *nl
+			'"Well I''m glad <i>someone</i> enjoyed it," you smile ruefully. "It''s not exactly my favorite flavour of syrup. But as long as it made you happy I guess."'
+			'"So what about you? What did you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		
+		act'Your cum is disgusting':
+			npc_gross_cum[$boy] = 1
+			npc_rel[$boy] -= 2
+			cla & *nl
+			'"You could stand to eat some more fruit if you want me to keep doing it," you say, wrinkling your nose. "Your cum tastes <i>horrible</i>. It''s like drinking expired caviar."'
+			*nl
+			'You stick your tongue out, half retching at the lingering flavour.'
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		act'You''re delicious':
+			npc_tasty_cum[$boy] = 1
+			cla & *nl
+			if pcs_traits['cumeater'] > 0:
+				'"Your cum is delicious," you grin. "I like all cum, but yours is like a fine shot of vodka. Smooth and leaves you wanting more."'
+			else
+				'"Your cum is delicious," you grin. "I don''t usually like cum all that much, but yours is really nice. It''s almost sweet."'
+			end
+			'"What else did you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		if pcs_traits['cumeater'] > 0:
+			act'I love cum':
+				cla & *nl
+				'"I love cum," you grin. "If it''s in my mouth, I can''t help but swallow."'
+				'"What else did you like?"'
+				gs'booty_call_pillow_talk', 'pc_favorite_part'
+			end
+		end
+	else
+		$booty_call['boy_favorite'] = 'cum_in_mouth'
+		'"Coming in your mouth felt great," <<$npc_firstname[$boy]>> says. "I wish you''d swallow though."'
+		act'I don''t like it':
+			cla & *nl
+			'"I don''t like it," you say, wrinkling your nose. "It''s just <i>weird</i> swallowing cum."'
+			'"Then what <i>do</i> you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		act'It''s gross':
+			cla & *nl
+			'"Cum is gross," you say, wrinkling your nose. "I hate it. There''s no way I''m swallowing that vile shit."'
+			'"Then what <i>do</i> you like?"'
+			gs'booty_call_pillow_talk', 'pc_favorite_part'
+		end
+		
+		act'Don''t like you enough':
+			cla & *nl
+			'"I don''t like you enough for that yet," you say.'
+			'"So if you liked me more, you''d swallow for me?"'
+			act'No':
+				cla & *nl
+				'"No," you smirk teasingly. "Now that I know it''s what you want, maybe I''ll keep spitting just to fuck with you."'
+			end
+			
+			act'Maybe':
+				cla & *nl
+				'"Maybe," you smirk teasingly.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+			
+			act'Yes':
+				cla & *nl
+				'"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."'
+				!! insert invite for date
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		end
+		
+		act'Only for boyfriends':
+			cla & *nl
+			'"I only swallow for my boyfriend," you say.'
+			'"So if I were your boyfriend, you''d swallow for me?"'
+			act'No':
+				cla & *nl
+				'"No," you smirk teasingly. "Not now that I know how much you''d love it. I''d spit just to drive you crazy."'
+			end
+			
+			act'Maybe':
+				cla & *nl
+				'"Maybe," you smirk teasingly.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+			
+			act'Yes':
+				cla & *nl
+				'"Yes," you smirk, a mischievous twinkle in your eye. "Every drop."'
+				!! insert invite to start dating
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'pc_favorite_part':
+	act'Your cock':
+		cla & *clr
+		if pcs_pubes < 12:
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/dick_play1.jpg"></center>'
+		else
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/dick_play2.jpg"></center>'
+		end
+		'"Your cock," you grin, teasingly wrapping your fingers around his shaft. "This bad boy is the main reason I keep coming over all the time."'
+		gs'booty_call_pillow_talk', 'topics'
+	end
+	
+	if booty_call['bj_count'] > 0 and npc_gross_cum[$boy] ! 1:
+		act'Sucking your cock':
+		
+		end
+	end
+	
+	act'The sex':
+		cla
+		if booty_call['gentle_fuck'] = 1:
+			act'When you got rough with me':
+			
+			end
+		end
+		if booty_call['rough_fuck'] = 1:
+			act'When you got rough with me':
+			
+			end
+		end
+		if booty_call['rough_enjoy'] = 1:
+			act'When you got rough with me':
+				booty_call['rough_pillow_talk'] = 1
+				
+			end
+		end
+	end
+	
+	if booty_call['cuni_orgasm'] > 0:
+		act'Getting eaten out':
+			
+		end
+		
+		act'When I sat on your face':
+			
+		end
+	end
+	
+	if booty_call['creampie_count'] > 0:
+		
+	end
+	
+	if booty_call['mouth_cum'] > 0:
+		
+	end
+	
+	if booty_call['facial'] > 0:
+		
+	end
+	
+	if booty_call['tit_cum'] > 0:
+		
+	end
+	
+	if booty_call['creampie_eat'] > 0:
+		act'When you ate the creampie out of me':
+		
+		end
+	end
+end
+
 if $ARGS[0] = 'good_for_you_too':
 	act'Satisfied':
 		cla & *nl
@@ -137,7 +408,7 @@ if $ARGS[0] = 'good_for_you_too':
 	if booty_call['orgasm_count'] + booty_call['fake_orgasm_count'] > 3:
 		act'Lots of orgasms':
 			cla & *nl
-			'"You made me come so many times," you say, beaming at <<$npc_firstname[$boy]>>. "It was more than good."'
+			'"You made me come lots," you say, flashing a tired smile at <<$npc_firstname[$boy]>>. "It was more than good."'
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	elseif booty_call['orgasm_count'] > 0:
@@ -187,8 +458,8 @@ if $ARGS[0] = 'keep_it_up':
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			booty_call['keep_it_up'] = 1
 			minut += 1
-			'"You can really keep it up, huh?" you say, impressed with how many times he managed to come.'
-			'"Yeah, I guess I have a pretty high sex drive. Glad that you have one to match," he smiles back.'
+			'"You can really keep it up, huh?" you say, trying to count how many times he came.'
+			'"Yeah, I guess I have a pretty high sex drive," he smiles back.'
 			gs'booty_call_pillow_talk', 'topics'
 		end
 	end
@@ -221,8 +492,8 @@ if $ARGS[0] = 'long_time':
 			booty_call['keep_it_up'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-			'"Damn," you pant, reaching over to check your phone. "We were at it for a long time."'
-			'"Yeah," he grins back. "You''re just too much fun to fuck."'
+			'"Wow," you pant, reaching over to check your phone. "We were at it for a long time."'
+			'"I just can''t stop fucking you," he grins back. "It''s too much fun."'
 			gs'booty_call_pillow_talk', 'sex_talk'
 		end
 	end
@@ -831,17 +1102,20 @@ if $ARGS[0] = 'so_many_creampies':
 			end
 			gs'booty_call_pillow_talk', 'topics'
 		end
-		
 		act'Did you have to come inside me so many times?':
 			booty_call['creampie_pillow_talk'] = 1
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			if cum_loc['vagina'] > 0:
-				'"Did you have to come inside me so many times?" you ask, shivering in disgust as you feel <<$npc_firstname[$boy]>>''s warm cum continue to ooze from your sex.'
+				'"Did you have to come inside me so many times?" you ask, shivering as you feel <<$npc_firstname[$boy]>>''s warm cum continue to ooze from your sex.'
 			else
 				'"Did you have to come inside me so many times?" you ask in annoyance. "It took forever to clean out."'
 			end
-			if $npc_cum_pref[$boy] = 'creampie':
+			
+			if npc_free_creampies[$boy] > 0:
+				'"You said I didn''t have to ask anymore," he smirks amusedly.'
+				'"That doesn''t mean I want you to blow every single load inside me," you grumble back.'
+			elseif $npc_cum_pref[$boy] = 'creampie':
 				if cum_loc['vagina'] > 0:
 					'"I couldn''t help it," he says. "If I could, I''d fill you up with so much cum that you''d still be dripping next week."'
 				else
@@ -861,8 +1135,162 @@ if $ARGS[0] = 'so_many_creampies':
 	end
 end
 
+if $ARGS[0] = 'free_creampies':
+	if booty_call['creampie_count'] > booty_call['surprise_creampie_count']:
+		act'You don''t need to ask to come inside':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+			'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me..."'
+			act'I don''t mind':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+				'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me. I don''t mind."'
+				gs 'booty_call_pillow_talk','free_creampies2'
+			end
+			act'I love creampies':
+				cla & *clr
+				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+				'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me. I really like it. It makes me feel good."'
+				gs 'booty_call_pillow_talk','free_creampies2'
+			end
+			if pc_cum_pref_know[$boy] = 'creampie':
+				act'I know how much you like it':
+					cla & *clr
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
+					'"Y''know," you say, gently looking into <<$npc_firstname[$boy]>>''s eyes. "You don''t need to ask if you want to come inside me. I know how much you like it. And I want you to feel good."'
+					gs 'booty_call_pillow_talk','free_creampies2'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'free_creampies2':
+!! npc_free_creampies[$boy] = 1: he will freely creampie you tell him its safe
+!! npc_free_creampies[$boy] = 2: he will creampie you whenever he wants
+	if npc_abusive[$boy] = 1 and npc_childfree[$boy] ! 1:
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.'
+			*nl
+			'"Good to know..."'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_pillow_talk', 'topics'
+	elseif (npc_selfish[$boy] = 1 or npc_know_bc[$boy] = 1) and npc_childfree[$boy] ! 1:
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a look like he might just burst inside you again before giving you a delighted grin.'
+			'"Next time, I''m gonna pump you full of so much cum, you''re going to still be dripping next week," he says excitedly and you can''t help but giggle at his boyish glee.'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_pillow_talk', 'topics'
+	else
+		if npc_childfree[$boy] = 1 and npc_know_bc[$boy] ! 1:
+			'"Are you sure...?" <<$npc_firstname[$boy]>> asks hesitantly. "You''re not worried you''re going to get pregnant? I''m... I''m not really up for having kids..."'
+			!! add more options later
+		else
+			'"Is that really okay?" <<$npc_firstname[$boy]>> asks, wide-eyed.'
+		end
+		
+		act'I''ll be fine':
+			cla & *nl
+			'"I''ll be fine," you insist, smiling gently. "What could go wrong?"'
+			if npc_childfree[$boy] = 1 or rand(1,4) = 1:
+				npc_free_creampies[$boy] = -1
+				'"I''m not comfortable with it," <<$npc_firstname[$boy]>> says, shaking his head. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'"Okay..." <<$npc_firstname[$boy]>> says hesitantly, but smiles back at you anyways.'
+			end
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		act'It feels good':
+			cla & *nl
+			'"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."'
+			*nl
+			if ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] = 1 and rand(npc_willpwr[$boy],100) <= pcs_persuas) or ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] ! 1):
+				npc_free_creampies[$boy] = 2
+				'Desire wars with willpower within <<$npc_firstname[$boy]>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.'
+				'"Okay." <<$npc_firstname[$boy]>> says. "I won''t ask anymore."'
+			elseif npc_childfree[$boy] = 1:
+				npc_free_creampies[$boy] = -1
+				'<<$npc_firstname[$boy]>> hesitates for a moment before shaking his head.'
+				'"I''m not comfortable with it," he says. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'<<$npc_firstname[$boy]>> hesitates for a moment before nodding slowly.'
+				'"Okay," he says, smiling. "I won''t ask anymore."'
+			end
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		act'I''ll tell you when it''s safe':
+			npc_free_creampies[$boy] = 1
+			cla & *nl
+			if npc_childfree[$boy] = 1 and npc_know_bc[$boy] ! 1:
+				'"I don''t really want to get pregnant yet either," you smile wryly. "So... I''ll let you know when it''s a safe day. And then you can come inside me as much as you want."'
+			else
+				'"I''ll let you know when it''s a safe day," you smile gently. "And then you can come inside me as much as you want."'
+			end
+			'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+			gs'booty_call_pillow_talk', 'topics'
+		end
+		
+		if birth_control['think_safe'] = 1:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		elseif pillcon2 >= 20000:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective any day now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		else
+			act'I''m on birth control (lie)':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you lie with a seductively gentle smile. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_pillow_talk', 'topics'
+			end
+		end		
+	end
+end
+
 if $ARGS[0] = 'broken_creampie_rule':
-	if npc_boyfriend_creampie_rule[$boy] <= 2 and npc_boyfriend_creampie_rule[$boy] > 0 and booty_call['creampie_count'] > 0 and booty_call['broken_creampie_rule'] = 0:
+	if npc_boyfriend_creampie_rule[$boy] <= 2 and npc_boyfriend_creampie_rule[$boy] > 0 and booty_call['creampie_count'] > 0 and booty_call['broken_creampie_rule'] = 0 and npc_free_creampies[$boy] = 0:
 		act'Broke my creampie rule':
 			booty_call['broken_creampie_rule'] = 1
 			cla			
@@ -1040,6 +1468,22 @@ if $ARGS[0] = 'fine_high_five':
 end
 
 
+if $ARGS[0] = 'sleep_fucking_talk':
+	act'Couldn''t sleep?':
+		cla & *clr
+		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
+		'"So... couldn''t sleep?" you ask <<$npc_firstname[$boy]>> amusedly.'
+		if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
+			'"Hard to sleep with my cock snuggled up against your ass," he grins.'
+			'"Easy to get hard you mean," you snicker.'
+		else
+			'"I didn''t get enough earlier," he says. "Was still horny."'
+			'"I can tell," you giggle, rubbing your just-fucked pussy.'
+		end
+	end
+end
+
+!! ------------------------------ BOY INITIATED CONVERSATIONS -------------------------------------------------
 if $ARGS[0] = 'boy_talk':
 	if booty_call['boy_topic_check'] = 1: gs 'booty_call_pillow_talk', 'boy_topic_check'
 	

+ 897 - 74
locations/booty_call_sex.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'sex_start':
 			act'Fuck <<$npc_firstname[$boy]>>':booty_call['must_fuck'] = 1 & booty_call['fuck_now'] = 1 & gs 'booty_call_sex', 'sex_pre'
 		else
 			act'Fuck again':
-				if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['force_harden']:
+				if booty_call['cum_count'] >= npc_sexdrive[$boy] + booty_call['extra_cum']:
 					booty_call['fuck_again'] = 1
 					gs 'booty_call_after', 'fucked_out'
 				else
@@ -23,7 +23,8 @@ if $ARGS[0] = 'sex_start':
 end
 
 if $ARGS[0] = 'sex_pre':
-	cla & *nl
+	cla & *clr
+	$npc_apt_bedroom[$boy]
 	if booty_call['fuck_count'] = 0:
 		if booty_call['about_time'] = 1:
 			'"It''s about fucking time," you say, scooting backwards onto the bed.'
@@ -68,8 +69,8 @@ if $ARGS[0] = 'position_choose':
 		gs 'booty_call_virgin', 'start_options'
 	!! initiative roll
 	elseif booty_call['no_sex'] = 0:
-		booty_call['initative'] = rand(0,1)
-		if (booty_call['initative'] = 1 and booty_call['force_initiative'] ! 2) or booty_call['force_initiative'] = 1:
+		booty_call['initiative'] = rand(0,1)
+		if (booty_call['initiative'] = 1 and booty_call['force_initiative'] ! 2) or booty_call['force_initiative'] = 1:
 			!! player wins initiative
 			if $booty_call['pos_speed'] = '':
 				act'Let him choose':
@@ -158,7 +159,7 @@ if $ARGS[0] = 'rand_position':
 	elseif booty_call['position_rand'] = 4 and booty_call['must_fuck'] ! 1:
 		!! blowjob
 		gs 'booty_call_start', 'bj_ask'
-	elseif booty_call['position_rand'] = 5 and booty_call['must_fuck'] ! 1:
+	elseif booty_call['position_rand'] = 5 and booty_call['must_fuck'] ! 1 and (booty_call['creampie_count'] < 1 or npc_pussyeater[$boy] = 1):
 		*nl
 		'<<$npc_firstname[$boy]>> starts leading a trail of kisses down your stomach towards your pussy.'
 		gs 'booty_call_start', 'kuni_start'
@@ -168,6 +169,51 @@ if $ARGS[0] = 'rand_position':
 	end
 end
 
+if $ARGS[0] = 'fuck_continue':
+	
+	
+	if booty_call['bored'] = 1:
+		act'Keep going':gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.bored'
+	elseif booty_call['virgin_enjoyment'] = -1:
+		if $booty_call['pos_speed'] = 'miss3' or $booty_call['pos_speed'] = 'doggy3':
+			act'Sob':booty_call['virgin_pain'] = 4 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+			act'Try to hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		else
+			act'Hold back tears':booty_call['virgin_pain'] = 3 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		end
+		act'Perservere':booty_call['virgin_pain'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'The pain is fading':booty_call['virgin_pain'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+	elseif booty_call['virgin_enjoyment'] = 1:
+		act'Just keep fucking':booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Fake some moans':booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Starting to feel good':booty_call['virgin_feel_good'] = 1 & $orgasm_or = '' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+	else
+		act'Focus on the sensations':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 0 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Moan softly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 1 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		act'Moan loudly':$orgasm_or = '' & booty_call['dirty_talk'] = 0 & booty_call['moan'] = 2 & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+!!		act'Talk dirty':gs 'booty_call_sex', 'dirty_talk1'
+		act'Talk dirty':
+			$orgasm_or = ''
+			booty_call['moan'] = 0
+			booty_call['dirty_talk'] = 1
+			gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		end
+		if booty_call['virgin_enjoyment'] ! 2:
+			act'Fake enjoyment':booty_call['bored'] = 1 & booty_call['moan'] = 3 & $orgasm_or = 'no' & gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+		end
+	end
+	
+	act'Change position':
+		cla
+		booty_call['change_pos'] = 1
+		gs 'booty_call_sex', 'position_change'
+	end
+	
+	if $booty_call['position'] = 'cowgirl':
+		act'Change pace':gs 'booty_call_cowgirl', 'cowgirl_change_pace'
+	end
+end
+
 if $ARGS[0] = 'position_change':
 	booty_call['bored'] = 0
 	if $booty_call['position'] ! 'miss': gs 'booty_call_miss', 'missionary_start'
@@ -181,24 +227,30 @@ if $ARGS[0] = 'girl_cum_pre':
 end
 
 if $ARGS[0] = 'sex_end':
-	if booty_call['mad'] = 1:
-		gs'booty_call_after', 'bad_sex_end'
+	if booty_call['force_harden'] = 2:
+		gs 'booty_call_after', 'finish'
 	else
-		gs'booty_call_after', 'stop_here'
-	end
-	if booty_call['sex_stop'] = 0:
-		gs'booty_call_after', 'keep_going'
-		gs'booty_call_sex', 'harden_hand'
-		gs'booty_call_sex', 'harden_mouth'
-		gs'booty_call_sex', 'sex_start'
-	end
-	if booty_call['cleanup'] = 0:gs'booty_call_after', 'cum_clean'
-	if booty_call['react'] = 0:
-		gs'booty_call_after', 'facial_mouth_clean'
-		gs'booty_call_after', 'cum_kiss_cock'
-		gs'booty_call_talk', 'cum_react'
+		if booty_call['mad'] = 1:
+			gs'booty_call_after', 'bad_sex_end'
+		else
+			gs'booty_call_after', 'stop_here'
+		end
+		if booty_call['sex_stop'] = 0:
+			gs'booty_call_sex', 'keep_fucking'
+			gs'booty_call_sex', 'take_a_break'
+	!!		gs'booty_call_after', 'keep_going'
+			gs'booty_call_sex', 'harden_hand'
+			gs'booty_call_sex', 'harden_mouth'
+			gs'booty_call_sex', 'sex_start'
+		end
+		if booty_call['cleanup'] = 0:gs'booty_call_after', 'cum_clean'
+		if booty_call['react'] = 0:
+			gs'booty_call_after', 'facial_mouth_clean'
+			gs'booty_call_after', 'cum_kiss_cock'
+			gs'booty_call_talk', 'cum_react'
+		end
+		gs'booty_call_after', 'tap_out'
 	end
-	gs'booty_call_after', 'tap_out'
 end
 
 if $ARGS[0] = 'speed_select':
@@ -210,52 +262,457 @@ if $ARGS[0] = 'speed_select':
 		if booty_call['speed'] > 3: booty_call['speed'] = 3
 	end
 end
-if $ARGS[0] = 'reset':
-	$booty_call['cum_choice'] = ''
-	$booty_call['last_cum'] = ''
-	booty_call['orgasm'] = orgasm
-	booty_call['kiss'] = 0
-	booty_call['bored'] = 0
-	booty_call['he_ask'] = 0
+
+
+
+if $ARGS[0] = 'dirty_talk1':
+	cla
+	
+end
+
+if $ARGS[0] = 'dirty_talk2':
 	$orgasm_or = ''
-	booty_call['cock_remove'] = 0
-	booty_call['not_inside'] = 0
-	booty_call['pullout_ask'] = 0
-	booty_call['creampie_exit'] = 0
-	booty_call['no_cum'] = 0
-	$booty_call['position'] = ''
-!!	$booty_call['pos_speed'] = ''
-	booty_call['cleanup'] = 0
-	if booty_call['cum_together'] > 0:
-		booty_call['cum_together'] = 0
-		booty_call['creampie_orgasm'] = 1
+	booty_call['moan'] = 0
+	booty_call['dirty_talk'] = 1
+	gt 'booty_call_<<$booty_call[''position'']>>', '<<$booty_call[''pos_speed'']>>.2'
+end
+
+if $ARGS[0] = 'keep_fucking':
+	if booty_call['cock_remove'] = 0 and $booty_call['position'] = 'miss' or  $booty_call['position'] = 'doggy' or  $booty_call['position'] = 'cowgirl':
+		act'Keep fucking':
+			cla & *nl
+			$booty_call['reset_pos'] = $booty_call['position']
+			minut += rand(1,2)
+			'"Think you can keep going?" you ask, flexing your pussy around his cock. It twitches inside in response, feeling a little stiffer than before, causing you to grin. "That feels like a yes."'
+			gs'booty_call_sex', 'reset'
+			act'Continue':
+				cla
+				gs 'booty_call_sex', 'reset'
+				gs 'booty_call_condoms', 'condoms'
+				gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'take_a_break':
+	act'Take a break':
+		cla & *clr
+		!! if Sveta came
+		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>'
+				gs 'booty_call_sex', 'break_ask'
+				*nl
+				'You flop down onto the bed beside <<$npc_firstname[$boy]>>, feeling his cum trickling from your pussy.'
+				*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>'
+				elseif $booty_call['position'] = 'doggy':
+					'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+				elseif $booty_call['position'] = 'cowgirl':
+					'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+				end
+				
+				gs 'booty_call_sex', 'break_ask'
+				
+				act'Pull apart':
+					cla & *clr
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
+						'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You breathe slowly, letting yourself sink into the bed as you feel <<$npc_firstname[$boy]>>''s cum trickle from your pussy.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/doggy2.jpg"></center>'
+						'<<$npc_firstname[$boy]>> climbs off of you and flops down beside you. You barely move, breathing slowly and let your face sink into the pillow as <<$npc_firstname[$boy]>>''s cum trickles from your pussy.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after1.jpg"></center>'
+						'You climb off of <<$npc_firstname[$boy]>>, flopping down beside him and let yourself sink into the softness of the bed. His cum slowly oozes from your pussy.'
+					end
+					gs 'booty_call_sex', 'break_time'
+				end
+				
+				act'Stay like this':
+					cla & *nl
+					if $booty_call['position'] = 'miss':
+						'You lay still, leaving <<$npc_firstname[$boy]>>''s occasionally twitching cock stuffed inside you, your pussy full of his cum, taking deep breaths as you wind down.'
+					elseif $booty_call['position'] = 'doggy':
+						'You let your legs give out from under you, collapsing to the bed with <<$npc_firstname[$boy]>> still on top, his occasionally twitching cock stuffed inside you and your pussy full of his cum, taking deep breaths as you wind down.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						'You collapse onto <<$npc_firstname[$boy]>>, feeling his breathing through your breasts pressed up against his chest and the occasional twitch of his cock still stuffed inside your pussy.'
+					end
+					gs 'booty_call_sex', 'break_time'
+				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/sex/after/pillow_talk1.jpg"></center>'
+				'You flop down onto the bed, breathing hard as your body slowly unwinds, relaxing as you let yourself sink into the bed. <<$npc_firstname[$boy]>> removes the condom from his cock, tossing it aside before laying down beside you.'
+				*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
+			else
+				if $booty_call['position'] = 'miss':
+					'<<$npc_firstname[$boy]>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You breathe slowly, letting yourself sink into the bed as your body relaxes.'
+				elseif $booty_call['position'] = 'doggy':
+					'<<$npc_firstname[$boy]>> climbs off of you, removing the condom from his softening cock before flopping down beside you. You turn over onto your back and breathe slowly, letting yourself sink into the bed as your body relaxes.'
+				elseif $booty_call['position'] = 'cowgirl':
+					'You climb off of <<$npc_firstname[$boy]>>, flopping down beside him as he removes the condom from his softening cock, and let yourself sink into the softness of the bed. He ties off the rubber and tosses it aside.'
+				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>'
+				'You lay back, breathing slowly as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+			elseif $booty_call['last_cum'] = 'spit':
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+				'You lay back, breathing slowly as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+			elseif $booty_call['last_cum'] = 'swallow':
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+				'You lay back, breathing slowly as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+			elseif $booty_call['last_cum'] = 'facial':
+				'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+				'You lay back, breathing slowly as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+			elseif $booty_call['last_cum'] = 'tits':
+				$npc_apt_bedroom[$boy]
+				'You lay back, breathing slowly as you wind down, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+			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>'
+					'You lay back, breathing slowly as you wind down, feeling the warm cum on your belly already beginning to cool.'
+				elseif $booty_call['position'] = 'doggy':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+					'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, breathing slowly as you wind down.'
+				end				
+			end
+			*nl
+			'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+			gs'booty_call_sex', 'break_time'
+		end
 		
 	end
-	booty_call['cum_together_fake'] = 0
-	booty_call['cum_react'] = 0
-	if booty_call['mad'] = 1:booty_call['mad'] = 2
-	booty_call['boy_cum'] = 0
-	booty_call['consecutive_cuni_orgasm'] = 0
-!!	booty_call['reluctant_bj'] = 0
-!!	booty_call['cum_mouth'] = 0
-!!	booty_call['cum_mouth_force'] = 0
-	booty_call['about_time'] = 0
-	booty_call['his_choice'] = 0
-	booty_call['cum_warn'] = 0
-	booty_call['cum_where'] = 0
-	booty_call['he_ask'] = 0
-	booty_call['he_ask_creampie'] = 0
-	booty_call['he_ask_creampie_yes'] = 0
-	booty_call['he_ask_mouth'] = 0
-	booty_call['he_ask_facial'] = 0
-	booty_call['he_ask_tits'] = 0
-	booty_call['cum_wherever'] = 0
-	booty_call['swallow'] = 0
-	booty_call['spit'] = 0
-	booty_call['gag'] = 0
-	booty_call['react'] = 0
-	booty_call['fuck_again'] = 0
-	booty_call['must_fuck'] = 0
+end
+
+if $ARGS[0] = 'break_ask':
+	if booty_call['orgasm'] < orgasm and booty_call['cum_together_fake'] ! 1:
+		!! if Sveta came
+		if booty_call['came_together'] > 0:
+			'"Can we take a quick break?," you gasp, still shivering in the throes of your simultaneous orgasm. "I need a breather."'
+		elseif orgasm - booty_call['orgasm'] > 1:
+			'"Can we take a quick break?," you gasp, quivering from your consecutive orgasms. "I need a breather."'
+		else
+			'"Can we take a quick break?," you gasp, quivering from your recent orgasms. "I need a breather."'
+		end
+	else
+		'"Can we take a quick break?," you gasp. "Can we take a quick break? I need a breather."'
+	end
+	if booty_call['cum_count'] - 2 >= npc_sexdrive[$boy]:
+		'"Yeah," he pants back. "I think I need one too."'
+	else
+!!		if npc_selfish[$boy] = 1:
+		
+!!		else
+		'"Sure," he nods.'
+!!		end
+	end
+end
+
+if $ARGS[0] = 'break_time':
+	if booty_call['first_break'] = 0 or rand(1,3) < 3 or booty_call['cum_count'] >= npc_sexdrive:
+		booty_call['first_break'] = 1
+		
+		gs 'booty_call_after', 'stop_here'
+		gs 'booty_call_sex', 'keep_going'
+		gs 'booty_call_sex', 'ciga_break'
+		gs 'booty_call_sex', 'birth_control_take'
+	else
+		act'Continue': gs 'booty_call_sex', 'he_end_break'
+	end
+end
+
+if $ARGS[0] = 'birth_control_take':
+	if birth_control['remind_icon'] = 1:
+		act'Take your birth control':
+			birth_control['message_skip'] = daystart
+			gs'din_bad', 'quick_takepill'
+			gs 'stat'
+			cla & *clr
+			$npc_apt_bedroom[$boy]
+			'"Wait," you say, noticing your phone blinking at you from your purse.'
+			*nl
+			'<i><font color="pink"><b>Take your vitamins!</b></font></i>'
+			*nl
+			'"Gimme a sec?" you ask. "I need to take my birth control."'
+			act'Take it shyly':
+				cla & *clr
+				$npc_apt_bedroom[$boy]
+				if booty_call['cock_remove'] = 0:
+					'You somehow manage to grab hold of your purse without extricating yourself from <<$npc_firstname[$boy]>> and pop a birth control pill from the packaging.'
+					*nl
+					'"This is what the pill is for after all," you blush, shyly placing it between your lips, feeling your pussy reflexively squeeze his cock as you swallow.'
+				elseif cumloc[0] > 0:
+					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.'
+					*nl
+					if booty_call['risky_creampie'] = 1:
+						'"Hopefully we won''t have to worry about this stuff soon," you smile, shyly placing the pill between your lips and swallowing.'
+					else
+						'"This is what the pill is for after all," you smile, shyly placing the pill between your lips and swallowing.'
+					end
+				else
+					'You reach down to your purse and pull out your birth control.'
+					*nl
+					if pillcon2 > 20000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"I think it''ll kick in soon," you smile, shyly placing the pill between your lips and swallowing.'
+					elseif pillcon2 > 10000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"It''s gonna be a while before it starts working," you smile, shyly placing the pill between your lips and swallowing.'
+					elseif pillcon2 > 0 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"I only just started it," you smile, shyly placing the pill between your lips and swallowing.'
+					else
+						'"This is what the pill is for after all," you smile, shyly placing the pill between your lips and swallowing.'
+					end
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+			
+			act'Take it sexily':
+				cla & *nl
+				if booty_call['cock_remove'] = 0:
+					'You somehow manage to grab hold of your purse without extricating yourself from <<$npc_firstname[$boy]>> and pop a birth control pill from the packaging.'
+					*nl
+					'"This is what the pill is for after all," you grin, placing it between your lips, feeling your pussy reflexively squeeze his cock as you swallow.'
+				elseif cumloc[0] > 0:
+					'With <<$npc_firstname[$boy]>>''s cum still leaking from your pussy, you reach down to your purse and pull out your birth control.'
+					*nl
+					if booty_call['risky_creampie'] = 1:
+						'"You better hope this stuff kicks in soon," you say, placing the pill between your lips and swallowing with a grin.'
+					elseif birth_control['think_safe'] = 1:
+						'"My baby police pill," you say, placing the pill between your lips and swallowing with a grin. "So you can keep coming inside me without worry."'
+					else
+						'"This is what the pill is for after all," you say, placing the pill between your lips and swallowing with a grin.'
+					end
+				else
+					'You reach down to your purse and pull out your birth control.'
+					*nl
+					if pillcon2 > 20000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"Just a few more days and we''ll never have to worry about condoms again," you say, placing the pill between your lips and swallowing with a grin.'
+					elseif pillcon2 > 10000 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"It''ll take a little while, but then we''ll never have to worry about condoms again," you say, placing the pill between your lips and swallowing with a grin.'
+					elseif pillcon2 > 0 and birth_control['think_safe'] ! 1:
+						npc_know_bc_not_effective[$boy] = 1
+						'"I only just started," you say, placing the pill between your lips and swallowing with a grin. "But in about a few weeks, we''ll be able to go condom free."'
+					else
+						'"Nothing sexier than safe sex," you say, placing the pill between your lips and swallowing with a grin.'
+					end
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'he_end_break':
+	booty_call['position_rand'] = rand(1,5)
+	cla & *clr
+	$npc_apt_bedroom[$boy]
+	if booty_call['position_rand'] = 1 or $npc_fav_pos[$boy] = 'missionary':
+		!! missionary
+		'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you. You realize what''s about to happen just before he jumps on top of you, eliciting...'
+		act'... giggles':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as he forces your legs open and plunges his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
+		end
+		act'... a yelp of surprise':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss3.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting a yelp of surprise from your lips as he forces your legs open and plunges his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
+		end
+	elseif booty_call['position_rand'] = 2 or $npc_fav_pos[$boy] = 'doggy':
+		!! doggy
+		'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you. You realize what''s about to happen just before he jumps you, eliciting...'
+		act'... giggles':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy1.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting uncontrollable giggles from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
+		end
+		act'... a yelp of surprise':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/dog1.jpg"></center>'
+			'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you with a raging erection. You realize what''s about to happen just before he jumps on top of you, eliciting a yelp of surprise from from your lips as flips you onto your stomach, pulls you up by the hips, and slaps your ass before plunging his cock into your pussy.'
+			act'Get fucked':gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
+		end
+	elseif booty_call['position_rand'] = 3 and booty_call['must_fuck'] ! 1:
+		!! blowjob
+		'After a few minutes, you glance over at <<$npc_firstname[$boy]>> and find him hungrily staring at you.'
+		'"What...?" you ask hesitantly.'
+		'"I can''t stop thinking about you sucking my cock," he growls, his stare becoming even more predatory.'
+		gs 'booty_call_start', 'bj_ask2'
+	elseif booty_call['position_rand'] = 4 and (cum_loc['vagina'] = 0 or npc_pussyeater[$boy] = 1):
+		gs 'arousal','foreplay', -5, 'no_orgasm_msg'
+		'After a few minutes, <<$npc_firstname[$boy]>> climbs on top of you without saying anything.'
+		'"Hey, what are you-" you start to ask until his head descends to your stomach. He lightly kisses it, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, slowly heading towards your thighs.'
+		gs 'booty_call_start', 'kuni_start'
+	else
+		gs 'arousal','foreplay', -5, 'no_orgasm_msg'
+		'After a few minutes, <<$npc_firstname[$boy]>> climbs on top of you without saying anything.'
+		'"Hey, what are you-" you start to ask until his head descends to your neck. He lightly kisses your throat, sending shivers across your skin, before kissing again and again and again, each kiss lower than the last, blazing a trail down your collarbone to the breasts his hands are already thoroughly massaging.'
+		act'Continue':gs 'booty_call_start', 'nipple_play'
+	end
+end
+
+if $ARGS[0] = 'keep_going':
+	act'Keep going?':
+		if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			gs 'booty_call_after', 'fucked_out'
+		elseif $booty_call['position'] = 'miss' or $booty_call['position'] = 'doggy' or $booty_call['position'] = 'cowgirl':
+			if booty_call['cock_remove'] = 1:
+				cla & *clr
+				minut += rand(1,2)
+				'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
+				'"Ready to keep going?" you ask, looking over at <<$npc_firstname[$boy]>>.'
+				'"Yeah, gimme a minute to get hard again."'
+				'While you wait, you consider what you want to do next...'
+				gs'booty_call_sex', 'reset'
+				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+				act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+			else
+				cla & *nl
+				$booty_call['reset_pos'] = $booty_call['position']
+				minut += rand(1,2)
+				'"Think you can keep going?" you ask, flexing your pussy around his cock. You grin when you feel it twitch in response, seeming a little stiffer inside you than before. "That feels like a yes."'
+				gs'booty_call_sex', 'reset'
+				act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+				act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+				act'Keep fucking':
+					cla
+					gs 'booty_call_sex', 'reset'
+					gs 'booty_call_condoms', 'condoms'
+					gt 'booty_call_<<$booty_call[''reset_pos'']>>', $booty_call['pos_speed']
+				end
+			end
+		else
+			cla & *clr
+			minut += rand(1,2)
+			'<center><video autoplay loop src="images/shared/sex/misc/wait.mp4"></video></center>'
+			'"Ready to keep going?" you ask eagerly.'
+			if $booty_call['cum_choice'] ! '':
+				'"Yeah, gimme a minute to get hard again."'
+			else
+				'"Definitely. What do you have in mind?"'
+			end
+			
+			gs'booty_call_sex', 'reset'
+			act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+			act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+			act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+		end
+	end
+end
+
+if $ARGS[0] = 'ciga_break':
+	if booty_call['smoke_break'] = 0:
+		if siga > 0:
+			act'Have a smoke':
+				cla & *clr
+				booty_call['smoke_break'] = 1
+				gs 'drugs', 'smoke'
+				if npc_smoker[$boy] > 0:
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
+					if booty_call['cock_remove'] = 1:
+						'You reach down and pull out your pack of cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
+					else
+						booty_call['cock_remove'] = 1
+						if $booty_call['last_cum'] = 'creampie':
+							'You finally pull apart, immediately feeling <<$npc_firstname[$boy]>>''s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
+						else
+							'You finally pull apart, letting <<$npc_firstname[$boy]>>''s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. <<$npc_firstname[$boy]>> takes the opportunity to light up as well while you take your first drag.'
+						end
+					end
+					*nl
+					'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, and the two of you continue to puff away until there''s but the charred butts left.'
+				else
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke1.jpg"></center>'
+					if $booty_call['last_cum'] = 'creampie':
+						'You finally pull apart, immediately feeling <<$npc_firstname[$boy]>>''s cum spill from inside you as his cock vacates your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.'
+					else
+						'You finally pull apart, letting <<$npc_firstname[$boy]>>''s rubber coated cock slip from your pussy before reaching down for your cigarettes, placing one in your mouth and tossing the pack back into your purse. You spark your lighter, inhaling deeply as you take your first drag.'
+					end
+					*nl
+					'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, puffing away until there''s nothing but a charred butt left.'
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+		else
+			act'Got any smokes?':
+				cla & *clr
+				booty_call['smoke_break'] = 1
+				if npc_smoker[$boy] > 0 and rand(1,20) < 20:
+					siga += 1
+					siga_bum = 1
+					gs 'drugs', 'smoke'
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke3.jpg"></center>'
+					if booty_call['cock_remove'] = 1:
+						'"Got any smokes?" you ask. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
+					else
+						booty_call['cock_remove'] = 1
+						if $booty_call['last_cum'] = 'creampie':
+							'"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
+						else
+							'"Got any smokes?" you ask as you pull apart, finally letting <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. <<$npc_firstname[$boy]>> nods and fishes out a pack, proffering the first one to you and igniting it for you. He pulls out one for himself and lights up as well while you take your first drag.'
+						end
+					end
+					*nl
+					'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, and the two of you continue to puff away until there''s but the charred butts left.'
+				else
+					'<center><img <<$set_imgh>> src="images/shared/sex/after/annoyed1.jpg"></center>'
+					if booty_call['cock_remove'] = 1:
+						'"Got any smokes?" you ask but <<$npc_firstname[$boy]>> just shakes his head.'
+					elseif $booty_call['last_cum'] = 'creampie':
+						'"Got any smokes?" you ask, feeling the cum spill from your pussy as you finally let <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.'
+					else
+						'"Got any smokes?" you ask as you pull apart, finally letting <<$npc_firstname[$boy]>>''s cock slip from your pussy before sitting up. Unfortunately, he just shakes his head.'
+					end
+					booty_call['cock_remove'] = 1
+					if npc_smoker[$boy] > 0:
+						'"Fresh out," he shrugs.'
+					else
+						'"I don''t smoke. It''s bad for you y''know."'
+					end
+					'"Damn," you sigh unhappily. "A cigarette is just what I need right now..."'
+				end
+				gs'booty_call_sex', 'break_time'
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'harden_hand':
@@ -263,9 +720,13 @@ if $ARGS[0] = 'harden_hand':
 		act'Try to get him hard again (hand)':
 			booty_call['cock_remove'] = 1
 			cla & *clr
-			if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
 				$npc_apt_bedroom[$boy]
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
 				if $booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise':
 					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>> and grab his cock. You work his shaft furiously, trying to keep him hard. But despite your best efforts, his dick softens in your grasp and you can''t get it to rise again. '
 				else
@@ -277,6 +738,10 @@ if $ARGS[0] = 'harden_hand':
 				gs 'booty_call_after', 'after_sex1'
 			else
 				'<center><video autoplay loop src="images/shared/sex/handjob/hj3.mp4"></video></center>'
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
 				if $booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise':
 					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>> and grab his cock. You work his shaft furiously, trying to keep him hard. It doesn''t take long, only a minute or two, and before you know it <<$npc_firstname[$boy]>> is standing at attention once again.'
 				else
@@ -286,6 +751,8 @@ if $ARGS[0] = 'harden_hand':
 					'"Yeah, that''s right...  Just like that little guy..."'
 				end
 				booty_call['not_done'] = 0
+				if booty_call['force_harden'] > 0:booty_call['force_harden'] = 2
+				booty_call['extra_cum'] += 1
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				gs 'booty_call_start', 'handjob_dom1'
@@ -305,15 +772,19 @@ if $ARGS[0] = 'harden_mouth':
 		act'Try to get him hard again (mouth)':
 			booty_call['cock_remove'] = 1
 			cla & *clr
-			if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			if booty_call['cum_count'] >= npc_sexdrive[$boy] and (booty_call['force_harden'] >= 2 or rand(1,3) = 1):
 				!! IMAGE HERE
 				$npc_apt_bedroom[$boy]
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
 				if ($booty_call['last_cum'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
-					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, with his cock in an attempt to keep him hard. But try as you might, you can feel his dick softening between your lips.'
+					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard again.'
 				elseif $booty_call['last_cum'] = 'condom':
-					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft while trying to keep him hard. But try as you might, you can feel his dick softening between your lips.'
+					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard agains.'
 				else
-					'You pull away and get down in front of <<$npc_firstname[$boy]>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, trying to keep him hard. But try as you might, you can feel his dick softening between your lips.'
+					'You pull away and get down in front of <<$npc_firstname[$boy]>>. Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing with his softening cock. But try as you might, it''s like trying to play billiards with a rope. You just can''t get him hard again.'
 				end
 				if booty_call['not_done'] = 1:
 					'"Goddammit!" you growl. "I still wanted more out of you!"'
@@ -323,17 +794,28 @@ if $ARGS[0] = 'harden_mouth':
 				!! REPLACE
 				!! IMAGE HERE
 				 '<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
-				if ($booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
-					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips noticeably stiffens up and is ready to ride again.'
+				!! if ($booty_call['cum_choice'] = 'creampie' or $booty_call['cum_choice'] = 'creampie_surprise') and booty_call['cock_remove'] ! 1:
+				if booty_call['force_harden'] > 0:
+					'"Oh no you''re not," you growl lustfully.'
+					*nl
+				end
+				if $booty_call['last_cum'] = 'creampie' and booty_call['cock_remove'] ! 1:
+					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices, and suck gently on its head, licking, teasing, playing, trying to keep him hard. As you do, the dick between your lips begins to stiffen up again.'
+				elseif $booty_call['last_cum'] = 'creampie' and booty_call['cock_remove'] ! 1 and booty_call['force_harden'] > 0:
+					'You pull away, pussy trailing semen as you get down in front of <<$npc_firstname[$boy]>>. You take him in your mouth, tasting of cum and your own juices as you lick, tease, and play with his shaft. After a few moments of softness, <<$npc_firstname[$boy]>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again..'
 				elseif $booty_call['last_cum'] = 'condom':
-					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips noticeably stiffens up and ready to ride again.'
+					'You pull away and get down in front of <<$npc_firstname[$boy]>>. You slip the condom from his cock and take him in your mouth, you suck gently on its head, licking, teasing, playing, cleaning the cum from his shaft. As you do, the dick between your lips begins to stiffen up again.'
+				elseif booty_call['force_harden'] > 0:
+					'Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, <<$npc_firstname[$boy]>> groans in a way that sounds almost painful and the dick between your lips begins to stiffen up again.'
 				else
-					'Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, trying to keep him hard. After a few moments of softness, the dick between your lips noticeably stiffens up and is ready to ride again.'
+					'Taking his cock in your mouth, you suck gently on its head, licking, teasing, playing, with your lips and tongue across his shaft. After a few moments of softness, the dick between your lips begins to stiffen up again.'
 				end
 				if booty_call['not_done'] = 1:
-					'"Yeah, that''s right...  Just like that little guy..."'
+					'"Yeah, that''s right...  Just like that little guy..." you whisper, pulling your mouth off with a pop and smiling wickedly as you continue slowly pumping him with your hand.'
 				end
 				booty_call['not_done'] = 0
+				if booty_call['force_harden'] > 0:booty_call['force_harden'] = 2
+				booty_call['extra_cum'] += 1
 				$booty_call['foreplay'] = ''
 				gs'booty_call_sex', 'reset'
 				act'Keep blowing him':cla & *clr & gs 'booty_call_start', 'bj_dom2'
@@ -405,6 +887,56 @@ if $ARGS[0] = 'no_sex_only':
 	end
 end
 
+if $ARGS[0] = 'reset':
+	$booty_call['cum_choice'] = ''
+	$booty_call['last_cum'] = ''
+	booty_call['orgasm'] = orgasm
+	booty_call['kiss'] = 0
+	booty_call['bored'] = 0
+	booty_call['he_ask'] = 0
+	$orgasm_or = ''
+	booty_call['cock_remove'] = 0
+	booty_call['not_inside'] = 0
+	booty_call['pullout_ask'] = 0
+	booty_call['creampie_exit'] = 0
+	booty_call['no_cum'] = 0
+	$booty_call['position'] = ''
+!!	$booty_call['pos_speed'] = ''
+	booty_call['cleanup'] = 0
+	if booty_call['cum_together'] > 0:
+		booty_call['cum_together'] = 0
+		booty_call['creampie_orgasm'] = 1
+		
+	end
+	booty_call['cum_together_fake'] = 0
+	booty_call['cum_react'] = 0
+	if booty_call['mad'] = 1:booty_call['mad'] = 2
+	booty_call['boy_cum'] = 0
+	booty_call['consecutive_cuni_orgasm'] = 0
+!!	booty_call['reluctant_bj'] = 0
+!!	booty_call['cum_mouth'] = 0
+!!	booty_call['cum_mouth_force'] = 0
+	booty_call['about_time'] = 0
+	booty_call['his_choice'] = 0
+	booty_call['cum_warn'] = 0
+	booty_call['cum_where'] = 0
+	booty_call['he_ask'] = 0
+	booty_call['he_ask_creampie'] = 0
+	booty_call['he_ask_creampie_yes'] = 0
+	booty_call['he_ask_mouth'] = 0
+	booty_call['he_ask_facial'] = 0
+	booty_call['he_ask_tits'] = 0
+	booty_call['cum_wherever'] = 0
+	booty_call['swallow'] = 0
+	booty_call['spit'] = 0
+	booty_call['gag'] = 0
+	booty_call['react'] = 0
+	booty_call['fuck_again'] = 0
+	booty_call['must_fuck'] = 0
+	booty_call['smoke_break'] = 0
+	booty_call['first_break'] = 0
+end
+
 if $ARGS[0] = 'pain':
 	if booty_call['speed'] ! 3:
 		if $npc_dick_desc[$boy] = 'lengthy':
@@ -455,4 +987,295 @@ if $ARGS[0] = 'pain':
 	end
 end
 
+if $ARGS[0] = 'sleep_sex':
+	booty_call['sleep_fuck'] = 1
+	gs'arousal', 'vaginal', rand(5,10), 'no_orgasm_msg'
+	if npc_sex_speed <= 2:
+		$booty_call['sleep_video1'] = '<center><video autoplay loop src="images/shared/sex/sleep/slow<<rand(1,2)>>.mp4"></video></center>'
+		$booty_call['sleep_video2'] = '<center><video autoplay loop src="images/shared/sex/sleep/slow2.mp4"></video></center>'
+	else
+		$booty_call['sleep_video1'] = '<center><video autoplay loop src="images/shared/sex/sleep/fast<<rand(1,2)>>.mp4"></video></center>'
+		$booty_call['sleep_video2'] = '<center><video autoplay loop src="images/shared/sex/sleep/fast2.mp4"></video></center>'
+	end
+	$booty_call['sleep_video1']
+	'<i>Mmmmmmm...</i>'
+	*nl
+	'You''re in a dream...'
+	*nl
+	'What kind of dream is it?'
+	act'Nice':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Mmmmmmm...</i>'
+		*nl
+		'"It''s a nice dream. You''re rocking back and forth on a hammock on the water. There''s a thick pillow between your legs and everything feels so comfy.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			'You carry on with your pleasant dream, falling deeper and deeper into it, and don''t wake up until the morning.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'Even in your sleep your brow wrinkles.'
+			*nl
+			'<i>Hammock on the water? That doesn''t make any sense. And it doesn''t feel like there''s a pillow between <b>my legs</b>, it feels like it''s...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+	
+	act'Bad':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Nnngh...</i>'
+		*nl
+		'"It''s a horrid dream. The town has declared you''re a witch and are to be impaled and then burned at the stake. You can already feel it stabbing between your legs.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			'You toss back and forth, moaning incoherently in your sleep, and don''t wake up until the morning.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'Even in your sleep your brow wrinkles.'
+			*nl
+			'<i>That doesn''t feel like wood. I''m not being impaled, I''m being...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+	
+	act'Sexy':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Mmmmmmm...</i>'
+		*nl
+		'"It''s a <i>good</i> dream. You''re rocking back and forth on a your fuckbuddy''s cock, riding him like there''s no tomorrow as it fills your pussy in all the right ways.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			if orgasm > booty_call['orgasm']:
+				'You carry on with your pleasant dream, feeling your entire body quake in orgasm, even in sleep, and don''t wake up until the morning.'
+			else
+				'You carry on with your pleasant dream, moaning loudly even in your sleep, and don''t wake up until the morning.'
+			end
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'You moan involuntarily as a spark of pleasure jumps through your chest.'
+			*nl
+			'<i>I''m not dreaming... I''m...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+	
+	act'Weird':
+		cla & *clr
+		$booty_call['sleep_video1']
+		'<i>Mmmmmmm...</i>'
+		*nl
+		'"It''s a weird dream. You''re suspended in a giant block of Jello. You can''t move your arms or your legs, but you can breath, and the jelly is alive somehow. You can feel it pulsing between your thighs. In fact, it almost feels like its inside you.'
+		act'Keep dreaming':
+			cla & *clr
+			$booty_call['sleep_video2']
+			'You carry on with your strange dream, falling deeper and deeper into it, and don''t wake up until the morning.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+		
+		act'Wait a minute':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+			'<i>Hang on a minute.</i>'
+			*nl
+			'Even in your sleep your brow wrinkles.'
+			*nl
+			'<i>It <b>is</b> inside me! And that''s not jelly, that''s...</i>'
+			*nl
+			'Your eyes flutter open and find <<$npc_firstname[$boy]>> on top of you, his cock balls deep inside you, and his hand openly groping your breast.'
+			gs'booty_call_sex', 'sleep_wake_options'
+		end
+	end
+end
+
+if $ARGS[0] = 'sleep_wake_options':
+	*nl
+	if npc_sleep_sex_okay[$boy] < 1:
+		act'What the fuck!':gt'booty_call_sex', 'sleep_wake_wtf'
+	elseif npc_sleep_sex_okay[$boy] = 1:
+		!! npc_sleep_sex_okay[$boy] = 2 means you''ve asked him to wake you up for sleep sex
+		'"You''re finally awake," <<$npc_firstname[$boy]>> smiles.'
+	end
+	
+	act'Moan':
+		cla & *clr
+		booty_call['sleep_fuck'] = 2
+		$booty_call['position'] = 'miss'
+		'<center><video autoplay loop src="images/shared/sex/sleep/wake1.mp4"></video></center>'
+		'<i>Ahh~! Aahn~!</i>'
+		*nl
+		'You moan with hoarse arousal, spreading your legs wider so <<$npc_firstname[$boy]>> can keep fucking you.'
+		if npc_sex_speed <= 2:
+			booty_call['speed'] = 1
+			act'Fuck <<$npc_firstname[$boy]>>':gs'booty_call_miss','miss1.2'
+		else
+			booty_call['speed'] = 3
+			act'Fuck <<$npc_firstname[$boy]>>':gs'booty_call_miss','miss3.1'
+		end
+	end
+	
+	act'Oh. (go back to sleep)':
+		cla & *nl
+		'"Hmm? Oh," you say flatly and lazily close your eyes, letting yourself drift back into dreamland.'
+		gs'booty_call_sex','sleep_cum'
+	end
+	
+	act'Don''t wake me up':
+		cla & *nl
+		'"Do whatever you want to me, just don''t wake me up," you murmur and promptly close your eyes, letting yourself drift back into dreamland.'
+		gs'booty_call_sex','sleep_cum'
+	end
+end
+
+if $ARGS[0] = 'sleep_wake_wtf':
+	cla & *clr
+	$npc_apt_bedroom[$boy]
+	'"<i>WHAT THE FUCK!</i>" you scream, kicking <<$npc_firstname[$boy]>> out of you and scrambling across the bed from him. "What the fuck do you think you''re doing?!"'
+	if (npc_caretaker[$boy] = 1 or rand(1,3) = 1) and npc_abusive[$boy] ! 1:
+		'<<$npc_firstname[$boy]>> looks deeply embarrassed.'
+		if booty_call['cum_count'] >= npc_sexdrive[$boy]:
+			'"I- I''m sorry," he stammers. "After you fell asleep, I woke up. You were right there and I was so hard. I just couldn''t get back to sleep. And since we just... you know... I thought I could...'
+		else
+			'"I- I''m sorry," he stammers. "After you fell asleep, I was still hard. I just couldn''t get to bed. And since we just... you know... I thought I could...'
+		end
+		act'Forgive him':
+			cla & *nl
+			'Your hard stare softens and you feel the anger slowly drain from your body.'
+			'"It''s fine, I guess," you say. "Just..."'
+			gs'booty_call_sex', 'sleep_wtf_forgive'
+		end
+	else
+		'"What?" he asks, unabashed. "It''s not like I was doing anything we hadn''t already done."'
+		act'Forgive him':
+			cla & *nl
+			'Your hard stare softens and you feel the anger slowly drain from your body.'
+			'"I guess you have a point," you admit reluctantly. "Just..."'
+			gs'booty_call_sex', 'sleep_wtf_forgive'
+		end
+	end
+end
+
+if $ARGS[0] = 'sleep_wtf_forgive':
+	act'Don''t do it again':
+		npc_sleep_sex_okay[$boy] = -1
+		cla & *nl
+		'"... don''t do it again, okay?" you warn.'
+		'"Okay..." he says. After a moment, still blushing, he says, "Since you''re awake... do you think we could...?"'
+		gs'booty_call_sex', 'sleep_wtf_forgive2'
+	end
+	
+	act'Ask next time':
+		npc_sleep_sex_okay[$boy] = 1
+		cla & *nl
+		'"... ask next time, okay?" you say with a soft smile.'
+		'"Ask?" he says hesitantly. "You mean, wake you up?"'
+		act'For permission':
+			cla & *nl
+			'"Just enough to get my permission," you reply. "I don''t like getting raped in my sleep. But if you have my consent, it''s not rape."'
+			'"Okay," he nods. After a moment, still blushing, he says, "Since you''re awake... do you think we could...?"'
+			gs'booty_call_sex', 'sleep_wtf_forgive2'
+		end
+		
+		act'Maybe I''ll be in the mood':
+			cla & *nl
+			'"Maybe I''ll be in the mood too," you smirk teasingly. "It''s not fair if you get all the fun."'
+			'"Okay," he nods. After a moment, still blushing, he says, "Since you''re awake... do you think we could...?"'
+			gs'booty_call_sex', 'sleep_wtf_forgive2'
+		end		
+	end
+end
+
+if $ARGS[0] = 'sleep_wtf_forgive2':
+	act'No way':
+		booty_call['sleep_fuck'] = -1
+		cla & *clr
+		npc_apt_bedroom[$boy]
+		'Your anger returns swiftly.'
+		'"No! Did you really think I was going to say yes after you were just <i>molesting</i> me in my sleep?"'
+		'<<$npc_firstname[$boy]>> sighs disappointedly and lays back in bed.'
+		act'Time to leave':
+			cla & *clr
+			npc_apt_bedroom[$boy]
+			'"Ugh." You sneer at him as you get up. "I see how it''s gonna be. Not gonna get a wink of sleep with you around. I''m leaving."'
+			*nl
+			'Quick as you can, you gather your things and get dressed and head out the door.'
+			act'Leave':gt'booty_call_after', 'exit'
+		end
+		
+		act'Back to sleep':
+			cla & *clr
+			npc_apt_bedroom[$boy]
+			'You crawl back under the sheets, closing your eyes, and try to get back to sleep.'
+			act'. . .':gt'booty_call_after', 'sleep_function'
+		end
+	end
+	
+	act'Oh alright':
+		booty_call['sleep_fuck'] = 2
+		cla & *clr
+		npc_apt_bedroom[$boy]
+		'You give him a look and after a brief pause, you sigh dramatically, rolling your eyes.'
+		*nl
+		'"Oh alright. Come here," you say, beckoning him towards you so you can do something about his raging hard-on.'
+		gs'booty_call_sex', 'reset'
+		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+	end
+	
+	act'Sure':
+		booty_call['sleep_fuck'] = 2
+		cla & *clr
+		npc_apt_bedroom[$boy]
+		'"Sure," you grin, beckoning him closer so you can put his raging erection to use.'
+		gs'booty_call_sex', 'reset'
+		act'Let him lead':cla & gs 'booty_call_sex', 'he_choose_position'
+		act'Foreplay':cla & gs 'booty_call_start', 'foreplay_choose'
+		act'Sex':cla & gs'booty_call_sex', 'position_change' & gs 'booty_call_condoms', 'condoms'
+	end
+end
+
+if $ARGS[0] = 'sleep_cum':
+	if $npc_cum_pref[$boy] = 'creampie' and ((npc_condom_conscious[$boy] ! 1 and npc_childfree[$boy] ! 1) or (npc_free_creampies[$boy] = 1 and (booty_call['safe_day'] = 1 or booty_call['probably_safe_day'] = 1)) or npc_free_creampies[$boy] = 2 or npc_know_bc[$boy] = 1):
+		gs'cum_call', '', $boy,1
+	elseif $npc_cum_pref[$boy] = 'mouth' or $npc_cum_pref[$boy] = 'face':
+		gs'cum_call', 'face',$boy,1
+	elseif $npc_cum_pref[$boy] = 'tits':
+		gs'cum_call', 'breasts',$boy,1
+	elseif $npc_cum_pref[$boy] = 'pullout':
+		gs'cum_call', 'stomach',$boy,1
+	else
+		gs'cum_call', 'stomach',$boy,1
+	end
+	act'. . .':gt'booty_call_after', 'sleep_function'
+end
+
 --- booty_call_sex ---------------------------------

+ 168 - 5
locations/booty_call_shower.qsrc

@@ -5,7 +5,7 @@
 
 !! --------------------------------- Before Sex Showers ---------------------------------------
 
-if $ARGS[0] = 'borrow_shower':
+if $ARGS[0] = 'before_borrow_shower':
 	act'Borrow yours?':
 		cla & *nl
 		'"Can I borrow yours before we get started?" you ask.'
@@ -137,8 +137,8 @@ if $ARGS[0] = 'before_together2':
 				'<center><video autoplay loop src="images/shared/sex/shower/leg_up_enter1.mp4"></video></center>'
 				gs'arousal', 'massage',5,'no_orgasm_msg'
 				gs'stat'
-				'You turn to face <<$npc_firstname[$boy]>>'
-				if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1) or booty_call['danger_day'] = 1:
+				'You turn to face <<$npc_firstname[$boy]>>.'
+				if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1 and npc_free_creampies[$boy] < 1) or booty_call['danger_day'] = 1:
 					'"You won''t come inside me, will you?" you ask.'
 					'"Don''t worry, I won''t."'
 					*nl
@@ -152,6 +152,8 @@ if $ARGS[0] = 'before_together2':
 	else
 		*nl
 		'<<$npc_firstname[$boy]>>''s hand runs down your belly to your pussy, spreading your lips, and you can feel his hardon between your thighs, threatening to penetrate you.'
+!! temporary action until alternative is available
+		act'Blow him':gt'booty_call_shower', 'before_bj1'
 !!		act'Blow him instead':
 		
 !!		end
@@ -425,7 +427,7 @@ if $ARGS[0] = 'before_shower_creampie':
 		*nl
 		'Eventually, his orgasm fades and his cock slips from inside you and a hot dribble of liquid runs down your leg.'
 		*nl
-		if booty_call['shower_no_condom'] > 0 or npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2 or npc_know_not_bc[$boy] = 1:
+		if (booty_call['shower_no_condom'] > 0 or (npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] <= 2) or npc_know_not_bc[$boy] = 1) and npc_free_creampies[$boy] < 1:
 			'"I thought..." <<$npc_firstname[$boy]>> pants. "You didn''t want me... to come inside you..."'
 			act'Changed my mind':
 				cla & *clr
@@ -492,6 +494,62 @@ end
 !! --------------------------------- After Sex Showers ---------------------------------------
 !! anything with the 'after_' prefix happens after the main content of a booty call
 
+if $ARGS[0] = 'after_borrow_shower':
+	cla & *clr
+	NoShampoo = 1
+	$npc_apt_bedroom[$boy]
+	'"I''m gonna borrow your shower," you say, sliding out of the bed.'
+	if rand(1,10) < npc_sexdrive[$boy]:
+		'"Why don''t I join you?" <<$npc_firstname[$boy]>> says, a glimmer in his eyes that lets you know he wants to do more than just "join" you.'
+		act'I''d rather not':
+			cla & *nl
+			'"No thanks," you say, smiling back wryly as you keep going. "I like my alone time," you say, just before you shut the door behind you.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+		act'Sounds nice':
+			cla & *nl
+			'"That sounds like nice," you smile and you let him lead you into the bathroom.'
+			act'Go shower':gt'booty_call_shower', 'after_shower_together'
+		end
+	elseif npc_selfish[$boy] = 1:
+		'"Don''t use up all my soap."'
+		act'Okay':
+			cla & *nl
+			'"Okay. I won''t," you promise and head into the bathroom.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+
+		act'I''ll try':
+			cla & *nl
+			'"I''ll try not to," you smile, padding your way into the bathroom.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+		
+		act'We''ll see':
+			cla & *nl
+			'"We''ll see about that," you smirk and pad your way into the bathroom.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+		
+		act'Roll your eyes':
+			cla & *nl
+			'"Yeah yeah," you say snarkily, rolling your eyes.'
+			act'Shower':gt'booty_call_shower', 'after_alone'
+		end
+	else
+		if npc_caretaker[$boy] = 1:
+			if npc_apt_type <= 2:
+				'"Okay. Feel free to use my towel when you''re done."'
+			else
+				'"Okay. Feel free to use any towel in there."'
+			end
+		else
+			'"Sure, whatever."'
+		end
+		act'Shower':gt'booty_call_shower', 'after_alone'
+	end
+end
+
 if $ARGS[0] = 'after_alone':
 	minut += 10
 	cla & *clr
@@ -718,7 +776,7 @@ if $ARGS[0] = 'after_shower_fun3':
 	*nl
 	'<<$pcs_nickname>>-!" he grunts. "I''m-!"'
 	'"Me too," you gasp.'
-	act'Come together':gt'booty_call_after', 'after_shower_fun4'
+	act'Come together':gt'booty_call_shower', 'after_shower_fun4'
 end
 
 if $ARGS[0] = 'after_shower_fun4':
@@ -1106,4 +1164,109 @@ if $ARGS[0] = 'after_shower_together_end':
 		gs'booty_call_shower', 'after_towel_skip2'
 	end
 end
+
+!! --------------------- MORNING SHOWERS ------------------------------
+
+if $ARGS[0] = 'morning_shower_join1':
+	booty_call['morning_shower'] = 1
+	'<center><video autoplay loop src="images/shared/sex/shower/join1.mp4"></video></center>'
+	'A blast of steam hits you in the face as you open the bathroom door. You pad your way inside, casually slipping into the shower with <<$npc_firstname[$boy]>>.'
+	'"Mind if I share?" you ask nonchalantly.'
+	'"Of course not," <<$npc_firstname[$boy]>> replies, his eyes sparkling with arousal.'
+	act'Shower with <<$npc_firstname[$boy]>>':gt'booty_call_shower', 'morning_shower_join2'
+end
+
+if $ARGS[0] = 'morning_shower_join2':
+	gs 'arousal', 'foreplay', 5
+	cla & *clr
+	'<center><video autoplay loop src="images/shared/sex/shower/join1.mp4"></video></center>'
+	'You join <<$npc_firstname[$boy]>> under the water, relaxing in the heat with him.'
+	*nl
+	'It isn''t long before his hands begin to roam your body, pawing your breasts and slipping between your thighs. Something hard pokes you in the back.'
+	act'Moan':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		'"<i>Aahhh~!</i>"'
+		*nl
+		'Your soft moans encourage him even more and he gropes your tits with both hands, giving them a hard squeeze, producing a gasp from your lips.'
+		gs'booty_call_shower', 'morning_together_sex1'
+	end
+	
+	act'Giggle':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		'You giggle uncontrollably at his rabid pawing, only serving to encourage him even more and he gropes your tits with both hands, giving them a hard squeeze, producing a gasp from your lips.'
+		gs'booty_call_shower', 'morning_together_sex1'
+	end
+	
+	act'"Just like that!"':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		'"<i>Aahhh~!</i> Just like that!"'
+		*nl
+		'You moan loudly, causing his groping to become energized and he grabs your tits with both hands, giving them a mighty squeeze, producing a gasp to go along with your moans.'
+		gs'booty_call_shower', 'morning_together_sex1'
+	end
+end
+
+if $ARGS[0] = 'morning_together_sex1':
+	act'Leave it there':
+		cla & *clr
+		'<center><video autoplay loop src="images/shared/sex/shower/grope2.mp4"></video></center>'
+		gs 'arousal', 'foreplay', 10
+		noShampoo = 1
+		dynamic $showerdin
+		'You stay in the shower with <<$npc_firstname[$boy]>> a while longer, allowing him to keep playing with your breasts and fondling your body, but don''t let it progress any further until the water shuts off.'
+		*nl
+		'He doesn''t seem put off by it at all.'
+		act'Put on a towel':gt'booty_call_shower', 'morning_towel_on'
+		act'Skip the towel':gt'booty_call_shower', 'morning_towel_skip'
+	end
+	act'Jerk him off':gt'booty_call_shower', 'before_jerkoff1'
+	
+	act'Blow him':gt'booty_call_shower', 'before_bj1'
+
+	if stat['think_virgin'] = 0 or booty_call['fuck'] > 0:
+		act'Let him fuck you':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/shower/leg_up_enter1.mp4"></video></center>'
+			gs'arousal', 'massage',5,'no_orgasm_msg'
+			gs'stat'
+			'You turn to face <<$npc_firstname[$boy]>>.'
+			if (booty_call['condom'] > 0 and booty_call['no_condom'] ! 1 and npc_free_creampies[$boy] < 1) or booty_call['danger_day'] = 1:
+				'"You won''t come inside me, will you?" you ask.'
+				'"Don''t worry, I won''t."'
+				*nl
+				'You gasp as without further warning, <<$npc_firstname[$boy]>> lifts your leg and pushes his cock inside you.'
+			else
+				'You look at <<$npc_firstname[$boy]>> and your expression tells him everything he needs to know. Without another word, he lifts your leg and pushes his cock inside you.'
+			end
+			act'Fuck':gt'booty_call_shower', 'after_shower_sex1'
+		end
+	end
+end
+
+if $ARGS[0] = 'morning_towel_on':
+	cla & *clr
+	booty_call['towel'] = 1
+	'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/towel.jpg"></center>'
+	'You borrow a towel from <<$npc_firstname[$boy]>>''s cupboard and dry off with it before wrapping it around your chest and exit into the bedroom with him.'
+	act'Continue':gs'booty_call_morning', 'wakeup2'
+end
+
+if $ARGS[0] = 'morning_towel_borrow':
+	act'Borrow a towel':
+		cla & *nl
+		booty_call['towel'] = 1
+		'You accept gratefully it and towel off before wrapping it around your chest, exiting the bathroom with him.'
+		act'Continue':gs'booty_call_morning', 'wakeup2'
+	end
+end
+
+if $ARGS[0] = 'morning_towel_skip':
+	'<center><img <<$set_imgh>> src="images/shared/romance/lovers/misc/no_towel.jpg"></center>'
+	'You grab <<$npc_firstname[$boy]>>''s towel before he can and give yourself a quick wipe before handing it off to him with a mischievous smirk and head back to the bedroom naked.'
+	act'Continue':gs'booty_call_morning', 'wakeup2'
+end
+
 --- booty_call_shower ---------------------------------

+ 55 - 18
locations/booty_call_start.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 				cla & *nl
 				'"I didn''t have time," you smile. "I came as soon as I saw your message."'
 				gs 'booty_call_start', 'fuck_or_what'
-				gs 'booty_call_shower', 'borrow_shower'
+				gs 'booty_call_shower', 'before_borrow_shower'
 			end
 			if stat['dance_day'] = daystart:
 				act'Came from dance':
@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 					'"I came straight from dance practice," you shrug.'
 					'"And you couldn''t take a shower first?"'
 					gs 'booty_call_start', 'couldnt_wait'
-					gs 'booty_call_shower', 'borrow_shower'
+					gs 'booty_call_shower', 'before_borrow_shower'
 				end
 			end
 			
@@ -49,7 +49,7 @@ if $ARGS[0] = 'start':
 				'"I was playing football when I saw your message," you shrug.'
 				'"And you couldn''t take a shower first?"'
 				gs 'booty_call_start', 'couldnt_wait'
-				gs 'booty_call_shower', 'borrow_shower'
+				gs 'booty_call_shower', 'before_borrow_shower'
 			end}
 			
 			if stat['volleyball_day'] = daystart:
@@ -58,7 +58,7 @@ if $ARGS[0] = 'start':
 					'"I came straight from volleyball practice," you shrug.'
 					'"And you couldn''t take a shower first?"'
 					gs 'booty_call_start', 'couldnt_wait'
-					gs 'booty_call_shower', 'borrow_shower'
+					gs 'booty_call_shower', 'before_borrow_shower'
 				end
 			end
 			if stat['run_day'] = daystart:
@@ -67,7 +67,7 @@ if $ARGS[0] = 'start':
 					'"I was on a run when I saw your message," you shrug.'
 					'"And you couldn''t take a shower first?"'
 					gs 'booty_call_start', 'couldnt_wait'
-					gs 'booty_call_shower', 'borrow_shower'
+					gs 'booty_call_shower', 'before_borrow_shower'
 				end
 			end
 			
@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 				cla & *nl
 				'"I came straight from work," you shrug. "Didn''t want to go home and clean up first."'
 				gs 'booty_call_start', 'fuck_or_what'
-				gs 'booty_call_shower', 'borrow_shower'
+				gs 'booty_call_shower', 'before_borrow_shower'
 			end
 			
 			gs 'booty_call_start', 'couldnt_wait'
@@ -131,6 +131,7 @@ if $ARGS[0] = 'start':
 				else
 					'"Don''t mess up my makeup," you say, walking past him towards the bedroom.'
 				end
+				act'Undress':gt 'booty_call_start', 'undress'
 				if date = daystart and date_hour_meet <= hour + 1:
 					act'I have a date soon':
 						cla & *clr
@@ -155,7 +156,8 @@ if $ARGS[0] = 'start':
 						end
 						act'Undress':gt 'booty_call_start', 'undress'
 					end
-				elseif hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
+				end
+				if hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
 					act'I''m going to the disco':
 						cla & *clr
 						$npc_apt_hall[$boy]
@@ -167,8 +169,6 @@ if $ARGS[0] = 'start':
 						!!end
 						act'Undress':gt 'booty_call_start', 'undress'
 					end
-				else
-					act'Undress':gt 'booty_call_start', 'undress'
 				end
 			end
 		end
@@ -515,7 +515,14 @@ if $ARGS[0] = 'pussy_lick':
 	gs 'arousal', 'cuni',rand(5,10),'no_orgasm_msg'
 	gs 'stat'
 	$booty_call['position'] = 'kuni'
-	'You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<$npc_firstname[$boy]>>''s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, tickling you and eliciting a giggle. It feels <i>so</i> good and you relax while he goes to work on you down there.'
+	if cum_loc['vagina'] > 0:
+		booty_call['creampie_eat'] += 1
+		cumspclnt = 0
+		gs 'cum_cleanup'
+		'You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<$npc_firstname[$boy]>>''s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch and you can feel <<$npc_firstname[$boy]>> slurping up the load he deposited inside you, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.'
+	else
+		'You lay back on the bed, closing your eyes, letting them roll back in your skull, and focus on the sensation of <<$npc_firstname[$boy]>>''s tongue exploring your pussy. It playfully flicks across your clit, making you squirm. It runs up the lips of your snatch, sending shivers through your spine. Every once in a while, he licks the side of your thigh, prompting ticklish giggles. It feels <i>so</i> good and you relax while he goes to work on you down there.'
+	end
 	if booty_call['orgasm'] < orgasm:
 		act'Orgasm':
 			cla & *clr
@@ -617,7 +624,7 @@ if $ARGS[0] = 'cuni_too_sensitive':
 		$npc_apt_bedroom[$boy]
 		'"Stop! Stop! Stop!" you cry desperately, pushing his head away and snapping your legs closed, your entire body writhing uncontrollably on the bed as orgasmic tremors continue to quake through you.'
 		'"I can''t take it anymore!"'
-		'<<$npc_firstname[$boy]>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he''s still as hard as a rock, but something about his expression says to you that he got off on this anyways.'
+		'<<$npc_firstname[$boy]>> looks up at you, wet lips pulled back in a grin. You look at him from the corner of your eye, face half buried in the sheets, breathing hard as he stands up. You can see he''s still as hard as a rock, but something about his expression says to you that he got off on this anyway.'
 		act'I''m done':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -680,6 +687,13 @@ if $ARGS[0] = 'bj_ask2':
 		act'Blow him':gt'booty_call_start', 'bj_sub1'
 	end
 	
+	act'Reluctant (joking)':
+		cla & *nl
+		booty_call['reluctant_bj'] = 1
+		'"Ugh, fiiine! If I really have to..." you mock sigh, letting him know you''re joking by flashing him a wide grin as you crawl down between his legs.'
+		act'Blow him':gt'booty_call_start', 'bj_sub1'
+	end
+	
 	act'Okay':
 		cla & *nl
 		'"Okay," you smile and crawl down between his legs.'
@@ -692,8 +706,27 @@ if $ARGS[0] = 'bj_ask2':
 		act'Blow him':gt'booty_call_start', 'bj_sub1'
 	end
 	
+	if stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0:
+		act'Fuck instead?':
+			cla & *nl
+			booty_call['must_fuck'] = 1
+			if booty_call['fuck_count'] > 0:
+				'"Hmmm... I couuuuld..." you hum, pretending to think before breaking into a wide grin. "Or we could just fuck again?"'
+			else
+				'"Hmmm... I couuuuld..." you hum, pretending to think before breaking into a wide grin. "Or we could just fuck?"'
+			end
+			if $npc_fav_pos[$boy] = 'doggy':
+				'Your eyes meet for just a moment before <<$npc_firstname[$boy]>> jumps you, eliciting uncontrollable giggles as he flips you onto your knees and plunges into your pussy.'
+				act'Get fucked':gt 'booty_call_doggy', 'doggy<<booty_call[''speed'']>>'
+			else
+				'Your eyes meet for just a moment before <<$npc_firstname[$boy]>> jumps you, eliciting uncontrollable giggles as he forces your legs apart and plunges into your pussy.'
+				act'Get fucked':gt 'booty_call_miss', 'miss<<booty_call[''speed'']>>'
+			end
+		end
+	end
+	
 !!{	if booty_call['fuck_count'] > 0:
-		act'Can''t we just fuck again?':
+		act'Can''t we just fuck again? (complain)':
 			cla & *nl
 			'"Ugh, do I have to?" you complain. "Can''t we just fuck again?"'
 			if npc_selfish[$boy] = 1:
@@ -704,6 +737,8 @@ if $ARGS[0] = 'bj_ask2':
 			
 			end
 		end
+		
+		
 	end}
 end
 
@@ -713,7 +748,7 @@ if $ARGS[0] = 'bj_sub1':
 	gs'stat'
 	if booty_call['reluctant_bj'] = 1:
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj46.mp4"></video></center>'
-		'You grumble internally but get to work anyways, spending a few minutes bobbing your head up and down on his cock. You weren''t really in the mood to begin with, so you get bored quickly, but hopefully he''ll want to do something else soon.'
+		'You grumble internally but get to work anyway, spending a few minutes bobbing your head up and down on his cock. You weren''t really in the mood to begin with, so you get bored quickly, but hopefully he''ll want to do something else soon.'
 	else
 		'<center><video autoplay loop src="images/shared/sex/blowjob/bj<<rand(46,50)>>.mp4"></video></center>'
 		'You lean forward and take him in your mouth, gently sucking his cock and bobbing your head up and down on it. You take pride in your work, doing your best to make <<$npc_firstname[$boy]>> feel good.'
@@ -784,7 +819,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
-			'You hum in surprise, but take it in stride anyways, continuing to suck as <<$npc_firstname[$boy]>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.'
+			'You hum in surprise, but take it in stride anyway, continuing to suck as <<$npc_firstname[$boy]>> comes right down your throat. You swallow it all as best you can until his hips stop bucking beneath you and you slowly pull away, gulping one last time to get the last drops.'
 			gs 'booty_call_talk', 'bj_warning_next_time'
 			gs 'booty_call_talk', 'bj_tasty'
 			gs 'booty_call_talk', 'bj_already'
@@ -797,7 +832,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			gs 'stat'
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit6.mp4"></video></center>'
-			'You hum in surprise, but take it in stride anyways, continuing to suck as <<$npc_firstname[$boy]>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<$npc_firstname[$boy]>>''s dick.'
+			'You hum in surprise, but take it in stride anyway, continuing to suck as <<$npc_firstname[$boy]>> straight into the back of your throat. You carefully let it pool there, waiting until his hips stop bucking beneath you. When he finally stops, you gather it to the front of your mouth and spit it out, letting it spill past your lips and all over <<$npc_firstname[$boy]>>''s dick.'
 			gs 'booty_call_talk', 'bj_warning_next_time'
 			gs 'booty_call_talk', 'bj_already'
 		end
@@ -809,7 +844,7 @@ if $ARGS[0] = 'bj_sub_cum_surprise':
 			gs 'cum_call', 'mouth', $boy, 1
 			gs 'stat'
 			'<center><video autoplay loop src="images/shared/sex/cum/mouth/spit3.mp4"></video></center>'
-			'The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erputing with cum and spilling all over <<$npc_firstname[$boy]>>''s cock and the floor.'
+			'The moment the cum touches your throat, you gag. Your eyes water and you cough involuntarily, mouth explosively erupting with cum and spilling all over <<$npc_firstname[$boy]>>''s cock and the floor.'
 			act'Sorry':
 				cla & *clr
 				!!'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum52.jpg"></center>'
@@ -919,7 +954,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth1':
 	act'Reluctantly let him':
 		cla & *nl
 !!		'<center><video autoplay loop src="images/shared/sex/cum/mouth/swallow5.mp4"></video></center>'
-		'"Mmmrrrm mmm mmmmph~!" You grumble unintelligibly around his cock but keep sucking anyways. Not exactly your ideal way to finish, but if it''s what he wants...'
+		'"Mmmrrrm mmm mmmmph~!" You grumble unintelligibly around his cock but keep sucking anyway. Not exactly your ideal way to finish, but if it''s what he wants...'
 		gs 'booty_call_start', 'bj_sub_cum_mouth_spit'
 		gs 'booty_call_start', 'bj_sub_cum_mouth_swallow'
 	end
@@ -1032,7 +1067,7 @@ if $ARGS[0] = 'bj_sub_cum_mouth_swallow':
 		*nl
 		if booty_call['cum_swallow'] > 1:
 			'"Yeech!" you wince. "I''m never going to get used to that!"'
-			'"But you still keep doing it anyways," <<$npc_firstname[$boy]>> smirks.'
+			'"But you still keep doing it anyway," <<$npc_firstname[$boy]>> smirks.'
 			'"Yeah, yeah, shut up," you say, rolling your eyes and sticking out your tongue, trying to air it out.'
 			gs 'booty_call_sex', 'sex_end'
 		else
@@ -1872,6 +1907,7 @@ end
 if $ARGS[0] = 'bj_dom1':
 	act'Play with his cock (mouth)':
 		$booty_call['position'] = 'blowjob_tease'
+		booty_call['bj_tease'] += 1
 		gs'arousal', 'bj',rand(2,3),'no_orgasm_msg'
 		gs'stat'
 		cla & *clr
@@ -2203,6 +2239,7 @@ if $ARGS[0] = 'facesit_1':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		$booty_call['position'] = 'facesit'
+		booty_call['facesit_count'] += 1
 		if booty_call['foreplay_change'] >= 1:
 			'You pull away from <<$npc_firstname[$boy]>>''s cock, crawling forward until your legs are over his head. You lower your pussy down onto his mouth with a dirty grin.'
 			'"I think it''s time for me to get a little tender loving care."'

+ 12 - 2
locations/booty_call_stats.qsrc

@@ -27,11 +27,13 @@ if $ARGS[0] = 'starting_stats':
 	booty_call['orgasm'] = orgasm
 	booty_call['orgasm_limit'] = orgasm + 6
 	booty_call['pc_condom_count'] = prezik
+	if npc_fuckbuddy[$boy] ! 1: npc_fuckbuddy[$boy] = 1
 end
 
 if $ARGS[0] = 'save':
 	!! number of times you have initiated or responded to a booty call
 	npc_bootycalls[$boy] += 1
+	
 	!! number of times you have made your fuckbuddy cum
 	npc_cum_count[$boy] += booty_call['cum_count']
 	
@@ -73,6 +75,8 @@ if $ARGS[0] = 'save':
 	
 	!! number of times your fuckbuddy has cum in your mouth
 	npc_mouth_cum_count[$boy] += booty_call['mouth_cum']
+	
+	if booty_call['sleep_fuck'] > 0: npc_sleep_fuck += 1
 end
 
 if $ARGS[0] = 'dick_update':
@@ -110,8 +114,14 @@ if $ARGS[0] = 'dick_update':
 			$npc_dick_desc[$boy] = 'monster'
 		end
 	end
-
-
 end
 
+if $ARGS[0] = 'sleep_check':
+	booty_call['sleep_cum_vagina'] = cum_loc['vagina']
+	booty_call['sleep_cum_butt'] = cum_loc['butt']
+	booty_call['sleep_cum_face'] = cum_loc['face']
+	booty_call['sleep_cum_stomach'] = cum_loc['stomach']
+	booty_call['sleep_cum_tits'] = cum_loc['tits']
+	booty_call['sleep_cum_hair'] = cum_loc['hair']
+end
 --- booty_call_stats ---------------------------------

+ 395 - 61
locations/booty_call_talk.qsrc

@@ -16,9 +16,10 @@ if $ARGS[0] = 'cum_react':
 				gs 'booty_call_talk', 'no_facial'
 			elseif booty_call['he_ask_tits'] = 1 and $booty_call['last_cum'] ! 'tits':
 				gs 'booty_call_talk', 'no_tits_cum'
-	!!		else
-	!!			'You grin at him as he comes all over your hand, continuing to jerk him until his cock stops twitching and nothing else comes out. After a couple more tugs for good measure, you pull back.'
-	!!			gs'booty_call_sex', 'sex_end'
+			else
+!!temporary fix but was commented out
+				'You grin at him as he comes all over your hand, continuing to jerk him until his cock stops twitching and nothing else comes out. After a couple more tugs for good measure, you pull back.'
+				gs'booty_call_sex', 'sex_end'
 			end
 			gs'booty_call_talk', 'handjob_react'
 			gs'booty_call_talk', 'kuni_react'
@@ -86,46 +87,6 @@ if $ARGS[0] = 'no_cum_inside':
 			'"Sorry," you say, <<$booty_call[''cum_describe2'']>>. "I don''t like you enough to let you do that yet."'
 			gs'booty_call_sex', 'sex_end'
 		end
-		if booty_call['danger_day'] = 1:
-			act'Danger day (apologetic)':
-				cla & *nl
-				!! IMAGE HERE
-				'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but it''s a danger day. I''ll get pregnant."'
-				gs'booty_call_sex', 'sex_end'
-			end
-			
-			act'Danger day (annoyed)':
-				cla & *nl
-				!! IMAGE HERE
-				'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "I told you it''s a danger day for me! Are you <i>trying</i> to get me pregnant?"'
-				gs'booty_call_sex', 'sex_end'
-			end
-		else
-			if birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 0:
-				act'Not on birth control':
-					cla & *nl
-					!! IMAGE HERE
-					npc_know_not_bc[$boy] = 1
-					'"Sorry. I can''t let you come inside me," you say, <<$booty_call[''cum_describe2'']>>. "I''m not on birth control."'
-					gs'booty_call_sex', 'sex_end'
-				end
-			elseif birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 1:
-				act'You know I''m not on birth control (apologetic)':
-					cla & *nl
-					!! IMAGE HERE
-					'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but I''m still not on birth control."'
-					gs'booty_call_sex', 'sex_end'
-				end
-				
-				act'You know I''m not on birth control (annoyed)':
-					cla & *nl
-					!! IMAGE HERE
-					'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "You know I''m not on birth control!"'
-					gs'booty_call_sex', 'sex_end'
-				end
-			end
-		end
-
 		
 		act'Only my boyfriend is allowed to come inside me':
 			cla & *nl
@@ -178,6 +139,49 @@ if $ARGS[0] = 'no_cum_inside':
 			end
 		end
 	end
+	
+	if birth_control['think_safe'] < 1:
+		if birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 0:
+			act'Not on birth control':
+				cla & *nl
+				!! IMAGE HERE
+				npc_know_not_bc[$boy] = 1
+				'"Sorry. I can''t let you come inside me," you say, <<$booty_call[''cum_describe2'']>>. "I''m not on birth control."'
+				gs'booty_call_sex', 'sex_end'
+			end
+		elseif birth_control['think_safe'] < 1 and npc_know_not_bc[$boy] = 1:
+			act'You know I''m not on birth control (apologetic)':
+				cla & *nl
+				!! IMAGE HERE
+				'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but I''m still not on birth control."'
+				gs'booty_call_sex', 'sex_end'
+			end
+			
+			act'You know I''m not on birth control (annoyed)':
+				cla & *nl
+				!! IMAGE HERE
+				'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "You know I''m not on birth control!"'
+				gs'booty_call_sex', 'sex_end'
+			end
+		end
+		
+		if stat['dangerous_day'] = 1:
+			act'Danger day (apologetic)':
+				cla & *nl
+				!! IMAGE HERE
+				'"I''m sorry," you say wistfully, <<$booty_call[''cum_describe2'']>>. "I know how much you want to finish inside me, but it''s a danger day. I''ll get pregnant."'
+				gs'booty_call_sex', 'sex_end'
+			end
+			if booty_call['danger_day'] = 1:
+				act'Danger day (annoyed)':
+					cla & *nl
+					!! IMAGE HERE
+					'"Dumbass!" you scowl, <<$booty_call[''cum_describe2'']>>. "I told you it''s a danger day for me! Are you <i>trying</i> to get me pregnant?"'
+					gs'booty_call_sex', 'sex_end'
+				end
+			end
+		end
+	end
 end
 
 if $ARGS[0] = 'no_tits_cum':
@@ -273,21 +277,26 @@ if $ARGS[0] = 'creampie_react':
 						'"Did you... did we... together..?" you murmur. <<$npc_firstname[$boy]>> just nods.'
 					end
 					act'Continue':cla & gs 'booty_call_sex', 'sex_end'
+					gs'booty_call_talk', 'bask_satisfaction'
 					gs'booty_call_talk', 'feel_full'
 					gs'booty_call_talk', 'love_creampies'
 					gs'booty_call_talk', 'cum_together_kiss'
+					gs'booty_call_talk', 'free_creampies'
 				end
 			end
+			gs'booty_call_talk', 'bask_satisfaction'
 			gs'booty_call_talk', 'creampie_felt_great'
 			gs'booty_call_talk', 'feel_full'
 			gs'booty_call_talk', 'love_creampies'
 			gs'booty_call_talk', 'creampie_ask_next_time'
+			gs'booty_call_talk', 'free_creampies'
 			gs'booty_call_talk', 'told_you_not_to_creampie'
 			gs'booty_call_talk', 'thanks_for_asking'
 			gs'booty_call_talk', 'cum_together_kiss'
 			gs'booty_call_talk', 'thought_no_creampies'
 			gs'booty_call_talk', 'cum_together_no_bc'
 		else
+			gs'booty_call_talk', 'bask_satisfaction'
 			gs'booty_call_talk', 'creampie_enjoy_that'
 			gs'booty_call_talk', 'creampie_felt_great'
 			gs'booty_call_talk', 'creampie_gross'
@@ -340,7 +349,7 @@ if $ARGS[0] = 'creampie_enjoy_that':
 end
 
 if $ARGS[0] = 'creampie_ask_next_time':
-	if booty_call['he_ask_creampie'] ! 1 and booty_call['creampie_ask'] ! 1:
+	if booty_call['he_ask_creampie'] ! 1 and booty_call['creampie_ask'] ! 1 and npc_free_creampies[$boy] = 0:
 		if booty_call['creampie_surprise'] = 1 and npc_ask_creampie[$boy] = 0:
 			act'Ask next time (not mad)':
 				npc_ask_creampie[$boy] = 1
@@ -401,8 +410,232 @@ if $ARGS[0] = 'creampie_ask_next_time':
 		end
 	end
 end
+
+if $ARGS[0] = 'free_creampies':
+	if npc_free_creampies[$boy] = 0 and booty_call['he_ask_creampie'] > 0:
+		if $booty_call['position'] = 'miss':
+				$booty_call['temp_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+			elseif $booty_call['position'] = 'doggy':
+				$booty_call['temp_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+			elseif $booty_call['position'] = 'cowgirl':
+				$booty_call['temp_pic'] = '<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+			end
+		act'You don''t need to ask':
+			cla & *clr
+			$booty_call['temp_pic']
+			'"You don''t need to ask to come inside me y''know," you murmur.'
+			act'I don''t mind':
+				cla & *clr
+				$booty_call['temp_pic']
+				if birth_control['think_safe'] = 1:
+					npc_know_bc[$boy] = 1
+					'"You don''t need to ask to come inside me y''know," you murmur. "I don''t mind. Plus I''m on birth control, so it''s not like it really matters."'
+				else
+					'"You don''t need to ask to come inside me y''know," you murmur. "I don''t mind."'
+				end
+				gs 'booty_call_talk','free_creampies2'
+			end
+			act'I love creampies':
+				cla & *clr
+				$booty_call['temp_pic']
+				if birth_control['think_safe'] = 1:
+					npc_know_bc[$boy] = 1
+					'"You don''t need to ask to come inside me y''know," you murmur. "I love it when you come inside. It feels really good. Plus I''m on birth control. So you don''t need to ask permission."'
+				else
+					'"You don''t need to ask to come inside me y''know," you murmur. "I love it when you come inside. It feels really good. So you don''t need to ask permission."'
+				end
+				gs 'booty_call_talk','free_creampies2'
+			end
+			if pc_cum_pref_know[$boy] = 'creampie':
+				act'I know how much you like it':
+					cla & *clr
+					$booty_call['temp_pic']
+					if birth_control['think_safe'] = 1:
+						npc_know_bc[$boy] = 1
+						'"You don''t need to ask to come inside me y''know," you murmur. "I know how much you like it. Plus I''m on birth control. So you don''t need to ask permission."'
+					else
+						'"You don''t need to ask to come inside me y''know," you murmur. "I know how much you like it."'
+					end
+					gs 'booty_call_talk','free_creampies2'
+				end
+			end
+			if birth_control['think_safe'] = 1:
+				act'I''m on birth control':
+					cla & *clr
+					$booty_call['temp_pic']
+					if npc_know_bc[$boy] = 1:
+						'"You don''t need to ask to come inside me y''know," you murmur. "You know I''m on birth control. So if you want to come inside me, you should go right ahead."'
+					else
+						'"You don''t need to ask to come inside me y''know," you murmur. "I''m on birth control. So if you want to come inside me, you should go right ahead."'
+					end
+				end
+			end
+		end
+	elseif npc_free_creampies[$boy] = 1 and booty_call['safe_day'] = 0 and booty_call['probably_safe_day'] = 0 and mesec <= 0:
+		if stat['safe_day'] = 1:
+			act'It''s a safe day':
+				booty_call['safe_day'] = 1
+				cla & *clr
+				$booty_call['temp_pic']
+				'"Don''t worry," you smile. "It''s a safe day for me. You can come inside me as much as you want today."'
+				if npc_childfree[$boy] = 1: '<<$npc_firstname[$boy]>> lets out a sigh of relief.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		elseif stat['probably_safe_day'] = 1:
+			act'It''s probably safe day':
+				booty_call['probably_safe_day'] = 1
+				cla & *clr
+				$booty_call['temp_pic']
+				'"Don''t worry," you smile. "I''m probably safe. It''s okay for you to come inside me today."'
+				if npc_childfree[$boy] = 1: '<<$npc_firstname[$boy]>> lets out a sigh of relief.'
+				*nl
+				'<i>Probably...</i> you quietly reiterate to yourself.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		else
+			act'It''s a safe day (lie)':
+				booty_call['safe_day'] = 1
+				cla & *clr
+				$booty_call['temp_pic']
+				'"Don''t worry," you smile. "It''s a safe day for me. You can come inside me as much as you want."'
+				act'<i>I''ll be fine</i>':
+					cla & *nl
+					'<i>It''s fine,</i> you think to yourself. <i>A few creampies won''t kill me...</i>'
+					gs'booty_call_sex', 'sex_end'
+				end
+				
+				act'<i>I hope I get pregnant</i>':
+					cla & *nl
+					'<i>I really hope this gets me pregnant,</i> you think giddily to yourself. <i>I want <<$npc_firstname[$boy]>>''s babies swimming around inside me...</i>'
+					gs'booty_call_sex', 'sex_end'
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'free_creampies2':
+!! npc_free_creampies[$boy] = 1: he will freely creampie you tell him its safe
+!! npc_free_creampies[$boy] = 2: he will creampie you whenever he wants
+	if npc_abusive[$boy] = 1 and npc_childfree[$boy] ! 1:
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a predatory grin, so full of desire that it makes you involuntarily swallow.'
+			*nl
+			'"Good to know..."'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_sex', 'sex_end'
+	elseif (npc_selfish[$boy] = 1 or npc_know_bc[$boy] = 1) and (npc_childfree[$boy] ! 1 or npc_know_bc[$boy] = 1):
+		npc_free_creampies[$boy] = 2
+		if $npc_cum_pref[$boy] = 'creampie':
+			'<<$npc_firstname[$boy]>> gives you a look like he might just burst inside you again before giving you a delighted grin.'
+			'"I''m gonna pump you full of so much cum, you''re going to still be dripping next week," he says excitedly and you can''t help but giggle at his boyish glee.'
+		else
+			'"Good to know," he smirks amusedly.'
+		end
+		gs'booty_call_sex', 'sex_end'
+	else
+		if npc_childfree[$boy] = 1 and npc_know_bc[$boy] ! 1:
+			'"Are you sure...?" <<$npc_firstname[$boy]>> asks hesitantly. "You''re not worried you''re going to get pregnant? I''m... I''m not really up for having kids..."'
+			!! add more options later
+		else
+			'"Is that really okay?" <<$npc_firstname[$boy]>> asks, wide-eyed.'
+		end
+		
+		act'I''ll be fine':
+			cla & *nl
+			'"I''ll be fine," you insist, smiling gently. "What could go wrong?"'
+			if npc_childfree[$boy] = 1 or rand(1,4) = 1:
+				npc_free_creampies[$boy] = -1
+				'"I''m not comfortable with it," <<$npc_firstname[$boy]>> says, shaking his head. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'"Okay..." <<$npc_firstname[$boy]>> says hesitantly, but smiles back at you anyways.'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
+		
+		act'It feels good':
+			cla & *nl
+			'"It feels so good," you coo gently. "I <i>want</i> you to come inside me. I want you to fill me with your cum..."'
+			*nl
+			if ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] = 1 and rand(npc_willpwr[$boy],100) <= pcs_persuas) or ($npc_cum_pref[$boy] = 'creampie' and npc_childfree[$boy] ! 1):
+				npc_free_creampies[$boy] = 2
+				'Desire wars with willpower within <<$npc_firstname[$boy]>>. You watch as he struggles back and forth until he leers at you with a hungry stare and you know which one won out.'
+				'"Okay." <<$npc_firstname[$boy]>> says. "I won''t ask anymore."'
+			elseif npc_childfree[$boy] = 1:
+				npc_free_creampies[$boy] = -1
+				'<<$npc_firstname[$boy]>> hesitates for a moment before shaking his head.'
+				'"I''m not comfortable with it," he says. "Maybe if you started birth control..."'
+			else
+				npc_free_creampies[$boy] = 2
+				'<<$npc_firstname[$boy]>> hesitates for a moment before nodding slowly.'
+				'"Okay," he says, smiling. "I won''t ask anymore."'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
+		
+		act'I''ll tell you when it''s safe':
+			npc_free_creampies[$boy] = 1
+			cla & *nl
+			'"I''ll let you know when it''s a safe day," you smile gently. "And then you can come inside me as much as you want."'
+			'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+			gs'booty_call_sex', 'sex_end'
+		end
+		
+		if birth_control['think_safe'] = 1:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		elseif pillcon2 >= 20000:
+			act'I''m on birth control':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you smile gently. "And it should be effective any day now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you smile gently. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		else
+			act'I''m on birth control (lie)':
+				npc_free_creampies[$boy] = 2
+				cla & *nl
+				if npc_know_not_bc[$boy] = 1:
+					npc_know_not_bc[$boy] = 0
+					npc_know_bc[$boy] = 1
+					'"I started birth control," you lie with a seductively gentle smile. "And it should be effective now. So you can come inside me as much as you want."'
+				else
+					npc_know_bc[$boy] = 1
+					'"I''m on birth control," you lie with a seductively gentle smile. "So you can come inside me as much as you want."'
+				end
+				'"Okay." <<$npc_firstname[$boy]>> smiles back, beaming at you.'
+				gs'booty_call_sex', 'sex_end'
+			end
+		end		
+	end
+end
+
 if $ARGS[0] = 'cum_together_no_bc':
-	if booty_call['risky_creampie'] = 1 and booty_call['creampie_ask'] = 0 and booty_call['he_ask_creampie_yes'] ! 1:
+	if booty_call['risky_creampie'] = 1 and booty_call['creampie_ask'] = 0 and booty_call['he_ask_creampie_yes'] ! 1 and npc_free_creampies[$boy] = 0:
 		act'Be careful (pregnancy)':
 			cla
 			if pillcon2 > 0:
@@ -517,7 +750,11 @@ end
 if $ARGS[0] = 'creampie_gross2':
 	act'Creampies are weird':
 		cla & *nl
-		'"I really don''t like creampies," you grimace. "They feel weird."'
+		if npc_free_creampies[$boy] > 0 and $pc_cum_pref_know[$boy] = 'creampie':
+			'"I really don''t like creampies. They feel weird," you grimace, before twisting your mouth in a wry smirk and shrug. "But I like you. So you better be happy."'
+		else
+			'"I really don''t like creampies," you grimace. "They feel weird."'
+		end
 		gs'booty_call_sex', 'sex_end'
 	end
 	if birth_control['think_safe'] ! 1:
@@ -531,7 +768,7 @@ if $ARGS[0] = 'creampie_gross2':
 end
 
 if $ARGS[0] = 'thanks_for_asking':
-	if booty_call['he_ask_creampie'] = 1:
+	if booty_call['he_ask_creampie'] = 1 and npc_free_creampies[$boy] = 0:
 		act'Thanks for asking':
 			cla & *clr
 			if $booty_call['position'] = 'miss':
@@ -583,7 +820,7 @@ if $ARGS[0] = 'thanks_for_asking':
 end
 
 if $ARGS[0] = 'told_you_not_to_creampie':
-	if booty_call['promise_no_creampie'] = 1 and booty_call['creampie_ask'] ! 1 and booty_call['he_ask_creampie_yes'] ! 1:
+	if booty_call['promise_no_creampie'] = 1 and booty_call['creampie_ask'] ! 1 and booty_call['he_ask_creampie_yes'] ! 1 and npc_free_creampies[$boy] = 0:
 		act'I said no creampies (not mad)':
 			cla & *clr
 			if $booty_call['position'] = 'miss':
@@ -612,7 +849,7 @@ if $ARGS[0] = 'told_you_not_to_creampie':
 end
 
 if $ARGS[0] = 'thought_no_creampies':
-	if booty_call['creampie_ask'] = 1 and npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] < 3:
+	if booty_call['creampie_ask'] = 1 and npc_boyfriend_creampie_rule[$boy] > 0 and npc_boyfriend_creampie_rule[$boy] < 3 and npc_free_creampies[$boy] = 0:
 		cla
 		act'Continue':
 			cla & *clr
@@ -757,11 +994,11 @@ if $ARGS[0] = 'bask_satisfaction':
 				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.'
+						'You lay back, shivering 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.'
+						'You lay back, shivering 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.'
+						'You lay back, shivering 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.'
@@ -769,20 +1006,20 @@ if $ARGS[0] = 'bask_satisfaction':
 					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.'
+							'You lay still, shivering as you wind down from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s 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.'
+							'You lay still, shivering as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s 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.'
+							'You lay still, shivering as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s 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.'
+							'You just lay there, shivering 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.'
+							'You just lay there, shivering 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.'
+							'You just lay there, shivering 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>'
@@ -798,12 +1035,12 @@ if $ARGS[0] = 'bask_satisfaction':
 					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.'
+						'The two of you just stay like that for a while, panting hard in the aftermath 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>'
+					'<center><img <<$set_imgh>> src="images/shared/sex/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:
@@ -907,6 +1144,90 @@ if $ARGS[0] = 'bask_satisfaction':
 			end
 			gs'booty_call_sex', 'sex_end'
 		end
+	else
+		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>'
+					'You lay back, breathing hard and feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy as you wind down.'
+					*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>'
+						'You lay still, panting as you wind down, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s cock still twitching inside you.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						'You just lay there, panting with <<$npc_firstname[$boy]>> on top of you, winding down together with his cock still twitching inside you.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						'You collapse onto <<$npc_firstname[$boy]>>, breathing hard and letting your body melt into his, your breasts pressing against his chest while his cock still twitches inside you.'
+					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/sex/after/pillow_talk1.jpg"></center>'
+					'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down.'
+					*nl
+					'A few minutes pass and your breathing slowly calms, the two of you relaxing together 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>'
+						'You lay still, panting as you wind down, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>''s cock still twitching in the condom inside you.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						'You just lay there, panting with <<$npc_firstname[$boy]>> on top of you, winding down together with his cock still twitching in the condom inside you.'
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						'You collapse onto <<$npc_firstname[$boy]>>, breathing hard and letting your body melt into his, your breasts pressing against his chest while his cock still twitches in the condom inside you.'
+					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>'
+					'You lay back, panting as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+				elseif $booty_call['last_cum'] = 'spit':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					'You lay back, panting as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+				elseif $booty_call['last_cum'] = 'swallow':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					'You lay back, panting as you wind down, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+				elseif $booty_call['last_cum'] = 'facial':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					'You lay back, panting as you wind down, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+				elseif $booty_call['last_cum'] = 'tits':
+					$npc_apt_bedroom[$boy]
+					'You lay back, panting as you wind down, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+				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>'
+						'You lay back, panting as you wind down, feeling the warm cum on your belly already beginning to cool.'
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+						'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, panting as you wind down.'
+					end				
+				end
+				*nl
+				'A few minutes pass and your breathing slowly calms, the two of you relaxing together in a moment of quiet satisfaction.'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
 	end
 end
 
@@ -1625,12 +1946,25 @@ if $ARGS[0] = 'facial_react1':
 				gs 'booty_call_sex', 'sex_end'
 			end
 		end
+		
 		act'It''s so warm':
 			cla & *clr
 			$booty_call['facial_pic']
 			'"It''s so warm..." you muse, <<$npc_firstname[$boy]>>''s sperm dribbling slowly down your cheeks.'
 			gs 'booty_call_sex', 'sex_end'
 		end
+		
+		act'Disgusting':
+			cla & *clr
+			'<center><video autoplay loop src="images/shared/sex/cum/facial/facial_after1.mp4"></video></center>'
+			if npc_facial_count[$boy] + booty_call['facial'] = 1:
+				'"Ugh, disgusting!" you groan, spitting the vile viscous fluid away from your lips. "It''s like getting sneezed on! Why did I let you do this?"'
+			else
+				'"Ugh, disgusting!" you groan, spitting the vile viscous fluid away from your lips. "It''s like getting sneezed on! Why do I let you do this?"'
+			end
+			gs 'booty_call_sex', 'sex_end'
+		end
+		
 		if cum_loc['hair'] > 0:
 			act'Got in my hair (annoyed)':
 				cla & *clr
@@ -1668,7 +2002,7 @@ end
 	
 
 if $ARGS[0] = 'cum_tasty':
-	if trait['cumeater'] = 1 and ($booty_call['last_cum'] = 'face_mouth' or $booty_call['cum_choice'] = 'mouth'):
+	if pcs_traits['cumeater'] = 1 and ($booty_call['last_cum'] = 'face_mouth' or $booty_call['cum_choice'] = 'mouth'):
 		act'Tasty':
 			cla & *clr
 			booty_call['react'] = 1

+ 3 - 3
locations/brother.qsrc

@@ -988,8 +988,8 @@ if $ARGS[0] = 'brother_voyeur_ev2':
 	menu_off = 1
 	gs 'stat'
 	temp_var = rand(5,10)
-	minut += temp_var
 	gs 'arousal','foreplay', temp_var
+	killvar 'temp_var'
 	picrand = rand(1,7)
 	if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/kolka/event/shower/c (<<picrand>>).jpg"></center>'
@@ -1370,7 +1370,6 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		gs 'cum_call', 'stomach', 'A34', 1, 0, 0, rand(20,30)
 		gs 'cum_call', 'breasts', 'A34', 1, 0, 0, rand(10,20)
 		gs 'cum_call', 'labia', 'A34', 1, 0, 0, rand(10,20)
-		$orgasm_or = 'yes'
 		gs 'stat'
 		if brotherSex < 4:brotherSex = 4
 		if sound = 0:PLAY 'sound/moaning<<ivrand>>.mp3',30
@@ -1380,7 +1379,8 @@ if $ARGS[0] = 'brother_voyeur_ev8':
 		if stat['think_virgin'] = 0:'You slip your fingers into your burning pussy, the sensation causing you to moan.'
 		'You watch as Kolka pulls down his pants and his fully erect <<npc_dick[''A34'']>> cm cock pops free. He kneels between your spread knees and starts to jerk himself off while he watches you play with yourself. Your heart begins to beat faster and faster, you start panting as you feel a primitive heat bubbling up deep from within. Moments later, you hear Kolka groan and watch as ropes of hot cum fly out of his cock, splashing over your crotch, stomach and even your breasts. It''s too much for you and soon you join your brother in ecstasy when your own release finally peaks. It takes everything inside of you to keep from screaming in bliss as your hips buck up and down, your fingers rubbing faster as you ride wave after wave of your orgasm.'
 
-		gs 'arousal','masturbate', 10, 'incest'
+		$orgasm_or = 'yes'
+		gs 'arousal', 'vaginal_finger', 10, 'masturbate', 'incest', 'no_orgasm_msg'
 		gs 'arousal','foreplay', 10, 'incest'
 		minut -= 10
 		gs 'stat'

+ 1 - 1
locations/brother_voyeur.qsrc

@@ -971,7 +971,7 @@ if $ARGS[0] = 'showerfun':
 			act'Suggest you wash each other':gt'brother_voyeur','brother_wash'
 		end
 		act'Get into it':
-			cla & *nl
+			cls & *nl
 			gs 'arousal','breasts', 2
 			pcs_horny += 10
 			gs 'stat'

+ 3 - 3
locations/brother_voyeur_sex.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'brother_shower_bj':
 						end
 					end
 
-					if trt_cumeater = 1:
+					if trait['cumeater'] = 1:
 						act'I didn''t want to waste it':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
@@ -851,7 +851,7 @@ if $ARGS[0] = 'shower_swallow':
 			end
 		end
 
-		if trt_cumeater = 1:
+		if trait['cumeater'] = 1:
 			act'"Tasty!"':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/brothershower.jpg"></center>'
@@ -1148,7 +1148,7 @@ if $ARGS[0] = 'shower_facial':
 			end
 		end
 
-		if trt_cumeater = 1:
+		if trait['cumeater'] = 1:
 			act'Feels like a waste':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/home/bathroom/facial2.jpg"></center>'

+ 36 - 36
locations/camera.qsrc

@@ -123,7 +123,7 @@ $camera_people['eugene'] = {
 if $ARGS[0] = 'start':
 	*clr & cla
 	'<center><img src="images/pc/items/accessories/camera.jpg"></center>'
-	'You can''t help but smile as you check your camera. You love capturing life as it happens, but can be hard to decide exactly who or what you want to take photographs of.'
+	'You can''t help but smile as you check your camera. You love capturing life as it happens, but it can take time to decide precisely who or what you want to take photographs of.'
 	'You spend a few minutes thinking about places and people that might make for interesting subjects. Perhaps...'
 	*nl
 	! Get the number of locations in the array
@@ -198,30 +198,30 @@ if $ARGS[0] = 'eugene':
 	npc_rel['A89'] += 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big89.jpg"></center>'
 	'"Hey, can I ask you something?"'
-	'She smiles and nods. "Sure. What is it sweetie?"'
+	'She smiles and nods. "Sure. What is it, sweetie?"'
 	'"Can I take your photo?"'
 	'"Sure thing, sweetie." She stops to let you take a photo, misunderstanding what you meant.'
 	'You shake your head and pull out your camera. "No, I meant with this."'
 	'She looks a little surprised and sheepish. "Oh! Are you working on becoming a photographer?"'
 	*nl
 	'You nod. "Yes, I just need more practice. Which is where you come in."'
-	'She laughs softly. "Okay, why not? I havn''t taken a break yet today. We can go to my place and you can take my picture there. Sound good?"'
-	'You nod. "Sure, that works for me." She tells her sister that she''s taking a break and leads you out of the cafe to her apartment building. She leads you upstairs and into her apartment. Once inside, you take out your camera.'
+	'She laughs softly. "Okay, why not? I haven''t taken a break yet today. So we can go to my place, and you can take my picture there. Sound good?"'
+	'You nod. "Sure, that works for me." She tells her sister she''s taking a break and leads you out of the cafe to her apartment building. She leads you upstairs and into her apartment. Once inside, you take out your camera.'
 	act 'Start taking her picture': gt 'eugeneev1', 'photography'
 end
 
 if $ARGS[0] = 'mother':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/mother.jpg"></center>'
-	'You take our your camera. "Hey <<$npc_nickname[''A29'']>>, do you mind if I take your photograph for my portfolio?"'
+	'You take out your camera. "Hey, <<$npc_nickname[''A29'']>>, do you mind if I take your photograph for my portfolio?"'
 	'She frowns at you. "Where did you get that camera?"'
-	'You shrug a little. "I saved up and bought it. Please? I need the practice and I think you would make a great subject."'
+	'You shrug a little. "I saved up and bought it. Please? I need the practice, and I think you would make a great subject."'
 	'She shakes her head. "Seems like a waste of money to me."'
-	'You sigh. "I love doing it, plus I can make a living from it. Please?"'
+	'You sigh. "I love doing it, and I can make a living. Please?"'
 	*nl
 	'She sighs. "Fine, but I still think it''s a waste of time."'
 	'You nod. "I know. Let''s go outside."'
-	'"I don''t have time for that, just take my picture." she sternly replies'
+	'"I don''t have time for that. Just take my picture." she sternly replies.'
 	'"Please?" you plead.'
 	'She shakes her head. "Fine. The things I do for you kids..."'
 	act 'Take her photo':
@@ -233,9 +233,9 @@ if $ARGS[0] = 'mother':
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/1.jpg"></center>'
 		'You go outside and have her stand in a few poses around the courtyard before finally settling on her standing in front of some flowers. "I got it!"'
 		'She walks over to you. "Finally. Now I can get back to the housework."'
-		'You show her the photos you took and the one you finally decided on. "Here look, this one here is the one I will use for my portfolio."'
-		'She smiles. "They do look nice... I still say it''s a waste of time though."'
-		'You roll your eyes. "I know <<$npc_nickname[''A29'']>>." you reply as she walks back inside.'
+		'You show her your photos and the one you finally decided on. "Here, look, this is the one I will use for my portfolio."'
+		'She smiles. "They do look nice... I still say it''s a waste of time, though."'
+		'You roll your eyes. "I know, <<$npc_nickname[''A29'']>>," you reply as she walks back inside.'
 		act 'Put your camera away': gt 'pav_complex', 'start'
 	end
 end
@@ -245,7 +245,7 @@ if $ARGS[0] = 'anya':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/home/sisboyqw_05.jpg"></center>'
 	'You climb off the bed and grab your camera off your desk. "Hey, do you mind if I take your photograph for my portfolio?"'
 	'She smiles. "What is it with you and that camera?"'
-	'You shrug a little. "I just love doing it. If I get good enough I could do it for a living. So please? I need the practice and I think you would make a great subject."'
+	'You shrug a little. "I just love doing it. If I get good enough, I could do it for a living. So, please? I need the practice, and I think you would make a great subject."'
 	'She giggles. "Fine, but something classy."'
 	'You nod. "Deal."'
 	act 'Take her photo':
@@ -257,9 +257,9 @@ if $ARGS[0] = 'anya':
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/2.jpg"></center>'
 		'You direct her to lie on the bed in several poses, then stand in various spots around the room before you finally find the perfect image. Once you''ve taken it, you sit down on the bed. "I got it."'
 		'She sits down next to you. "Let me see."'
-		'You show her the photos you took and the one you finally decided on. "You sure my ass doesn''t look fat in this? I think it looks fat." she says with a pout.'
+		'You show her your photos and the one you finally decided on. "You sure my ass doesn''t look fat in this? I think it looks fat," she says with a pout.'
 		'You shake your head and reassure her. "Your ass looks perfect. That''s why I took this photo. Trust me."'
-		'"Fine!" she pouts before sits back down on her bed. You put your camera away and join her.'
+		'"Fine!" she pouts before sitting back down on her bed. You put your camera away and join her.'
 		act 'Finish': gt 'sister_chat', 'sister_chat'
 	end
 end
@@ -277,7 +277,7 @@ if $ARGS[0] = 'lazar':
 		portfolio_people[3] = 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/3.jpg"></center>'
-		'You watch as he starts showing off his skills, pretending to be teaching them, but you''re fairly sure he''s just showing off for you. You start taking several photos of him and they''re looking pretty good. He then suddenly pulls off his shirt and you keep taking photographs as you try to remain focused. You finally get the shot you want and put your camera away before giving Lazar a wave. He returns the wave as you leave.'
+		'You watch as he starts showing off his skills, pretending to be teaching them, but you''re reasonably sure he''s just showing off for you. You begin taking several photos of him, and they''re looking pretty good. He then suddenly pulls off his shirt, and you keep taking photographs as you try to remain focused. You finally get the shot you want and put your camera away before giving Lazar a wave. He returns the wave as you leave.'
 		act 'Walk off the pitch': gt 'gschool_grounds', 'sports'
 	end
 end
@@ -289,7 +289,7 @@ if $ARGS[0] = 'city_library':
 	portfolio_locations[1] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'You make your way over to the city library. It is a grand building and would make for a wonderful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'You make your way over to the city library. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -300,7 +300,7 @@ if $ARGS[0] = 'city_uni':
 	portfolio_locations[2] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'You make your way over to the university. It is a grand building and would make for a wonderful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice all the students moving around and feel that they would make for a great photo as well. You stop and take several more photos of the students before stopping. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'You make your way over to the university. It is a grand building and would make for a beautiful photograph. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice all the students moving around and feel they would make for a great shot. You stop and take several more photos of the students before stopping. You''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -311,7 +311,7 @@ if $ARGS[0] = 'gadukino':
 	portfolio_locations[4] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in the village, you realize what a wonderful photograph this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You can''t help but notice the houses and feel that they would make for a great photo as well. You stop and take several photos of different houses before finally settling on your grandparents home. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in the village, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You can''t help but notice the houses and feel that they would also make for a great photo. You stop and take several pictures of different places before finally settling on your grandparents'' home. You''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -322,7 +322,7 @@ if $ARGS[0] = 'gadforest':
 	portfolio_locations[6] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in the forest, you are amazed by how breathtakingly beautiful it is out here. You walk around taking photos of the trees until you''re happy and check all the photos you''ve taken. You feel confident that you''ve found something to add to your portfolio and put your camera away.'
+	'Standing in the forest, you are amazed by how breathtakingly beautiful it is. You take photos of the trees until you''re happy and check all the shots you''ve taken. Finally, you feel confident that you''ve found something to add to your portfolio and put your camera away.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -333,7 +333,7 @@ if $ARGS[0] = 'pav_church':
 	portfolio_locations[12] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in front of the local church, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You then spot the cemetery and walk over to take some photos of it as well. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the local church, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. You then spot the cemetery and take some photos of it. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -344,7 +344,7 @@ if $ARGS[0] = 'pav_train_hall':
 	portfolio_locations[8] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in front of the local train station, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the local train station, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -355,7 +355,7 @@ if $ARGS[0] = 'pav_complex':
 	portfolio_locations[7] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in the courtyard, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in the courtyard, you realize this place would make a wonderful photo. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -366,7 +366,7 @@ if $ARGS[0] = 'pav_school':
 	portfolio_locations[9] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Standing in front of the school, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Standing in front of the school, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -377,7 +377,7 @@ if $ARGS[0] = 'pav_park':
 	portfolio_locations[10] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'Walking through the park, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'Walking through the park, you realize what a wonderful photo this place would make. You move around several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 end
 
@@ -388,10 +388,10 @@ if $ARGS[0] = 'pav_lake':
 	portfolio_locations[11] = 1
 	gs 'stat'
 	'<center><img src="images/pc/activities/photography/sveta_camera.jpg"></center>'
-	'As you look out over the lake, you realize what a wonderful photo this place would make. You walk around the shore several times until you find the perfect spot and take several photos before pausing and checking them. You''re happy with the results, knowing that you have something to add to your portfolio.'
+	'As you look out over the lake, you realize what a wonderful photo this place would make. You walk around the shore several times until you find the perfect spot and take several pictures before pausing and checking them. Finally, you''re happy with the results, knowing you have something to add to your portfolio.'
 	act 'Put your camera away': gt $loc, $loc_arg
 	if soniaPS > 0 and sunWeather = 1 and temp > 15 and hour > 6 or hour < 22:
-		'Just as you''re about to put your camera away, you notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia and she appears to be alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
+		'Just as you''re about to put your camera away, you notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia, and she appears alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
 		gs 'camera', 'pav_lake_sonia'
 	else
 		act 'Put your camera away': gt $loc, $loc_arg
@@ -399,14 +399,14 @@ if $ARGS[0] = 'pav_lake':
 end
 
 if $ARGS[0] = 'pav_lake_sonia':
-	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia and she appears to be alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
+	if $ARGS[1] = 'describe': 'You notice a girl sunbathing topless. It takes you a minute to realize that it''s Sonia, and she appears alone. You wonder if she would make a good subject, a take on how innocence can be lost in a cruel world.'
 	act 'Take her photograph':
 		*clr & cla
 		camera_found['sonia'] = 1
 		gs 'exp_gain', 'photoskl', rand(1,2)
 		gs 'stat'
 		'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo1.jpg"></center>'
-		'You get a little closer and start taking her photograph, moving around and taking a number of shots from different angles before she suddenly sits up and looks in your direction.'
+		'You get a little closer and start taking her photograph, moving around and taking several shots from different angles before she suddenly sits up and looks in your direction.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
 		act 'Caught':
@@ -414,11 +414,11 @@ if $ARGS[0] = 'pav_lake_sonia':
 			gs 'exp_gain', 'photoskl', rand(1,2)
 			gs 'stat'
 			'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo2.jpg"></center>'
-			'She covers herself up and looks at you in surprise. "What the fuck <<$pcs_nickname>>?! What are you doing?"'
-			'You smile and take another photo of her. "Sorry, I was just taking your photo. You''re just so beautiful and I couldn''t help myself."'
+			'She covers herself up and looks at you in surprise. "What the fuck, <<$pcs_nickname>>?! What are you doing?"'
+			'You smile and take another photo of her. "Sorry, I was just taking your photo. You''re just so beautiful, and I couldn''t help myself."'
 			'She smiles at the compliment. "Really?"'
 			'You nod as you take another photo of her. "Yes, now why don''t you get up and stop covering up?"'
-			'She smiles even more. "Okay, but just a few." She gets up on her knees and removes her hands, giving you a nice shot of her topless body.'
+			'She smiles even more. "Okay, but just a few." Then, she gets up on her knees and removes her hands, giving you a nice shot of her topless body.'
 			gs 'arousal', 'voyeur', 2
 			gs 'stat'
 			act 'Take more photos':
@@ -427,7 +427,7 @@ if $ARGS[0] = 'pav_lake_sonia':
 				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo3.jpg"></center>'
-				'She is a little awkward at first, not knowing what to do, but as you continue taking more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoying it.'
+				'She is a little awkward at first, not knowing what to do, but as you take more photos, she starts to relax and become more natural in her poses. She even starts to get into it herself and enjoys it.'
 				act 'Take more photos':
 					*clr & cla
 					gs 'exp_gain', 'photoskl', rand(1,2)
@@ -451,11 +451,11 @@ if $ARGS[0] = 'pav_lake_sonia':
 							portfolio_people[4] = 1
 							gs 'stat'
 							'<center><img src="images/characters/pavlovsk/school/girl/sonia/lake/photography/photo6.jpg"></center>'
-							'You continue taking photos of her now naked body and start getting a lot closer to her. The longer it goes on, the more turned on she seems to get, eventually playing with her pussy. Finally, having taken several dozen photos, you feel that you''ve taken enough and stop. "Thanks Sonia, I got what I needed."'
-							'She frowns before bobbing her head slightly and smiling. "It was my pleasure, I really liked it. M-Maybe we can do it again sometime?" You can hear her shy sweet former self coming out.'
-							'You feel bad for her, knowing that almost nobody talks to her anymore. "Yeah sure, I would like that."'
+							'You continue taking photos of her naked body and start getting closer to her. The longer it goes on, the more turned on she seems to get, eventually playing with her pussy. Finally, having taken several dozen photos, you feel you''ve taken enough and stop. "Thanks, Sonia. I got what I needed."'
+							'She frowns before bobbing her head slightly and smiling. "It was my pleasure. I really liked it. M-Maybe we can do it again sometime?" You can hear her shy, sweet former self coming out.'
+							'You feel bad for her, knowing that almost nobody talks to her anymore. "Yeah, sure, I would like that."'
 							'She breaks into a huge smile and looks happier than you''ve seen her in a long time. "Okay, just let me know or maybe stop by my house sometime?"'
-							'You nod. "I will, but for now I''ve got all I need. I''ll let you get back to sunbathing. Thanks again." She smiles and gets dressed as you put your camera away.'
+							'You nod. "I will, but I''ve got all I need now. I''ll let you get back to sunbathing. Thanks again." She smiles and gets dressed as you put your camera away.'
 							gs 'arousal', 'voyeur', 5
 							gs 'arousal', 'end'
 							gs 'stat'

+ 10 - 10
locations/city_center.qsrc

@@ -44,7 +44,7 @@ else
 end
 *nl
 
-'Day or night the city center is alive and bustling. Whether You''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
+'Day or night, the city centre is alive and bustling. So whether you''re looking to shop, hit the gym or get some cheap food, you''ll find it hard not to have your needs satisfied.'
 *nl
 
 gs'street_event','city_center', 'extras'
@@ -73,15 +73,15 @@ if shantpopala > 0:
 	rape += 1
 	shantpopala -= 1
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/sex/rape.jpg"></center>'
-	'On the street close to you, a black jeep suddenly hit the brakes. You turn your head to see what''s happening and see two large men jump of it and start to run towards you in. Before you can react and run away, they grap you and drag you into the car.'
-	'"You''re doing this for a living? Taking pictures of naked people in the park?", one of the shouts, holding one of the pictures to your face you''ve made awhile back and sent someone over a social network, hoping they would pay the ransom.'
-	'"No... what? What the hell is going on? I don''t know what you''re talking about!", you try to explain.'
-	'"Don''t lie to use you stupid bitch.", as he said that, he hits you on your head and you pass out.'
-	'You wake up somewhere out of town, you''re tied up and naked. You look down on yourself and notice traces of cum on your body, it also seems like that cum is flowing from your ass and your pussy.'
-	'You notice that the blokes, who captured you sit next to you and seem to have a break, some of them are smoking.'
-	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said, as he noticed you moving. Some of them are starting to get an evil grin on their face.'
-	'They got up and came back at you, barely a minute later you wished your were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded to black and you lost you consciousness again.'
-	'You feel groggy as you wake up, but it feels like someone is grapping you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he shouts, then kicks you into the stomach and leaves. As you collapse on the ground holding your stomach in pain, you take a glimpse at the street and see the assholes driving away in their black jeep. The mainroad is about 200m away, you crawl most of the way there, but soon you can walk again and eventually you find your way back to one of the mainstreets.'
+	'A black jeep suddenly hit the brakes on the street close to you. You turn your head to see what''s happening and see two prominent men jump out of it and start running towards you. Before you can react and run away, they grab you and drag you into the car.'
+	'"You''re doing this for a living? Taking pictures of naked people in the park?" one of them shouts while holding one of the pictures to your face you''ve made a while back and sent someone over a social network, hoping they would pay the ransom.'
+	'"No... what? What the hell is going on? I don''t know what you''re talking about!" you try to explain.'
+	'"Don''t lie to us, you stupid bitch." as he says that, he hits you on your head, and you pass out.'
+	'You wake up somewhere out of town, tied up and naked. You look down on yourself and notice traces of cum on your body. It also seems like that cum is flowing from your ass and pussy.'
+	'You notice that the blokes, who captured you, sit next to you and seem to have a break. Some of them are smoking.'
+	'"Oh, she is finally awake, then the next fuck-cycle will be far more fun.", one of the men said as he noticed you moving. Some of them are starting to get evil grins on their face.'
+	'They got up and came back at you. Barely a minute later, you wished you were still knocked out, as these jackasses had their ways with. You tried to resist, but the tape hindered you from moving. Not long after, everything faded black, and you lost consciousness again.'
+	'You feel groggy as you wake up, but someone grabs you by the hair and shouts at you. "Let this be a lesson for you, bitch.", he yells, then kicks you in the stomach and leaves. As you collapse on the ground holding your stomach in pain, you glimpse the street and see the assholes driving away in their black jeep. The main road is about 200m away. You crawl most of the way there, but soon you can walk again, and eventually, you find your way back to one of the main streets.'
 	gs 'arousal', 'bj', -60, 'sub', 'gangbang','humiliation', 'rough'
 	gs 'arousal', 'vaginal', -60, 'sub', 'gangbang', 'humiliation', 'rough'
 	gs 'arousal', 'anal', -60, 'sub', 'gangbang', 'humiliation', 'rough'

+ 7 - 8
locations/city_clinic.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'start':
 
 	if katjob > 0:act 'Visit the chief doctor': gt 'city_clinic', 'glavdoc'
 
-	if (pcs_teeth > -1 and (dentistday + 90 < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
+	if (pcs_teeth > -1 and (dentistday < daystart or dentistday = 0)) or (pcs_missing_teeth > 0  and pcs_brace = 0):
 		act 'Go to the dentist':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/clinic/dentist.jpg"></center>'
@@ -212,7 +212,6 @@ if $ARGS[0] = 'start':
 			if pcs_brace = 1:
 				pcs_brace = 0
 				pcs_teeth -= 1
-				dentistday = daystart
 				'The dentist spends 15 minutes to take of you brace and clean up. You look at the mirror afterward and you teeth are '+iif(pcs_teeth = 0, 'now straight', 'straighter, but can still use some more work.')
 				gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 				gs 'stat'
@@ -244,11 +243,11 @@ if $ARGS[0] = 'start':
 								pcs_missing_teeth = 0
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 							elseif pcs_teeth > 0:
-								dentistday = daystart
+								dentistday = daystart + 180
 								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 							else
-								dentistday = daystart
+								dentistday = daystart + 90
 								pcs_teeth = -1
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 							end
@@ -267,12 +266,12 @@ if $ARGS[0] = 'start':
 								pcs_missing_teeth = 0
 								'You pay the dentist to fix your teeth, within an hour he has restored your winning smile.'
 							elseif pcs_teeth > 0:
-								dentistday = daystart
+								dentistday = daystart + 180
 								pcs_brace = 1
-								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it three months to have it taken of.'
+								'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
 							else
 								pcs_teeth = -1
-								dentistday = daystart
+								dentistday = daystart + 90
 								'You pay the dentist to brighten and polish your teeth, an hour later your smile is much brighter and more attractive.'
 							end
 							gs 'AppearanceSystem', 'UpdateBaseAppearnce'

+ 17 - 17
locations/city_coffee_hole.qsrc

@@ -33,28 +33,28 @@ if $args[0]= 'inner':
 		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>'
+				'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>'
+				'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>'
+				'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>'
+				'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>'
+				'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.'
+				'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>'
+				'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.'
+				'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
@@ -106,10 +106,10 @@ if $ARGS[0] = 'post_komp':
 end
 
 if $ARGS[0] = 'toilet':
-	$locM = city_coffee_hole
-	$locM_args = 'toilet'
-	$menu_loc = city_coffee_hole
-	$menu_args = 'toilet'
+	$locM = 'city_coffee_hole'
+	$locM_arg = 'toilet'
+	$menu_loc = 'city_coffee_hole'
+	$menu_arg = 'toilet'
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/restroom.jpg"></center>'
@@ -160,7 +160,7 @@ if $args[0]= 'anushka_work':
 	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 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."'
@@ -189,7 +189,7 @@ if $args[0]= 'anushka_work':
 			'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
+		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."'
@@ -331,7 +331,7 @@ if $args[0]= 'lazar':
 		'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
+			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
@@ -395,11 +395,11 @@ if $args[0] = 'marcus':
 	'<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
+		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
+			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.'

+ 79 - 51
locations/city_kafe.qsrc

@@ -66,13 +66,13 @@ if $ARGS[0] = 'table':
 	act 'Get up from the table':gt 'city_kafe', 'start'
 
 	act 'Order from the menu (0:05)':gs 'food_menu'
-	if kafe_food < (pcs_ate + pcs_drank):
-		if rand(1, 10) > 5:
-			gs 'boy'
-			'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
-			xgt 'city_kafe', 'razvod'
-		end
-	end
+	!!if kafe_food < (pcs_ate + pcs_drank):
+	!!	if rand(1, 10) > 5:
+	!!		gs 'boy'
+	!!		'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
+	!!		xgt 'city_kafe', 'razvod'
+	!!	end
+	!!end
 end
 
 if $ARGS[0] = 'fabi2':
@@ -160,6 +160,7 @@ if $ARGS[0] = 'fabi':
 	act 'Yes':
 		*nl
 		minut += 5
+		workKafe['job'] = 1
 		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."'
@@ -199,6 +200,9 @@ if $ARGS[0] = 'beg1':
 	$menu_arg = 'beg1'
 	menu_off = 0
 	workKafe['tips_roll'] += 30
+	!!set time to 15:30
+	if hour <= 15: minut += (15-hour) * 60 +30 - minut
+	gs 'stat'
 	'<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'
@@ -209,6 +213,10 @@ if $ARGS[0] = 'beg2':
 	$menu_arg = 'beg2'
 	menu_off = 0
 	workKafe['tips_roll'] -= 30
+	!!set time to 15:30
+	if hour <= 15: minut += (15-hour) * 60 +30 - minut
+	gs 'stat'
+
 	'<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'
@@ -219,6 +227,10 @@ if $ARGS[0] = 'beg3':
 	$menu_arg = 'beg3'
 	menu_off = 0
 	workKafe['tips_roll'] += 30
+	!!set time to 15:30
+	if hour <= 15: minut += (15-hour) * 60 +30 - minut
+	gs 'stat'
+
 	'<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'
@@ -229,6 +241,10 @@ if $ARGS[0] = 'beg4':
 	$menu_arg = 'beg4'
 	menu_off = 0
 	workKafe['tips_roll'] -= 30
+	!!set time to 15:30
+	if hour <= 15: minut += (15-hour) * 60 +30 - minut
+	gs 'stat'
+
 	!!Fabi
 	npc_rel['A41'] += 1
 	!!Ashot
@@ -248,6 +264,10 @@ if $ARGS[0] = 'beg5':
 	$menu_arg = 'beg5'
 	menu_off = 0
 	workKafe['tips_roll'] += 40
+	!!set time to 15:30
+	if hour <= 15: minut += (15-hour) * 60 +30 - minut
+	gs 'stat'
+
 	'<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'
@@ -258,6 +278,10 @@ if $ARGS[0] = 'beg6':
 	$menu_arg = 'beg6'
 	menu_off = 0
 	workKafe['tips_roll'] -= 40
+	!!set time to 15:30
+	if hour <= 15: minut += (15-hour) * 60 +30 - minut
+	gs 'stat'
+
 	'<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'
@@ -266,15 +290,12 @@ end
 if $ARGS[0] = 'lunch':
 	$location_type = 'event'
 	*clr & cla
-	!!set time to 15:30
-	minut += 270 - minute
-	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 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'
+		act 'Eat lunch': gt 'city_kafe', 'lunch_alone'
 	end
 	if city_cafe['lunch_talk'] ! daystart:
 		act 'Talk to Fabi': gt 'city_kafe', 'lunch_fabi'
@@ -282,30 +303,15 @@ if $ARGS[0] = 'lunch':
 		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 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
 	act 'Return to work': gt 'city_kafe', 'events'
 end
 
-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'
+if $ARGS[0] = 'lunch_alone':
+	gs 'city_kafe', 'eat_lunch'
 	*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
 
@@ -313,15 +319,15 @@ if $ARGS[0] = 'lunch_fabi':
 	city_cafe['lunch_talk'] = daystart
 	minut += 10
 	npc_rel['A41'] += 1
+	!!gs 'city_kafe', 'eat_lunch'
 	*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 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
 	act 'Return to work': gt 'city_kafe', 'events'
 end
 
@@ -329,15 +335,15 @@ if $ARGS[0] = 'lunch_ashot':
 	city_cafe['lunch_talk'] = daystart
 	minut += 10
 	npc_rel['A42'] += 1
+	!!gs 'city_kafe', 'eat_lunch'
 	*clr & cla
-	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<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 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
 	act 'Return to work': gt 'city_kafe', 'events'
 end
 
@@ -345,15 +351,15 @@ if $ARGS[0] = 'lunch_marisha':
 	city_cafe['lunch_talk'] = daystart
 	minut += 10
 	npc_rel['A93'] += 1
+	gs 'city_kafe', 'eat_lunch'
 	*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 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
 	act 'Return to work': gt 'city_kafe', 'events'
 end
 
@@ -361,33 +367,50 @@ if $ARGS[0] = 'lunch_nika':
 	city_cafe['lunch_talk'] = daystart
 	minut += 10
 	npc_rel['A43'] += 1
+	gs 'city_kafe', 'eat_lunch'
 	*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 'Go to the bathroom': gt 'city_kafe', 'lunch_bath'
 	act 'Return to work': gt 'city_kafe', 'events'
 end
 
-if $ARGS[0] = 'events':
-	!!set time to 18:00
-	if hour = 15:
-		miunt += 180 - minut
+if $ARGS[0] = 'eat_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
-		minut += 120 - minut
+		pcs_hydra += 40
 	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'food', 'aftermeal'
+	gs 'stat'
+end
+
+
+if $ARGS[0] = 'events':
+	!!set time to 18:00
+	if hour < 18: minut += (18-hour)*60 - minut
+
 	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:
+	elseif city_cafe['events_firsttime'] = 1:
 		gt 'city_kafe', 2
-	elseif city_cafe['events_firsttime'] = 3:
+	elseif city_cafe['events_firsttime'] = 2:
 		gt 'city_kafe', 3
+	elseif city_cafe['events_firsttime'] = 3:
+		gt 'city_kafe', 4
 !!	elseif rand(0,4) <= 1:
 !!		gt random events yet to be added
 	else
@@ -395,7 +418,7 @@ if $ARGS[0] = 'events':
 	end
 end
 
-if ARGS[0] = 0:
+if ARGS[0] = 1:
 	npc_rel['A93'] += 1
 	minut += 10
 	*clr & cla
@@ -415,7 +438,8 @@ if ARGS[0] = 0:
 
 	'"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:
+
+elseif ARGS[0] = 2:
 	npc_rel['A41'] += 1
 	minut += 10
 	*clr & cla
@@ -439,7 +463,8 @@ elseif ARGS[0] = 1:
 
 	'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:
+
+elseif ARGS[0] = 3:
 	npc_rel['A43'] += 1
 	minut += 10
 	*clr & cla
@@ -463,7 +488,8 @@ elseif ARGS[0] = 2:
 
 	'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:
+
+elseif ARGS[0] = 4:
 	npc_rel['A42'] += 1
 	minut += 10
 	*clr & cla
@@ -499,7 +525,9 @@ end
 
 
 if $ARGS[0] = 'shift_end':
-	minut += 120
+	!! set to 20:00
+	if hour < 20: minut += (20-hour)*60 - minut
+
 	if rand(0,5) = 0:
 		gt 'city_kafe', 'end_1'
 	elseif rand(0,4) = 0:

+ 1 - 1
locations/city_lake.qsrc

@@ -1168,7 +1168,7 @@ if $ARGS[0] = 'vlake1cum':
 
 	act 'Masturbate':
 		*clr & cla
-		gs 'arousal', 'masturbate', 5
+		gs 'arousal', 'clit_finger', 5, 'masturbate'
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/lake/sex/vlake1/vlake6.jpg"></center>'
 		'Left unsatisfied, you take matters into your own hands and vigorously caress your pussy until you scream out in orgasm.'
 		$orgasm_or = 'yes'

+ 1 - 1
locations/city_mansion_residence_3.qsrc

@@ -71,7 +71,7 @@ if $ARGS[0] = 'ypool':
 			end
 		else
 			if $clothingworntype = 'nude':
-				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_<<rand(1,2)>>.jpg"></center>'
+				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_nude_preg_<<rand(1,2)>>.jpg"></center>'
 				inhib_exp += rand(2,4)
 			else
 				'<center><img <<$set_imgh>> src="images/pc/activities/swim/pool/swim_bikini_preg_<<rand(1,4)>>.jpg"></center>'

+ 6 - 1
locations/city_redlight.qsrc

@@ -47,7 +47,12 @@ if $ARGS[0] = 'start':
 	else
 		'You see a small printing shop tucked away between two larger buildings. It is currently closed and will open at 10:00.'
 	end
-
+		if hour >= 19 or hour < 2:
+		'A <a href="exec:gt ''hookahlounge'', ''start''">Hookah Lounge</a> is on a corner, with Indian music streaming from an open door, with a scent of exotic spices.'
+	else 
+		'A <a href="exec:msg ''The Hookah Lounge is closed for now and will reopen at 19:00''">Hookah Lounge</a> is on a corner, but it''s currently closed.'
+	end
+	
 	act 'Walk to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
 
 	act 'Wait':gs 'obj_din', 'wait'

+ 3 - 3
locations/city_suburbs.qsrc

@@ -31,10 +31,10 @@ if $ARGS[0]='start':
 		'There is a vacant piece of land for sale where a large mansion could be constructed.'
 		act 'Visit the land for sale': minut += 10 & gt 'city_mansion_entrance'
 	elseif func('homes_properties', 'is_property_of_status', 'owned', 'matryona_mansion'):
-		const_status = func('homes_properties', 'get_property_construction_status', 'matryona_mansion')
-		if const_status = 0:
+		constructionstatus = func('homes_properties', 'get_property_construction_status', 'matryona_mansion')
+		if constructionstatus = 0:
 			'Your vacant plot of land is near hear'
-		elseif const_status = 1:
+		elseif constructionstatus = 1:
 			'You mansion is partially built near here.'
 		else
 			'Your mansion is not too far from her'

+ 1 - 8
locations/clothing.qsrc

@@ -418,7 +418,7 @@ if $ARGS[0] = 'clothing_list':
 			:loopgm_school_filter
 		end
 
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = cloc and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:*P dyneval($clothing_list_line, $ward_list_page, 'gm_school', 6)
 		end
 
@@ -1727,13 +1727,6 @@ if $ARGS[0] = 'strip':
 	PXCloThinness = 0
 	PXCloTopCut = 0
 	PXCloBottomShortness = 0
-	glamur = 0
-	sport = 0
-	ski = 0
-	ofclo = 0
-	sexual = 0
-	odevnesh = 0
-	exhibiHideNewCloth = 0
 end
 
 

+ 1 - 1
locations/divan.qsrc

@@ -11,7 +11,6 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		if divanmastr = 0:
 			divanmastr = 1
-			stat['mast'] += 1
 			if pcs_inhib < 30:inhib_exp += rand(1,3)
 		end
 
@@ -22,6 +21,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 		$orgasm_or = 'yes'
 		gs 'arousal', 'clit_finger', 15, 'masturbate'
+		gs 'arousal', 'end'
 		gs 'stat'
 
 		gs 'stat'

+ 1 - 1
locations/dreams.qsrc

@@ -150,12 +150,12 @@ if $ARGS[0] = 'hypno_dreams':
 			end
 		end
 	elseif ivrand = 7:
+		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack1.mp4"></video></center>'
 		if dreamedOfTherapistFucking <= 0:dreamedOfTherapistFucking = 1
 		if dreamedOfTherapistFucking = 2:
 			'You dream that you are being fucked hard in the pussy by your therapist.'
 			'You spread your legs as wide as you can so his cock can go as deep as possible. It feels amazing.'
 		else
-			'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolFuckCouchBack1.mp4"></video></center>'
 			'You dream that you are being fucked hard in the pussy. You are spreading and holding your legs as wide as possible so their cock goes as deep as possible.'
 			if guy = 0:
 				'You''ve never had sex before, but it feels amazing! You try to focus and realize... your therapist is fucking you?'

+ 12 - 12
locations/drugs.qsrc

@@ -128,9 +128,9 @@ elseif $ARGS[0] = 'alcohol':
 	gs 'cum_cleanup'
 	pcs_breath = 0
 	if $ARGS[1] = 'beer':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(1,2)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(0,1)
 		else
 			alko += 1
@@ -142,11 +142,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		traits['alko_day'] += 1
+		pcs_traits['alko_day'] += 1
 	elseif $ARGS[1] = 'wine' or $ARGS[1] = 'champagne':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += 3
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += 1
 		else
 			alko += 2
@@ -158,11 +158,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra += 10
 		end
-		traits['alko_day'] += 2
+		pcs_traits['alko_day'] += 2
 	elseif $ARGS[1] = 'vodka' or $ARGS[1] = 'whiskey' or $ARGS[1] = 'scotch' or $ARGS[1] = 'rum':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(4,5)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(1,2)
 		else
 			alko += 3
@@ -173,11 +173,11 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		traits['alko_day'] += 3
+		pcs_traits['alko_day'] += 3
 	elseif $ARGS[1] = 'moonshine':
-		if traits['alko_status'] = -1:
+		if pcs_traits['alko_status'] = -1:
 			alko += rand(7,8)
-		elseif traits['alko_status'] = 1:
+		elseif pcs_traits['alko_status'] = 1:
 			alko += rand(2,3)
 		else
 			alko += 5
@@ -188,7 +188,7 @@ elseif $ARGS[0] = 'alcohol':
 		else
 			pcs_hydra -= 10
 		end
-		traits['alko_day'] += 5
+		pcs_traits['alko_day'] += 5
 	else
 		'<br><font color = red>Developer note: The type of alcohol is missing in this scene. Please report this and a small part of the text of the current scene as a bug.</font>'
 	end

+ 278 - 0
locations/emp_functions.qsrc

@@ -0,0 +1,278 @@
+# emp_functions
+
+!! Employmnent and Event Systems
+!! 2022-09-30
+!! Author: Hooded Silence
+!!
+!! v.01 - Initial code base
+!! v.02 - Event generator partially integrated
+!! v.03 - Job management system integrated
+!! 
+
+!! --------------------- UI Interface for Journal
+
+if $ARGS[0] = 'gen_schedule':
+	*clr & cla 
+		if night_mode = 1 or night_mode = 2:
+		$header_theme = '#91B0B4'
+		$body_theme = '#303030'
+		$body_theme_alt  = '#474747'
+		$font_theme = '#000000'
+	else
+		$header_theme = '#e27c00'
+		$body_theme = '#E0DED4'
+		$body_theme_alt  = '#D58B32'
+		$font_theme = '#FFFFFF'
+	end
+	if  function_sw = 1:	'<center><h2>' + $npc_firstname['A<<mod_npc_id>>'] + ' ' + $npc_lastname['A<<mod_npc_id>>'] + '</h2></center>'
+	if function_sw = 2: 
+		gs 'journal', 'journalmenu'
+		'<center><h2>Work</h2></center>'
+	end
+	!! Enable selector if attending school or Uni by NPC group type or by character and set default to School
+	if (npc_grupTipe['A<<mod_npc_id>>']>= 1 and npc_grupTipe['A<<mod_npc_id>>']<= 5) or mod_npc_id = 34 and function_sw <= 1: 
+		if flag_schedule = 0: flag_schedule = 1
+		school_group = 1
+		'<center>Change to: <a href="exec: flag_schedule = 1 & gs ''emp_functions'', ''gen_schedule''">School</a> | <a href="exec: flag_schedule = 2 &  gs ''emp_functions'', ''gen_schedule''">University</a> | <a href="exec: flag_schedule = 3 &  gs ''emp_functions'', ''gen_schedule''">Holiday</a> </center>'
+	else
+		!! Set schedule to holiday / non-edu NPCs
+		flag_schedule = 3
+	end
+
+	!! Initiate loop variables
+
+	i_day = 1
+    mod_max_day = 7
+	i_hour = ARGS[1]
+    mod_max_hour = ARGS[1] + 8 
+    header_switch = 1
+	killvar '$tablebody'   
+	killvar '$tableheader'
+
+	!! create header, using header switch to fill in :00 or :30 automatically using mod to determine odd/even and set display hour automatically.
+
+	$tableheader = '<tr border="1" align="center"  bgcolor="<<$header_theme>>"><th style="padding: 10px;"></th>'
+	:jmp_header_create
+		if (i_hour mod 2) = 0:
+			display_hour = i_hour/ 2
+		end
+		if display_hour = 24: Display_hour = 0
+		if header_switch = 1:
+			header_switch += 1
+			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<<display_hour >>', display_hour) + ':00</font></th>'
+		elseif header_switch=2: 
+			header_switch = 1
+			$tableheader += '<th style="padding: 10px;"><font color="<<$font_theme>>">' + iif(display_hour < 10, '0<< display_hour>>', display_hour) + ':30</font></th>'
+		end		
+		i_hour += 1
+	if i_hour <=  mod_max_hour: jump 'jmp_header_create'
+	! Reset i_hour for next loop	
+	killvar 'display_hour'
+	killvar 'header_switch'
+	i_hour = ARGS[1]
+	header_switch = 1
+	!! Close out table header
+	$tableheader += '</tr>'
+	!! Create table body, with alternating colour rows for legibility
+    :jmp_day_create
+
+        !Set day
+        if i_day = 1 or i_day = 3 or i_day = 5 or i_day = 7:
+			$tablebody += '<tr><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+		else
+			$tablebody += '<tr bgcolor="<<$body_theme_alt>>"><td  style="padding: 10px;" bgcolor="<<$header_theme>>"><b><font color="<<$font_theme>>">' + $week[i_day] + '</font></b></td>'
+		end
+		!! fill the slots from the NPC schedule
+
+        :jmp_hour_create 
+			if i_day >= 1:
+
+				!! Create function switcher:
+				!! 1: NPC tracker
+				!! 2: Job tracker
+				!! 3: Event Tracker
+
+				if function_sw = 1 or function_sw = 0:
+					dynamic $schedule_tracker 
+				elseif function_sw = 2:
+                    flag_active  = 1
+                    j_id = emp_rota_week[i_day +  '_' + i_hour]
+                    if emp_rota_week[i_day +  '_' + i_hour] ! 0:							
+                        $transient_tb =  '<a  href="exec:gs ''emp_functions'', ''job_info'', <<j_id>>">' + $emp_job_title[j_id] + '</a>'
+                    else
+                        $transient_tb  = 'Free'
+                    end
+				elseif function_sw = 3:
+				else
+					msg 'Error - Failed to create body. Please set content switch.'
+				end
+
+				if flag_active = 0:
+					$tablebody += '<td style="padding: 10px;">Slot: ' + i_hour +'</td>'
+				else
+					$tablebody +=  '<td style="padding: 10px;">' + $transient_tb +'</td>'
+					flag_active = 0
+					killvar '$transient_tb'
+				end	
+			else
+				 i_day += 1
+				 jump 'jmp_day_create'
+			end
+			i_hour += 1
+            if i_hour <=  mod_max_hour: jump 'jmp_hour_create'
+			$tablebody +='</tr>'
+			i_day += 1
+			i_hour = ARGS[1]
+        if i_day <= mod_max_day: jump 'jmp_day_create'	
+	!! Create navigaton bars
+	if (mod_max_hour + 8)  <= 48:
+		set_hour = ARGS[1] + 8
+		$msg_forward = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Forward 4 hours</b></a>'
+	else
+		$msg_forward = 'End of Day'
+	end
+    if (mod_max_hour  - 8) >0 :
+		set_hour = ARGS[1] - 8
+        $msg_back = '<a  href="exec:gs ''emp_functions'', ''gen_schedule'', <<set_hour>>"><b>Back 4 hours</b></a>'
+    else
+		$msg_back = 'Start of day'
+    end
+
+    !! Start the table constuction    
+    '<center><table border=0 cellpadding=1 bgcolor="<<$body_theme>>" width="95%" align="center"><<$tableheader>><<$tablebody>></table>'
+    '<<$msg_back>> | <<$msg_forward>>'
+    *nl
+    if  function_sw = 1:
+	'<b>Note:</b> Times are approximate, some characters will appear at quarter past or quarter to the hour.</center>' 
+	end
+	if  function_sw = 2:
+		'<b>Note:</b> Times are approximate, some jobs may extend past the allotted time or have flexi-starts.</center>' 
+	end
+    act 'Back':
+		killvar 'flag_schedule'
+		killvar 'school_group'
+		killvar 'j_id'
+		gt $loc, $loc_arg
+	end
+end
+
+!! Job Info popup
+if $ARGS[0] = 'job_info':
+	j_id = ARGS[1]
+	killvar '$msg_body'
+	$msg_body +=  '<p>Job Title: ' + $emp_job_title[j_id] + '</p>'
+	$msg_body += '<p>Location: ' + $emp_job_loc[j_id] + '</p>'
+	$msg_body += '<p>Notes: ' + $emp_job_notes[j_id]+ '</p>'
+	$msg_body += '<p>Wages: ' +emp_job_wages[j_id] + '<b>₽</b></p>'
+	
+	msg '<<$msg_body>>'
+end
+
+!!  Removed event generation for initial code review and to make job integration easier.
+
+!! --------------------- Event Generator
+
+!! Author - Hooded Silence
+!! Date created - 26 Aug 22
+!! Event Generator - filler content only for one off events or recurring work from NPCs
+!!
+!! v. 01 - Initial code base
+!! v. 02 - UI improvements and feature feedback
+
+
+!! --------------------- Job management system
+
+
+!! book role, creates a time slot for emp_rota_week in format day_hour to be used in schedule mode.
+
+if $ARGS[0] = 'emp_booking':
+	gs 'emp_functions', 'emp_chk_clk'
+	if emp_rota_fail  = 0:	
+		gs 'emp_functions', 'loop_configure'
+		j_finish = emp_job_end[j_id]
+		:jmp_daily_book
+			j_idx = emp_job_start[j_id]
+			:jmp_hour_book
+				emp_rota_week[d_idx + '_' + j_idx]  = j_id
+				j_idx += 1
+			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			d_idx += 1
+		if d_idx <= d_end: jump 'jmp_daily_book'
+		emp_job_status[j_id] = 1
+		emp_job[active] += 1
+		killvar 'j_idx'
+		killvar 'j_finish'
+		killvar 'd_idx'
+		killvar 'd_end'
+	else
+		msg 'Sorry, you''ve already got a job for this time period.'
+	end
+
+	killvar 'emp_rota_fail'
+end
+
+!! check if time slots are avaialble for this role. 
+
+if $ARGS[0] = 'emp_chk_clk':	
+	gs 'emp_functions', 'loop_configure'
+	j_finish = emp_job_end[j_id]
+	:jmp_daily_chk
+		j_idx = emp_job_start[j_id]
+		:jmp_job_chk
+			if emp_rota_week[d_idx + '_' + j_idx]  >  0:
+				!! booking failed					
+				emp_rota_fail = 1
+			else
+				!! booking passed
+				emp_rota_fail = 0
+			end	
+			j_idx +=1
+		if j_idx <= j_finish and emp_rota_fail = 0: jump 'jmp_job_chk'	
+		d_idx += 1
+	if d_idx <= d_end and emp_rota_fail = 0: jump 'jmp_daily_chk'
+end
+
+if $ARGS[0] = 'emp_terminate':
+	if ARGS[1] >= 4:
+		gs 'emp_functions', 'loop_configure'
+		j_finish = emp_job_end[j_id]
+		:jmp_daily_book
+			j_idx = emp_job_start[j_id]
+			:jmp_hour_book
+				emp_rota_week[d_idx + '_' + j_idx] = 0
+				j_idx += 1
+			if j_idx <= j_finish: jump 'jmp_hour_book'	
+			d_idx += 1
+		if d_idx <= d_end: jump 'jmp_daily_book'
+		!! Set the termination value
+		emp_job_status[j_id] = ARGS[1]
+		emp_job[active] -= 1
+	else
+		msg 'Job termination failed. Please ensure you set to  4 - Terminated or 5 - Fired'
+	end
+	killvar 'j_idx'
+	killvar 'j_finish'
+	killvar 'd_idx'
+	killvar 'd_end'	
+end
+
+if $ARGS[0] = 'loop_configure':	
+	if  j_day= 0 or j_day = 1 or j_day = 2:
+		d_idx = 1
+	else
+		d_idx= 6
+	end
+	if  j_day <= 1:
+		d_end = 5
+	else
+		d_end= 7
+	end	
+end
+--- emp_functions ---------------------------------
+
+
+
+
+
+
+

+ 124 - 0
locations/emp_job_array.qsrc

@@ -0,0 +1,124 @@
+# emp_job_array
+
+!! Jobs array
+!! < 4 hours is classed as ad-hoc work 
+!! => 4 hours is contract roles
+!! Events are non-permanent employment of varying rates/times and set in the future.
+!!
+!! Index:
+!! 1 - Tourist Guide
+!! 2 - Pavlosk Hotel Maid
+!! 3 - Pussy Kats Shop Assistant
+!! 4 - Titran Secretary
+!! 5 - City Burger Joint
+
+if $ARGS[0] = 'emp_tourist_guide':
+	!! Transitory variables to initialise job start - REQ
+	j_id = 1
+	
+	!! j_day defines work days: 1 - Mon-Sun, 2 Mon-Fr, 3 Weekend.  - REQ
+	j_day = 2
+
+	!! Role ID - Array index and used as job identifier.
+	emp_job_id[j_id] = 1
+	
+	!! Job Role	- REQ
+	$emp_job_title[j_id] = 'Tourist Guide' 
+	
+	!! Job start time - a day has 48 slots from base 0 - REQ
+	emp_job_start[j_id] = 16
+	
+	!! Job finish time - REQ
+	emp_job_end[j_id] = 32
+	
+	!! Job pay rate- REQ
+	emp_job_wages[j_id] = 1000
+	
+	!! Job employment location- REQ
+	$emp_job_loc[j_id] = 'Pavlosk Park'
+	
+	!! Job notes - to remind the player of the job details
+	$emp_job_notes[j_id] = 'Summer job with flexible days - start between 08:00 and 09:00'
+		
+	if emp_job_status[j_id] < 1:
+		!! Job status 1 Employed, 2 Started with favour, 3 Started with merit, 4 Terminated/suspended, 5 Fired permanently - REQ. <= 10 reserved for core mechanics, 10 + for custom quest markers
+		emp_job_status[j_id] = 0
+	end
+	if emp_job_rank[j_id] < 1:
+		!! Job ranking system for promotions and career progression. - Opt
+		emp_job_rank[j_id] = 1
+	end
+	
+end
+
+if $ARGS[0] = 'emp_pav_maid':
+	j_id = 2
+	j_day = 2
+	emp_job_id[j_id] = 2
+	$emp_job_title[j_id] = 'Hotel Maid'
+	emp_job_start[j_id] = 33
+	emp_job_end[j_id] = 40
+	emp_job_wages[j_id] = 375
+	$emp_job_loc[j_id] = 'Pavlosk Park'
+	$emp_job_notes[j_id] = 'Be at the Pavlosk Hotel reception between 16:00-17:00 to start your shift.'		
+	if emp_job_status[j_id] < 1:
+		emp_job_status[j_id] = 0
+	end
+	if emp_job_rank[j_id] < 1:
+		emp_job_rank[j_id] = 1
+	end
+
+end
+
+if $ARGS[0] = 'emp_pussy_kats':
+	j_id = 3
+	if ARGS[1] = 1:
+		!! Weekdays
+		j_day = 2
+		emp_job_start[j_id] = 32
+		emp_job_end[j_id] = 40
+	else
+		!! P/T weekend
+		j_day = 3
+		emp_job_start[j_id] = 18
+		emp_job_end[j_id] = 30
+	end
+	emp_job_id[j_id] = 3
+	$emp_job_title[j_id] = 'Shop Assistant'
+	emp_job_wages[j_id] = 205
+	$emp_job_loc[j_id] = 'Pussy Cats'
+	$emp_job_notes[j_id] = 'Shop assistant at Pussy Cat''s in the City Center Mall. You''ve missed <<young_shop_miss>> day(s).'
+		
+	if emp_job_status[j_id] < 1:
+		emp_job_status[j_id] = 0
+	end
+	if emp_job_rank[j_id] < 1:
+		emp_job_rank[j_id] = 1
+	end
+
+end
+
+if $ARGS[0] = 'emp_titran':
+	j_id = 4
+	j_day = 2
+	emp_job_start[j_id] = 18
+	emp_job_end[j_id] = 34
+
+	emp_job_id[j_id] = 3
+	$emp_job_title[j_id] = 'Secretary'
+	emp_job_wages[j_id] = 1500
+	$emp_job_loc[j_id] = 'Titran-Express Engineering'
+	$emp_job_notes[j_id] = 'You work as a secretary at Titran Express. You need to come to work by 09:00 during the week Monday-Friday. Salary is automatically transferred on the 25th of each month.'
+		
+	if emp_job_status[j_id] < 1:
+		emp_job_status[j_id] = 0
+	end
+
+	!! Secretatry Career examples
+	!! 1 Office Secretary 2 Pool Secretary 3 Head Secretary 4 PA - Trainable through the Ind Comm Ctr
+	if emp_job_rank[j_id] < 1:
+		emp_job_rank[j_id] = 1
+	end
+end
+
+--- emp_job_array ---------------------------------

+ 102 - 102
locations/eugeneev1.qsrc

@@ -5,15 +5,15 @@ if $ARGS[0] = 'firsttime':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttime1.jpg"></center>'
-	'You follow Eugene through the kitchen and into the pantry. Racks of stored food and equipment, as well as various boxes are stacked around back here. There is also a desk in the corner and an old couch as well.'
-	'She stops near the couch and turns towards you before pulling you into a kiss. You passionately make out for several minutes before she breaks the kiss and looks at you hesitantly as she backs away from you as an awkward silence falls over you.'
-	'After a few awkward seconds, she breaks the silence. "This may scare you, but I don''t know how else to say it, so..." She reaches under her skirt and pulls her panties down around her ankles before she starts slowly lifting her skirt...'
+	'You follow Eugene through the kitchen and into the pantry. Racks of stored food and equipment, as well as various boxes, are stacked around back here. There is a desk in the corner and an old couch as well.'
+	'She stops near the couch and turns towards you before pulling you into a kiss. You passionately make out for several minutes before she breaks the kiss and looks at you hesitantly. As she backs away from you, an awkward silence falls over you.'
+	'After a few awkward seconds, she breaks the silence. "This may scare you, but I don''t know how else to say it, so..." She reaches under her skirt and pulls her panties down around her ankles before slowly lifting her skirt...'
 	gs 'arousal', 'kiss', 2
 	gs 'stat'
 	act 'Look':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttime2.jpg"></center>'
-		'She finishes pulling her her skirt up and you see... a cock!? She looks at you questioningly and you can tell she is feeling unsure of herself and vulnerable. Part of you wants to reassure her and part of you wants to run away, but you also feel the urge to just drop to your knees and suck her dick...'
+		'She finishes pulling her skirt up, and you see... a cock!? She looks at you questioningly, and you can tell she feels unsure and vulnerable. Part of you wants to reassure her, and part of you wants to run away, but you also feel the urge to just drop to your knees and suck her dick...'
 		gs 'arousal', 'foreplay', 2
 		gs 'stat'
 		act 'Get on your knees':
@@ -24,22 +24,22 @@ if $ARGS[0] = 'firsttime':
 			npc_QW['A89'] = 2
 			npc_sex[$boy] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimebj1.jpg"></center>'
-			'You smile as you walk over to her and she bites her lip as you drop to your knees and start sucking her cock. You feel it rapidly growing and stiffening in your mouth as you suck on it, and it''s soon rock hard and completely filling your mouth.'
+			'You smile as you walk over to her, and she bites her lip as you drop to your knees and start sucking her cock. You feel it rapidly growing and stiffening in your mouth as you suck on it, and it''s soon rock hard and completely filling your mouth.'
 			gs 'arousal', 'bj', 2
 			gs 'stat'
 			act 'Keep sucking':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimebj2.jpg"></center>'
-				'You look up and see her watching you with a smile as you keep sucking. She starts moaning in pleasure, and after a few minutes looks down again and says "I want to fuck you."'
+				'You look up and see her watching you with a smile as you keep sucking. Then, after a few minutes, she starts moaning in pleasure, looks down again, and says, "I want to fuck you."'
 				gs 'arousal', 'bj', 5
 				gs 'stat'
 				act 'Suck her off':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimebj3.jpg"></center>'
 					'You pop her cock out of your mouth to reply. "I''d rather just suck you off if that''s okay?"'
-					'She nods and encourages you to deepthroat her as you take her cock back into your mouth. Several minutes go by before you feel her hand on the back of your head and she groans as her dick starts twitching in your mouth. Her hand holds you down as her cum pours down your throat. When she finishes, she lets out a satisfied moan and pulls her cock your mouth. You smile up at her as you swallow her cum. "Next time, I want to fuck you..."'
+					'She nods and encourages you to deepthroat her as you take her cock back into your mouth. Several minutes go by before you feel her hand on the back of your head, and she groans as her dick twitches in your mouth. Her hand holds you down as her cum pours down your throat. When she finishes, she lets out a satisfied moan and pulls her cock into your mouth. You smile up at her as you swallow her cum. "Next time, I want to fuck you..."'
 					'You grin at her as you stand up. "We''ll see..." you reply before she kisses you passionately.'
-					'"Okay, we better get back." With that, she leads you back out into the main area and returns to work.'
+					'"Okay, we better get back." She leads you back into the main area and returns to work.'
 					gs 'arousal', 'bj', 5, 'deepthroat'
 					gs 'cum_call', 'mouth_swallow', 'A89', 1
 					gs 'arousal', 'end'
@@ -50,13 +50,13 @@ if $ARGS[0] = 'firsttime':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimevag1.jpg"></center>'
 					'You pop her cock out of your mouth and smile. "Okay..."'
-					'She pulls you up to your feet and you start stripping each other. Once you''re both naked, she pulls you over to some boxes and pushes you back on them. She spreads your legs wide and steps in between them.'
+					'She pulls you up to your feet, and you start stripping each other. Once you''re both naked, she pulls you to some boxes and pushes you back on them. Then, she spreads your legs wide and steps in between them.'
 					*nl
 					if pcs_vag = 0:
 						brokenhymen = 1
-						'She uses one hand to rub your clit while she rubs the tip of her dick against your slit. Once she''s satisfied you''re wet enough, she slowly slides her cock into your pussy and you feel a sharp pain when she breaks your hymen. She goes slowly and not too deeply at first, giving you time to adjust before you start moaning in pleasure. Several pleasurable minutes of her fucking your pussy pass before she speaks up. "I want to fuck your cute little ass."'
+						'She uses one hand to rub your clit while she rubs the tip of her dick against your slit. Once she''s satisfied you''re wet enough, she slowly slides her cock into your pussy, and you feel a sharp pain when she breaks your hymen. She goes slow and not too intensely at first, giving you time to adjust before you moan in pleasure. Several pleasurable minutes of her fucking your pussy pass before she speaks up. "I want to fuck your cute little ass."'
 					else
-						'She uses one hand to rub your clit while she rubs the tip of her dick against your slit. Once she''s satisfied you''re wet enough, she slowly slides her cock into your pussy. She goes slowly and not too deeply at first, giving you time to get wetter and adjust. You start moaning in pleasure and several pleasurable minutes of her fucking your pussy pass before she speaks up. "I want to fuck your cute little ass."'
+						'She uses one hand to rub your clit while she rubs the tip of her dick against your slit. Once she''s satisfied you''re wet enough, she slowly slides her cock into your pussy. She goes slow and not too intensely at first, giving you time to get wetter and adjust. Finally, you start moaning, and several minutes of her fucking your pussy pass before she speaks up. "I want to fuck your cute little ass."'
 					end
 					gs 'arousal', 'vaginal', 5
 					gs 'stat'
@@ -72,15 +72,15 @@ if $ARGS[0] = 'firsttime':
 							'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimevagcum.jpg"></center>'
 							if brokenhymen = 1:
 								killvar 'brokenhymen'
-								'Several minutes of blissful fucking pass by before she starts grunting and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. After several more squirts, she squeezes out her last drops of cum onto your stomach before she notices the blood. "Is that blood!? Are you okay?"' 
+								'Several minutes of blissful fucking pass by before she grunts and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. Finally, after several more squirts, she squeezes out her last drops of cum onto your stomach before she notices the blood. "Is that blood!? Are you okay?"' 
 								'You smile and nod at her. "Yes, this was my first time..."'
 								*nl
 								'She looks surprised and a little confused. "Oh, you could have said something. We didn''t ...."'
-								'You interrupt her. "It''s fine, I wanted this."'
-								'She just nods before getting up and walking away, grabbing a towel out of a box and tossing it at you. She gets dressed as you clean up before getting dressed yourself. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.'
+								'You interrupt her. "It''s fine. I wanted this."'
+								'She just nods before getting up and walking away, grabbing a towel out of a box and tossing it at you. She gets dressed as you clean up before getting dressed. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.'
 							else
-								'Several minutes of blissful fucking go by before she starts grunting and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. After several more squirts, she squeezes out her last drops of cum onto your stomach.' 
-								'Once she''s finished, she gets up and walks over to a box, grabbing a towel out of it and tossing it at you. She gets dressed as you clean up before getting dressed yourself. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
+								'Several minutes of blissful fucking go by before she grunts and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. Finally, after several more squirts, she squeezes out her last drops of cum onto your stomach.' 
+								'Once she''s finished, she gets up and walks over to a box, grabs a towel out of it and tosses it at you. She gets dressed as you clean up before getting dressed. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
 							end
 							gs 'arousal', 'vaginal', 5
 							gs 'cum_call', 'stomach', 'A89', 1
@@ -95,18 +95,18 @@ if $ARGS[0] = 'firsttime':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimeanal1.jpg"></center>'
 						'You nod your head and bite your lip. "Yes, fuck my tight little ass with your big fat cock!"'
-						'She grins and you can tell that she''s really aroused now. She pulls out of you and flips you over onto all fours on top of the box. As you get in place, she walks over to the desk and pulls out a bottle of lube. She walks back over and applies some to your asshole and uses her fingers to work it inside of you. She then applies some to her already wet cock before tossing the bottle aside.'
+						'She grins, and you can tell that she''s really aroused now. She pulls out of you and flips you over onto all fours on top of the box. As you get in place, she walks over to the desk and pulls out a bottle of lube. She walks back over, applies some to your asshole, and uses her fingers to work it inside you. She then applies some to her wet cock before tossing the bottle aside.'
 						*nl
-						'The head of her dick presses against your asshole before it suddenly pops in and you gasp as you feel her cock stretching your backdoor wide. She starts fucking your ass, not going too fast or too deep, giving you plenty of time to adjust.'
+						'The head of her dick presses against your asshole before it suddenly pops in, and you gasp as you feel her cock stretching your backdoor wide. Then, she starts fucking your ass, not going too fast or too deep, giving you plenty of time to adjust.'
 						gs 'arousal', 'anal_sex', 5, 'lube'
 						gs 'stat'
 						act 'Get butt fucked':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimeanal2.jpg"></center>'
-							'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you even harder before she cries out and shoves herself balls deep into your ass and holds it there. You feel her cock twitching inside you as she fills your ass with her warm cum.'
+							'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls-deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you even harder before she cries out, shoves herself deep into your ass, and holds it there. You feel her cock twitching as she fills your ass with her warm cum.'
 							*nl
-							'She pulls out of you and her cum trickles out of your stretched hole. "What a beautiful sight. You ass looks so cute with my cum leaking out of it."'
-							'You giggle at her comment as you get up and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
+							'She pulls out of you, cum trickles out of your stretched hole. "What a beautiful sight. Your ass looks so cute with my cum leaking out of it."'
+							'You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
 							gs 'arousal', 'anal', 5, 'lube'
 							gs 'cum_call', 'anus', 'A89', 1
 							gs 'arousal', 'end'
@@ -119,19 +119,19 @@ if $ARGS[0] = 'firsttime':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimeanal1.jpg"></center>'
 					'You pop her cock out of your mouth and smile. "I want you to fuck my ass instead."'
-					'She grins. "I can do that." She pulls you up to your feet and you start stripping each other. Once you''re both naked, she pulls you over to some boxes and turns you around to face them. She stands behind you, pushes you forward and lifts your leg to help you climb on the box and get on all fours.'
+					'She grins. "I can do that." She pulls you up to your feet, and you start stripping each other. Once you''re both naked, she pulls you to some boxes and turns you around to face them. She stands behind you, pushes you forward and lifts your leg to help you climb on the box and get on all fours.'
 					*nl
-					'Once you are in place, she walks over to the desk and pulls out a bottle of lube. She walks back over and applies some to your asshole and uses her fingers to work it inside of you before applying some to her already wet cock and tossing the bottle aside.'
-					'The head of her dick presses against your asshole before it suddenly pops in and you gasp as you feel her cock stretching your backdoor wide. She starts fucking your ass, not going too fast or too deep, giving you plenty of time to adjust.'
+					'Once you are in place, she walks over to the desk and pulls out a bottle of lube. She walks back over, applies some to your asshole, and uses her fingers to work it inside you before applying some to her wet cock and tossing the bottle aside.'
+					'The head of her dick presses against your asshole before it suddenly pops in, and you gasp as you feel her cock stretching your backdoor wide. Then, she starts fucking your ass, not going too fast or too deep, giving you plenty of time to adjust.'
 					gs 'arousal', 'anal', 5, 'lube'
 					gs 'stat'
 					act 'Get butt fucked':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttimeanal2.jpg"></center>'
-						'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you even harder before she cries out and shoves herself balls deep into your ass and holds it there. You feel her cock twitching inside you as she fills your ass with her warm cum.'
+						'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls-deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you even harder before she cries out, shoves herself deep into your ass, and holds it there. You feel her cock twitching as she fills your ass with her warm cum.'
 						*nl
-						'She pulls out of you and her cum trickles out of your stretched hole. "What a beautiful sight. You ass looks so cute with my cum leaking out of it."'
-						'You giggle at her comment as you get up and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
+						'She pulls out of you, cum trickles out of your stretched hole. "What a beautiful sight. Your ass looks so cute with my cum leaking out of it."'
+						'You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
 						gs 'arousal', 'anal', 5, 'lube'
 						gs 'cum_call', 'anus', 'A89', 1
 						gs 'arousal', 'end'
@@ -147,8 +147,8 @@ if $ARGS[0] = 'firsttime':
 			minut += 7
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/firsttime1.jpg"></center>'
 			'You shake your head a little. "I... this wasn''t what I expected. I just... I don''t know."'
-			'She nods and drops her skirt back into place, then squats down to pull her panties back up. "I understand. If you change your mind, let me know."'
-			'All you can do is nod as she walks over and gives you a hug. "We should get back." With that, she leads you out of the pantry and returns to work while you, unsure what to do, choose to leave.'
+			'She nods, drops her skirt back into place, and then squats down to pull her panties back up. "I understand. If you change your mind, let me know."'
+			'All you can do is nod as she walks over and gives you a hug. "We should get back." With that, she leads you out of the pantry, returning to work while you choose to leave, unsure of what to do.'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Continue': gt 'city_industrial'
@@ -175,23 +175,23 @@ end
 
 if $ARGS[0] = 'sex':
 	'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex1.jpg"></center>'
-	'Eugene leads you to the pantry again, and gives you a wink before she starts to undress.'
-	'"So, what would you like to do today <<$pcs_nickname>>?" she chuckles as she exposes her semi-erect cock to you. You kiss and fondle each other as you undress and once you''re both mostly naked, she grabs you by the hair and pushes you down.'
+	'Eugene again leads you to the pantry and gives you a wink before she undresses.'
+	'"So, what would you like to do today, <<$pcs_nickname>>?" she chuckles as she exposes her semi-erect cock to you. You kiss and fondle each other as you undress, and once you''re both mostly naked, she grabs you by the hair and pushes you down.'
 	gs 'arousal', 'foreplay', 5
 	gs 'stat'
 	act 'Get on your knees':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex2.jpg"></center>'
-		'You get on your knees in front of her and she holds you by the hair as she strokes her dick until it''s hard. Once it is, she pushes it into your mouth and you start sucking it, letting her control the action with her hand intertwined in your hair. "Oh yeah, you''re such a good little cock sucker!" Several minutes go by before she speaks again. "I want to fuck you now."'
+		'You get on your knees in front of her, and she holds you by the hair as she strokes her dick until it''s hard. Once it is, she pushes it into your mouth, and you start sucking it, letting her control the action with her hand intertwined in your hair. "Oh yeah, you''re such a good little cock sucker!" Several minutes go by before she speaks again. "I want to fuck you now."'
 		gs 'arousal', 'bj', 5
 		gs 'stat'
 		act 'Suck her off':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex3.jpg"></center>'
-			'You pop her cock out of your mouth to respond. "I want to just suck you off if that''s okay."'
-			'She laughs. "Fine, have it your way, but you''re going to swallow my load." You slide her cock back into your mouth and resume sucking it. She starts to grunt a few minutes later and holds your head in place as she keeps just the tip of her dick in your mouth and starts stroking it. Moments later, you feel and taste her salty cum shooting into your mouth. She keeps stroking it until she has milked every drop of cum into your mouth. She keeps hold of your hair as she pulls her dick out of your mouth. "Now swallow it."'
+			'You pop her cock out of your mouth to respond. "I want to suck you off if that''s okay."'
+			'She laughs. "Fine, have it your way, but you''re going to swallow my load." You slide her cock back into your mouth and resume sucking it. She grunts a few minutes later and holds your head in place as she keeps the tip of her dick in your mouth and starts stroking it. Moments later, you feel and taste her salty cum shooting into your mouth. She keeps stroking it until she has milked every drop of cum into your mouth. She keeps hold of your hair as she pulls her dick out of your mouth. "Now swallow it."'
 			*nl
-			'You swallow her cum, opening your mouth to show her, and she lets go of your hair. you get up and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.'
+			'You swallow her cum, opening your mouth to show her, and she lets go of your hair. You get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.'
 			gs 'arousal', 'bj', 5
 			gs 'cum_call', 'mouth_swallow', 'A89', 1
 			gs 'arousal', 'end'
@@ -201,7 +201,7 @@ if $ARGS[0] = 'sex':
 		act 'Agree to fuck':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex4.jpg"></center>'
-			'You nod your head in agreement and she pulls you up and pushes you back into the desk. She moves in close and starts passionately kissing you while gently pushing you, which causes you to sit down on the desk. One of her hands fondles your breasts, then slides down your body to your clit. She rubs it for a few seconds before sliding a finger inside your wet pussy. She keeps kissing you while fingerbanging you until she finally breaks the kiss, but keeps fingering you. "Feels like your pussy is soaking wet and just begging for my cock..." she teases as she tries to push you onto your back.'
+			'You nod your head in agreement, and she pulls you up and pushes you back into the desk. She moves in close and starts passionately kissing you while gently pushing you, which causes you to sit down on the desk. One of her hands fondles your breasts, then slides down your body to your clit. She rubs it for a few seconds before sliding a finger inside your wet pussy. She keeps kissing you while fingerbanging you until she finally breaks the kiss but keeps fingering you. "Feels like your pussy is soaking wet and just begging for my cock..." she teases as she tries to push you onto your back.'
 			gs 'arousal', 'vaginal_finger', 5
 			gs 'arousal', 'kiss', -5
 			gs 'stat'
@@ -210,17 +210,17 @@ if $ARGS[0] = 'sex':
 				'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex5.jpg"></center>'
 				if pcs_vag = 0:
 					brokenhymen = 1
-					'You lay back on the desk and spread your legs. She moves in close and takes a moment to rub the tip against your wet slit before sliding her cock inside you. You feel a sharp pain as she tears your hymen, and moan in pleasure and pain as you feel her cock stretching your pussy. The more you moan, the faster she starts to fuck you. After a few minutes, she slaps you on the ass and pulls out before sliding you off the desk. She leads you over to the couch and pushes you down on it on your hands and knees. "I''m going to fuck your cute little ass now."'
+					'You lay back on the desk and spread your legs. She moves in close and gently rubs the tip against your wet slit before sliding her cock inside you. You feel a sharp pain as she tears your hymen and moans in pleasure and pain as you feel her cock stretching your pussy. The more you moan, the faster she starts to fuck you. After a few minutes, she slaps you on the ass and pulls out before sliding you off the desk. She leads you to the couch and pushes you down on your hands and knees. "I''m going to fuck your cute little ass now."'
 				else
-					'You lay back on the desk and spread your legs. She moves in close and takes a moment to rub the tip against your wet slit before sliding her cock inside you. You moan in pleasure as you feel her cock stretching your pussy. The more you moan, the faster she starts to fuck you. After a few minutes, she slaps you on the ass and pulls out before sliding you off the desk. She leads you over to the couch and pushes you down on it on your hands and knees. "I''m going to fuck your cute little ass now."'
+					'You lay back on the desk and spread your legs. She moves in close and gently rubs the tip against your wet slit before sliding her cock inside you. You moan in pleasure as you feel her cock stretching your pussy. The more you moan, the faster she starts to fuck you. After a few minutes, she slaps you on the ass and pulls out before sliding you off the desk. She leads you to the couch and pushes you down on your hands and knees. "I''m going to fuck your cute little ass now."'
 				end
 				gs 'arousal', 'vaginal', 5
 				gs 'stat'
 				act 'No anal':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex6.jpg"></center>'
-					'You look back over your shoulder at her. "Just fuck my pussy please."'
-					'She smiles at you and slaps your ass hard. "Okay, but next time I <i>am</i> fucking this cute little ass of yours." She then slides her cock back into your wet pussy and starts fucking you again. The pleasure you feel overrides your desire to respond to her comment as you blissfully take her cock doggystyle.'
+					'You look back over your shoulder at her. "Just fuck my pussy, please."'
+					'She smiles at you and slaps your ass hard. "Okay, but next time I <i>am</i> fucking this cute little ass of yours." She then slides her cock back into your wet pussy and starts fucking you again. Again, your pleasure overrides your desire to respond to her comment as you blissfully take her cock doggy style.'
 					gs 'arousal', 'vaginal', 5
 					gs 'stat'
 					act 'Cumming':
@@ -228,15 +228,15 @@ if $ARGS[0] = 'sex':
 						'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex7.jpg"></center>'
 						if brokenhymen = 1:
 							killvar 'brokenhymen'
-							'Several minutes of blissful fucking pass by before she starts grunting and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. After several more squirts, she squeezes out her last drops of cum onto your stomach before she notices the blood. "Is that blood!? Are you okay?"' 
+							'Several minutes of blissful fucking pass by before she grunts and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. Finally, after several more squirts, she squeezes out her last drops of cum onto your stomach before she notices the blood. "Is that blood!? Are you okay?"' 
 							'You smile and nod at her. "Yes, this was my first time..."'
 							*nl
-							'She looks surprised and a little confused. "Oh, you could have said something we didn''t ...."'
-							'You interrupt her. "It''s fine, I wanted this."'
-							'She just nods before she gets up and walks over to a box, grabbing a towel out of it and tossing it at you. She gets dressed as you clean up before getting dressed yourself. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.'
+							'She looks surprised and a little confused. "Oh, you could have said something. We didn''t ...."'
+							'You interrupt her. "It''s fine. I wanted this."'
+							'She just nods before she gets up and walks over to a box, grabbing a towel out of it and tossing it at you. She gets dressed as you clean up before getting dressed. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.'
 						else
-							'Several minutes of blissful fucking go by before she starts grunting and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. After several more squirts, she squeezes out her last drops of cum onto your stomach.' 
-							'Once she''s finished, she gets up and walks over to a box, grabbing a towel out of it and tossing it at you. She gets dressed as you clean up before getting dressed yourself. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
+							'Several minutes of blissful fucking go by before she grunts and suddenly pulls out of you and starts jerking off. After a few strokes, ropes of her warm cum start landing on your stomach. Finally, after several more squirts, she squeezes out her last drops of cum onto your stomach.' 
+							'Once she''s finished, she gets up and walks over to a box, grabs a towel out of it and tosses it at you. She gets dressed as you clean up before getting dressed. She waits until you''re finished before giving you a kiss. "That was amazing! We need to do this again, but we must get back now." With that, she leads you back to the front of the cafe and returns to work.' 
 						end
 						gs 'arousal', 'vaginal', 5
 						gs 'cum_call', 'tits', 'A89', 1
@@ -249,12 +249,12 @@ if $ARGS[0] = 'sex':
 					*clr & cla
 					gs 'boyStat', 'A89'
 					'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex7.jpg"></center>'
-					'She squirts some lube onto your asshole and works it inside of you with her fingers before applying some to her dick. Once it''s lubed up, she gets on the couch behind you and you feel the tip of her cock pressing against your backdoor until it pops in. You gasp when it enters you before she slides it in slowly, giving you time to adjust to her <<dick>>cm <<$dick_girth>> dick stretching your asshole.'
+					'She squirts lube onto your asshole and works it inside you with her fingers before applying some to her dick. Once it''s lubed up, she gets on the couch behind you, and you feel her cock pressing against your backdoor until it pops in. You gasp when it enters you before she slides it in slowly, giving you time to adjust to her <<dick>>cm <<$dick_girth>> dick stretching your asshole.'
 					*nl
-					'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you even harder before she cries out and shoves herself balls deep into your ass and holds it there. You feel her cock twitching inside you as she fills your ass with her warm cum.'
+					'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls-deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you even harder before she cries out, shoves herself deep into your ass, and holds it there. You feel her cock twitching as she fills your ass with her warm cum.'
 					*nl
-					'She pulls out of you and her cum trickles out of your stretched hole. "What a beautiful sight. You ass looks so cute with my cum leaking out of it."'
-					'You giggle at her comment as you get up and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
+					'She pulls out of you, cum trickles out of your stretched hole. "What a beautiful sight. Your ass looks so cute with my cum leaking out of it."'
+					'You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
 					gs 'arousal', 'anal', 10, 'lube'
 					gs 'cum_call', 'anus', 'A89', 1
 					gs 'arousal', 'end'
@@ -267,13 +267,13 @@ if $ARGS[0] = 'sex':
 			*clr & cla
 			gs 'boyStat', 'A89'
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/sex7.jpg"></center>'
-			'You resist being pushed back. "I want you to fuck my ass..." Instead of pushing you back, she grabs your hand and pulls you off the desk before grabbing a bottle out of a drawer.'
-			'She leads you over to the couch and pushes you down on it on all fours. "Fine by me, but I want to fuck it right." She squirts some lube onto your asshole and works it inside of you with her fingers before applying some to her dick. Once it''s lubed up, she gets on the couch behind you and you feel the tip of her cock pressing against your backdoor until it pops in. You gasp when it enters you and she slides it in slowly, giving you time to adjust to her <<dick>>cm <<$dick_girth>> dick stretching your asshole.'
+			'You resist being pushed back. "I want you to fuck my ass..." Instead of forcing you back, she grabs your hand and pulls you off the desk before grabbing a bottle out of a drawer.'
+			'She leads you to the couch and pushes you down on it on all fours. "Fine by me, but I want to fuck it right." She squirts lube onto your asshole and works it inside you with her fingers before applying some to her dick. Once it''s lubed up, she gets on the couch behind you, and you feel her cock pressing against your backdoor until it pops in. You gasp when it enters you, and she slides it in slowly, giving you time to adjust to her <<dick>>cm <<$dick_girth>>  stretching your asshole.'
 			*nl
-			'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you even harder before she cries out and shoves herself balls deep into your ass and holds it there. You feel her cock twitching inside you as she fills your ass with her warm cum.'
+			'As you start moaning in pleasure, she starts going a little deeper, and before long, she has worked herself balls-deep into you. You feel her balls slapping against your pussy as she pounds your ass. After a few minutes, she starts grunting and fucking you harder before she cries out, shoves herself deep into your ass, and holds it there. You feel her cock twitching as she fills your ass with her warm cum.'
 			*nl
-			'She pulls out of you and her cum trickles out of your stretched hole. "What a beautiful sight. You ass looks so cute with my cum leaking out of it."'
-			'You giggle at her comment as you get up and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
+			'She pulls out of you, cum trickles out of your stretched hole. "What a beautiful sight. Your ass looks so cute with my cum leaking out of it."'
+			'You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
 			gs 'arousal', 'anal', 15, 'lube'
 			gs 'cum_call', 'anus', 'A89', 1
 			gs 'arousal', 'end'
@@ -288,22 +288,22 @@ if $ARGS[0] = 'sex_work':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work1.jpg"></center>'
-	'Eugene leads you into the pantry again and pushes you down on top of one of the boxes, giving you a wink before she starts to strip you from the waist down.'
-	'She pulls off her panties and pulls her skirt up around her waist, exposing her semi-erect cock to you before she grabs you by the hair and pulls you around so you''re facing her on all fours on the box.'
+	'Eugene leads you into the pantry again and pushes you down on top of one of the boxes, giving you a wink before she strips you from the waist down.'
+	'She pulls off her pants and skirts around her waist, exposing her semi-erect cock to you before she grabs you by the hair and pulls you around, so you''re facing her on all fours on the box.'
 	act 'Open your mouth':
 		*clr & cla
 		npc_rel['A89'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work2.jpg"></center>'
-		'"Fuck, I''m so horny!" she says as she sticks her cock in your mouth, grabs the back of your head with both hands and starts face fucking you. You start gagging on her dick and she pulls back to let you catch your breath before face fucking you again. Several minutes of this goes by before she says "I''m going to fuck you now."'
+		'"Fuck, I''m so horny!" she says as she sticks her cock in your mouth, grabs the back of your head with both hands, and starts face fucking you. You start gagging on her dick, and she pulls back to let you catch your breath before face fucking you again. Several minutes of this go by before she says, "I''m going to fuck you now."'
 		gs 'arousal', 'bj', 5, 'deepthroat'
 		gs 'stat'
 		act 'Suck her dick':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work4.jpg"></center>'
-			'When she finally lets go to change positions, you cough a few times before responding. "I would rather just suck you off if that''s okay."'
-			'"Would you now?" Before you can respond, she shoves her dick back in your mouth and places her hands on the back of your head again. Her balls slap against your chin as she deepthroats you for some time before she starts to grunt and you feel her dick twitching. Her cum starts filling your mouth and she doesn''t pull out until she''s milked every drop onto your tongue. "I want you to swallow it all." she says with a slight laugh.'
+			'You cough a few times before responding when she finally let''s go to change positions. "I would rather suck you off if that''s okay."'
+			'"Would you now?" Before you can respond, she shoves her dick back in your mouth and places her hands on the back of your head again. Her balls slap against your chin as she deepthroats you for some time before she starts to grunt, and you feel her dick twitching. Her cum starts filling your mouth, and she doesn''t pull out until she''s milked every drop onto your tongue. "I want you to swallow it all," she says with a slight laugh.'
 			*nl
-			'You swallow her cum, then open your mouth to show her. With that done the two of you smooth your clothes out and put your panties back on. Once you are standing she pulls you into a kiss. Once the kiss is finished the two of you start getting dressed. Once you are both finished dressing she says. "We need to do that again, but for now we best get back." With that she leads you back to the front of the cafe, where she returns to work.'
+			'You swallow her cum, then open your mouth to show her. With that done, the two of you smooth your clothes out and put your panties back on. Once you are standing, she pulls you into a kiss. After the kiss is finished, the two of you start getting dressed. Afterwards, you are both finished dressing, she says. "We need to do that again, but for now, we best get back." With that, she leads you back to the front of the cafe, where she returns to work.'
 			gs 'arousal', 'bj', 5
 			gs 'cum_call', 'mouth_swallow', 'A89', 1
 			gs 'arousal', 'end'
@@ -314,13 +314,13 @@ if $ARGS[0] = 'sex_work':
 			act 'Let her fuck you':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work3.jpg"></center>'
-				'When she pulls her dick out of your mouth and you don''t protest, she flips you over onto your back before grabbing you by the leg and spinning you around. You spread your legs wide for her, and within moments you feel the tip of her dick rubbing against your slit. Once you are wet enough, she slides her dick inside your pussy and starts slowly fucking you, causing you to moan in pleasure.'
+				'When she pulls her dick out of your mouth, and you don''t protest, she flips you over onto your back before grabbing you by the leg and spinning you around. You spread your legs wide for her, and within moments you feel the tip of her dick rubbing against your slit. Once you are wet enough, she slides her dick inside your pussy and starts slowly fucking you, causing you to moan.'
 				gs 'arousal', 'vaginal', 5
 				gs 'stat'
 				act 'Suck her again':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work4.jpg"></center>'
-					'Without warning, she pulls you off the boxes and pushes you to your knees. She then sticks her wet dick back in your mouth and you can taste your pussy juices on her. After a few minutes, she places both her hands on the back of your head and starts ramming her dick down your throat, face fucking you.'
+					'She pulls you off the boxes without warning and pushes you to your knees. She then sticks her wet dick back in your mouth, and you can taste your pussy juices on her. After a few minutes, she places her hands on your head and starts ramming her dick down your throat, face fucking you.'
 					gs 'arousal', 'bj', 5, 'deepthroat'
 					gs 'stat'
 					act 'Get fucked again':
@@ -333,18 +333,18 @@ if $ARGS[0] = 'sex_work':
 						act 'No anal':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work6.jpg"></center>'
-							'She pulls out of you, but you protest before she can stick it in your ass. "No! Just fuck my pussy please."'
-							'She grabs you and flips you over onto your back again. At first, you don''t think she heard you, she relents as she takes off the rest of her clothes. "Fine but next time, I get to fuck that tight little ass of yours!"' 
-							'She then strips you as well, and once you''re both naked, she spreads your legs wide and plunges her dick back into your pussy before proceeding to fuck you hard and fast.'
+							'She pulls out of you, but you protest before she can stick it in your ass. "No! Just fuck my pussy, please."'
+							'She grabs you and flips you over onto your back again. At first, you don''t think she heard you. Then, she relents as she takes off the rest of her clothes. "Fine, but next time, I get to fuck that tight little ass of yours!"' 
+							'She strips you as well, and once you''re both naked, she spreads your legs wide and plunges her dick back into your pussy before proceeding to fuck you hard and fast.'
 							gs 'arousal', 'vaginal', 5, 'rough'
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Cumming':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work9.jpg"></center>'
-								'Several minutes go by before she starts to grunt, which only encourages her to go faster before she suddenly pulls out of you and starts jerking off. Within seconds, she starts shooting out streams of cum that splatter across your labia. She keeps jerking her cock until she squeezes the last few drops out, then wipes the tip of her dick on your thigh. "Sorry I was so rough this time, but I really needed that. I was so horny I thought my balls were going to explode!" she says with a laugh.'
+								'Several minutes go by before she grunts, encouraging her to go faster before she suddenly pulls out of you and starts jerking off. Within seconds, she starts shooting out streams of cum that splatter across your labia. She keeps jerking her cock until she squeezes the last few drops out, then wipes the tip of her dick on your thigh. "Sorry I was so rough this time, but I needed that. I was so horny I thought my balls were going to explode!" she laughs.'
 								*nl
-								'You grin at her. "Glad I could help, I really needed this too." She tosses you a towel to wipe yourself off with before you both get dressed. Once you finish, she pulls you into a kiss before leading you back to the front of the cafe, where she returns to work.'
+								'You grin at her. "Glad I could help. I really needed this too." She tosses you a towel to wipe yourself off with before you both get dressed. Once you finish, she pulls you into a kiss before leading you back to the front of the cafe, where she returns to work.'
 								gs 'arousal', 'vaginal', 5
 								gs 'cum_call', 'labia', 'A89', 1
 								gs 'arousal', 'end'
@@ -357,16 +357,16 @@ if $ARGS[0] = 'sex_work':
 						act 'Let her':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work7.jpg"></center>'
-							'She pulls out of your pussy to walk over and grab a bottle out of the desk. She comes back and squirts some lube onto your butthole, working it into your ass with her fingers. You glance over your shoulder and watch her squirt some lube onto her dick, once it is lubed up well she tosses the bottle aside. She lines her cock up and pushes it inside or your asshole. "Fuck your ass feels so tight." While saying that she shoves her dick all the way in you, until your feel her balls against your slit. You clench the box tightly, as you bite your lower lip, as she starts just hammering away at your ass. Causing you to have a mixture of moans of pleasure and groans of pain.'
+							'She pulls out of your pussy to walk over and grab a bottle out of the desk. She comes back and squirts some lube onto your butthole, working it into your ass with her fingers. You glance over your shoulder and watch her squirt some lube onto her dick. Once it is lubed up well, she tosses the bottle aside. Next, she lines her cock up and pushes it inside your asshole. "Fuck, your ass feels so tight." While saying that, she shoves her dick inside you until you feel her balls against your slit. You clench the box tightly as you bite your lower lip, as she starts just hammering away at your ass. Causing you to have a mixture of moans of pleasure and groans of pain.'
 							gs 'arousal', 'anal', 5, 'lube'
 							gs 'stat'
 							act 'Get butt fucked':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work8.jpg"></center>'
-								'She reaches up to grab you by the shoulder with one hand, while wrapping her other hand in your hair to pull it back. The echoing of the slapping of flesh on flesh fills the room, as she furiously fucks your butt. You feel her balls slapping against your pussy as she fucks your ass. Before to long she starts grunting, as she does she starts fucking you hard and fast, hammering away at your little ass. Just then she cries out and shoves herself balls deep in your ass and holds it there. You feel her cock twitching inside of you, as she feels your butt with hot cum.'
+								'She reaches up to grab you by the shoulder with one hand while wrapping her other hand in your hair to pull it back. The echoing of the slapping of flesh on flesh fills the room as she furiously fucks your butt. You feel her balls slapping against your pussy as she fucks your ass. Before too long, she starts grunting, and as she does, she starts fucking you hard and fast, hammering away at your little ass. Just then, she cries out, shoves herself deep in your ass, and holds it there. You feel her cock twitching inside of you as she feels your butt with hot cum.'
 								*nl
-								'She pulls out of your gapping ass, as she does, you feel a bit of her cum leaking out of it. "What a beautiful sight to behold. You ass is so cute with my cum leaking out of it."'
-								'You giggle a bit at that comment as you get up, she pulls you into a kiss. Once the kiss is finished the two of you start getting dressed. Once you are both finished dressing she says. "We need to do that again, but for now we best get back." With that she leads you back to the front of the cafe, where she returns to work.'
+								'She pulls out of your gaping ass, and you feel a bit of her cum leaking out of it as she does. "What a beautiful sight to behold. Your ass is so cute with my cum leaking out of it."'
+								'You giggle a bit at that comment as you get up. Then, she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. Once you are both finished dressing, she says. "We need to do that again, but for now, we best get back." With that, she leads you back to the front of the cafe, where she returns to work.'
 								gs 'arousal', 'anal', 5, 'lube'
 								gs 'cum_call', 'anus', 'A89', 1
 								gs 'arousal', 'end'
@@ -382,16 +382,16 @@ if $ARGS[0] = 'sex_work':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work7.jpg"></center>'
 			'She pulls out of your mouth, letting you respond to her. "I want you... to fuck my ass..." you gasp through your breaths.'
-			'She grins down at you and gives you a wink. "If that''s what you want." She leaves you on all fours on the box as she walks over and grabs a bottle out of the desk. She comes back and turns you around to squirt some lube onto your asshole, working it into your ass with her fingers. You glance over your shoulder and watch her squirt some lube onto her dick before tossing the bottle aside. She then lines her cock up and pushes it inside your asshole. "Fuck, your ass feels so tight!" You clench the box tightly and bite your lip as she slides balls deep into you and starts hammering away at your ass. You moan in a mixture of pleasure and pain.'
+			'She grins down at you and gives you a wink. "If that''s what you want." She leaves you on all fours, on the box, as she walks over and grabs a bottle from the desk. She comes back and turns you around to squirt some lube onto your asshole, working it into your ass with her fingers. You glance over your shoulder and watch her squirt some lube onto her dick before tossing the bottle aside. She then lines her cock up and pushes it inside your asshole. "Fuck, your ass feels so tight!" You clench the box tightly and bite your lip as she slides balls deep into you and starts hammering away at your ass. You moan in a mixture of pleasure and pain.'
 			gs 'arousal', 'anal_sex', 5, 'lube'
 			gs 'stat'
 			act 'Get butt fucked':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/work8.jpg"></center>'
-				'She reaches up to grab you by the shoulder with one hand, while wrapping her other hand in your hair to pull it back. The echoing of the slapping of flesh on flesh fills the room as she furiously fucks your backdoor. You feel her balls slapping against your pussy as she fucks your ass, and before too long she starts grunting and fucking you harder and faster before she cries out and shoves herself balls deep in your ass and holds it there. You feel her cock twitching inside you as she fills your ass with her warm cum.'
+				'She reaches up to grab you by the shoulder with one hand while wrapping her other hand in your hair to pull it back. The echoing of the slapping of flesh on flesh fills the room as she furiously fucks your backdoor. You feel her balls slapping against your pussy as she fucks your ass. Before too long, she starts grunting and fucking you harder and faster before she cries out, shoves herself deep in your ass, and holds it there. You feel her cock twitching as she fills your ass with her warm cum.'
 				*nl
-				'She pulls out of you and her cum trickles out of your stretched hole. "What a beautiful sight. You ass looks so cute with my cum leaking out of it."'
-				'You giggle at her comment as you get up and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
+				'She pulls out of you, cum trickles out of your stretched hole. "What a beautiful sight. Your ass looks so cute with my cum leaking out of it."'
+				'You giggle at her comment as you get up, and she pulls you into a kiss. Once the kiss is finished, the two of you start getting dressed. "That was amazing! We need to do this again, but we need to get back now." With that, she leads you back to the front of the cafe and returns to work.' 
 				gs 'arousal', 'anal', 5, 'lube'
 				gs 'cum_call', 'anus', 'A89', 1
 				gs 'arousal', 'end'
@@ -407,17 +407,17 @@ if $ARGS[0] = 'photography':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big89.jpg"></center>'
-	'You take a few photos of her fully dressed, but it really isn''t what you''re looking for. You then realize what you really want is her partially undressed, hinting at her secret without fully revealing it. "Hey would you mind putting on some lingerie and letting me take your picture?"'
+	'You take a few photos of her fully dressed, but you''re looking for something else. You then realize what you really want is her partially undressed, hinting at her secret without fully revealing it. "Hey, would you mind putting on some lingerie and letting me take your picture?"'
 	'She stops and looks at you for a moment. "Why?"'
-	'You lower the camera when she seems hesitent to agree. "I want this to be special, to hint at your..." You motion towards her crotch. "secret without actually revealing it."'
+	'You lower the camera when she seems hesitant to agree. "I want this to be special, to hint at your..." You motion towards her crotch. "secret without actually revealing it."'
 	'She seems even more unsure. "Who would see this? You know how some people are."'
 	*nl
-	'You smile at her. "Don''t worry, I won''t go around showing people and the few that do see it would be people I trust. Plus I would never reveal your identity to anyone."'
-	'She bites her lower lip as she thinks about it. "Okay, I guess I can trust you, but you have to trust me in return." she says with a devious smile.'
+	'You smile at her. "Don''t worry, I won''t go around showing people and the few that do see it would be people I trust. Plus, I would never reveal your identity to anyone."'
+	'She bites her lower lip as she thinks about it. "Okay, I guess I can trust you, but you have to trust me in return," she says with a devious smile.'
 	'You raise a shapely brow slightly. "Okay... In what way?"'
-	'She grins. "When you''re done taking your pictures, I get to fuck you any way I want, do whatever I want to you."'
+	'She grins. "When you''re done taking your pictures, I get to fuck you anyway I want, do whatever I want to you."'
 	'"Like what exactly?" you ask in response.'
-	'She shakes her head. "You''ll just have to trust me, like I''m trusting you." She does make a somewhat valid point, but do you trust her to not do something bad?'
+	'She shakes her head. "You''ll have to trust me like I''m trusting you." She makes a valid point, but do you trust her to not do something terrible?'
 	act 'Refuse':
 		cla & *clr
 		npc_rel['A89'] -= 10
@@ -425,15 +425,15 @@ if $ARGS[0] = 'photography':
 		gs 'stat'
 		'<center><video autoplay loop src="images/pc/reactions/no.mp4"></video></center>'
 		if stat['vaginal'] = 0:
-			'You think about it before shaking your head. "Um no, I''m not going to trade sex for photos. Sorry."'
+			'You think about it before shaking your head. "Um, no, I''m not going to trade sex for photos. Sorry."'
 			'She frowns but nods. "I understand. I just don''t want images of me out there. You never know how it might get out on the internet."'
-			'With your hopes dashed, you pack up your stuff. "Okay, well guess I''ll see you around then..."'
-			'She nods. "Yeah, see you later." With that, you leave and she heads back to work.'
+			'With your hopes dashed, you pack up your stuff. "Okay, well, guess I''ll see you around then..."'
+			'She nods. "Yeah, see you later." With that, you leave, and she heads back to work.'
 		else
-			'You think about it before shaking your head. "Um no, I''m not going to trade sex for photos. Sorry."'
+			'You think about it before shaking your head. "Um, no, I''m not going to trade sex for photos. Sorry."'
 			'She frowns but nods. "I understand. I just don''t want images of me out there. You never know how it might get out on the internet."'
-			'With your hopes dashed, you pack up your stuff. "Okay, well guess I''ll see you around then..."'
-			'She nods. "Yeah, see you later." With that, you leave and she heads back to work.'
+			'With your hopes dashed, you pack up your stuff. "Okay, well, guess I''ll see you around then..."'
+			'She nods. "Yeah, see you later." With that, you leave, and she heads back to work.'
 		end
 		act 'Leave':gt 'city_industrial'
 	end
@@ -443,8 +443,8 @@ if $ARGS[0] = 'photography':
 			npc_rel['A89'] += 5
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/activities/photography/foto/people/6.jpg"></center>'
-			'You think about it before nodding. "Okay, sure. You can fuck me however you want <i>after</i> I get the photo I want. Now go put on something sexy for me." She laughs before going to try on a few different outfits until she finds something she likes. She then starts posing for you and you take a few photos until you''re sure you have the one. With the one you want taken, you put the camera aside. "Okay, I''ve got it."'
-			'She smiles at you and beckons you over. "Well get that sexy body of yours over here. I''m going to do all sorts of things to it."'
+			'You think about it before nodding. "Okay, sure. You can fuck me however you want after I get the photo I want. Now go put on something sexy for me." She laughs before trying on a few different outfits until she finds something she likes. She then starts posing for you, and you take a few photos until you''re sure you have the one. With the photograph you want having been shot, you put the camera aside. "Okay, I''ve got it."'
+			'She smiles at you and beckons you over. "Well, get that sexy body of yours over here. I''m going to do all sorts of things to it."'
 			gs 'exp_gain', 'photoskl', rand(3,5)
 			portfolio_people[6] = 1
 			gs 'arousal', 'erotic_nudity', 10
@@ -453,54 +453,54 @@ if $ARGS[0] = 'photography':
 				cla & *clr
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo1.jpg"></center>'
-				'You walk over and climb onto the bed next to her. She starts kissing you and you both just make out for a few minutes.'
+				'You walk over and climb onto the bed next to her. She starts kissing you, and you both just make out for a few minutes.'
 				gs 'arousal', 'kiss', 2
 				gs 'stat'
 				act 'Undress':
 					cla & *clr
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo2.jpg"></center>'
-					'She breaks the kiss to start undressing you. She rubs your clit and sucks on your exposed nipples as she does. After spending a few minutes playing around, she finishes stripping you and pushes you forward onto your knees.'
+					'She breaks the kiss to start undressing you. First, she rubs your clit and sucks on your exposed nipples as she does. Then, after spending a few minutes playing around, she finishes stripping you and pushes you forward onto your knees.'
 					gs 'arousal', 'foreplay', 2
 					gs 'stat'
 					act 'Get eaten':
 						cla & *clr
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo3.jpg"></center>'
-						'She moves in behind you and starts licking your pussy from behind. She gives your ass an occasional slap as she licks your slit. You moan in pleasure, enjoying every minute of her tongue on your pussy.'
+						'She moves in behind you and starts licking your pussy from behind. She gives your ass an occasional slap as she licks your slit. You moan, enjoying every minute of her tongue on your pussy.'
 						gs 'arousal', 'cuni', 5
 						gs 'stat'
 						act 'Give her a blowjob':
 							cla & *clr
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo4.jpg"></center>'
-							'She stops licking your pussy and undresses herself before sitting down on the bed next to you. She grabs hold of your head and pulls it towards her hard dick. You open your mouth and start sucking it, the taste of her precum on your tongue arousing you even more. You keep your lips wrapped tightly around her dick as you bob your head up and down until she slaps your ass. "Okay, that''s enough. Lie down so I can fuck that nice wet pussy of yours."'
+							'She stops licking your pussy and undresses before sitting down on the bed next to you. She grabs hold of your head and pulls it towards her stiff dick. You open your mouth and start sucking it, the taste of her precum on your tongue arousing you even more. You keep your lips wrapped tightly around her dick as you bob your head up and down until she slaps your ass. "Okay, that''s enough. Lie down so I can fuck that nice wet pussy of yours."'
 							gs 'arousal', 'bj', 5
 							gs 'stat'
 							act 'Let her fuck you':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo5.jpg"></center>'
-								'You stop sucking her and roll over onto your back, spreading your legs wide. She moves in between your legs and slides the tip of her dick against your already wet slit before pushing her cock into your pussy. She starts fucking you slowly at first, but starts going faster as you start moaning at the sensation of her filling you.'
+								'You stop sucking her and roll over onto your back, spreading your legs wide. She moves between your legs, sliding the tip of her dick against your wet slit before pushing her cock into your pussy. She starts fucking you slowly at first but starts going faster as you moan at the sensation of her filling you.'
 								gs 'arousal', 'vaginal', 5
 								gs 'stat'
 								act 'Get fucked some more':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo6.jpg"></center>'
-									'As you start moaning louder, she picks up the pace and starts fucking you harder and faster. Just as it''s really starting to feel good, she pulls out of you. "Roll over." she demands.'
+									'As you moan louder, she picks up the pace and starts fucking you harder and faster. Then, just as it''s starting to feel good, she pulls out of you. "Roll over," she demands.'
 									gs 'arousal', 'vaginal', 5
 									gs 'stat'
 									act 'Roll over':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo7.jpg"></center>'
-										'You roll over onto all fours, but instead of sliding back into your pussy, you feel her cock pressing against your asshole. "That''s my ass!" you call out.'
+										'You roll over onto all fours, but instead of sliding back into your pussy, you feel her cock pressing against your asshole. "That''s my ass!" you cry out.'
 										'She thrusts forwards, causing her <<dick>>cm <<$dick_girth>> dick to pop into your asshole. Even the natural lube from your pussy is enough to let it slide in easily, stretching your backdoor. You hiss in pain as she leans in and whispers in your ear. "I know..."'
-										'She stands up behind you and shoves her cock balls deep into your ass. She starts fucking you deeply, but not too fast. You grit your teeth until it stops hurting and starts feeling good.'
+										'She stands behind you and shoves her cock balls deep into your ass. She starts fucking you deeply, but not too fast. You grit your teeth until it stops hurting and starts feeling good.'
 										gs 'arousal', 'anal', 5, 'lube'
 										gs 'stat'
 										act 'Get butt fucked':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo8.jpg"></center>'
-											'She grabs a bottle of lube out of the bed side table and squirts it on her dick as it slides in and out of your ass. With your ass now slick, she starts hammering your backdoor hard, her hips smacking against your ass cheeks hard enough to force you forward until you''re flat on your stomach.'
+											'She grabs a bottle of lube from the bedside table, squirting it on her dick as it slides in and out of your ass. Then, with your ass slick, she starts hammering your backdoor hard, her hips smacking against your ass cheeks hard enough to force you forward until you''re flat on your stomach.'
 											gs 'arousal', 'anal', 5, 'lube'
 											gs 'cum_call', 'anus', 'A89', 1
 											gs 'arousal', 'end'
@@ -509,7 +509,7 @@ if $ARGS[0] = 'photography':
 												*clr & cla
 												'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo9.jpg"></center>'
 												'After a few minutes, she pulls out of you again. "Roll over again."' 
-												'You do as she says and rolls over as she gets off the bed and drags you to the edge. She spreads your legs spread wide, slides her dick back into your gaping ass and starts fucking you hard and fast again.'
+												'You do as she says and rolls over as she gets off the bed and drags you to the edge. She spreads your legs wide, slides her dick back into your gaping ass and starts fucking you hard and fast again.'
 												gs 'arousal', 'anal', 5, 'lube'
 												gs 'stat'
 												act 'Cumming':
@@ -517,8 +517,8 @@ if $ARGS[0] = 'photography':
 													'<center><img <<$set_imgh>> src="images/characters/city/eugene/sex/photo10.jpg"></center>'
 													'After a few minutes, she starts grunting and barely pulls out of you before streams of cum shoot out of her dick and splatter across your thighs. She jerks her cock a few times to squeeze out the last few drops before she wipes the tip against your thigh. She then glances over at the clock and jumps up.'
 													*nl
-													'"Fuck, I need to get back to work! This was fun and all, but I''m already late." With that, she starts getting dressed into her work clothes and your clothes at you. Grabbing some tissues, you clean her cum off you before quickly getting dressed youself.'
-													'Once you''re both dressed, she leads you out and locks the door before giving you a quick kiss. "I had a wonderful time. Come and see me again." With that, she jogs off back to work, leaving you outside her building.'
+													'"Fuck, I need to get back to work! This was fun and all, but I''m already late." With that, she starts getting dressed into her work clothes and your clothes at you. Grabbing some tissues, you clean her cum off you before quickly getting dressed.'
+													'Once you''re both dressed, she leads you out and locks the door before giving you a quick kiss. "I had a wonderful time. Come and see me again." Then, she jogs off back to work, leaving you outside her building.'
 													gs 'cum_call', 'legs', 'A89', 1
 													gs 'arousal', 'end'
 													cumspclnt = 17

+ 8 - 10
locations/foto.qsrc

@@ -739,7 +739,7 @@ if $ARGS[0] = 'job_offer':
 	if age >= 18:
 		act'Show him your passport':
 			cla & *nl
-			'He takes it from you and begins copying the information onto his computer. As he types he occasionally glances at you, like he can''t wait to see you naked again. Finally, he hits a key on his keyboard with an air of finality and holds up the fake passport one more time to compare the information he just typed in. Satisfied that it has been entered accurately, he nods and clicks a few more times to save the data.'
+			'He takes it from you and begins copying the information onto his computer. As he types he occasionally glances at you, like he can''t wait to see you naked again. Finally, he hits a key on his keyboard with an air of finality and holds up the passport one more time to compare the information he just typed in. Satisfied that it has been entered accurately, he nods and clicks a few more times to save the data.'
 			act 'Continue':gt 'foto', 'model_name1'
 		end
 	elseif fakepassport = 1:
@@ -1044,34 +1044,32 @@ if $ARGS[0] = 'showers':
 								$orgasm_or = 'no'
 								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 								$orgasm_or = 'yes'
+								$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
 								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
-								gs 'stat'
 								pcs_mood += 15
-								$orgasm_or = 'yes'
-								$orgasm_txt = 'Soon you feel a warm wave spreading over your entire body and you shudder as an orgasm overtakes you. You quickly look around hoping no one noticed your public masturbation session.'
 								gs 'arousal', 'end'
+								gs 'stat'
 								act 'Dry off':gt 'foto', 'showers'
 							else
-								gs 'arousal', 'masturbate', 'exhibitionism', 5
-								gs 'stat'
 								pcs_mood += 15
 								$orgasm_or = 'no'
 								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 								$orgasm_or = 'no'
 								gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 								$orgasm_or = 'yes'
-								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
 								$orgasm_txt = 'You loudly groan as you shudder in orgasm, uncaring if anyone notices what you''re up to. In fact, it kind of turns you on and makes you want to keep going...'
+								gs 'arousal', 'clit_vibe', 5, 'masturbate', 'exhibitionism'
 								gs 'arousal', 'end'
 								act 'Dry off':gt 'foto', 'showers'
 							end
 						else
-							gs 'arousal', 'masturbate', 'exhibitionism', 5
-							gs 'stat'
 							pcs_horny += 5
 							pcs_mood += 10
-							'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
+							$orgasm_or = 'no'
+							gs 'arousal', 'masturbate', 'exhibitionism', 5
 							gs 'arousal', 'end'
+							gs 'stat'
+							'At first it feels very nice, but after a while you become self conscious of how long you''ve been masturbating in the public staff showers. You think maybe it''s time to stop.'
 							act 'Dry off':gt 'foto', 'showers'
 						end
 					end

+ 2 - 2
locations/gadhouse.qsrc

@@ -251,7 +251,7 @@ if $ARGS[0] = 'start':
 		if (kanikuli = 4 or kanikuli = 5) and ((month = 6 or month = 7) or (month = 8 and day <= 25)):
 			'"Will you be staying with us during the summer or will you be traveling back and forth with your parents?" she asks.'
 
-			act 'Stay with your grandaparents':gadstay = 1 & gt 'gadhouse', 'main'
+			act 'Stay with your grandparents':gadstay = 1 & gt 'gadhouse', 'main'
 			act 'Stay in Pavlovsk':gadstay = 0 & gt 'gadhouse', 'main'
 		else
 			act 'Continue':gt 'gadhouse', 'main'
@@ -1609,7 +1609,7 @@ if $ARGS[0] = 'family_trip':
 						*nl
 						'<<$npc_nickname[''A29'']>> asks, "<<$pcs_nickname>>, are you coming home with us or are you going to stay in the village with your grandparents?"'
 
-						act 'Stay with your grandaparents':gadstay_day = daystart & gadstay = 1 & locat['Fam_inGad'] = 0 & gt 'gadhouse', 'main'
+						act 'Stay with your grandparents':gadstay_day = daystart & gadstay = 1 & locat['Fam_inGad'] = 0 & gt 'gadhouse', 'main'
 						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'
 					else
 						act 'Go home to Pavlovsk': gt 'gadhouse', 'to_pavlovsk'

+ 80 - 80
locations/gopsex.qsrc

@@ -31,11 +31,11 @@ if $ARGS[0] = 'gg_devst_deflor':
 		if pcs_vag = 0:
 			pcs_horny = 0
 			pcs_mood = pcs_mood - 15
-			'You tell them that it''s your first time, and ask them to be gentle.'
-			'<font color = red><b>You bit your lip in pain and tears well up in your eyes, when his member enters into your pussy, breaking your hymen. You are crying and moaning as the sturdy cock fucks your bloody pussy.</b></font>'
+			'You tell them it''s your first time and ask them to be gentle.'
+			'<font color = red><b>You bite your lip in pain and tears well up in your eyes when his member enters your pussy, breaking your hymen. You are crying and moaning as the sturdy cock fucks your bloody pussy.</b></font>'
 		else
-			'You tell them that it''s your first time, and ask them to be gentle.'
-			'His member enters you with some resistance but it doesn''t hurt, if anything it feels good. You had expected your first time to be painful and for there to be some blood yet there is none of either.'
+			'You tell them it''s your first time and ask them to be gentle.'
+			'His member enters you with some resistance, but it doesn''t hurt. If anything, it feels good. You expected your first time to be painful and with some blood, yet there is none.'
 		end
 	end
 end
@@ -48,33 +48,33 @@ if $ARGS[0] = 'gg_sex_orgasm':
 	!periods, orgasm is not possible
 		pcs_horny = 0
 		pcs_mood = pcs_mood - 10
-		'<font color = red><b>You have a period. As his cock ramming your cunt, period blood is leaking out of your box.</b></font>'
+		'<font color = red><b>You have a period. As his cock rams your cunt, period blood is leaking out of your box.</b></font>'
 	elseif pcs_horny >= 50:
 		horny_orgasm_text = RAND(0,11)
 		if horny_orgasm_text = 0:
-			'You are trying to come and you beg him to '+func('gopsex','hide','gop_sextext1')+' you harder.'
+			'You are trying to come, and you beg him to '+func('gopsex','hide','gop_sextext1')+' you harder.'
 		elseif horny_orgasm_text = 1:
 			'You try to reach your peak, so you start bouncing faster.'
 		elseif horny_orgasm_text = 2:
 			'You are about to cum, and you ask him to push his dick deeper.'
 		elseif horny_orgasm_text = 3:
-			'You are trying to come and you ask him to '+func('gopsex','hide','gop_sextext1')+' you faster.'
+			'You are trying to come and ask him to '+func('gopsex','hide','gop_sextext1')+' you faster.'
 		elseif horny_orgasm_text = 4:
 			'You want to come badly, so you try to catch his pace and bounce his hard dick.'
 		elseif horny_orgasm_text = 5:
 			'You want to reach your peak, so you begin actively humping his dick.'
 		elseif horny_orgasm_text = 6:
-			'You are trying to come and you ask him to hurry.'
+			'You are trying to come, and you ask him to hurry.'
 		elseif horny_orgasm_text = 7:
-			'You crave to '+func('gopsex','hide','gop_sextext1')+' you harder...'
+			'You crave for them to '+func('gopsex','hide','gop_sextext1')+' you harder...'
 		elseif horny_orgasm_text = 8:
-			'You want to finish and plead him to treat you rough.'
+			'You want to finish and plead with him to treat you rough.'
 		elseif horny_orgasm_text = 9:
 			'You beg your partner to '+func('gopsex','hide','gop_sextext1')+' you harder.'
 		elseif horny_orgasm_text = 10:
-			'You yell smut naming yourself a dirty whore to provoke your partned and reach your peak.'
+			'You yell smut naming yourself a dirty whore to provoke your partner and reach your peak.'
 		elseif horny_orgasm_text = 11:
-			'You are overexcited and you want to climax. You beg your partner to '+func('gopsex','hide','gop_sextext1')+' you heavily.'
+			'You are overexcited, and you want to climax. So you beg your partner to '+func('gopsex','hide','gop_sextext1')+' you heavily.'
 		end
 		if pcs_horny >= 70:
 			orgasm += 1
@@ -83,29 +83,29 @@ if $ARGS[0] = 'gg_sex_orgasm':
 			pcs_hairbsh = 0
 			orgasm_text = RAND(0,11)
 			if orgasm_text = 0:
-				'The excitement exceeded your limits and you scream loudly as you underwent a strong climax.'
+				'The excitement exceeds your limits, and you scream loudly as you undergo an intense climax.'
 			elseif orgasm_text = 1:
-				'Your body begins shaking and you cumm violently.'
+				'Your body begins shaking, and you cum violently.'
 			elseif orgasm_text = 2:
-				'A loud groan comes out from your mouth and a strong orgasm engulf your body.'
+				'A loud groan comes from your mouth, and an intense orgasm engulfs your body.'
 			elseif orgasm_text = 3:
 				'You shiver in convulsions and begin to finish.'
 			elseif orgasm_text = 4:
-				'You are breathing heavily being excited and you''ll reach your climax soon.'
+				'You are breathing heavily, being excited, and you''ll reach your climax soon.'
 			elseif orgasm_text = 5:
-				'Thanks to skillfulness of your partner, you experience a strong orgasm.'
+				'Thanks to the skillfulness of your partner, you experience an intense orgasm.'
 			elseif orgasm_text = 6:
-				'Amazing feeling overfilled your senses and you finish loudly.'
+				'Amazing feeling overfilled your senses, and you finish loudly.'
 			elseif orgasm_text = 7:
-				'You''ve never experienced so strong orgasm before, you shiver still a couple of minutes after until your climax faded.'
+				'You''ve never experienced such an intense orgasm before. You shiver still for a couple of minutes until your climax fades.'
 			elseif orgasm_text = 8:
-				'Experiencing incredible feeling, you reach a pinnacle.'
+				'Experiencing incredible feelings, you reach a pinnacle.'
 			elseif orgasm_text = 9:
-				'You moan loudly and thanks to skillful actions of your partner you climax.'
+				'You moan loudly, and thanks to the skilful actions of your partner, you climax.'
 			elseif orgasm_text = 10:
-				'The room fills with your screams. You finish loudly no matter who can hear you.'
+				'The room fills with your screams. Finally, you finish loudly, no matter who can hear you.'
 			elseif orgasm_text = 11:
-				'You are overcome by surging emotions and you finish with a loud groan.'
+				'You are overcome by surging emotions and finish with a loud groan.'
 			end
 		end
 	end
@@ -118,29 +118,29 @@ if $ARGS[0] = 'masturb_gg':
 		pcs_horny = 0
 		pcs_mood = pcs_mood - 10
 		minut +=3
-		'<font color = red><b>What you are seeing makes you a little excited, but since it''s your time of month, you don''t feel like masturbating and getting your fingers bloody...</b></font>'
+		'<font color = red><b>What you see makes you a little excited, but since it''s your time of the month, you don''t feel like masturbating and getting your fingers bloody...</b></font>'
 	elseif mesec <= 0:
 		!no monthly, orgasm is possible
 		if pcs_horny >=50:
 			$dummywhere = 'into your panties'
-			if $pantyworntype = 'none': $dummywhere = 'down to your pussy'
+			if $pantyworntype = 'none': $dummywhere = 'to your pussy'
 			if PCloSkirt > 0: $dummywhat = 'lift up your skirt'
-			if CloPantsShortness > 0: $dummywhat = 'unbutton and unzipp your pants'
-			if CloPantsShortness > 2: $dummywhat = 'unbutton and unzipp your shorts'
+			if CloPantsShortness > 0: $dummywhat = 'unbutton and unzip your pants'
+			if CloPantsShortness > 2: $dummywhat = 'unbutton and unzip your shorts'
 			rnd_masturb_text = rand(1,3)
 			if rnd_masturb_text = 1:
 				'The view is quite exciting. You slip your hand <<$dummywhere>> and start rubbing your clit.'
 			elseif rnd_masturb_text = 2:
-				'You are very excited from this view. You can''t help, but your hand slips <<$dummywhere>> and you start rubbing your itching pussy.'
+				'You are very excited about this view. Of course, you can''t help, but your hand slips <<$dummywhere>>, and you start rubbing your itching pussy.'
 			elseif rnd_masturb_text = 3:
-				'Watching the scene, you become strongly excited. You <<$dummywhat>>, slip your hand <<$dummywhere>> and you start masturbating.'
+				'Watching the scene, you become enormously excited. You <<$dummywhat>>, slip your hand <<$dummywhere>>, and start masturbating.'
 			end
 			killvar '$dummywhere'
 			killvar '$dummywhat'
 		end
-		if pcs_horny >=60:'Your excitement grows, you start even faster to rub your pussy poking your fingers deeper into your love hole and tease your clit.'
+		if pcs_horny >=60:'Your excitement grows, and you start even faster to rub your pussy, poking your fingers deeper into your love hole and teasing your clit.'
 		if pcs_horny >=70:
-			$orgasm_txt = 'You are overcome by surging emotions and you finish with a loud groan.'
+			$orgasm_txt = 'You are overcome by surging emotions and finish with a loud groan.'
 			$orgasm_or = 'yes'
 		end
 		gs 'arousal', 'clit_finger', 3, 'masturbate'
@@ -161,12 +161,12 @@ if $ARGS[0] = 'gopsex_select':
 	gs 'gopsex', 'settings'
 	gs 'stat'
 	if pcs_horny <50 and PCloStyle ! 4: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/b'+rand(1,17)+'.jpg"></center> <br> You want sex.'
-	if pcs_horny >=50 and PCloStyle ! 4: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/g'+rand(1,20)+'.jpg"></center> <br> You are overexcited and you strongly want to fuck.'
+	if pcs_horny >=50 and PCloStyle ! 4: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/g'+rand(1,20)+'.jpg"></center> <br> You are overexcited, and you strongly want to fuck.'
 	if PCloStyle = 4: '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/body/h'+rand(1,17)+'.jpg"></center>'
 	act 'Have sex with '+func('gopsex','hide','Shulga_var_name'): 
 		if shgopsex_vasya_count <= 0:
 			cla
-			'Vasily said: "<<$pcs_nickname>>, you fucked with me already, it''s enough fun for today, don''t bother."'
+			'Vasily said, "<<$pcs_nickname>>, you fucked with me already. It''s enough fun for today, don''t bother."'
 			act 'Leave': gt 'vasilyhome', 'livingroom'
 		else
 			$gopsex_n_npc = 1
@@ -181,7 +181,7 @@ if $ARGS[0] = 'gopsex_select':
 		act 'Have sex with Dan': 
 			if shgopsex_den_count <= 0:
 				cla
-				'Dan says: "'+func('gopsex','hide','gop_gg_name')+', you''ve fucked me enough today, get out!"'
+				'Dan says, "'+func('gopsex','hide','gop_gg_name')+', you''ve fucked me enough today. Get out!"'
 				act 'Leave': gt 'vasilyhome', 'livingroom'
 			else
 				$gopsex_n_npc = 0
@@ -195,7 +195,7 @@ if $ARGS[0] = 'gopsex_select':
 		act 'Sex with Vitek':
 			if shgopsex_vitya_count <= 0:
 				cla
-				'Vitek says: "Sorry <<$pcs_nickname>>, I can''t fuck you more today."'
+				'Vitek says, "Sorry, <<$pcs_nickname>>, I can''t fuck you more today."'
 				act 'Leave': gt 'vasilyhome', 'livingroom'
 			else
 				$gopsex_n_npc = 2
@@ -233,9 +233,9 @@ if $ARGS[0] = 'shgopsex':
 	if $ARGS[1] ! 'cont':
 		'"So <<$boydesc>>, do you want to have fun with me?" You lick your lips sensually and ask him: "What can I do for you?"'
 		if mesec > 0:
-			'<font color = red><b>You warn him that you''re on your period and so your pussy is off limits!</b></font>'
+			'<font color = red><b>You warn him that you''re on your period, so your pussy is off-limits!</b></font>'
 		elseif mesec <= 0 and stat['think_virgin'] = 1:
-			'<font color = red><b>You tell him, that you want to save your virginity, so your pussy is available only for eating.</b></font>'
+			'<font color = red><b>You tell him that you want to save your virginity so your pussy is available only for eating.</b></font>'
 		end
 	end
 	act 'Hand job': gt 'gopsex', 'shgopsex_hj'
@@ -293,7 +293,7 @@ if $ARGS[0] = 'shgopsex_lick':
 	!Vasily (NPC 1)
 	if $gopsex_n_npc = 1:
 		if fame['pav_slut'] >= 200:
-			'<<$pcs_nickname>> you are a <<$gnikname>>, it''s unpleasant for me to lick cunt such girl, God knows how many cocks you have got there today. So go ahead, expose your whorish holes! I''m going to fuck you.'
+			'<<$pcs_nickname>>, you are a <<$gnikname>>. It''s unpleasant for me to lick the cunt of such a girl. God knows how many cocks you have got there today. So go ahead, expose your whorish holes! I''m going to fuck you.'
 		elseif fame['pav_slut'] < 200:
 			pcs_horny += 10
 			minut += ''+rand(3,7)+''
@@ -305,7 +305,7 @@ if $ARGS[0] = 'shgopsex_lick':
 	!Vitek (NPC 2)
 	if $gopsex_n_npc = 2:
 		if fame['pav_slut'] >= 200:
-			'<<$pcs_nickname>> you are a <<$gnikname>>, it''s unpleasant for me to lick cunt such girl, God knows how many cocks you have got there today. So go ahead, show me better your whorish holes!'
+			'<<$pcs_nickname>>, you are a <<$gnikname>>. It''s unpleasant for me to lick the cunt of such a girl. God knows how many cocks you have got there today. So go ahead, show me better your whorish holes!'
 		elseif fame['pav_slut'] < 200:
 			pcs_horny += 10
 			minut += ''+rand(3,7)+''
@@ -318,9 +318,9 @@ if $ARGS[0] = 'shgopsex_lick':
 	!Dan (NPC 0)
 	if $gopsex_n_npc = 0:
 	'"Dan, lick my pussy, please." You ask sweetly.'
-	'"<<$pcs_nickname>>, aren''t you screwy to asking me doing such stuff?"'
+	'"<<$pcs_nickname>>, aren''t you screwy to ask me to do such stuff?"'
 	'"And what''s wrong with that? Are you ashamed to do me nicely?"'
-	'"Yes, it''s unpleasant for me to lick cunt of a slut, God knows how many cocks you have got there today... So come on! Don''t fuck with me... Expose your whorish holes! I''m going to fuck you."'
+	'"Yes, it''s unpleasant for me to lick cunt of a slut. God knows how many cocks you have got there today... So come on! Don''t fuck with me... Expose your whorish holes! I''m going to fuck you."'
 	end
 	act 'Sex selection': gs 'gopsex', 'shgopsex','cont'
 end
@@ -331,7 +331,7 @@ if $ARGS[0] = 'shgopsex_69':
 	gs 'stat'
 	if $gopsex_n_npc >= 1:
 		if fame['pav_slut'] >= 200:
-			'<<$pcs_nickname>> you are a <<$gnikname>>, it''s unpleasant for me to lick cunt such girl, God knows how many cocks you have got there today. So go ahead, show me better your whorish holes!'
+			'<<$pcs_nickname>>, you are a <<$gnikname>>. It''s unpleasant for me to lick the cunt of such a girl. God knows how many cocks you have got there today. So go ahead, show me better your whorish holes!'
 			act 'Sex selection': gs 'gopsex', 'shgopsex','cont'
 		elseif fame['pav_slut'] < 200:
 			gs 'arousal', 'bj', 5
@@ -364,8 +364,8 @@ if $ARGS[0] = 'shgopsex_tits':
 	gs 'stat'
 	gs 'gopsex', 'hide','ind_stamina_npc'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/bigroom/gopsex/tits/tits'+rand(1,6)+'.jpg"></center>'
-	'"Well <<$boydesc>>, do you like my boobies '+func('gopsex','hide','gop_text3')+'?"'
-	'"Yes <<$pcs_nickname>>, you''ve got awesome tits!"'
+	'"Well, <<$boydesc>>, do you like my boobies'' '+func('gopsex','hide','gop_text3')+'?"'
+	'"Yes, <<$pcs_nickname>>, you''ve got awesome tits!"'
 	act 'Suck boobs': gt 'gopsex', 'hide','shgopsex_eattits'
 	act 'Titty fuck': gt 'gopsex', 'hide','shgopsex_fucktits'
 	act 'Sex selection': gs 'gopsex', 'shgopsex','cont'
@@ -487,12 +487,12 @@ if $ARGS[0] = 'shgopsex_group':
 	if $ARGS[1] ! 'cont':
 		gs 'gopsex','hide','group_sex_text'
 		if mesec > 0 and stat['think_virgin'] = 0:
-			'<font color = red><b>You warn them that you''re on your period and so your pussy is off limits!</b></font>'
+			'<font color = red><b>You warn them that you''re on your period, so your pussy is off-limits!</b></font>'
 		elseif mesec <=0 and stat['think_virgin'] = 1:
-			'<font color = red><b>you remind to them, that you want to preserve your virginity, so your pussy is not available for play!</b></font>'
+			'<font color = red><b>You remind them that you want to preserve your virginity, so your pussy is not available for play!</b></font>'
 		end
 	end
-	act 'Suck on by one': gs 'gopsex','hide','group_sex_start' & gt 'gopsex','hide','shgopsex_group_bj'
+	act 'Suck one by one': gs 'gopsex','hide','group_sex_start' & gt 'gopsex','hide','shgopsex_group_bj'
 	if stat['bj'] >= 50:
 		act 'Suck all at once': gs 'gopsex','hide','group_sex_start' & gt 'gopsex','hide','shgopsex_group_bja'
 	end
@@ -552,11 +552,11 @@ if $ARGS[0] = 'hide':
 	if $ARGS[1] = 'npc_orgasm':
 		if shgopsex_count = 0:
 			npc_orgasm_txt = rand(1,5)
-			if npc_orgasm_txt = 1:$npc_orgasm_txt = '"Oh shit, <<$pcs_nickname>> I can''t hold it any longer, I''ll finish right now!", <<$boydesc>> warns you.'
-			if npc_orgasm_txt = 2:$npc_orgasm_txt = '<<$boydesc>> warns you: -"<<$pcs_nickname>> I''m going to cum right now, finish!"'
-			if npc_orgasm_txt = 3:$npc_orgasm_txt = '<<$boydesc>> asks: -"So <<$pcs_nickname>>, where should I load my cum? It doesn''t matter? Well, I pick myself!"'
-			if npc_orgasm_txt = 4:$npc_orgasm_txt = '"I''m ready to finish!, <<$pcs_nickname>>, where do you want my semen? You don''t know? Well I pick myself!"'
-			if npc_orgasm_txt = 5:$npc_orgasm_txt = '<<$boydesc>> tells you: -"<<$pcs_nickname>> I''m on the top, I''ll cum soon!"'
+			if npc_orgasm_txt = 1:$npc_orgasm_txt = '"Oh shit, <<$pcs_nickname>>, I can''t hold it any longer. I''ll finish right now!" <<$boydesc>> warns you.'
+			if npc_orgasm_txt = 2:$npc_orgasm_txt = '<<$boydesc>> warns you, "<<$pcs_nickname>>, I''m going to cum right now, finish!"'
+			if npc_orgasm_txt = 3:$npc_orgasm_txt = '<<$boydesc>>, "So <<$pcs_nickname>>, where should I offload my cum? It doesn''t matter? Well, I''ll choose myself!"'
+			if npc_orgasm_txt = 4:$npc_orgasm_txt = '"I''m ready to finish! <<$pcs_nickname>>, where do you want my semen? You don''t know? Well, I''ll choose myself!"'
+			if npc_orgasm_txt = 5:$npc_orgasm_txt = '<<$boydesc>> tells you, "<<$pcs_nickname>>, I''m on the top. I''ll cum soon!"'
 			'<<$npc_orgasm_txt>>'
 			killvar '$npc_orgasm_txt'
 		end
@@ -566,7 +566,7 @@ if $ARGS[0] = 'hide':
 			analplugin = 0
 			'"What?! Do you have a buttplug in your ass?" <<$boydesc>> asks in surprise.'
 			'"Aha, you are loosening your anus."'
-			'"That''s great, but it obstructs now." He notes and pulls out the plug.<br>'
+			'"That''s great, but it''s in the way right now." He comments and pulls the plug out from your ass.<br>'
 		end
 	end &!--- gop_sex_analplugin ---
 	if $ARGS[1] = 'group_sex_start':
@@ -585,7 +585,7 @@ if $ARGS[0] = 'hide':
 				if agape > 1:agape = 1
 				pcs_horny += 20
 				gop_sex_lubri = 1
-				$pod_whore_lubri_text = '"<<$boydesc>>, wait! If you want to fuck me in the ass, it is necessary to grease my hole!" You say and pull a tube out of your purse. You take the cap off and squeeze some jelly onto your fingers and smear your anus with lube then.'
+				$pod_whore_lubri_text = '"<<$boydesc>>, wait! If you want to fuck me in the ass, you should lube up my hole!" You say and pull a tube out of your purse. You take the cap off, squeeze some lube onto your fingers, and smear your anus with lube.'
 			elseif lubri = 0:
 				if agape > 2:agape = 2
 				pcs_horny = 0
@@ -596,9 +596,9 @@ if $ARGS[0] = 'hide':
 	if $ARGS[1] = 'gop_groupsex_analplugin':
 		if analplugin = 1:
 			analplugin = 0
-			'"What?! Do you have a buttplug in your ass?" '+func('gopsex','hide','gop_name_npc')+' ask in surprise.'
+			'"What?! Do you have a buttplug in your ass?" '+func('gopsex','hide','gop_name_npc')+' asks in surprise.'
 			'"Aha, you are loosening your anus."'
-			'"That''s great, but it obstructs now." He notes and pulls out the plug.<br>'
+			'"That''s great, but it''s in the way right now." He comments and pulls the plug out from your ass.<br>'
 		end
 	end &!--- gop_groupsex_analplugin ---
 
@@ -609,7 +609,7 @@ if $ARGS[0] = 'hide':
 				if agape > 1:agape = 1
 				pcs_horny += 20
 				gop_groupsex_lubri = 1
-				$pod_whore_lubri_text = '"'+func('gopsex','hide','gop_text_npcr')+', wait! If you want to fuck me in the ass, it is necessary to grease my hole!" You say and pull a tube out of your purse. You take the cap off and squeeze some jelly onto your fingers and smear your anus with lube then.'
+				$pod_whore_lubri_text = '"'+func('gopsex','hide','gop_text_npcr')+', wait! If you want to fuck me in the ass, you should lube up my hole!" You say and pull a tube out of your purse. You take the cap off, squeeze some lube onto your fingers, and smear your anus with lube.'
 			elseif lubri = 0:
 				if agape > 2:agape = 2
 				pcs_horny = 0
@@ -1083,47 +1083,47 @@ if $ARGS[0] = 'hide':
 	if $ARGS[1] = 'accview_ggsex':
 		!home affairs
 		rnd_domdela_text = rand(1,9)
-		if rnd_domdela_text = 1:$rnd_domdela_text = 'cook a dinner'
+		if rnd_domdela_text = 1:$rnd_domdela_text = 'cook some dinner'
 		if rnd_domdela_text = 2:$rnd_domdela_text = 'do homework'
 		if rnd_domdela_text = 3:$rnd_domdela_text = 'clean your room'
 		if rnd_domdela_text = 4:$rnd_domdela_text = 'wash dishes'
 		if rnd_domdela_text = 5:$rnd_domdela_text = 'go to bakery for a loaf of bread'
 		if rnd_domdela_text = 6:$rnd_domdela_text = 'wash your fanny'
 		if rnd_domdela_text = 7:$rnd_domdela_text = 'go to shop'
-		if rnd_domdela_text = 8:$rnd_domdela_text = 'cook a supper'
+		if rnd_domdela_text = 8:$rnd_domdela_text = 'cook some supper'
 		if rnd_domdela_text = 9:$rnd_domdela_text = 'do the laundry'
 		!turnip: davalka
 		rnd_telogg_text = rand(1,15)
 		if rnd_telogg_text = 1:$rnd_telogg_text = '"That''s no pussy but a bucket fanny."'
 		if rnd_telogg_text = 2:$rnd_telogg_text = '"The girl is thoroughly fucked."'
 		if rnd_telogg_text = 3:$rnd_telogg_text = '"Our <<$pcs_nickname>> has got a bottomless hole!"'
-		if rnd_telogg_text = 4:$rnd_telogg_text = '"Again <<$pcs_nickname>>, you sleep around in a row..."'
-		if rnd_telogg_text = 5:$rnd_telogg_text = '"They are <<gop_sextext3>> you again, <<$pcs_nickname>>? Is it possible? Aren''t you tired to lending your holes to everybody in a row..."'
+		if rnd_telogg_text = 4:$rnd_telogg_text = '"Again, <<$pcs_nickname>>, you sleep around in a row..."'
+		if rnd_telogg_text = 5:$rnd_telogg_text = '"They are <<gop_sextext3>> you again, <<$pcs_nickname>>? Is it possible? Aren''t you tired of lending your holes to everybody in a row..."'
 		if rnd_telogg_text = 6:$rnd_telogg_text = '"Poor girl, <<gop_sextext2>> at every corner."'
 		if rnd_telogg_text = 7:$rnd_telogg_text = '"<<$pcs_nickname>> unfailing '+func('gopsex','hide','gop_gg_name2')+'!"'
 		if rnd_telogg_text = 8:$rnd_telogg_text = '"Poor <<$pcs_nickname>>, they probably fuck up all her holes."'
-		if rnd_telogg_text = 9:$rnd_telogg_text = '"Blimey <<$pcs_nickname>>, damn, you''re a worn cunt!"'
-		if rnd_telogg_text = 10:$rnd_telogg_text = '"What have we here <<$pcs_nickname>>?! How come they stretch you here so?"'
-		if rnd_telogg_text = 11:$rnd_telogg_text = '"She lost her fear fully, '+func('gopsex','hide','gop_gg_name2')+'!"'
-		if rnd_telogg_text = 12:$rnd_telogg_text = '"She lost her shyness fully, '+func('gopsex','hide','gop_gg_name2')+'!"'
-		if rnd_telogg_text = 13:$rnd_telogg_text = '"How can you so shamelessly expose your holes right, left and centre, '+func('gopsex','hide','gop_gg_name2')+'?"'
-		if rnd_telogg_text = 14:$rnd_telogg_text = '"<<$pcs_nickname>>, you are so shameless '+func('gopsex','hide','gop_gg_name2')+'!"'
-		if rnd_telogg_text = 15:$rnd_telogg_text = '"Oh, <<$pcs_nickname>>, aren''t you sorry for youself?"'
+		if rnd_telogg_text = 9:$rnd_telogg_text = '"Blimey, <<$pcs_nickname>>, damn, you''re a worn cunt!"'
+		if rnd_telogg_text = 10:$rnd_telogg_text = '"What have we here, <<$pcs_nickname>>?! How come they stretch you here so?"'
+		if rnd_telogg_text = 11:$rnd_telogg_text = '"She lost her fear completely, '+func('gopsex','hide','gop_gg_name2')+'!"'
+		if rnd_telogg_text = 12:$rnd_telogg_text = '"She lost her shyness completely, '+func('gopsex','hide','gop_gg_name2')+'!"'
+		if rnd_telogg_text = 13:$rnd_telogg_text = '"How can you shamelessly expose your holes right, left and centre, '+func('gopsex','hide','gop_gg_name2')+'?"'
+		if rnd_telogg_text = 14:$rnd_telogg_text = '"<<$pcs_nickname>>, you are so shameless, '+func('gopsex','hide','gop_gg_name2')+'!"'
+		if rnd_telogg_text = 15:$rnd_telogg_text = '"Oh, <<$pcs_nickname>>, aren''t you sorry for yourself?"'
 		!turnip: whore
 		rnd_telogg2_text = rand(1,14)
-		if rnd_telogg2_text = 1:$rnd_telogg2_text = '"<<$pcs_nickname>>, aren''t you ashamed of working at such filthy place?"'
+		if rnd_telogg2_text = 1:$rnd_telogg2_text = '"<<$pcs_nickname>>, aren''t you ashamed of working at such a filthy place?"'
 		if rnd_telogg2_text = 2:$rnd_telogg2_text = '"<<$pcs_nickname>>, are you earning extra money even here?"'
 		if rnd_telogg2_text = 3:$rnd_telogg2_text = '"<<$pcs_nickname>>, are you selling your body like a whore?"'
-		if rnd_telogg2_text = 4:$rnd_telogg2_text = '"You found customers and you''re working wholeheartedly, <<$pcs_nickname>>"'
-		if rnd_telogg2_text = 5:$rnd_telogg2_text = '"You are finding quickly your customers, <<$pcs_nickname>>, I''m amazed!"'
-		if rnd_telogg2_text = 6:$rnd_telogg2_text = '"Look <<$pcs_nickname>>, if they ruined all your holes, you''ll not be able doing your business.!"'
-		if rnd_telogg2_text = 7:$rnd_telogg2_text = '"<<$pcs_nickname>>, if you''ll serve anywhere and anybody, you''ll wear out your slit and you''ll be out of work!"'
-		if rnd_telogg2_text = 8:$rnd_telogg2_text = '"Who I see <<$pcs_nickname>>? You trade your body again! I''m surprised that you are such nutural '+func('gopsex','hide','gop_gg_name2')+'!"'
-		if rnd_telogg2_text = 9:$rnd_telogg2_text = '"You trade your body, so you are a '+func('gopsex','hide','gop_gg_name2')+'. <<$pcs_nickname>>, I can''t understand after whom."'
-		if rnd_telogg2_text = 10:$rnd_telogg2_text = '"You are giving to anybody for a hundred bucks again. Doesn''t it bother you?"'
-		if rnd_telogg2_text = 11:$rnd_telogg2_text = '"<<$pcs_nickname>> , even a '+func('gopsex','hide','gop_gg_name2')+' takes a day off!"'
-		if rnd_telogg2_text = 12:$rnd_telogg2_text = '"Well, you are a '+func('gopsex','hide','gop_gg_name2')+' <<$pcs_nickname>>. If I don''t not pass by, you trade your pussy ..."'
-		if rnd_telogg2_text = 13:$rnd_telogg2_text = '"Fully '+func('gopsex','hide','gop_gg_name2')+', she was lost to shame, she is giving to in underpass ..."'
+		if rnd_telogg2_text = 4:$rnd_telogg2_text = '"You found customers, and you''re working wholeheartedly <<$pcs_nickname>>."'
+		if rnd_telogg2_text = 5:$rnd_telogg2_text = '"You are quickly finding your customers, <<$pcs_nickname>>. I''m amazed!"'
+		if rnd_telogg2_text = 6:$rnd_telogg2_text = '"Look <<$pcs_nickname>>, if they ruin all your holes, you''ll be unable to do your business!"'
+		if rnd_telogg2_text = 7:$rnd_telogg2_text = '"<<$pcs_nickname>>, if you''ll serve anywhere and anybody, you''ll wear out your slit, and you''ll be out of work!"'
+		if rnd_telogg2_text = 8:$rnd_telogg2_text = '"Who do I see, <<$pcs_nickname>>? You sell your body again! I''m surprised you are such a natural '+func('gopsex','hide','gop_gg_name2')+'!"'
+		if rnd_telogg2_text = 9:$rnd_telogg2_text = '"You sell your body, so you are a '+func('gopsex','hide','gop_gg_name2')+'. <<$pcs_nickname>>. I can''t understand after whom."'
+		if rnd_telogg2_text = 10:$rnd_telogg2_text = '"You are giving yourself to anybody for a hundred bucks again. Doesn''t it bother you?"'
+		if rnd_telogg2_text = 11:$rnd_telogg2_text = '"<<$pcs_nickname>>, even a '+func('gopsex','hide','gop_gg_name2')+' takes a day off!"'
+		if rnd_telogg2_text = 12:$rnd_telogg2_text = '"Well, you are a '+func('gopsex','hide','gop_gg_name2')+' <<$pcs_nickname>>. If I don''t pass by, you sell your pussy..."'
+		if rnd_telogg2_text = 13:$rnd_telogg2_text = '"Complete '+func('gopsex','hide','gop_gg_name2')+', she was lost to shame, she is giving to in underpass ..."'
 		if rnd_telogg2_text = 14:$rnd_telogg2_text = '"Whore lost her shame completely, she''s ready for 50 bucks her box in the street expose ..."'
 		!different text
 		rnd_rodnya_text = rand(1,3)
@@ -1247,7 +1247,7 @@ if $ARGS[0] = 'hide':
 		if rnd_caught_othernpc = 4 and fame['pav_slut'] >= 250:$rnd_caught_othernpc = '<<$rnd_rodnya_text>> Natasha Belova, <<$rnd_viewgg_text>> and <<$rnd_talkgg_text>> <<$rnd_talkgg2_text>>: - <<$rnd_telogg2_text>>'
 		if rnd_caught_othernpc = 5 and fame['pav_slut'] < 250:$rnd_caught_othernpc = '<<$rnd_rodnya_text>> Julia Milov, <<$rnd_viewgg_text>> and <<$rnd_talkgg_text>> <<$rnd_talkgg2_text>>: - <<$rnd_telogg_text>>'
 		if rnd_caught_othernpc = 5 and fame['pav_slut'] >= 250:$rnd_caught_othernpc = '<<$rnd_rodnya_text>> Julia Milov, <<$rnd_viewgg_text>> and <<$rnd_talkgg_text>> <<$rnd_talkgg2_text>>: - <<$rnd_telogg2_text>>'
-		if rnd_caught_othernpc = 6:$rnd_caught_othernpc = 'Young boys notice you. Nudging each other, they are clicking on their phone what''s happening. You overhear their talk vaguely: "Look...! Look...! Not here, over there...! There is... Oh shit...!" "Shoot! Shoot! Faster...!" "Holy shit!", I''ve never seen a woman being fucked in real." "What the fuck...?" "That''s a cunt!" "Can it be done also in the ass?" "Idiot, they''re able almost whole forearm insert there. Heifers want it so. I''ve seen pics at Kirian''s." "Don''t brag...!" "Let''s no quarrel!"'
+		if rnd_caught_othernpc = 6:$rnd_caught_othernpc = 'Young boys notice you. Nudging each other, they click on their phone to see what''s happening. You overhear their talk vaguely: "Look...! Look...! Not here, over there...! There is... Oh shit...!" "Shoot! Shoot! Faster...!" "Holy shit!", I''ve never seen a woman being fucked in real." "What the fuck...?" "That''s a cunt!" "Can it be done also in the ass?" "Idiot, they''re able almost whole forearm insert there. Heifers want it so. I''ve seen pics at Kirian''s." "Don''t brag...!" "Let''s no quarrel!"'
 		if rnd_caught_othernpc = 7 and evgenQW < 4:$rnd_caught_othernpc = '<<$rnd_rodnya_text>>, uncle Misha <<$rnd_viewgg_text>> <<$rnd_talkgg_text>> <<$rnd_talkgg2_text>>: "Oh dear! What kind of people! Like mother, like daughter! Exactly the same! Boobs exposed, legs apart. And the eyes are so cunning... Come to me then, we need to talk."'
 		if rnd_caught_othernpc = 7 and evgenQW >= 4:$rnd_caught_othernpc = 'Your brother''s football buddies notice you, when they are walking past you. They stop and start talking about you intensively: "Oh, my fuck, we treat her like a princess: only in her mouth... thank you... please... see you! It turns out that she is quite a prostitute. Oh shit, if we had known it then, we would have '+func('gopsex','hide','gop_sextext2')+' that ripper in one gate all three of us, as we had wanted always. Well... Svetochka... It isn''t hard for you to help us, is it...? After all, you are Kolya''s sister... moreover older. Cavaliers, fuck... Now we get all. After all, they don''t ask whores, they bang them right with their cocks, do they? Am I right, <<$pcs_nickname>>?" ... "Hurrah, she nodded! Oooh, you''re such our sweetie! Fuck yeah! We''re lucky: We have got our cum dumpster now. See you soon, fuckhole! Prepare your butt hole! Let''s delight Kolya. He has been always jacking off dreaming about her. ... I call dibs on her ass!" "Can she hold three at once in her mouth? We should try it long ago. Fuck, we were too shy to suggest it, frigging gentlemen!"'
 		if rnd_caught_othernpc = 8:$rnd_caught_othernpc = 'You are approached by a charwoman in the stairwell: "Well boys, step back and let your toy have a rest for a while. Don''t throw away bottle, just put them on window sill when you''re done. I''ll take them away. Don''t make a mess with scumbags everywhere! I gather up after you on half a bucket each day! Better, don''t use them at all: it will be much pleasurable for you and your smasher without them or stack them neatly into her purse: she can take her trophies home with her, when she is done. Oi! Oi!!! Fuckbunny! Swallow, don''t spit on the floor! Did you understand? Washing the floor after every whore, I would ruin my health. Don''t drain your pussy onto the floor otherwise I''ll make you lick all the scum!"'

+ 6 - 5
locations/gschool_boys_bathroom.qsrc

@@ -1038,9 +1038,11 @@ if $ARGS[0] = 'companyb2':
 		end
 		*nl
 		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking the guy is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
+		$orgasm_or = 'no'
+		gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		$orgasm_or = 'custom'
-		gs 'arousal', 'masturbate', 20
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close, and all is quiet once more.'
@@ -1085,7 +1087,7 @@ if $ARGS[0] = 'companyb3':
 		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking Arkadi is giving Anushka. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder.'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
 		$orgasm_or = 'custom'
-		gs 'arousal', 'masturbate', 20
+		gs 'arousal', 'vaginal_finger', 20, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'
@@ -1155,7 +1157,7 @@ if $ARGS[0] = 'Join them':
 			'You rub your sensitive little nub carefully to ease yourself into the pleasure. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fucking Arkadi is giving Anushka. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they fuck faster and faster.'
 			$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse.'
 			$orgasm_or = 'custom'
-			gs 'arousal', 'masturbate', 10
+			gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 			gs 'arousal', 'end'
 			gs 'stat'
 			*nl
@@ -1218,11 +1220,10 @@ end
 
 if $ARGS[0] = 'masturbateb4':
 	*clr & cla
-	stat['mast'] += 1
 	if pcs_inhib < 40: inhib_exp += rand(1,3)
 	orgasm += 1
 	pcs_horny = 0
-	gs 'arousal', 'mast', 10
+	gs 'arousal', 'clit_finger', 10, 'masturbate'
 	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><b><font color="maroon">Boy''s bathroom</font></b></center>'

+ 41 - 42
locations/gschool_break.qsrc

@@ -21,12 +21,12 @@ if $ARGS[0] = 'watercooler':
 		'You stop at the water cooler to get a drink, but no one else is around.'
 	end
 	gs 'stat'
-	
-	act 'Leave': 
+
+	act 'Leave':
 		if $breaktype = 'long':
 			gt 'gschool_lunch', 'break'
 		elseif $breaktype = 'first':
-			gt 'gschool_lessons', 'morning'	
+			gt 'gschool_lessons', 'morning'
 		else
 			gt 'gschool_lessons', 'short_break'
 		end
@@ -46,11 +46,11 @@ if $ARGS[0] = 'watercooler':
 		cumspclnt = 2
 		gs 'cum_cleanup'
 		'<br>You drink some water.'
-		act 'Leave': 
+		act 'Leave':
 			if $breaktype = 'long':
 				gt 'gschool_lunch', 'break'
 			elseif $breaktype = 'first':
-				gt 'gschool_lessons', 'morning'	
+				gt 'gschool_lessons', 'morning'
 			else
 				gt 'gschool_lessons', 'short_break'
 			end
@@ -64,12 +64,12 @@ if $ARGS[0] = 'boys_restroom':
 	$loc_arg = 'boys_restroom'
 	$locM_arg = 'boys_restroom'
 	menu_off = 0
-	gs 'stat'	
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/boysbathroom.jpg"></center>'
 	'The restroom is empty.'
-	
+
 	gs 'gschool_break', 'restroom_actions'
-	
+
 	if rand(0,2) = 2: gt 'gschool_break', 'boys_restroom_events'
 end
 
@@ -82,21 +82,21 @@ if $ARGS[0] = 'girls_restroom':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
 	'The restroom is empty.'
-	
+
 	gs 'gschool_break', 'restroom_actions'
-	
+
 	if rand(0,2) = 2: gt 'gschool_break', 'girls_restroom_events'
 end
 
 if $ARGS[0] = 'restroom_actions':
 	$location_type = 'bathroom'
 	$locclass = 'school_bathroom'
-	act 'Leave the restroom': 
+	act 'Leave the restroom':
 		minut += 5
 		if $breaktype = 'long':
 			gt 'gschool_lunch', 'break'
 		elseif $breaktype = 'first':
-			gt 'gschool_lessons', 'morning'	
+			gt 'gschool_lessons', 'morning'
 		else
 			gt 'gschool_lessons', 'short_break'
 		end
@@ -104,12 +104,12 @@ if $ARGS[0] = 'restroom_actions':
 	gs 'din_van', 'pblc_pee'
 	act 'Use the mirrors': gt 'mirror', 'start'
 	if siga > 0: act 'Smoke': gt 'gschool_break', 'smoke1'
-	
+
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
 	dynamic $publicpan
-end	
+end
 
 if $ARGS[0] = 'girls_restroom_events':
 	*clr & cla
@@ -162,9 +162,9 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 4 and npc_rel['A14'] >= 60 and npc_rel['A15'] >= 60 and (katjaQW['QWstage'] > 0 or mey_vika['mey_vika_qw'] > 0):
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/sisters.jpg"></center>'
-		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<$pcs_nickname>>, pose for a photo with us."' 
+		'As you walk into the girls bathroom, Katja grabs you and drags you over against the wall next to the door. "Come on <<$pcs_nickname>>, pose for a photo with us."'
 		'She pulls you in close on her right side and wraps one of her legs halfway around you as you hold it. Vicky wraps an arm and almost a leg around Katja from the left. The three of you do your best to strike several sexy poses as Lizaveta takes your picture. After several such pictures, the Meynold sisters each kiss you on the cheek before hurrying out. Lizaveta is a bit slower, and gives you a knowing smile before leaving as well. You wonder just what Lizaveta knows and, being the gossip that she is, who else knows as you finish your business.'
-		
+
 		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>'
@@ -344,7 +344,7 @@ if $ARGS[0] = 'girls_restroom_events':
 							gs 'stat'
 							act 'Continue':
 								*clr & cla
-								gs 'boyStat', 'D2' 
+								gs 'boyStat', 'D2'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully2.jpg"></center>'
 								'Several of the girls hold you down while Lera puts on one of the strapon harnesses with a rather large looking dildo attached. As she sits between your legs and scoots closer, she spits on your pussy and rubs the saliva around, grinning at you. "Some lubrication for you, slut." She then pushes the head of the dildo against your slit and shoves the <<dick>>cm <<$dick_girth>> dildo inside of you before she grabs you by the thighs and pulls herself closer. As she fucks you with the dildo, the other girls make rude comments about how much you love it.'
 								gs 'arousal', 'vaginal_strap', 2, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -358,7 +358,7 @@ if $ARGS[0] = 'girls_restroom_events':
 									gs 'stat'
 									act 'Continue':
 										*clr & cla
-										gs 'boyStat', 'D3' 
+										gs 'boyStat', 'D3'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully4.jpg"></center>'
 										'Lena puts on one of the large strapons and pushes Lera out of the way. "Let me show you how it''s done." With that, she shoves the <<dick>>cm <<$dick_girth>> dildo into your pussy and, like Lera before her, starts hammering away at you. Unable to do anything, you just have to endure what the other girls are doing to you. After a while your cries start to get too loud, so someone covers your mouth to silence you.'
 										gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
@@ -430,7 +430,7 @@ if $ARGS[0] = 'girls_restroom_events':
 		gt $loc, $loc_arg
 	end
 end
-		
+
 if $ARGS[0] = 'boys_restroom_events':
 	*clr & cla
 	$menu_arg = 'boys_restroom'
@@ -449,7 +449,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			'You blush slightly, not knowing what to say, before you turn around and rush out.'
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
-		
+
 		act 'Stay':
 			cla & *nl
 			'You glance at him as you walk to the sinks. "Shut up, I just need to use a mirror. It''s not like it''s hurting you." you tell him as you take a look at yourself in the mirror, checking your hair and makeup.'
@@ -510,7 +510,7 @@ if $ARGS[0] = 'boys_restroom_events':
 					act 'Leave': gt 'gschool_lessons', 'short_break'
 				end
 			end
-			
+
 			act 'Greet them':
 				*clr & cla
 				npc_rel['A25'] += 3
@@ -569,7 +569,7 @@ if $ARGS[0] = 'boys_restroom_events':
 					act 'Continue your break': gt 'gschool_lessons', 'short_break'
 				end
 			end
-			
+
 			act 'Greet them':
 				*clr & cla
 				npc_rel['A25'] += 3
@@ -803,7 +803,7 @@ if $ARGS[0] = 'boys_restroom_events':
 			'You peek through the partially open stall door and see Lavrenti standing to the side of the toilet while Alyona is sitting on the toilet with her legs apart and back against the other stall wall, sucking Lavrenti''s dick. Neither of them have noticed you yet.'
 			gs 'arousal', 'voyeur_sex', 1, 'unknown'
 			gs 'stat'
-			act 'Sneak away and leave':	gs 'arousal', 'end' & gt 'gschool_lessons', 'short_break'
+			act 'Sneak away and leave': gs 'arousal', 'end' & gt 'gschool_lessons', 'short_break'
 
 			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost < pcs_willpwr:
@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'join_alylav':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'smoke1':
 	*clr & cla
 	menu_off = 1
@@ -1029,7 +1029,7 @@ if $ARGS[0] = 'smoke1':
 	'You pull out your pack of cigarettes and fish one out. Placing it between your lips, you light the cigarette and take a long slow drag of it. You spend a few minutes smoking the cigarette before dropping the bud into the toilet.'
 	act 'Continue your break': gt $loc, $loc_arg
 end
-	
+
 if $ARGS[0] = 'smoke2':
 	*clr & cla
 	menu_off = 1
@@ -1096,7 +1096,7 @@ if $ARGS[0] = 'smoke2':
 										gs 'pain', 1, 'asscheeks', 'spank'
 										gs 'arousal', 'foreplay', 2, 'sub'
 										gs 'stat'
-										
+
 										gs 'willpower', 'misc', 'resist', 'medium'
 										if will_cost < pcs_willpwr:
 											act 'No (<<will_cost>> Willpower)':
@@ -1190,7 +1190,7 @@ if $ARGS[0] = 'smoke2':
 										else
 											act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 										end
-										
+
 										act 'Yes':
 											*clr & cla
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo6.jpg"></center>'
@@ -1206,14 +1206,14 @@ if $ARGS[0] = 'smoke2':
 						end
 					end
 				end
-			end	
+			end
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/causmo1.jpg"></center>'
 		'You pull out your pack of cigarettes and fish one out. Placing it between you lips, you light the cigarette and take a long slow drag of it. You spend a few minutes smoking the cigarette before dropping the bud into the toilet.'
 		gs 'drugs', 'smoke'
 		gs 'stat'
-		
+
 		act 'Continue your break': gt $loc, $loc_arg
 	end
 end
@@ -1261,13 +1261,13 @@ if $ARGS[0] = 'lena_gop':
 		end
 		act 'Agree to take turns':
 			*clr & cla
-			gs 'boyStat', 'D2' 
+			gs 'boyStat', 'D2'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena4.jpg"></center>'
 			'You nod your head. "Sounds good to me. Do you want to go first or should I?" you ask.'
 			'She starts pulling on the harness. "I''ll fuck you first, then you can fuck me."'
 			'A few seconds later, she has the strapon tightly in place. "Okay, turn around and lift your leg up for me." You turn so your back is facing her and bend slightly forward before you lift up your right leg to give her easy access to your pussy. You feel the tip of the dildo press against your pussy before it slides inside you.'
 			*nl
-			'Once she has it as deep as it will go, she grabs onto your hips and starts to fuck you hard and fast. She seems to be really getting off on fucking you, alhough you can barely think about it as you feel your arousal rising like water against a dam. She fucks you really good and seems to have had more than a bit of practice at wearing one of these.'
+			'Once she has it as deep as it will go, she grabs onto your hips and starts to fuck you hard and fast. She seems to be really getting off on fucking you, although you can barely think about it as you feel your arousal rising like water against a dam. She fucks you really good and seems to have had more than a bit of practice at wearing one of these.'
 			gs 'arousal', 'vaginal_strap', 5, 'lesbian'
 			gs 'stat'
 			'She abruptly stops fucking you, grabs you by the hair and pulls you around before bringing your face down to the strapon. "Suck my dick clean, bitch!"'
@@ -1295,7 +1295,7 @@ if $ARGS[0] = 'lena_gop':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'lena_dom':
 	*clr & cla
 	menu_off = 1
@@ -1310,7 +1310,7 @@ if $ARGS[0] = 'lena_dom':
 		gs 'fame', 'pav', 'sex', 2
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/lena2.jpg"></center>'
 		'As she gets more turned on, she pulls herself up on the sink until she is sitting on it and spreads her legs wide. You follow her as she moves, your face staying in her crotch and eating her pussy. As she gets louder, she starts to hump her pussy against your face, smearing your face with her pussy juices. Your face and her crotch are soon completely covered in her pussy cum as she trembles and rocks against you, orgasming hard.'
-		'Once the trembling stops, she sighs ofor a moment, then says. "Lick me clean, slut!"'
+		'Once the trembling stops, she sighs for a moment, then says, "Lick me clean, slut!"'
 		*nl
 		'You obey her and start licking all her smeared juices off her. After you get her as clean as you can, she pushes you away, gets off the sink and starts to get dressed. As she finishes up, she turns to you. "I''ll make sure to let the other girls know what an obedient little lesbian slut you are." she says with a laugh before walking out.'
 		gs 'arousal', 'cuni_give', 10, 'lesbian', 'sub'
@@ -1318,8 +1318,8 @@ if $ARGS[0] = 'lena_dom':
 		gs 'stat'
 		act 'Continue your break': gt $loc, $loc_arg
 	end
-end	
-		
+end
+
 if $ARGS[0] = 'naked_bathroom':
 	*clr & cla
 	menu_off = 1
@@ -1330,7 +1330,7 @@ if $ARGS[0] = 'naked_bathroom':
 	act 'Go see the head mistress':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/afterschool/strip5.jpg"></center>'
-		'You decide it would be better to go see the headmistress than run half way across Pavlovsk naked. You peek out one last time, and when you see no one present,  you step out into the hallway, feeling yourself blushing heavily, but also a tingling sensation at the thrill of being naked in public. You put such thoughts aside and sneak through the halls, careful to avoid other people. At one point, you have to duck under the stairs to avoid being seen by Rolan, but you eventually make it to the office.'
+		'You decide it would be better to go see the headmistress than run half way across Pavlovsk naked. You peek out one last time, and when you see no one present,	 you step out into the hallway, feeling yourself blushing heavily, but also a tingling sensation at the thrill of being naked in public. You put such thoughts aside and sneak through the halls, careful to avoid other people. At one point, you have to duck under the stairs to avoid being seen by Rolan, but you eventually make it to the office.'
 		gs 'stat'
 		act 'Enter her office':
 			*clr & cla
@@ -1359,7 +1359,7 @@ if $ARGS[0] = 'naked_bathroom':
 						money -= 200
 						'"I already have a spare one at home. Is it OK if I return the uniform tomorrow?" you ask and she nods. "However, you will have to pay 200 <b>₽</b> to get it professionally cleaned."'
 						'"Sure, that''s not a problem." you say and hand over the money.'
-					end						
+					end
 				else
 					'She sighs and gives you a minute to tell the truth. When you finish, she gets up and opens up a closet, looks around in it for a minute before she pulls out a cheap very conservative school uniform and hands it over to you. "Here is a replacement one, your parents will be sent a bill for it. Now get dressed and be on your way."'
 					'You take the uniform and get dressed, thanking her for helping you out. Once fully dressed, you leave the office and head out.'
@@ -1371,7 +1371,7 @@ if $ARGS[0] = 'naked_bathroom':
 					gm_school_b[25] = pcs_hips
 				end
 				gs 'clothing', 'wear', 'gm_school', 25
-				act 'Leave her office': 
+				act 'Leave her office':
 					if hour >= 14:
 						gt 'gschool_grounds', 'main'
 					else
@@ -1400,7 +1400,7 @@ if $ARGS[0] = 'naked_bathroom':
 							money -= 200
 							'"I already have a spare one at home. Is it OK if I return the uniform tomorrow?" you ask and she nods. "However, you have to pay 200 <b>₽</b> to get it professionally cleaned."'
 							'"Sure, that''s not a  problem." you say and hand over the money.'
-						end						
+						end
 					else
 						'She sighs and gets up. She walks over to and opens up a closet, looks around in it for minute and pulls out a cheap, conservative school looking uniform and hands it over to you. "Here is a replacement one, your parents will be sent a bill for it. Now get dressed and be on your way."'
 						'You take the uniform and get dressed, thanking her for helping you out. Once fully dressed, you leave the office and head out.'
@@ -1412,7 +1412,7 @@ if $ARGS[0] = 'naked_bathroom':
 						gm_school_b[25] = pcs_hips
 					end
 					gs 'clothing', 'wear', 'gm_school', 25
-					act 'Leave her office': 
+					act 'Leave her office':
 						if hour >= 14:
 							gt 'gschool_grounds', 'main'
 						else
@@ -1442,7 +1442,7 @@ if $ARGS[0] = 'naked_bathroom':
 			gs 'stat'
 			act 'Continue': gt 'pav_aptcourtev', 'naked_aptcomplex'
 		end
-		
+
 		act 'Sneak home':
 			*clr & cla
 			gs 'fame', 'pav', 'sex', 2
@@ -1455,4 +1455,3 @@ if $ARGS[0] = 'naked_bathroom':
 end
 
 --- gschool_break ---------------------------------
-

+ 1 - 1
locations/gschool_events.qsrc

@@ -188,7 +188,7 @@ if $ARGS[0] = 'teacher_greet':
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/bendover.jpg"></center>'
 								'You don''t pay attention to his words and decide to have a little more fun. Reaching for the next book, you inadvertently pull your skirt up, giving the teacher a full view of your panty clad ass.'
 								'"Miss <<$pcs_lastname>>! Please cover up." he says before he rushes to you and pulls your skirt down, covering your ass.'
-								'He gives you a lecture on how to properly pick up books from the floor beofre you both leave, not saying a word to each other.'
+								'He gives you a lecture on how to properly pick up books from the floor before you both leave, not saying a word to each other.'
 								act 'Continue': gt 'gschool_lessons', 'morning'
 							end
 						end

+ 4 - 2
locations/gschool_girls_bathroom.qsrc

@@ -510,7 +510,6 @@ if $ARGS[0] = 'company2':
 	end
 	act 'Masturbate':
 		*clr & cla
-		stat['mast'] += 1
 		if pcs_inhib < 40:inhib_exp += rand(1,3)
 		orgasm += 1
 		pcs_horny = 0
@@ -520,9 +519,12 @@ if $ARGS[0] = 'company2':
 		'Listening to <<$rand_girl>> getting her ass violated, the constant slapping sounds of flesh and her moans of pleasure is exciting - too exciting for you. You know you shouldn''t, you know it''s risky, but you just can''t resist: You pull your panties off, hike up your skirt and spread you legs. Your hand slides down your thigh, then back up towards your crotch. Your pussy lips are already swollen and starting to get wet, and your clit stands out as if to make it easier for you to find it.'
 		*nl		
 		'You rub your sensitive little nub carefully to ease yourself into the pleasure; if you don''t stay in control, you''re going to make sounds and you don''t want them to notice you. After teasing yourself for a bit, you sink two of your fingers into your wet hole, gasping soundlessly, and mimic the fuck <<$rand_boy>> is giving <<$rand_girl>>. You add your other hand to the mix, rubbing your clit while you''re fingerfucking yourself, faster and faster as they get louder and louder, and even play with your asshole a little bit, encouraged by the girl''s audible pleasure.'
+		$orgasm_or = 'no'
+		gs 'arousal', 'vaginal_finger', -10, 'masturbate'
 		$orgasm_or = 'custom'
 		$orgasm_txt = 'You have to bite your lip to keep from crying out as an orgasm shoots through your body and causes you to convulse on the toilet seat.'
-		gs 'arousal', 'mast', 10
+		gs 'arousal', 'vaginal_finger', -10, 'masturbate'
+		gs 'arousal', 'clit_finger', 10, 'masturbate'
 		gs 'arousal', 'end'
 		gs 'stat'
 		'By the sound of it, you came in perfect unison with her and only a few moments later, you can hear him grunt as well. They talk in low voices again after they have both cum; the water is running for a couple of seconds as they clean up, then you hear the door open and close and all is quiet once more.'

+ 40 - 45
locations/gschool_jock_chats.qsrc

@@ -396,28 +396,30 @@ if $ARGS[0] = 'christina':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
 	if NatbelQW['chrispaid'] = 2 and money >= 500:
 		act 'Pay off Natasha''s debt (500 <b>₽</b>)':
+			*clr & cla		
+			money -= 500
 			NatbelQW['chrispaid'] = 3
 			NatbelQW['evt_day'] = daystart
+			gs 'stat'
+			
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big18.jpg"></center>'
-			'You see Christina chatting with Lina when you approach her. As Christina notices you, she glares at you before turning to Lina.'
-			'"Later, Lina," she says. Lina smiles at Christina and leaves.'
-			'Christina turns back to you. "What do you want, <<$pcs_nickname>>?"'
-			'You decide to ignore her attitude. "I believe Natasha owes you some money. Five hundred rubles?"'
-			'"What about it? It''s not any of your business," she snaps.'
+			'You see Christina chatting with Lina as you approach. When she notices you, she glares at you before turning to Lina.'
+			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
+			'You ignore her attitude. "Natasha owes you money, right? Five hundred rubles?"'
+			'"Yeah, what about it? It''s not any of your business," she snaps.'
 			'"Actually, it is," you say, pulling out the money and handing it to her. "I''m here to pay you back."'
 			'She snatches the money from your hand. "What, was she too scared to speak to me? She had to get you to do it for her?"'
-			'"Something like that," you reply. "Anyways, don''t lend her any more money."'
-			'"Wasn''t planning to. It took her long enough to pay this one back!"'
-			'She counts out the money and a slight smile crosses her face. "Alright, we''re done here. You can leave now," she says.'
-			money -= 500
-			gs 'stat'
+			'"Something like that," you reply. "Anyway, don''t lend her any more money."'
+			'"Wasn''t planning to. It took her long enough to pay this back!" She counts out the money and a slight smile crosses her face. "Alright, we''re done here. You can leave now."'
+			
+			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif christinaQW['subpath'] >= 2:
 		if christinaQW['subpath'] >= 3:
-			'As you pass by Christina, she looks at you triumphantly. "Don''t forget my little slave! Showers after the gym class..."'
+			'As you pass by Christina, she looks at you triumphantly. "Don''t forget my little slave! Showers after gym class..."'
 			'Before you''re able to respond, she turns around and walks away.'
 		else
-			'"I''m looking forward to after P.E. class." Christina says with a wicked smile.'
+			'"I''m looking forward to after P.E. class," Christina says with a wicked smile.'
 			'"W-Why? What happens after class?"'
 			'"Oh, I don''t want to ruin the suprise, pet." Throwing one last smirk in your direction, she heads off to her next class.'
 		end
@@ -425,26 +427,26 @@ if $ARGS[0] = 'christina':
 		if LariskaQW['story'] = 3:
 			LariskaQW['story'] = 4
 			christinaQW['blackmail'] = 2
-			'Going up to Christina, you quietly say "I need to talk to you about something, Christina."'
-			'"What do you want, <<$pcs_nickname>>, I''m busy," she says, not even looking at you.'
+			'Walking up to Christina, you quietly say "I need to talk to you."'
+			'"What do you want? I''m busy," she says, not even looking at you.'
 			'Taking a deep breath, you say "Lariska. I want Lariska."'
 			'Suprised, she finally looks at you. "No, <<$pcs_nickname>>. She''s mine, and I don''t want you filling her head with nonsense."'
-			'"Well, the thing is you don''t really have a choice. Not a good one anyway." Pulling out your phone and checking to make sure nobody is looking, you show her a picture of her blowing the coach.'
-			'Her face turns bright red with anger and she hisses at you. "You fucking bitch. How did you get that?! If you show anybody..."'
-			'"I won''t...if you tell Lariska it''s okay to hang out with me outside of school! I mean, I would hate to see these pictures fall into Lizaveta''s hands..."'
-			'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I even hear about these pictures again, I will fucking break you into tiny pieces!"'
+			'"Well, the thing is you don''t really have a choice. Not a good one anyway." Pulling out your phone and checking to make sure nobody''s looking, you show her a picture of her blowing the coach.'
+			'Her face turns bright red with anger and she hisses at you. "You fucking bitch! How did you get that?! If you show anybody..."'
+			'"I won''t...if you tell Lariska it''s okay to hang out with me outside of school. I mean, I would hate to see these pictures fall into Lizaveta''s hands..."'
+			'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I even hear about these pictures again, I will break you into tiny fucking pieces!"'
 			'"Oh, you won''t. So long as you keep your word..." you say with a fake smile that doesn''t quite reach your eyes. "Now do be a dear and let her know she''s free to do whatever she wants outside of school, will you?"'
 			'"Oh, and if you try and punish her for this, I will know," the threat clear on your face. Turning on your heels, you head off to your next class, smiling.'
 		else
 			christinaQW['blackmail'] = 2
-			'Going up to Christina, you quietly say "I need to talk to you about something, Christina."'
-			'"What do you want, <<$pcs_nickname>>, I''m busy," she says, not even looking at you.'
+			'Walking up to Christina, you quietly say "I need to talk to you."'
+			'"What do you want? I''m busy," she says, not even looking at you.'
 			'"Oh, I just wanted you to know I have something you should see." Pulling out your phone and checking to make sure nobody is looking, you show her a picture of her blowing the coach.'
 			'Her face turns bright red with anger and she hisses at you. "You fucking bitch! How did you get that?! If you show anybody..."'
-			'"It would be a real shame if Lisaveta got her hands on these..." you say menacingly.'
+			'"It would be a real shame if Lizaveta got her hands on these..." you say menacingly.'
 			'Glaring at you, her hands balled into fists, she says quietly "What the fuck do you want from me, bitch?"'
 			'"Oh, I haven''t decided yet. When I do, I''ll let you know. I''m sure whatever I decide I want, you''ll give it to me without a fuss. In the meantime, stay away from me."'
-			'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I even hear about these pictures again, I will fucking break you into tiny pieces!"'
+			'Her face turns even more red, if that were possible. "Fine," she spits out. "But I swear, if I even hear about these pictures again, I will break you into tiny fucking pieces!"'
 			'"Oh, you won''t. So long as you keep your word..." you say with a fake smile that doesn''t quite reach your eyes. Turning on your heels, you head off to your next class, smiling.'
 		end
 	elseif christinaQW['blackmail'] = 2:
@@ -459,7 +461,7 @@ if $ARGS[0] = 'christina':
 		'Seeing you walking towards her, she tenses up and whispers "What do you need?"'
 		'"Nothing," you say cheerfully. "Just came over to say hi."'
 		'"Uh, hi. Well, I gotta go, class is starting." Grabbing her stuff, she flees from your sight. Chuckling to yourself, you do the same.'
-	else
+	else 
 		if fame['pav_slut'] >= 200:
 			'"What does the biggest school slut want from me? Don''t you have a cock to suck somewhere?" Christina asks mockingly.'
 			'"Shut up Christina! I''m tired of your bullshit," you tiredly reply.'
@@ -480,34 +482,27 @@ if $ARGS[0] = 'christina':
 	! Natasha quest line:
 
 	if christinaQW['fight'] = 1 and NatbelQW['FriendLover'] = 2:
-		act 'Talk to Christina':
+			act 'Talk to Christina':
 			NatbelQW['chrispaid'] = 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/18.jpg"></center>'
-			'You see Christina chatting with Lina when you approach her. As Christina notices you, she glares at you and then turns to Lina.'
-			'"Later, Lina," she says. Lina smiles at Christina and leaves.'
-			'Christina turns back to you, "What do you want, <<$pcs_nickname>>?"'
-			'You decide to ignore her attitude, "I wanted to speak to you privately about how you treat Natasha."'
+			'You see Christina chatting with Lina when as approach. When Christina notices you, she glares at you and then turns to Lina.'
+			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
+			'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
 			'"What about it?" she snaps. "It''s not any of your business!"'
-			'"Actually, it is, she''s my friend and I hate seeing you bully her so I''m asking you politely to stop as I don''t want to embarrass you in front of the others."'
-			'Christina doesn''t answer.'
-			'So you continue. "Right, well, I take it your silence means you agree? That is unless you want to go another round with me? I hope that won''t be necessary because I won''t stop at a simple beating this time!"'
-			'She nods in agreement and abruptly storms off.'
-			'With a grin you mutter to yourself, "Thank you, your highness."'
+			'"Actually, it is. She''s my friend, so I''m telling you to stop so I don''t have to beat your ass in front of everyone again."'
+			'Christina doesn''t answer, so you continue. "So we''re in agreement then? Unless you want to go another round with me? I hope not, because I won''t stop at a simple beating this time!"'
+			'She nods in agreement before storming off. With a grin on your face, you head to your next class.'
 		end
-	elseif christinaQW['blackmail'] = 2 and  NatbelQW['FriendLover'] = 2:
+	elseif christinaQW['blackmail'] = 2 and NatbelQW['FriendLover'] = 2:
 		act 'Talk to Christina':
 			NatbelQW['chrispaid'] = 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/18.jpg"></center>'
-			'You see Christina chatting with Lina when you approach her. As Christina notices you, she glares at you and then turns to Lina.'
-			'"Later, Lina," she says. Lina smiles at Christina and leaves.'
-			'Christina turns back to you, "What do you want, <<$pcs_nickname>>?"'
-			'You decide to ignore her attitude, "I wanted to speak to you privately about how you treat Natasha."'
+			'You see Christina chatting with Lina when as approach. When Christina notices you, she glares at you and then turns to Lina.'
+			'"Later, Lina," she says. Lina smiles at Christina and leaves before Christina turns back to you. "What do you want?"'
+			'You ignore her attitude. "I wanted to talk about how you treat Natasha."'
 			'"What about it?" she snaps. "It''s not any of your business!"'
-			'"Actually, it is, she''s my friend and I hate seeing you bully her so I''m asking you politely to stop as I don''t want to embarrass you in front of the others."'
-			'Christina doesn''t answer.'
-			'So you continue. "Right, well, I take it your silence means you agree? That is unless you want me to release the recording I have of you?"'
-			'She nods in agreement and abruptly storms off.'
-			'With a grin you mutter to yourself, "Thank you, your highness."'
+			'"Actually, it is. She''s my friend, so I''m asking you to stop because I don''t want to embarrass you in front of the others."'
+			'"Fucking make me," she scoffs, so you pull out your phone and show her your recording of her blowing the coach.'
+			'She balls her fists in rage. "So we''re in agreement then? Unless you want everyone to see this?" you ask smugly.'
+			'She coldly glares at you before storming off without answering. A satisifed grin on your face, you head to your next class.'
 		end
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'

+ 18 - 18
locations/gschool_lessons1.qsrc

@@ -10,17 +10,17 @@ if $ARGS[0] = 'russian':
 	'You walk into the classroom and take a seat farthest to the right, next to a window. The rest of your classmates walk in one by one before Mr. Yenotin enters the classroom. Just as he''s about to close the door, one of your classmates grabs the door from outside the room. Mr. Yenotin turns to the tardy student and informs them that they are late and that next time he will have to report them. This instruction is followed by an awkward wink and the student is allowed in to find a seat. Everyone knows that he never reports the tardy students. As everyone settles in, Mr. Yenotin does a roll call before opening a grammar book, telling you to open your textbooks to where you left off last lesson.'
 	'After a while, he tells the class to do the assignments on the last page of the chapter as he starts walking up and down the classroom, mostly talking to the students about off topic things like how their time off was often disrupting them from their focus. He''s always trying to impress the students with his endeavors, but no one really believes what he says because most of it sounds exaggerated or simply not possible. When someone has a real question he''s quick to answer as fair as possible without being arrogant, no matter what kind of question it is.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Yenotin'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Yenotin'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] +=1
 			gs 'grades', 'class_activity_attributes', 'school', 'rus', pcs_intel
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Yenotin for the duration of the class. He manages to make today''s lesson very interesting and informative, and you feel like you have learned something from actively taking part in the discussion.'
@@ -565,17 +565,17 @@ if $ARGS[0] = 'geography':
 	'You walk into the classroom and see Mrs. Sokoloff sitting by her desk. The rest of your classmates walk in one by one under her watchful eye. Some of them get a friendly smile while others get a stern look.'
 	'Without wasting any time, she sternly tells the class to open their textbooks. "I hope you have all done your homework." Mrs. Sokoloff is a no nonsense teacher. She expects discipline and hard work and the ones able to abide by her rules are treated very kindly.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Sokoloff'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Sokoloff'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -=1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'geo', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
@@ -1090,17 +1090,17 @@ if $ARGS[0] = 'history':
 	'You walk into the classroom and see Mrs. Sokoloff sitting by her desk. The rest of your classmates walk in one by one under her watchful eye. Some of the students get a friendly smile while others get a stern look.'
 	'Without wasting time, she sternly tells the class to open their textbooks. "I hope you all have done your homework." Mrs. Sokoloff is a no nonsense teacher. She expects discipline and hard work and the ones able to abide by her rules are treated very kindly.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mrs. Sokoloff'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mrs. Sokoloff'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'his', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mrs. Sokoloff for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'

+ 24 - 24
locations/gschool_lessons2.qsrc

@@ -12,18 +12,18 @@ if $ARGS[0] = 'computer':
 	'You go to your computer class and find a seat at one of the computer stations. Before long, all of your classmates file in and takes their seats as well. Once the bell rings, Mr. Ivanov takes roll call and then gets up and starts walking around the room explaining today''s lesson. He occasionally stops to look at the screens of various students to make sure they are doing it right.'
 	'If he has to correct one of the nerds, he will take his time and quietly explain it to them, giving them lots of encouragement. For everyone else, he loudly proclaims what they did wrong, drawing attention to them. He makes sure the whole class knows about their mistake and does it in a condescending manner, like he is trying to prove how much smarter he is than them.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Ivanov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Ivanov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'exp_gain', 'compskl', rand(1,2)
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'comp', pcs_intel
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Ivanov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
@@ -589,17 +589,17 @@ if $ARGS[0] = 'science':
 	'You go to your science class and find a seat at your lab station. Before long all of your classmates file in and takes their seats as well. Miss Orlov takes roll call, then gets up and starts writing on the blackboard. She is wearing a fairly short skirt that nearly rides too high when she reaches up to write at the top of the blackboard, which the boys often encourage by asking her questions about whatever it is she has written at the top of the blackboard.'
     'She occasionally asks questions to the class and those that get them right receive heaps of praise while she takes the time to explain the answer to those that get them wrong. Once she is sure the student understands their mistake, she moves on with her lesson. She is quick to help anyone with a problem or answer questions and always does so with a shy smile.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Miss Orlov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Miss Orlov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			gs 'grades', 'class_activity_attributes', 'school', 'sci', pcs_intel
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'
@@ -1012,10 +1012,10 @@ if $ARGS[0] = 'music':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classmusic.jpg"></center>'
 	'You sit in the classroom and listen to Mr. Vasilyev go on about how great music is while you wait for class to start. He''s always upbeat and positive about teaching and encourages all of his students to take part.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Mr. Vasilyev'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Mr. Vasilyev'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
@@ -1023,8 +1023,8 @@ if $ARGS[0] = 'music':
 			gs 'exp_gain', 'instrmusic', rand(1,2)
 			gs 'exp_gain', 'vokal', rand(1,2)
 			gs 'exp_gain', 'chrsm', rand(1,2)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned a lot about the history of music and famous artists.'
@@ -1540,17 +1540,17 @@ if $ARGS[0] = 'biology':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classbiology.jpg"></center>'
 	'You go to your biology class and find a seat at your lab station. Before long, all your classmates file in and take their seats as well. Miss Orlov takes roll call before she gets up and starts walking around the room explaining today''s lessons, occasionally stopping at each lab station to make sure the students are doing the work correctly. She often gives words of encouragement if things are going well or stops and helps the student understand what they are doing wrong.'
 	'She occasionally asks questions to the class and those that get them right receive heaps of praise while she takes the time to explain the answer to those that get them wrong. Once she is sure the student understands their mistake, she moves on with her lesson. She is quick to help anyone with a problem or answer questions and always does so with a shy smile.'
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-		act 'Listen attentively to Miss Orlov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+		act 'Listen attentively to Miss Orlov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'exp_gain', 'intel', rand(0,1)
 			gs 'grades', 'class_activity_attributes', 'school', 'bio', pcs_intel
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Miss Orlov for the duration of the class. Today''s lesson was interesting and informative and you feel you learned from taking part in class.'

+ 23 - 23
locations/gschool_lessons3.qsrc

@@ -11,17 +11,17 @@ if $ARGS[0] = 'literature':
 	'"She''s always piling on the work and expects everyone to have it finished by the end of class!" you overhear a girl complain with a heavy sigh.'
 	'Clearing her throat, Ms. Braakman raises her voice to speak over the noise. "The sooner everyone takes out their textbooks, the quicker we can get started. Who knows, maybe we''ll finish early and you''ll have some free time." Hearing this, the room settles down and the lesson begins.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:
-		act 'Listen attentively'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
+		act 'Listen attentively'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -=1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'lit', pcs_intel
-			gs 'exp_gain', 'intel', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			intel_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
 			*nl
@@ -373,18 +373,18 @@ if $ARGS[0] = 'art':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classart.jpg"></center>'
 	'You sit in the classroom and listen to Mr. Vasilyev go on about how great art is. He''s always upbeat and positive about teaching and encourages all of his students to take part.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:
-		act 'Listen attentively to Mr. Vasilyev'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:
+		act 'Listen attentively to Mr. Vasilyev'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'art', pcs_intel
-			gs 'exp_gain', 'artskls', rand(1,2)
-			gs 'exp_gain', 'agil', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			artskls_exp += rand(1,2)
+			agil_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Vasilyev for the duration of the class. Today''s lesson was interesting and informative and you feel you learned a lot.'
@@ -958,18 +958,18 @@ if $ARGS[0] = 'shop':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/classshop.jpg"></center>'
 	'You sit in the classroom and listen to Mr. Kuznetsov''s monotonous droning, doing your best not to fall asleep.'
 	
-	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-	if traits['nerd_status'] = 2: will_cost = will_cost / 2
-	if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:		
-		act 'Listen attentively to Mr. Kuznetsov'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+	gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+	if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+	if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:		
+		act 'Listen attentively to Mr. Kuznetsov'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 			*clr & cla
 			grupvalue[4] -= 1
 			grupvalue[3] += 1
 			gs 'grades', 'class_activity_attributes', 'school', 'shop', pcs_intel
-			gs 'exp_gain', 'hndiwrk', rand(1,2)
-			gs 'exp_gain', 'agil', rand(0,1)
-			traits['nerd_lessons'] += 1
-			if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+			hndiwrk_exp += rand(1,2)
+			agil_exp += rand(0,1)
+			pcs_traits['nerd_lessons'] += 1
+			if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 			'You listen attentively to Mr. Kuznetsov for the duration of the class. Today''s lesson was interesting and informative, and you feel you learned from taking part in class.'

+ 12 - 12
locations/gschool_lessons4.qsrc

@@ -88,17 +88,17 @@ if $ARGS[0] = 'math':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-		if traits['nerd_status'] = 2: will_cost = will_cost / 2
-		if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-			act 'Focus on your school work'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+		if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+		if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+			act 'Focus on your school work'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
 				gs 'grades', 'class_activity_attributes', 'school', 'math', pcs_intel
 				gs 'exp_gain', 'intel', rand(0,1)
-				traits['nerd_lessons'] += 1
-				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				pcs_traits['nerd_lessons'] += 1
+				if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/attention.jpg"></center>'
 				'You carefully follow today''s lesson, trying to take in as much as possible.'
@@ -360,17 +360,17 @@ if $ARGS[0] = 'english':
 	if dimaRevenge = 1:
 		act 'Continue': gt 'dimaRevenge', 1
 	else
-		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and traits['nerd_status'] = 0, 'hard', iif(traits['nerd_status'] > 0, 'easy', 'medium'))
-		if traits['nerd_status'] = 2: will_cost = will_cost / 2
-		if will_cost <= pcs_willpwr or traits['nerd_status'] = 3:	
-			act 'Listen attentively'+iif(traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
+		gs 'willpower', 'misc', 'self', iif(grupTipe = 4 and pcs_traits['nerd_status'] = 0, 'hard', iif(pcs_traits['nerd_status'] > 0, 'easy', 'medium'))
+		if pcs_traits['nerd_status'] = 2: will_cost = will_cost / 2
+		if will_cost <= pcs_willpwr or pcs_traits['nerd_status'] = 3:	
+			act 'Listen attentively'+iif(pcs_traits['nerd_status'] = 3, '', ' (<<will_cost>> Willpower)')+' ':
 				*clr & cla
 				grupvalue[4] -= 1
 				grupvalue[3] += 1
 				gs 'grades', 'class_activity_attributes', 'school', 'mus', pcs_intel
 				gs 'exp_gain', 'intel', rand(0,1)
-				traits['nerd_lessons'] += 1
-				if traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
+				pcs_traits['nerd_lessons'] += 1
+				if pcs_traits['nerd_status'] < 3: gs 'willpower', 'pay', 'self'
 				gs 'stat'				
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/literature/work2.jpg"></center>'
 				'You actively take part in the lesson, raising your hand to answer questions, following along in your textbook and working quietly on the worksheets when given them.'

+ 2 - 2
locations/gschool_lessonsev1.qsrc

@@ -61,7 +61,7 @@ if $ARGS[0] = 'fiz_rand':
 				gs 'willpower', 'pay', 'self'
 				gs 'stat'
 				grupvalue[2] +=1
-				'He starts to back up, but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which causes the others to laugh harder at him. A few of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and put everything back in it''s proper place.'
+				'He starts to back up, but you manage to kick him hard in the shin, causing him to hop around on one leg while holding his shin in pain, which causes the others to laugh harder at him. A few of the other girls give the guys dirty looks and walk over to give you moral support and use their bodies to shield you from the rest of the class so you can peel your panties out of your ass and put everything back in its proper place.'
 				act 'End of lesson':gt 'gschool_lessons4', 'postphys'
 			end
 		else
@@ -1834,7 +1834,7 @@ if $ARGS[0] = 'russian':
 			end
 		elseif scooltiperand = 18:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/russian/alyonachalk.jpg"></center>'
-			'Mr. Yenotin calls Alyona up to the front of the class and asks her to write what he recites on the chalkboard. He faces the class talking about a complex sentence structure, but instead of writing what he says, Alyona starts drawing a female''s naked backside with a large dick in it''s ass. This gets the whole class laughing and confuses Mr. Yenotin, who tries to calm everyone down. He finally turns around, sees what''s on the chalkboard and rushes up to wipe it clean. He then tells Alyona to take a seat as he starts writing what he says on the chalkboard himself as he tries to continue the lesson.'
+			'Mr. Yenotin calls Alyona up to the front of the class and asks her to write what he recites on the chalkboard. He faces the class talking about a complex sentence structure, but instead of writing what he says, Alyona starts drawing a female''s naked backside with a large dick in its ass. This gets the whole class laughing and confuses Mr. Yenotin, who tries to calm everyone down. He finally turns around, sees what''s on the chalkboard and rushes up to wipe it clean. He then tells Alyona to take a seat as he starts writing what he says on the chalkboard himself as he tries to continue the lesson.'
 			act 'Wait for the end of the lesson': gt 'gschool_lessons', 'short_break'
 		elseif scooltiperand = 19:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/classroom/russian/alyonasmoke.jpg"></center>'

+ 4 - 2
locations/gschool_lessonsev3.qsrc

@@ -127,11 +127,13 @@ if $ARGS[0] = 'literature':
 				end
 				act 'Spread your legs':
 					*clr & cla
-					stat['mast'] += 1
-					orgasm += 1
+					$orgasm_or = 'yes'
+					gs 'arousal', 'vaginal_finger', 5, 'no_orgasm_msg'
+					gs 'arousal', 'end'
 					gs 'fame', 'pav', 'sex', 1
 					pcs_horny = 0
 					npc_rel['A157'] += 1
+					gs 'stat'
 					if $pantyworntype ! 'none':
 						'<center><video autoplay loop src="images/locations/pavlovsk/school/classroom/literature/events/heavy_petting.mp4"></video></center>'
 						'You spread your legs for him, and without hesitation, Roman''s hand dips between your legs, his fingers trailing along your inner thigh until he''s pressing against your pussy through your panties. You shiver with anticipation as he teasingly traces a finger along the outline of your lips. Slowly, he begins massaging circles around your clit, and in the heat of the moment, you let out a soft moan that catches the attention of the girl sitting a few feet away. Quickly, you drape your arm over your lap and lean forward to obscure her view. You give her a reassuring smile and hope she''ll leave it at that, but she continues to stare, convinced that something is happening.'

+ 61 - 61
locations/gschool_socialchg.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'Pavlovsk slut':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/shamewalk.jpg"></center>'
-	'As you walk down the school hallway, you notice almost everyone is eying you. Some sneer at you, others laugh, a few turn away in disgust. You are used to this treatment with your sexual escapades, but not to this level. No one wants to greet you and most seem to actively avoid you, you are starting to feel a bit uncomfortable at all the staring eyes. As you approach your locker, you see someone has spray painted ''Slut'' on it in big red letters. You hear someone walking up behind you before you turn around to see who it might be.'
+	'Walking down the school hallway, you notice almost everyone is eying you. Some sneer at you, others laugh, and others turn away in disgust. You are used to this treatment with your sexual escapades, but not to this level. No one wants to greet you and most actively avoid you. You are starting to feel a bit uncomfortable at all the staring eyes. As you approach your locker, you see someone has spray painted ''Slut'' on it in big red letters. You hear someone walking up behind you before you turn around to see who it might be.'
 
 	grupvalue[1] = min(100,grupvalue[1])
 	grupvalue[2] = min(150,grupvalue[2])
@@ -103,31 +103,31 @@ if $ARGS[0] = 'Pavlovsk slut':
 	if grupTipe = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/coolslut.jpg"></center>'
 		if soniaPS = 0:
-			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to and your ass is out. You''re no longer welcome around us. Go and find some dick to suck and maybe they will pretend to care about you." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to, and your ass is out. You''re no longer welcome around us. Find some dick to suck, and maybe they will pretend to care about you." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 		else	
-			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to and your ass is out. You''re no longer welcome around us. Go and find Sonia, I''m sure you two have a lot in common now." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+			'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe in complete disgust. Then, just as you''re about to ask what''s going on, Irina cuts you off. "Shut your cum hole, slut! I don''t want to smell your cum breath. We''ve all heard about what you''ve been up to, and your ass is out. You''re no longer welcome around us. Go and find Sonia. I''m sure you two have a lot in common now." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 		end	
 		'"What a waste, you fucking slut." He then spits at your feet before leaving as well. You hear many of the students around you laughing as you look around. 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.'
 	elseif grupTipe = 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/jockslut.jpg"></center>'
 		if christinaQW['fight'] < 1 or christinaQW['blackmail'] < 2:
-			'Christina, Lariska, and Lina walk up to you. Lariska and Lina are looking at you in disgust, while Christina is smirking. She shoves you hard up against your locker. "What are you doing here slut? Shouldn''t you be in the boys bathroom sucking a bunch of cocks? We all heard that''s all you do now. At least sluts know to get paid, but you just give it away for free." she says mockingly while laughing. Lariska, Lina and several other students nearby join in, openly mocking you.'
+			'Christina, Lariska, and Lina walk up to you. Lariska and Lina are looking at you in disgust while Christina is smirking. She shoves you hard up against your locker. "What are you doing here slut? Shouldn''t you be in the boys'' bathroom sucking a bunch of cocks? We all heard that''s all you do now. At least sluts know to get paid, but you just give it away for free, " she laughs mockingly. Lariska, Lina and several other students nearby join in, openly mocking you.'
 		else
-			'Albina and Lazar walk up to you with looks of disgust on their face. "What are you doing here? Shouldn''t you be in the boys bathroom sucking dick like the whore that you are?" Lazar says mockingly. Albina opens her mouth to say something, but chooses to remain quiet and stares at the floor. Christina smirks at you from behind them, not daring to challenge you directly, but definitely enjoying the moment.'
+			'Albina and Lazar walk up to you with looks of disgust on their face. "What are you doing here? Shouldn''t you be in the boys'' bathroom sucking dick like the whore that you are?" Lazar says mockingly. Albina opens her mouth to say something but chooses to remain quiet and stares at the floor. Christina smirks at you from behind them, not daring to challenge you directly but enjoying the moment.'
 		end
 		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.'
+			'"Go hang out with the other losers because none of us gives 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 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 hang out with the other losers because none of us gives 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>'
-		'A group of students stand in front of you, wanting to get a better look at what''s written on your locker. When you look at them, they start laughing and then quickly hurry away from you as if you have the plague. You turn and try to find some of your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but just as you''re about to say something, he turns to you. "Please go away! I don''t know what you''ve gotten yourself into, but the things they say you''ve done..." He looks disgusted. "I''m sorry, but I can''t be seen hanging out with you anymore. I''ve got enough problems without you making it worse."'
-		'He pauses for a second to stare at the dejected look on your face, realizing that you are now an outcast. He then lets out a short sigh. "I''m sorry, I really am but this is your own fault. What were you thinking doing all that.. sex stuff? Just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. You take a second to look around as most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+		'A group of students stand in front of you, wanting a better look at what''s written on your locker. They start laughing when you look at them and quickly hurry away from you as if you have the plague. You turn and try to find some of your friends, but most seem to be hiding or hurrying off when you approach. You finally manage to catch up to Gerasim, but he turns to you just as you''re about to say something. "Please go away! I don''t know what you''ve gotten yourself into, but the things they say you''ve done..." He looks disgusted. "I''m sorry, but I can''t be seen hanging out with you anymore. I''ve got enough problems without you making them worse."'
+		'He pauses for a second to stare at the dejected look on your face, realizing that you are now an outcast. He then lets out a short sigh. "I''m sorry, I really am, but this is your fault. What were you thinking doing all that.. sex stuff? Just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. You take a second to look around as most other students either start mocking you or actively look away. Finally, you grab your stuff and hurry to your next class.'
 	elseif grupTipe = 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/gopnikslut.jpg"></center>'
-		'You turn and see Pauline, Lera and Lena standing next to you. Lera is snickering, Pauline looks like she''s preparing to beat you up and Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. Noooo, you had to go around and be the town bicycle! Don''t act all surprised, we''ve all heard about how you let any guy fuck you in whatever hole they desire. Spineless sluts have no place with us, so stay the fuck away from us or I will personally beat the living shit out of you." With that, Pauline shoves your against you locker and walks away.'
-		'Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "If you ever try to approach us, we''ll take you to some nasty guys who will fuck you so hard that your holes will be loose enough to stick a watermelon inside them!" 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.'
+		'You turn and see Pauline, Lera and Lena standing next to you. Lera is snickering. Pauline looks like she''s preparing to beat you up, and Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently, hanging out, partying and having a good time wasn''t enough for you. Noooo, you had to go around and be the town bicycle! Don''t act all surprised. We''ve all heard about how you let any guy fuck you in whatever hole they desire. Spineless sluts have no place with us, so stay away from us, or I will beat the living shit out of you." With that, Pauline shoves you against your locker and walks away.'
+		'Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "If you ever try to approach us, we''ll take you to nasty guys who will fuck you so hard that your holes will be loose enough to stick a watermelon inside them!" 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
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	grupTipe = 5
@@ -140,13 +140,13 @@ if $ARGS[0] = 'coolkid':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey <<$pcs_nickname>>, we''ve been talking and you seem to have the right attitude to be one of us. So what do you say, do you want to join the popular clique?" Vicky asks and the three of them just stand there waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey, <<$pcs_nickname>>, we''ve been talking, and you seem to have the right attitude to be one of us. So what do you say? Do you want to join the popular clique?" Vicky asks, and the three of them just wait for your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I don''t think that''s a good idea."'
-		'Vicky frowns but nods. "Suit yourself then." With that, she turns and leaves, Andrey just shakes his head at you and does the same.'
-		'Stasya gives you a once over. "I told you guys she wasn''t cool enough! What a loser!" With that, she follows the others, leaving you behind to wonder if you made the right choice.'
+		'Vicky frowns but nods. "Suit yourself then." With that, she turns and leaves. Andrey just shakes his head at you and does the same.'
+		'Stasya gives you a once-over. "I told you guys she wasn''t cool enough! What a loser!" With that, she follows the others, leaving you behind to wonder if you made the right choice.'
 
 		grupvalue[1] = rand(600,650)
 		old_grupvalue[1] = grupvalue[1]
@@ -158,7 +158,7 @@ if $ARGS[0] = 'coolkid':
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-		'You nod your head. "Yes I would love to! I love hanging out with you guys!"'
+		'You nod your head. "Yes, I would love to! I love hanging out with you guys!"'
 		'Vicky gives you a hug. Once she lets go, Andrey wraps an arm around your shoulder and starts leading you to your next class. "From now on, you''re one of us." Stasya gives you a friendly smile as the four of you walk to your next class.'
 		
 		grupvalue[2] = min(rand(675,725),grupvalue[2])
@@ -190,9 +190,9 @@ if $ARGS[0] = 'coolkid warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey <<$pcs_nickname>>, is everything okay?"'
-	'Before you can answer, Stasya chimes in. "You havn''t been setting the right example of late. You''re acting more like the losers than us, so do you want to keep hanging around with us or not?"'
-	'You are again interrupted before you can speak. "Cool it, Stasya! Look <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do okay? That''s all we''re saying." Vicky says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other cool kids question whether you belong in the group or not...'
+	'You walk down the hallway and stop at your locker. You sense someone standing behind you and turn to see Vicky, Andrey and Stasya giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay?"'
+	'Before you can answer, Stasya chimes in. "You haven''t been setting the right example of late. You''re acting more like the losers than us, so do you want to keep hanging around with us?"'
+	'You are again interrupted before you can speak. "Cool it, Stasya! Look, <<$pcs_nickname>>, if you want to hang out with us, just act like you normally do, okay? That's all we're saying." Vicky says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -202,9 +202,9 @@ if $ARGS[0] = 'coolkid warn 2':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "Hey <<$pcs_nickname>>, we talked about this before, but you still seem to be not getting with the program." Vicky says with disdain.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "Hey, <<$pcs_nickname>>, we talked about this before, but you still seem to be not getting with the program," Vicky says with disdain.'
 	'Before you can answer, Stasya chimes in. "I told you she doesn''t want to be one of us! I don''t know why we ever let her hang out with us in the first place."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to get your act together or you''re out, simple as that." Andrey says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other cool kids question whether you belong in the group or not. You need to improve your standing with them or risk being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to get your act together, or you''re out, simple as that," Andrey says before the bell rings and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group. You need to improve your standing with them or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -214,9 +214,9 @@ if $ARGS[0] = 'coolkid slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumors about your sexual exploits. We all like sex but come on, this is getting out of hand." Vicky says with a hint of disdain.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vicky, Andrey and Stasya. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumours about your sexual exploits. Of course, we all like sex but come on, this is getting out of hand." Vicky says with a hint of disdain.'
 	'Before you can answer, Stasya chimes in. "Maybe she just wants to be a slut."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to start using a little discretion or you''re out." Andrey says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other cool kids question whether you belong in the group or not. You better fix things fast or you risk being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to start using a little discretion, or you''re out," Andrey says before the bell rings and you all hurry to class. You can''t help but worry. Your recent activity has made the other cool kids question whether you belong in the group. You better fix things fast, or you risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -225,13 +225,13 @@ if $ARGS[0] = 'jock':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey <<$pcs_nickname>>, we''ve been talking and you seem to have the right attitude to be one of us. So what do you say, do you want to join us and become a jock?" They seem to be waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey, <<$pcs_nickname>>, we''ve been talking, and you seem to have the right attitude to be one of us. So what do you say? Do you want to join us and become a jock?" They seem to be waiting on your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I don''t think that''s a good idea."'
-		'Lariska frowns then nods. "Suit yourself." With that, she turns and leaves.'
-		'Lina gives you a once over. "Well at least Christina will be happy." With that she follows after Lariska, leaving you behind to wonder if you made the right choice.'
+		'Lariska frowns, then nods. "Suit yourself." With that, she turns and leaves.'
+		'Lina gives you a once-over. "Well, at least Christina will be happy." With that, she follows after Lariska, leaving you behind to wonder if you made the right choice.'
 		grupvalue[2] = rand(600,650)
 		old_grupvalue[2] = grupvalue[2]
 		gs 'gschool_socialchg', 'group_rel_change','jocks', -5
@@ -243,7 +243,7 @@ if $ARGS[0] = 'jock':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinjock.jpg"></center>'
 		'You nod your head. "Yes, I would love to! I love hanging out with you guys!"'
-		'Lariska gives you a hug. "From now on you are one of us." Lina gives you a friendly smile and you all walk you to your next class.'
+		'Lariska gives you a hug. "From now on, you are one of us." Lina gives you a friendly smile, and you all walk to your next class.'
 
 		grupvalue[1] = min(rand(675,725),grupvalue[1])
 		grupvalue[3] = min(rand(600,650),grupvalue[3])
@@ -274,9 +274,9 @@ if $ARGS[0] = 'jock warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey <<$pcs_nickname>>, is everything okay with you?" Lariska asks.'
-	'Before you can answer, Lina chimes in. "You haven''t been putting your all into sports and you''re starting to act like some of the others, so does that mean that you don''t want to hang around with us anymore?"'
-	'The bell rings and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay with you?" Lariska asks.'
+	'Before you can answer, Lina chimes in. "You haven''t been putting your all into sports, and you''re starting to act like some others, so does that mean you don''t want to hang around with us anymore?"'
+	'The bell rings, and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -288,7 +288,7 @@ if $ARGS[0] = 'jock warn 2':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "<<$pcs_nickname>>, we talked about this before, but you still seem to be not getting the idea." Lariska scoffs.'
 	'Before you can answer, Lina chimes. "Christina says she doesn''t want you to be one of us and that we should have never let you hang out with us in the first place."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>> you need to get your act together or you''re out, simple as that." Lina says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not. You better fix things fast or risk becoming being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, you need to get your act together, or you''re out, simple as that," Lina says before the bell rings and you all hurry to class. You can''t help but worry. Your recent activity has made the other jocks question whether you belong in the group. You better fix things fast or risk becoming kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -298,8 +298,8 @@ if $ARGS[0] = 'jock slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumors about your sexual exploits. Sex is fun, but what are you going to do next? Fuck the whole football team?"'
-	'Before you can answer, Lina chimes. "You need to start using a little discretion or you''re out." The bell then rings and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other jocks question whether you belong in the group or not. You better fix things fast or risk being kicked out...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Lariska and Lina giving you friendly smiles. "What''s going on with you, <<$pcs_nickname>>? We''ve all heard the rumours about your sexual exploits. Sex is fun, but what are you going to do next? Fuck the whole football team?"'
+	'Before you can answer, Lina chimes. "You need to start using a little discretion, or you''re out." The bell then rings, and you all hurry to class, but you can''t help but worry. Your recent activity has made the other jocks question whether you belong in the group. So you better fix things fast or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -308,12 +308,12 @@ if $ARGS[0] = 'nerd':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up, all giving you friendly smiles. "Hey <<$pcs_nickname>>, we''ve been talking and we like you. We were wondering if you would like to come hang out with us at our game night?" They seem to be waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up, all giving you friendly smiles. "Hey, <<$pcs_nickname>>, we''ve been talking, and we like you. We were wondering if you would like to hang out with us at our game night?" They seem to be waiting on your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
 		'You shake your head. "I like hanging out with you guys, but I''m just not interested in doing a game night. Sorry."'
-		'Artem frowns then nods. "Oh, okay. Well maybe some other time then..." With that, he turns and the rest follow, looking a little disappointed. Looks like they were hoping you would join them. It makes you feel a little bad and wondering if you made the right choice.'
+		'Artem frowns and then nods. "Oh, okay. Well, maybe some other time then..." With that, he turns, and the rest follow, looking a little disappointed. Looks like they were hoping you would join them. It makes you feel a little bad and wonder if you made the right choice.'
 		grupvalue[3] = rand(600,650)
 		old_grupvalue[3] = grupvalue[3]
 		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
@@ -325,7 +325,7 @@ if $ARGS[0] = 'nerd':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joinnerd.jpg"></center>'
 		'You nod your head. "Yes, I would love to hang out with you guys! A game night sounds like a lot of fun."'
-		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great <<$pcs_nickname>>! Meet us at the community center library tonight at 20:00. See you then." With that they all start leaving and going to class, saying that they look forward to seeing you tonight.'
+		'They all start speaking at once, excited about you joining them. Feofan then speaks up. "That''s great, <<$pcs_nickname>>! Meet us at the community centre library tonight at 20:00. See you then." Then, they all start leaving and going to class, saying they look forward to seeing you tonight.'
 		
 		grupvalue[1] = min(rand(600,650),grupvalue[1])
 		grupvalue[2] = min(rand(625,625),grupvalue[2])
@@ -359,9 +359,9 @@ if $ARGS[0] = 'nerd warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey <<$pcs_nickname>>, is everything okay with you?"'
-	'Before you can answer, Julia chimes in. "You''re acting a lot like the others. Does that mean that you don''t want to hangout with us anymore?"'
-	'You are again interrupted before you can speak. "Look <<$pcs_nickname>>. We like you and want you to stay, but if you want to hang out with us, just act like you want to hang out with us? That''s all we''re saying." Feofan says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey, <<$pcs_nickname>>, is everything okay with you?"'
+	'Before you can answer, Julia chimes in. "You''re acting a lot like the others. Does that mean you don''t want to hang out with us anymore?"'
+	'You are again interrupted before you can speak. "Look, <<$pcs_nickname>>. We like you and want you to stay, but if you want to hang out with us, just act like you want to hang out with us? That''s all we''re saying." Feofan says before the bell rings, and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -371,9 +371,9 @@ if $ARGS[0] = 'nerd warn 2':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "<<$pcs_nickname>>, we talked about this, but you''re still acting out." Artem says with disdain.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "<<$pcs_nickname>>, we talked about this, but you''re still acting out," Artem says with disdain.'
 	'Before you can answer, Julia chimes in. "Yeah, we''re all worried about you. What''s wrong? Is there anything we can do to help? Please just ask."'
-	'You are again interrupted before you can speak. "<<$pcs_nickname>> I don''t know what''s wrong, but if you don''t want to hang out with us, just say so. In any case, we hope things get better for you." Deofan says before the bell rings and you all hurry to class. You can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not. You better fix things fast or risk being kicked out...'
+	'You are again interrupted before you can speak. "<<$pcs_nickname>>, I don''t know what''s wrong, but if you don''t want to hang out with us, just say so. In any case, we hope things get better for you." Deofan says before the bell rings, and you all hurry to class. You can''t help but worry. Your recent activity has made the other nerds question whether you belong in the group. You better fix things fast or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -383,8 +383,8 @@ if $ARGS[0] = 'nerd slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey <<$pcs_nickname>>, what''s going on with you? We''ve all heard some pretty disturbing rumors about you... If they''re even half true... I just don''t know what to say. You always seemed like such a nice girl." Feofan says with a hint of disappointment.'
-	'Before you can answer, Petka chimes in. "<<$pcs_nickname>>, you need to get yourself under control or you won''t be able to hang out with us anymore." The bell rings and you all hurry to class, but you can''t help but worry. It seems your recent activity has made the other nerds question whether you belong in the group or not. You better fix things fast or risk being kicked out...'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see a group of nerds bunched up and giving you friendly smiles. "Hey, <<$pcs_nickname>>, what''s going on with you? We''ve all heard some pretty disturbing rumours about you... If they''re even half true... I just don''t know what to say. You always seemed like such a nice girl." Feofan says with a hint of disappointment.'
+	'Before you can answer, Petka chimes in. "<<$pcs_nickname>>, you need to get yourself under control, or you won''t be able to hang out with us anymore." The bell rings, and you all hurry to class, but you can''t help but worry. Your recent activity has made the other nerds question whether you belong in the group. You better fix things fast or risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -393,12 +393,12 @@ if $ARGS[0] = 'gopnik':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joingopnik.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek and Lena. Vitek gives you a hungry once over and Lena gives you a smirk. "Hey <<$pcs_nickname>>, we''ve been talking and you seem like you have the right attitude to hang with us. So what do you say, want to come to one of our exclusive parties tonight?" They seem to be waiting on your response.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek and Lena. Vitek gives you a hungry once-over, and Lena gives you a smirk. "Hey, <<$pcs_nickname>>, we''ve been talking, and you seem like you have the right attitude to hang with us. So what do you say? Want to come to one of our exclusive parties tonight?" They seem to be waiting on your response.'
 	act 'No':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/nerdslut.jpg"></center>'
-		'You shake your head. "I like hanging out with you guys, but I''m just not in the partying mood tonight.""'
-		'Vitek''s eyes darken. "What, are you too good for us all of a sudden? Well fuck you then!" With that, he storms away. Lena looks at you with a derogatory stare before following her brother, leaving you behind to wonder if you made the right choice.'
+		'You shake your head. "I like hanging out with you guys, but I''m just not in the partying mood tonight."'
+		'Vitek''s eyes darken. "What, are you too good for us all of a sudden? Well, fuck you then!" With that, he storms away. Lena looks at you with a derogatory stare before following her brother, leaving you behind to wonder if you made the right choice.'
 		grupvalue[4] = rand(600,650)
 		gs 'gschool_socialchg', 'group_rel_change','gopniks', -5
 		gs 'stat'
@@ -408,9 +408,9 @@ if $ARGS[0] = 'gopnik':
 	act 'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joingopnik.jpg"></center>'
-		'You nod your head. "Yeah that sounds great, I love hanging out and maybe getting a little wasted."'
+		'You nod your head. "Yeah, that sounds great. I love hanging out and maybe getting a little wasted."'
 		'Vitek smirks and glances at Lena, leaving you wondering what they mean. "Lena will let you know where and when." With that, he turns and walks off, but you can''t help but feel you missed something, which makes you feel a little nervous.'
-		'Lena leans over. "Meet me and Lera after school at the apartment garages at eight this evening." She smiles like she knows something you don''t, but without a further word or letting you ask anything, she briskly walks away.'
+		'Lena leans over. "Meet Lera and me after school at the apartment garages at eight this evening." She smiles like she knows something you don''t, but she briskly walks away without a further word or letting you ask anything.'
 		gopnik_initiation = 1
 		gopnik_initiation_day = daystart
 		gs 'stat'
@@ -424,9 +424,9 @@ if $ARGS[0] = 'gopnik warn 1':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek, Lena, Lera and Dan. Vitek gives you a once over. "What the fuck is up with you, <<$pcs_nickname>>?"'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek, Lena, Lera and Dan. Vitek gives you a once-over. "What the fuck is up with you, <<$pcs_nickname>>?"'
 	'Before you can answer, Lena chimes in. "You''ve been acting like a little submissive bitch lately. Grow a fucking pair and get your shit together!"'
-	'You are again interrupted before you can speak. "Look <<$pcs_nickname>>. If you want to hang out with us, just act like it okay? That''s all we''re saying." Lera says before the bell rings and the group disperses. You can''t help but worry. It seems your recent activity has made the other gopniks question whether you belong in the group or not...'
+	'You are again interrupted before you can speak. "Look, <<$pcs_nickname>>. If you want to hang out with us, just act like it, okay? That''s all we''re saying." Lera says before the bell rings, and the group disperses. You can''t help but worry. It seems your recent activity has made the other Gopnik question whether you belong in the group or not...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -437,8 +437,8 @@ if $ARGS[0] = 'gopnik warn 2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
 	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Vitek, Lena, Lera and Dan. Lena shoves you into your locker. "What the fuck bitch? You deaf or something, or do you just think you''re too good for us?"'
-	'Before you can answer, Dan chimes in. "I told you she didn''t belong, this bitch is too soft." he says as he plays with your hair. "I don''t know why we let Vasily talk us into letting her hang out with us anyways. I mean maybe if she sucked a few more cocks we could look the other way..." he adds with a laugh.'
-	'You are again interrupted before you can speak. "Cool it, Dan. <<$pcs_nickname>>, get your shit together or you''re out, simple as that." Vitek says before the bell rings and the group disperses. You can''t help but worry. It seems your recent activity has made the other gopniks question whether you belong in the group or not. You better fix things fast or you risk being kicked out...'
+	'Before you can answer, Dan chimes in. "I told you she didn''t belong. This bitch is too soft," he says as he plays with your hair. "I don''t know why we let Vasily talk us into letting her hang out with us anyways. I mean, maybe if she sucked a few more cocks we could look the other way..." he laughs.'
+	'You are again interrupted before you can speak. "Cool it, Dan. <<$pcs_nickname>>, get your shit together, or you''re out, simple as that." Vitek says before the bell rings, and the group disperses. You can''t help but worry. Your recent activity has made the other Gopnik question whether you belong in the group. You better fix things fast, or you risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -448,13 +448,13 @@ if $ARGS[0] = 'gopnik slut warn':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/joincool.jpg"></center>'
-	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Pauline, Lena, Lera and Dan. Dan stands uncomfortably close and wraps an arm around your hip before pulling you in closer. "Hey slut. Sucked any cocks today? I can give you another one..." he says with a laugh.'
+	'You walk down the hallway and stop at your locker. You sense someone standing next to you and turn to see Pauline, Lena, Lera and Dan. Dan stands uncomfortably close and wraps an arm around your hip before pulling you closer. "Hey, slut. Sucked any cocks today? I can give you another one..." he says with a laugh.'
 	'Before you can answer, Lera chimes in. "Maybe she just wants to be a slut."'
-	'You are again interrupted before you can speak. "We don''t need another Nush, one slut is enough." Pauline says in reply.'
+	'You are again interrupted before you can speak. "We don''t need another Nush. One slut is enough." Pauline says in reply.'
 	'Lera fires back. "Hey, she isn''t a slut! She just likes to fuck. It''s not like she lets just anyone fuck her. Not like <<$pcs_nickname>> here." She gives Dan a pointed look, which makes him give Lera a sour look in return.'
 	*nl
-	'Pauline rolls her eyes. "Whatever. If you want to lick her ass so bad go ahead and do it, you carpet muncher."'
-	'Before Lera can reply, Lena steps between the girls. "That''s enough, we''re not here to bitch about this shit." She then turns to you. "And you, chill the fuck out and stop being the town bicycle or you''re out, got it?" They then turn and walk off, still chatting among themselves as the bell rings. You can''t help but worry. It seems your recent activity has made the other gopniks question whether you belong in the group or not. You better fix things fast or you risk being kicked out...'
+	'Pauline rolls her eyes. "Whatever. If you want to lick her ass so bad, go ahead and do it, you carpet muncher."'
+	'Before Lera can reply, Lena steps between the girls. "That''s enough. We''re not here to bitch about this shit." She then turns to you. "And you, chill the fuck out and stop being the town bicycle, or you''re out, got it?" They then turn and walk off, still chatting as the bell rings. You can''t help but worry. Your recent activity has made the other Gopnik question whether you belong in the group. You better fix things fast, or you risk being kicked out...'
 	act 'Go to class': school_period = 0 & gt 'gschool_lessons', 'schedule'
 end
 
@@ -462,7 +462,7 @@ if $ARGS[0] = 'coolkid outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it, we don''t care. I don''t know what happened, but you use to be cool. Now? Well you made your choice. You''re no longer welcome to hang out with us." With that Irina turns and walks away as Dimka gives you a final look and shakes his head.'
+	'Irina and Dimka walk up to you. Dimka is smirking at you while Irina looks you over from head to toe shaking her head. Just as you''re about to speak, Irina cuts you off. "Save it. We don't care. I don't know what happened, but you used to be cool. Now? Well, you made your choice. You''re no longer welcome to hang out with us." With that, Irina turns and walks away as Dimka gives you a final look and shakes his head.'
 	'"Now you''re where you always belonged. With the other losers." he says before leaving as well. You hear the other students laughing as you look around. Having been publicly 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.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 
@@ -490,9 +490,9 @@ if $ARGS[0] = 'jock outcast':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
 	if christinaQW['blackmail'] = 2 or christinaQW['fight'] = 1:
-		'Lazar and Albina walk up to you and Albina scoffs at you dismissively. "It seems like you care more about being a social reject than anything else, so fuck off and go hang out with the other losers where you belong. We''re not your friends anymore, and don''t try to pretend otherwise." She gives you a pitiful once over before forcefully shoving you aside and walking away. A disappointed looking Lazar just shakes his head at you before catching up with Albina, where you hear them clearly mocking you. Having been publicly 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.'
+		'Lazar and Albina walk up to you, and she scoffs at you dismissively. "It seems like you care more about being a social reject than anything else, so fuck off and go hang out with the other losers where you belong. We''re not your friends anymore, and don''t try to pretend otherwise." She gives you a pitiful once-over before forcefully shoving you aside and walking away. A disappointed-looking Lazar just shakes his head at you before catching up with Albina, where you hear them clearly mocking you. Having been publicly 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
-		'Christina, Lariska and Lina walk up to you. Lariska and Lina are looking at you like you did something wrong while Christina is smirking. She shoves you hard up against your locker. "What are you doing here bitch? You belong with the loser crowd now, so fuck off." she says with a laugh and Lariska and Lina join in openly mocking you. "Stay away from us or I''ll show you what happens to little bitches who don''t know their place." Christina warns before they turn and walk away. Having been publicly 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.'
+		'Christina, Lariska and Lina walk up to you. Lariska and Lina look at you like you did something wrong while Christina smirks. She shoves you hard up against your locker. "What are you doing here bitch? You belong with the loser crowd now, so fuck off." She laughs, and Lariska and Lina join in openly mocking you. "Stay away from us, or I''ll show you what happens to little bitches who don''t know their place," Christina warns before they turn and walk away. Having been publicly 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
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
@@ -519,7 +519,7 @@ if $ARGS[0] = 'nerd outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'You try to find your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but as you''re about to say something he turns to you. "Please go away, I can''t be seen hanging out with you. I''ve got enough problems without you making it worse. None of us want to be around you anymore." He sighs when he sees the dejected look on your face. "I''m sorry I really am, but this is your own fault. Please just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. You grab your stuff and hurry to your next class.'
+	'You try to find your friends, but most seem to be hiding or hurry off when you approach. You finally manage to catch up to Gerasim, but as you''re about to say something, he turns to you. "Please go away. I can''t be seen hanging out with you. I''ve got enough problems without you making them worse. None of us wants to be around you anymore." He sighs when he sees the dejected look on your face. "I''m sorry, I really am, but this is your fault. Please just leave me alone." The last part he says loudly enough for others to hear, which causes some of the other students to laugh at you as he wheels himself away from you decidedly. As you look around, most of the other students either start mocking you or actively look away. Finally, you grab your stuff and hurry to your next class.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
 	grupvalue[1] = min(rand(600,650),grupvalue[1])
@@ -545,7 +545,7 @@ if $ARGS[0] = 'gopnik outcast':
 	cla & *clr
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/outcast.jpg"></center>'
-	'As you approach your locker, Pauline, Lera and Lena walk up next to you. Pauline looks like she''s preparing to beat you up while Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently hanging out, partying and having a good time wasn''t enough for you. Nooo, you had to become a spineless cunt afraid of her own shadow, so stay the fuck away from us or I''ll beat the shit out of you!" With that, Pauline shoves you against your locker and walks away. Lena gives you a final look of disgust and shoves you again while Lera gives you a few parting words before walking away. "You''re so pathetic even the nerds will kick your ass now." Having been publicly 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.'
+	'As you approach your locker, Pauline, Lera, and Lena walk up next to you. Pauline looks like she''s preparing to beat you up, while Lera looks at you with disgust. Pauline shakes her head at you and finally speaks up. "I don''t know what your problem is, but apparently, hanging out, partying and having a good time wasn''t enough for you. Nooo, you had to become a spineless cunt afraid of her own shadow, so stay the fuck away from us, or I''ll beat the shit out of you!" With that, Pauline shoves you against your locker and walks away. Lena gives you a final look of disgust and pushes you again while Lera gives you a few parting words before walking away. "You''re so pathetic. Even the nerds will kick your ass now." Having been publicly 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.'
 	'<font color = red>You have been kicked out of your social group and become an outcast.</font>'
 	
 	grupvalue[1] = min(rand(625,675),grupvalue[1])
@@ -572,7 +572,7 @@ if $ARGS[0] = 'gopnik miss':
 	'<center><b><font color = maroon>School Hall</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big20.jpg"></center>'
 	'Just as you approach your locker, Lena shoves you against it. "Where the fuck were you bitch? We waited almost an hour for you!"'
-	'You start to answer, but before you can even get a single word out, she shoves you again. "It doesn''t matter, we changed our mind about you. You''re not welcome. So get lost." she snarls before storming off. Maybe if you try to earn their respect again they will give you a second chance.'
+	'You start to answer, but she shoves you again before you can even get a single word out. "It doesn''t matter. We changed our mind about you. You''re not welcome. So get lost." she snarls before storming off. If you try to earn their respect again, they will give you a second chance.'
 	minut += 1
 	grupvalue[4] = rand(675,725)
 	old_grupvalue[4] = grupvalue[4]

+ 5 - 5
locations/homes_properties.qsrc

@@ -587,7 +587,7 @@ if $ARGS[0] = 'get_properties_for_rent':
 	count = ARRSIZE('home_name')
 
 	if count > 0: 
-		:get_rented_properties_loop
+		:get_properties_for_rent_loop
 			$getpropforrentcode = $home_name[i]
 			if $getpropforrentcode ! '' and checked_homes[$getpropforrentcode] = 0 and accessible_property[$getpropforrentcode] = 0:
 				checked_homes[$getpropforrentcode] = 1
@@ -610,7 +610,7 @@ if $ARGS[0] = 'get_properties_for_rent':
 				killvar 'property'
 			end
 			i += 1
-		if i < count: jump 'get_rented_properties_loop'
+		if i < count: jump 'get_properties_for_rent_loop'
 	end
 	killvar 'checked_homes'
 	killvar 'count' & killvar 'i' & killvar 'j' & killvar '$getpropforrentcode' & killvar 'ishome' & killvar 'isrental'
@@ -923,7 +923,7 @@ 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])`
+!! Call: `func('homes_properties', 'get_rent_days', $ARGS[1])`
 !! Returns the remaining rent days for the property
 !!
 !! $ARGS[1] = the code name of the property, e.g. 'city_apartment'
@@ -936,7 +936,7 @@ end
 !!
 !! $ARGS[1] - property code
 if $ARGS[0] = 'get_rent_amount':
-	if $ARGS[1] ! '':
+	if $accessible_property[$ARGS[1]] ! '':
 		result = accessible_property['<<$ARGS[1]>>-rent']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]
@@ -961,7 +961,7 @@ if $ARGS[0] = 'progress_property_rent_time':
 	killvar 'property_code' & killvar 'count' & killvar 'i'
 end
 
-!! Call: `func('homes_properties', 'days_in_month'}`
+!! Call: `func('homes_properties', 'days_in_month')`
 !! Returns the rent the number of days in a give month.
 !! 
 if $ARGS[0] = 'days_in_month':

+ 66 - 0
locations/hookahlounge.qsrc

@@ -0,0 +1,66 @@
+# hookahlounge
+!!background should be kind of dark, maybe #664d4d
+!!time should also pass on entering and leaving, maybe 1 or 2 minutes
+!!I intend on adding 2 NPCs, a Muslim woman and a man of undecided origin. Unclear at the moment on what their connection is.
+!!Possibility to unlock more drugs to take using the hookah as relationship with Muslim woman progresses.
+!!I have an idea to possibly enable Sveta to work at the Hookah Lounge in the future
+!!I want something where on repeat visits, Aliyyah (the woman at the counter) greets Sveta by name instead of by "ma'am"
+if $ARGS[0] = 'start':
+	*clr & cla
+	$loc = 'hookahlounge'
+	$loc_arg = 'start'	
+	$menu_loc = 'hookahlounge'
+	$menu_arg = 'start'
+	menu_off = 0
+	$location_type = 'public_indoors'
+	!!  if sound = 0: 
+	!!	end
+	gs 'themes', 'indoors'
+	gs 'stat'	
+	'<center><h1><font color="maroon">Hookah Lounge</font></h1></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/hookahlounge/HookahLounge.jpg"></center>'
+	!! smoking with hookah should have same effect as smoking cigarettes
+	'You enter the lounge'
+	act 'Leave the Lounge': minut += 1 & gt 'city_redlight', 'start'
+	act 'Go to counter': gt 'hookahlounge', 'Hookah_Aliyyah'
+	if smoketab = 1:
+		act 'Sit Down':  gt 'hookahlounge', 'Smoke_Hookah'
+	end
+end
+!! end the main act
+
+if $ARGS[0] = 'Hookah_Aliyyah':
+	*clr & cla
+	menu_off = 1
+	'<center><b><font color="maroon">Untitled Hookah Lounge</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/characters/city/aliyyah/Hookah_Aliyyah.jpg"></center>'
+	'At the counter, you see a young Muslim woman. She appears quite timid. Nontheless, she greets you with a smile as you walk up. She squeaks "What do you need, ma''am?'
+	'I''d like to buy a seat at a hookah, please.'
+	'Okay, that will be <b>₽</b>100 please.'
+	'You glance at her name badge, before looking back at her. Smiling, you hand over the required amount and say "Here you go, <<$npc_firstname[''A262'']>>!"'
+	if smoketab = 0:
+		act 'Pay for an hour and leave the counter': money -= 100 & smoketab = 1 & gt 'hookahlounge', 'start'
+	else
+		act 'Leave the counter': gt 'hookahlounge', 'start'
+	end	
+end
+!! Smoking from hookah should give Sveta a "buzzed" effect, possible to code that please?
+if $ARGS[0] = 'Smoke_Hookah':
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/hookahlounge/HookahSit.jpg"></center>'
+	'You sit down at a booth'
+	act 'Smoke using hookah':
+		cla & *clr
+		smoketab = 0
+		minut += 60
+		gs 'stat'
+		siga += 1
+		gs 'drugs', 'smoke', 1
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/hookahlounge/HookahSmoke.jpg"></center>'
+		'You smoke using the hookah'
+		act 'Stop using Hookah': gt 'hookahlounge', 'start'
+		!! this finishes hookah act
+	end 
+end
+!! game code:
+
+--- hookahlounge ---------------------------------

+ 9 - 5
locations/hookup_morning.qsrc

@@ -4,9 +4,9 @@
 if $ARGS[0] = 'morning':
 	if npc_earlyriser[$boy] = 1:
 		if daystage = 1:
-			'<center><img <<$set_imgh>> src="images/shared/romance/misc/wake_dark1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/romance/misc/wake_dark.jpg"></center>'
 		elseif daystage = 2:
-			'<center><img <<$set_imgh>> src="images/shared/romance/misc/wake_light1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/shared/romance/misc/wake_light.jpg"></center>'
 		end
 	elseif npc_latesleeper[$boy] = 1:
 		'<center><video autoplay loop src="images/shared/romance/misc/wakeup4.mp4"></video></center>'
@@ -1067,14 +1067,18 @@ if $ARGS[0] = 'explore':
 end
 
 if $ARGS[0] = 'spare_explore':
+!!links for popups broken and in need of fixing at some time
 	if npc_apt_spare[$boy] = 1:
-		'Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$boy]''">a desk with a monitor and a keyboard on top.</a>'
+	'Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find a desk with a monitor and a keyboard on top.'
+!!		'Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$boy]''">a desk with a monitor and a keyboard on top.</a>'
 		'<i>Bit of a gamer huh?</i> you think to yourself, strutting past.'
 	elseif npc_apt_spare[$boy] = 2:
-		'Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$boy]''">a room filled with various exercise equipment.</a>'
+		'Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find a room filled with various exercise equipment.'
+!!		'Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$boy]''">a room filled with various exercise equipment.</a>'
 		'<i>Likes to work out huh?</i> you think to yourself, strutting past.'
 	else
-		'Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like.'
+		'Through one door is the living room you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like.'
+!!		'Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_livingroom[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like.'
 	end
 end
 

+ 1 - 0
locations/hookup_virgin.qsrc

@@ -368,6 +368,7 @@ if $ARGS[0] = 'bj_instead':
 					'"Ugh <i>again?</i>"'
 					'"... yes," you respond meekly.'
 					'"<i>Fine</i>, but it better be good." He grabs you roughly by the head and shoves you down towards his crotch.'
+					act'Blow him':gt'hookup','bj'
 				else
 					'"Ugh <i>again?</i>"'
 					'"... yes," you respond meekly.'

+ 3 - 3
locations/hunter_favors.qsrc

@@ -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 have nothing 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:
@@ -222,7 +222,7 @@ if $ARGS[0] = 'creekside_gangbang_request':
 			*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 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.'
+			'"<<$pcs_firstname>>, 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
@@ -598,7 +598,7 @@ if $ARGS[0] = 'yard_bondage':
 						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, Sveta," he says. "I think you are just being a bitchy cocktease", and walks away'
+						'"You are not exactly all pure and innocent, <<$pcs_firstname>>," he says. "I think you are just being a bitchy cocktease", and walks away'
 						act 'Further': gt 'swamp_yard', 'start'
 					end
 				end

+ 1 - 1
locations/hunter_interactions.qsrc

@@ -1217,7 +1217,7 @@ if $ARGS[0] = 'andrei_quick_fuck':
 				'After a few minutes he grabs you by the shoulders and unceremoniously shoves you on the ground on your back.'
 				'You watch him furiously jerk standing over you. You realize you have been playing with yourself for some time when he starts shooting his load all over your tits and belly'
 
-				gs 'arousal', 'masturbate', 15
+				gs 'arousal', 'vaginal_finger', 10, 'masturbate'
 				gs 'arousal', 'end'
 				gs 'cum_call', 'breasts', 'A172', 1
 				gs 'cum_call', 'stomach', 'A172', 1

+ 8 - 6
locations/internet_mobile.qsrc

@@ -34,7 +34,7 @@ subscription[<plan nam>-type]       The type of the subscription.
 Plan Names
 
 free:           A subscription that is freely available, libraries, friends and lovers apartment, etc. that has a computer.
-                The value of this plan is always 1 and the subscription_date is 0.
+                The value of this plan is always 1 and the subscription date is 0.
 
 mobile:         Mobile telephone (only internet or calls too?) and laptop if taken somewhere else. 
                 If at a location where subscription['free'] is used, she has to ask first to be able to use her own laptop
@@ -172,7 +172,7 @@ if $ARGS[0] = 'transfer_subscription':
     allowed = allowed and func('internet_mobile', 'check_allowed_location', $ARGS[2])
     if allowed:
         subscription[$ARGS[2]] = subscription[$ARGS[1]]
-        subscription_date['<<ARGS[2]>>-date'] = subscription['<<$ARGS[1]>>-date']
+        subscription['<<ARGS[2]>>-date'] = subscription['<<$ARGS[1]>>-date']
         subscription['<<ARGS[2]>>-price'] = subscription['<<$ARGS[1]>>-price']
         subscription['<<ARGS[2]>>-discount'] = subscription['<<$ARGS[1]>>-discount']
         !! This one is always 1 because only type 1 subscriptions can be transferred, but making it "future proof"
@@ -221,8 +221,8 @@ if $ARGS[0] = 'get_access':
                 k += 1
             if k < count: jump 'loop_args'
         end
-        if access['noporn'] = 1: $access['noporn-text'] = 'You can''t search for porn on this computer'
-        if access['nocamshow'] = 1: $access['nocamshow-text'] = 'You can''t do a cam show in this place'
+        if access['noporn'] = 1: $access['noporn'] = 'You can''t search for porn on this computer'
+        if access['nocamshow'] = 1: $access['nocamshow'] = 'You can''t do a cam show in this place'
         killvar 'count' & killvar 'k'
     end  
     killvar 'subsname'  
@@ -287,7 +287,8 @@ if $ARGS[0] = 'send_sms':
 end
 
 !! Using the internet - if metered, it lowers the minutes left
-!! $ARGS[1] - the name of the subscription used
+!! $ARGS[1] - the name of the subscription used (this could be completely unnecessary, at this point there is an active
+!!                                               $access which holds the subscription used.)
 !! ARGS[2] - the number of minutes used
 if $ARGS[0] = 'use_internet':
     if $subscription['<<$ARGS[1]>>-type'] = 'metered': 
@@ -300,7 +301,8 @@ end
 !! but monthly subscription can end abruptly too if she did not pay.
 !! Use it as a func() returns 1 or 0 based on the subscription[$ARGS[1]]  value
 !!
-!! $ARGS[1] - the name of the subscription
+!! $ARGS[1] - the name of the subscription (this could be completely unnecessary, at this point there is an active
+!!                                          $access which holds the subscription used.)
 if $ARGS[0] = 'check_internet_access':
     if subscription[$ARGS[1]] > 0: result = 1
 end

+ 14 - 14
locations/intro_city_select.qsrc

@@ -367,9 +367,9 @@ if $ARGS[0] = 'nerd':
 	npc_rel['A29'] += 10
 	genbsize = 13 
 !!b cup for ideal bmi
-	traits['nerd_points'] = 60
-	traits['nerd_status'] = 2
-	traits['nerd_lernHome'] = 5
+	pcs_traits['nerd_points'] = 60
+	pcs_traits['nerd_status'] = 2
+	pcs_traits['nerd_lernHome'] = 5
 end
 
 if $ARGS[0] = 'nerdqueen':
@@ -439,8 +439,8 @@ if $ARGS[0] = 'goodstudent':
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_city_select', 'nerd'
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
 		pcs_intel = 70
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'troublemaker':
 	'Now you are in the big city, a whole new playground to find trouble in.'
 	act 'Select another': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -50
+		pcs_traits['nerd_points'] = -50
 		gs 'intro_city_select', 'gopnik'
 		alterstrtimg = 19
 		pcs_stren = 65
@@ -1068,7 +1068,7 @@ if $ARGS[0] = 'alternative':
 	'That doesn''t matter now since you''re out in the city on your own, ready to do as you please.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -20
+		pcs_traits['nerd_points'] = -20
 		pcs_exhib = 25
 		Exhibitionist_lvl = 1
 		addictive_exp = 1
@@ -1258,9 +1258,9 @@ if $ARGS[0] = 'goodgirl':
 	'Now you are in the big city and have suddenly found there are no teachers or adults to impress. In fact, it seems buttering up to the adults your entire life has become something of a hinderance.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
-		traits['nerd_lernHome'] = 5
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
+		pcs_traits['nerd_lernHome'] = 5
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -5, 10, -20, 0, 20
 		npc_rel['A25'] -= 5
@@ -1315,8 +1315,8 @@ if $ARGS[0] = 'slut':
 	'However, your resultant addiction to sex made you a social pariah, and you were constantly mocked by your peers. Now you are in the big city where nobody knows you, giving you a chance to either start over or continue your life of debauchery.'
 	act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		trait['commando_lvl'] = 2
-		trait['cumeater'] = 1 and cumeater_cheat = 1
+		pcs_traits['commando_lvl'] = 2
+		pcs_traits['cumeater'] = 1 and cumeater_cheat = 1
 		pcs_exhib = 40
 		Exhibitionist_lvl = 1
 		gs 'intro_city_select', 'outcast'
@@ -1382,7 +1382,7 @@ if $ARGS[0] = 'slut':
 		guy = 15
 		orgasm = 120
 		swallow = 40
-		trait['cumeater'] = 1
+		pcs_traits['cumeater'] = 1
 		willpowermax = 50
 		motherKnowWhore = 1
 		sisterknowslut = 1
@@ -1411,7 +1411,7 @@ if $ARGS[0] = 'goth':
 	'With school over, you''ve moved to the city, where you feel a lot more accepted, although people still give you the odd stare.'
     act 'Select another option': gt 'intro_city_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_city_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', 0, 0, 5, +20, 0, 0
         npc_rel['A28'] -= 20

+ 4 - 0
locations/intro_initialization.qsrc

@@ -94,6 +94,7 @@ gs 'body', 'initial'
 !!	**********
 
 gs 'daystart'
+gs 'yearstart'
 gs 'din_pav'
 gs 'din_npc'
 gs 'dinSex2'
@@ -429,6 +430,9 @@ else
 		gm_school[49] = 1
 		gm_school_h[49] = 120
 		gm_school_b[49] = pcs_hips
+		market_outfits[17] = 1
+		market_outfits_h[17] = 60
+		market_outfits_b[17] = pcs_hips
 	elseif school_clothing = 3:
 		gm_school[25] = 1
 		gm_school_h[25] = 120

+ 1 - 0
locations/intro_initialization_city.qsrc

@@ -103,6 +103,7 @@ gs 'body', 'initial'
 !!	**********
 
 gs 'daystart'
+gs 'yearstart'
 gs 'din_pav'
 gs 'din_npc'
 gs 'dinSex2'

+ 15 - 15
locations/intro_sg_select.qsrc

@@ -440,9 +440,9 @@ if $ARGS[0] = 'nerd':
 	grupvalue[6] = 600
 	genbsize = 13 
 !!b cup for ideal bmi
-	traits['nerd_points'] = 60
-	traits['nerd_status'] = 2
-	traits['nerd_lernHome'] = 5
+	pcs_traits['nerd_points'] = 60
+	pcs_traits['nerd_status'] = 2
+	pcs_traits['nerd_lernHome'] = 5
 end
 
 if $ARGS[0] = 'nerdqueen':
@@ -514,8 +514,8 @@ if $ARGS[0] = 'goodstudent':
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
 		gs 'intro_sg_select', 'nerd'
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
 		alterstrtimg = 9
 		if glass < 1 : glass = 1
 		pcs_intel = 60
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'troublemaker':
 	'You have problems at home and school due to your antisocial behavior. This is especially true with your mother and stepfather, who see you going down the wrong path. You are well known to both your teachers and the police.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -50
+		pcs_traits['nerd_points'] = -50
 		gs 'intro_sg_select', 'gopnik'
 		alterstrtimg = 19
 		pcs_stren = 60
@@ -1162,7 +1162,7 @@ if $ARGS[0] = 'vitekgf':
 	'As you developed, he started to take an interest in you as well and you soon started dating. You''re not technically a gopnik - you are considered more of a wannabe - but the rest of the gopniks seem to accept you anyways. You''re not sure what would happen if you ever broke up with <<$npc_nickname[''A9'']>>, however, as being his girlfriend and hanging out with the other gopniks has cost you any real, close friends outside of their group.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_sg_select', 'gopnik'
 		alterstrtimg = 20
 		pcs_chrsm = 40
@@ -1236,7 +1236,7 @@ if $ARGS[0] = 'alternative':
 	'However, you have problems at home and school due to your behavior. This is especially true with your mother and stepfather, who see you going down the wrong path.'
 	act 'Select another': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -20
+		pcs_traits['nerd_points'] = -20
 		pcs_exhib = 25
 		Exhibitionist_lvl = 1
 		addictive_exp = 1
@@ -1434,9 +1434,9 @@ if $ARGS[0] = 'goodgirl':
 	'You love the attention you get from adults, and while you can feel lonely at times, you''re pretty happy knowing you''re a good girl. The nerds seem to tolerate you the most, likely because they almost never misbehave and always do their homework anyways.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = 100
-		traits['nerd_status'] = 3
-		traits['nerd_lernHome'] = 5
+		pcs_traits['nerd_points'] = 100
+		pcs_traits['nerd_status'] = 3
+		pcs_traits['nerd_lernHome'] = 5
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -10, -5, 10, -20, 0, 20
 		npc_rel['A25'] -= 5
@@ -1493,8 +1493,8 @@ if $ARGS[0] = 'slut':
 	'However, your sex addiction has made you a social pariah. The girls all despise you and the boys publicly mock you, although they don''t mind using you. The nerds completely avoid you, while the gopniks seem to tolerate you the most, likely because they enjoy taking advantage of you.'
 	act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		trait['commando_lvl'] = 2
-		trait['cumeater'] = 1 and cumeater_cheat = 1
+		pcs_traits['commando_lvl'] = 2
+		pcs_traits['cumeater'] = 1 and cumeater_cheat = 1
 		pcs_exhib = 40
 		Exhibitionist_lvl = 1
 		motherKnowSpravka = 1
@@ -1567,7 +1567,7 @@ if $ARGS[0] = 'slut':
 		guy = 15
 		orgasm = 120
 		swallow = 40
-		trait['cumeater'] = 1
+		pcs_traits['cumeater'] = 1
 		grupvalue[4] = 100
 		willpowermax = 50
 		motherKnowWhore = 1
@@ -1598,7 +1598,7 @@ if $ARGS[0] = 'goth':
 	'Fortunately, not everyone listens to them. The nerds like your reading proclivity and that you are into some of the same things they are; you think they might even invite you to their game night one day. A few of the gopniks like your party attitude, specifically those in the band, who seem to respect your artistic disposition. Or their lead singer just wants to get in your panties. It''s hard to tell.'
     act 'Select another option': gt 'intro_sg_select', 'charselect'
 	act 'Confirm this option':
-		traits['nerd_points'] = -10
+		pcs_traits['nerd_points'] = -10
 		gs 'intro_sg_select', 'outcast'
 		gs 'npc_relationship', 'socialgroup_setting', -5, 0, 0, +10, 0, -10
         npc_rel['A28'] -= 20

+ 4 - 4
locations/intro_sg_select_custom.qsrc

@@ -6,11 +6,11 @@ if $ARGS[0] = 'start':
 	act 'Confirm these options':
 		dynamic 'grupvalue[<<grupTipe>>] = 600'
 		if $soc_grup = 'nerd':
-			traits['nerd_points'] = 60
-			traits['nerd_status'] = 2
-			traits['nerd_lernHome'] = 5
+			pcs_traits['nerd_points'] = 60
+			pcs_traits['nerd_status'] = 2
+			pcs_traits['nerd_lernHome'] = 5
 		elseif $soc_grup = 'gopnik':
-			traits['nerd_points'] = -20
+			pcs_traits['nerd_points'] = -20
 		end
 		if pcs_inhib < 10: pcs_inhib = 10
 		!!This line should get sveta to wear school uniform because she has no other clothing with > 50

+ 18 - 18
locations/journal_school.qsrc

@@ -1017,30 +1017,30 @@ if $ARGS[0] = 'outcasts':
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/25.jpg"></center>'
 		'<center>Sonia Ivanko</center>'
 		'After a series of slutty incidents that crescendoed at the dance where she got way too drunk, gave Vitek and his buddies a simultaneous blowjob and returned with her face covered in their cum, Sonia''s reputation has been in shambles. Most of the girls give her the silent treatment, pretending she doesn''t exist, while the guys treat her like a cheap whore and regularly ask (or sometimes even demand) sex from her, knowing she doesn''t have the strength to refuse. Many say she has embraced being a cheap slut, happily letting anyone use her, while others say she has started to prostitute herself.'
-	end
-	if npc_rel['A25'] >= 80:
-		'She really likes you and considers you one of her best friends.'
-	elseif npc_rel['A25'] >= 50:
-		'She really likes you and considers you to be one of her friends.'
-	elseif npc_rel['A25'] <= 20:
-		'She really dislikes you, maybe even hates you. Either way, she can''t stand you.'
-	else
-		'You are acquaintances with her, but she doesn''t seem to care much about you either way.'
+		if npc_rel['A25'] >= 80:
+			'She really likes you and considers you one of her best friends.'
+		elseif npc_rel['A25'] >= 50:
+			'She really likes you and considers you to be one of her friends.'
+		elseif npc_rel['A25'] <= 20:
+			'She really dislikes you, maybe even hates you. Either way, she can''t stand you.'
+		else
+			'You are acquaintances with her, but she doesn''t seem to care much about you either way.'
+		end
 	end
 
 	if npc_grupTipe['A5'] = 5:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/5.jpg"></center>'
 		'<center>Fedor Kozlov</center>'
 		'Ever since Fedor gave Vasily a blowjob outside the school in front of everyone, he has been an outcast. Fedor claims he was forced and had no choice, but most people think he actually wanted to do it. Many of the boys mock him and even his former friend Ivan ignores him. The girls are nearly as bad, as many of them make fun of him as well. Fedor now mostly keeps to himself and tries to avoid the other students.'
-	end
-	if npc_rel['A5'] >= 80:
-		'He really likes you and considers you one of his best friends.'
-	elseif npc_rel['A5'] >= 50:
-		'He really likes you and considers you to be one of his friends.'
-	elseif npc_rel['A5'] <= 20:
-		'He really dislikes you, maybe even hates you. Either way, he can''t stand you.'
-	else
-		'You are acquaintances with him, but he doesn''t seem to care much about you either way.'
+		if npc_rel['A5'] >= 80:
+			'He really likes you and considers you one of his best friends.'
+		elseif npc_rel['A5'] >= 50:
+			'He really likes you and considers you to be one of his friends.'
+		elseif npc_rel['A5'] <= 20:
+			'He really dislikes you, maybe even hates you. Either way, he can''t stand you.'
+		else
+			'You are acquaintances with him, but he doesn''t seem to care much about you either way.'
+		end
 	end
 
 	act 'Put your notebook down': 		 

+ 12 - 14
locations/journal_work.qsrc

@@ -1,14 +1,11 @@
 # journal_work
-! Created 12/9/22 
-! 12/9/22 Initial code
-! Authored by Hooded Silence
-! Game Character work section. This is the container file for all work roles in game. Used to track income, work days and other relevant data.
-! V .01 Refactored code from Journal section into it''s own section to make legibility easier.
-!
-! Work Variables:
-!
-! employed[qw] = Work tracker if employed. To be set on starting or leaving a job.
-
+!! Created 12/9/22 
+!! 12/9/22 Initial code
+!! Authored by Hooded Silence
+!! Game Character work section. This is the container file for all work roles in game. Used to track income, work days and other relevant data.
+!! V .01 Refactored code from Journal section into it''s own section to make legibility easier.
+!! V. 02 New job schedule system integrated
+!!
 
 if $ARGS[0] = 'start':
 
@@ -18,8 +15,11 @@ if $ARGS[0] = 'start':
 	$jumploc = 'worktab'
 	gs 'journal', 'journalmenu'
 	'<center><h2>Work</h2></center>'
-	if employedqw['status'] = 0:
+	if emp_job[active] < 1:
 		'You need to find a job or get training to develop your career. Check the Quests or Information section.'
+	else
+		function_sw = 2
+		gs 'emp_functions', 'gen_schedule'
 	end
 	
 	if workPTU > 2:'You work as a teacher at the Lycée and your schedule is Monday to Saturday, teaching between 14:00 and 16:00. Your salary is 300 <b>₽</b> per day.'
@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 	if (work = 1 or cheatWork = 1) and young_shop_work1 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Saturday and Sunday. The salary shall be issued once a week, on Fridays.'
 	if (work = 1 or cheatWork = 1) and young_shop_work2 = 1:'You work in the city as a store clerk at the Pussy Cats clothing store. Work starts at 09:00 Monday through Friday. The salary shall be issued once a week, on Fridays.'
 	if (work = 1 or cheatWork = 1) and workFabrika = 1:'You work as a seamstress in the factory in Pavlovsk. Work is every weekday, with weekends off. Salary is automatically transferred on the 25th of each month.'
-	if (work = 1 or cheatWork = 1) and TourGuide = 1:'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b> .'
+	!!if (work = 1 or cheatWork = 1) and TourGuide = 1:'You work as a tour guide in the Pavlovsk park. Work is any day during the summer holidays for 8 hours, starting between 08:00 and 12:00. Salary is 1,000 <b>₽</b> .'
 	if workrin = 1:'You are working at the market in Arthur''s tent as a clothing saleswoman. You work on Tuesday, Thursday and Saturday with a start time of 08:00. Salary depends on sales.'
 	if maidqw = 1:
 		'You work in the Pavlovsk hotel as a maid. Your work schedule is every day from 16:00 to 19:00 and your salary is 250 <b>₽</b> plus tips.'
@@ -144,6 +144,4 @@ if $ARGS[0] = 'start':
 		end
 	end
 end
-
-
 --- journal_work ---------------------------------

+ 1 - 1
locations/katjaEvDin.qsrc

@@ -903,7 +903,7 @@ if $ARGS[0] = 'moron':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/prohorov_3.jpg"></center>'
 				'"And I can kiss all the boys," you say under the joyous hubbub of guys gathering near you. You begin to kiss all the boys in succession, carefully avoiding the one that called you a lesbian.'
 				'Seeing this, he seems offended. "The redhead doesn''t like guys, I bet." he says with a smirk, hoping Katja will kiss him to prove him wrong.'
-				'"Wrong again loser!" Katja replies and begins to repeat you by kissing the boys.'
+				'"Wrong again loser!" Katja replies and just as you did she starts going around kissing the boys.'
 				if $loc = 'pav_disco':
 					'After kissing the last boy, you turn back and make sure Katja kisses all of them too. You now realise the guys are hoping for more and quickly drag Katja away before you accidentally start an orgy.'
 					act 'Return to dance': gt 'pav_disco'

+ 30 - 30
locations/katja_chat.qsrc

@@ -94,7 +94,7 @@ if $ARGS[0] = 'start':
 
 	if npc_sex['A14'] > 0:
 		if katjaQW['slut'] >= 100:
-			'Katja embraces you and gives you quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after letting you go.'
+			'Katja embraces you and gives you a quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after letting you go.'
 			'"I''m good," you answer. "How about you?"'
 			'"I''m doing fine. In fact, even better now that you''re here," she replies.'
 		elseif katjaQW['slut'] >= 50:
@@ -110,9 +110,9 @@ if $ARGS[0] = 'start':
 		act 'Say you can''t stay to chat': gt $loc, $loc_arg
 	else
 		if fame['city_slut'] > 200:
-			'"This is not the place to attract boys," Katja says in a mocking tone. "Take your antics somewhere else!"'
+			'"This is not the place to attract boys," Katja says mockingly. "Take your antics somewhere else!"'
 			'"Maybe I am not hunting for boys but redheaded girls this time," you reply in jest.'
-			'"Stop it! I''m not interested," she says in a tone less harsh than you expected.'
+			'"Stop it! I''m not interested," she says, in a tone less harsh than you expected.'
 			'"Maybe you should be," you say with a smirk. "I could definitely teach you a thing or two about how to have fun."'
 			'Katja''s face grows red and her breath hitches, defying the stern look on her face.'
 			if npc_rel['A14'] > 40:
@@ -122,18 +122,18 @@ if $ARGS[0] = 'start':
 				act 'Leave': gt $loc, $loc_arg			
 			end
 		elseif npc_rel['A14'] > 60:
-			'"Hi <<$pcs_nickname>>, great to see you. How is it going?" Katja asks.'
+			'"Hi, <<$pcs_nickname>>. Great to see you. How is it going?" Katja asks.'
 			'"It''s going good," you reply. "How about you?"'
 			'"I''m good," Katja says.'
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 			act 'Say you don''t have time to chat': gt $loc, $loc_arg
 		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.'
+			'"What are you doing here?" Katja asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			act 'Leave': gt $loc, $loc_arg
 		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?"'
-			'"I''m good," she says and her composure loosens up a little.'
+			'"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?"'
+			'"I''m good," she says, and her composure loosens a little.'
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 			act 'Say you don''t have time to chat': gt $loc, $loc_arg
 		end
@@ -148,7 +148,7 @@ if $ARGS[0] = 'uni_cafe':
 
 	if npc_sex['A14'] > 0:
 		if katjaQW['slut'] >= 100:
-			'Katja get up and gives you quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after sitting down again.'
+			'Katja gets up and gives you a quick kiss on the lips. "How are you, <<$pcs_nickname>>? It''s great to see you," she says after sitting down again.'
 			'"I''m good," you answer. "How about you?"'
 			'"I''m doing fine. In fact, even better now that you''re here," she replies.'
 		else
@@ -157,7 +157,7 @@ if $ARGS[0] = 'uni_cafe':
 			'"I''m doing fine. In fact, even better now that you''re here," she replies.'
 		end
 		if uni_lunch_bought = 1:
-			'You sit down and start eating your lunch with Katja while the two of you are talking'
+			'You sit down and start eating your lunch with Katja while you are talking.'
 			act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 		else
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -165,14 +165,14 @@ if $ARGS[0] = 'uni_cafe':
 		end
 	else
 		if fame['city_slut'] > 200:
-			'"This is not the place to attract boys," Katja says in a mocking tone. "Take your antics somewhere else!"'
+			'"This is not the place to attract boys," Katja says mockingly. "Take your antics somewhere else!"'
 			'"Maybe I am not hunting for boys but redheaded girls this time," you reply in jest.'
-			'"Stop it! I''m not interested," she says in a tone less harsh than you expected.'
+			'"Stop it! I''m not interested," she says, in a tone less harsh than you expected.'
 			'"Maybe you should be," you say with a smirk. "I could definitely teach you a thing or two about how to have fun."'
 			'Katja''s face grows red and her breath hitches, defying the stern look on her face.'
 			if npc_rel['A14'] > 40:
 				if uni_lunch_bought = 1:
-					'You sit down and start eating your lunch with Katja while the two of you are talking'
+					'You sit down and start eating your lunch with Katja while you are talking.'
 					act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 				else
 					act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -182,25 +182,25 @@ if $ARGS[0] = 'uni_cafe':
 				act 'Leave': gt 'uni_cafe'		
 			end
 		elseif npc_rel['A14'] > 60:
-			'"Hi <<$pcs_nickname>>, great to see you. How is it going?" Katja asks.'
+			'"Hi, <<$pcs_nickname>>.Great to see you. How is it going?" Katja asks.'
 			'"It''s going good," you reply. "How about you?"'
 			'"I''m good," Katja says.'
 			if uni_lunch_bought = 1:
-				'You sit down and start eating your lunch with Katja while the two of you are talking'
+				'You sit down and start eating your lunch with Katja while you are talking.'
 				act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 			else
 				act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 				act 'Say you can''t stay to chat': gt '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.'
+			'"What are you doing here?" Katja asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			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?"'
-			'"I''m good," she says and her composure loosens up a little.'
+			'"I''m good," she says, and her composure loosens a little.'
 			if uni_lunch_bought = 1:
-				'You sit down and start eating your lunch with Katja while the two of you are talking'
+				'You sit down and start eating your lunch with Katja while you are talking.'
 				act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 			else
 				act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -216,24 +216,24 @@ if $ARGS[0] = 'chat':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if locat['katja'] = 26:
 		if $university['enrolled_in'] = 'teaching_studies':
-			'Katja says you need to leave for class now so that you aren''t late.'
+			'Katja says you need to leave for class now, so you aren''t late.'
 			hour -= 1
 			if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 			act 'Say you aren''t going to class and leave': hour += 1 & gt $loc, $loc_arg
 		else
-			'Katja says that she needs to leave now so that she isn''t late for class.'
+			'Katja says she needs to leave now, so she isn''t late for class.'
 			hour -= 1
 			if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 			act 'Say goodbye': hour +=1 & gt $loc, $loc_arg
 		end
 	elseif locat['katja'] = 50:
 		if $university['enrolled_in'] = 'teaching_studies':
-			'Katja says that you need to leave for class now so that you aren''t late for the exam.'
+			'Katja says that you need to leave for class now, so you aren''t late for the exam.'
 			hour -= 1
 			if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 			act 'Say you aren''t going to the exam and leave': hour += 1 & gt $loc, $loc_arg
 		else
-			'Katja says that she needs to leave for class now so that she isn''t late for her exam.'
+			'Katja says she needs to leave for class now, so she isn''t late for her exam.'
 			hour -= 1
 			if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 			act 'Say goodbye': hour +=1 & gt $loc, $loc_arg
@@ -285,12 +285,12 @@ if $ARGS[0] = 'chat1':
 	!!end
 
 	if locat['katja'] = 24: 
-		'Katja grabs a magazine lying on the table, opens it and hands it to you. "Look at that dress, <<$pcs_nickname>>. I think it would look very good on you," she says. It is indeed a nice dress, but before you can respond, she is already flipping pages to another dress.'
+		'Katja grabs a magazine lying on the table, opens it and hands it to you. "Look at that dress, <<$pcs_nickname>>. I think it would look perfect on you," she says. It is a lovely dress, but before you can respond, she is already flipping pages to another dress.'
 		'Katja spends the next few minutes showing you clothes that she thinks would suit you or would just like for herself.'
 		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 	elseif locat['katja'] = 25:
-		'Katja suddenly gestures to a tall brunette in a long dress walking by. "Look at her! She is so pretty in that dress. I wish I had that," she says longingly. You''re unsure if she meant that she wants the dress or the girl.'
+		'Katja suddenly gestures to a tall brunette in a long dress walking by. "Look at her! She is so pretty in that dress. I wish I had that," she says longingly. You''re unsure if she meant she wanted the dress or the girl.'
 		'You spend the next several minutes talking with Katja about the clothes and makeup of the girls who pass you by.'
 		if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 		if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
@@ -316,7 +316,7 @@ if $ARGS[0] = 'first_meet':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'"Are you studying at uni?" you ask.'
 	'"Yes, I''m '+iif(year = 2017 and month < 10, 'going to study', 'studying')+' to become a teacher," Katja says. "What about you. Are you also studying here?"'
-	'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher.', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university')+',')+'" you tell Katja.'
+	'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher,', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university,')+',')+'" you tell Katja.'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'
 end	
 
@@ -324,15 +324,15 @@ end
 if $ARGS[0] = 'sofia1':
 	sofiaQW['QWstage'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'"So what do you think about my roommate?" Katja asks with a curious look on her face.'
+	'"So, what do you think about my roommate?" Katja asks with a curious look on her face.'
 	'"She seems nice," you answer. "But she sure does talk a lot."'
 	'"She talks constantly; she never shuts up! Like she has nobody else to talk to except me," Katja complains.'
 	'"Is that true?" you ask.'
-	'"Maybe. I don''t think she''s made any friends since she moved here. So she probably only has me and her boyfriend," Katja says. "If she just had something interesting to say it might be a bit more bearable," Katja continues.'
+	'"Maybe. I don''t think she''s made any friends since she moved here. So she probably only has her boyfriend and me," Katja says. "If she just had something interesting to say, it might be a bit more bearable," Katja continues.'
 	'"She never says anything interesting?" you ask.'
-	'"Well, sometimes she talks about her classes, which isn''t too boring or she''ll tell me about something she saw or experienced that day," Katja says. "But mostly she just tells the same stories from her stupid hometown in the fucking middle of nowhere, or even worse, just fawns over her boyfriend." The redhead looks at you and smiles slightly, "At least she knows you now, so maybe she''ll start bothering you instead so I can get a little bit of peace."'
-	'"Hopefully she can make some more friends soon," you say with a laugh.'
-	'"I doubt it," Katja says. "She is constantly hanging out with her boyfriend and I don''t think he wants her to meet other girls. She also goes back to her hometown on Thursday nights and stays until Sunday, so she doesn''t have much time to meet anyone."'
+	'"Well, sometimes she talks about her classes, which isn''t too boring, or she''ll tell me about something she saw or experienced that day," Katja says. "But mostly, she just tells the same stories from her stupid hometown in the fucking middle of nowhere, or even worse, just fawns over her boyfriend." The redhead looks at you and smiles slightly, "At least she knows you now, so maybe she''ll start bothering you instead so I can get a little bit of peace."'
+	'"Hopefully, she can make some more friends soon," you laughingly.'
+	'"I doubt it," Katja says. "She is constantly hanging out with her boyfriend, and I don''t think he wants her to meet other girls. She also returns to her hometown on Thursday nights and stays until Sunday, so she doesn''t have much time to meet anyone."'
 	'"You''re not too fond of her boyfriend?" you ask.'
 	'"I don''t know," she says. "There''s something about him that feels a little bit off, but I shouldn''t speak ill of people you don''t even know. So let''s wait until after you meet him."'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'

+ 66 - 66
locations/katja_dorm.qsrc

@@ -3,7 +3,7 @@
 
 !!This files governs Katjas interactions in her dorm room. The following variables are part of her storry line:
 !! katjaQW['QWstage'] = 1 You have agreed to hang out with Katja afer school. (meynoldQW = 1)
-!! katjaQW['QWstage'] = 2 You have been to Katja''s house and you can go there to hang out with her. (meynoldQW = 2) 
+!! katjaQW['QWstage'] = 2 You have been to Katja''s house and you can go there to hang out with her. (meynoldQW = 2)
 !! katjaQW['QWstage'] = 3 You have kissed Katja and she might be interested in more. (katjaFirstKiss = 1 and KatjaOTN)
 !! npc_sex['A14'] = 1 You have had at least one sexual experince with Katja.
 !! katjaQW['QWstage'] = 4 Katja have asked you to helpe have sex with a boy.
@@ -11,7 +11,7 @@
 !! katjaQW['QWstage'] = 6 You have talked with Katja about her first experience with a boy.
 !! katjaQW['QWstage'] = 7 You have told Katja about the boys in the park.
 
-!! katjaQW['boy_block'] is set to 1 if you tell Katja that you have no interest in boys when she ask about you sex experience whit boy. 
+!! katjaQW['boy_block'] is set to 1 if you tell Katja that you have no interest in boys when she ask about you sex experience whit boy.
 
 !! katjaQW['anal_quest'] =1 Katja has asked you to help her have anal sex with a boy.
 !! katjaQW['anal_quest'] =2 You have agreed to help Katja have anal sex with a boy.
@@ -27,7 +27,7 @@
 !! katjaQW['horny'] a messure of Katja''s arousal. Grows until she have an orgasmn and will determine how willing she is at the moment to have sex.
 !! katjaQW['dom'] a number that tells if Katja is dominant or submissive. 0 is neutral, a negative means she is submissive and a positive means she is dominant. In general the absolute value needs to be above 30 before you will see any effect. (katjaDom but not a 1 to 1 translation since that variable was all over the place.)
 
-!! katjaQW['park_sex'] 	a measure of what experience Katja has had with random guys in the park. 0 means she has not had sex with anybody in the park, 
+!! katjaQW['park_sex'] 	a measure of what experience Katja has had with random guys in the park. 0 means she has not had sex with anybody in the park,
 !!					1 means that she has had sex with one guy at a time (either alone, in a threesome with the player character or while the player had sex with another guy next to them)
 !!					2 means she has had a threesome with 2 guys you met in the park, and 3 means she has paticipated in an orgy with guys from the park. (katjaSex)
 
@@ -108,7 +108,7 @@ if $ARGS[0] = 'start':
 	elseif locat['katja'] = 22:
 		'Katja is getting dressed and doing her makeup. She doesn''t want to be disturbed right now.'
 	elseif locat['katja'] = 24:
-		if minut < 50: 
+		if minut < 50:
 			'Katja is preparing to go to class, collecting the things she needs.'
 			act 'Talk to Katja': gt 'katja_chat', 'chat'
 		else
@@ -148,12 +148,12 @@ if $ARGS[0] = 'talk':
 		'"Sorry, but I have to run now. See you later," she says.'
 		act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 	else
-		if (katjaQW['lazer_pussy_talk'] = 0 or (katjaQW['lazer_pussy_talk'] = 2 and katjaQW['knows_sex'] = 1 and rand(0,4) = 0)) and katjaQW['lazer_pussy'] = 0 and katjQW['boy_block'] = 0 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and katjaQW['lazar_uni_meet'] = 1 and npc_sex['A14'] > 0:
+		if (katjaQW['lazer_pussy_talk'] = 0 or (katjaQW['lazer_pussy_talk'] = 2 and katjaQW['knows_sex'] = 1 and rand(0,4) = 0)) and katjaQW['lazer_pussy'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 50 and katjaQW['horny'] >= 40 and katjaQW['lazar_uni_meet'] = 1 and npc_sex['A14'] > 0:
 			!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have sex with him, provided they have not already done so before.
 			gt 'Katja_dorm', 'lazar_pussy_talk'
 			
 		else
-			if katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0 and katjQW['boy_block'] = 0 and katjaQW['slut'] >= 60 and katjaQW['lazar_uni_meet'] = 1 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0: 
+			if katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0 and katjaQW['boy_block'] = 0 and katjaQW['slut'] >= 60 and katjaQW['lazar_uni_meet'] = 1 and katjaQW['horny'] >= 40 and npc_sex['A14'] > 0:
 			!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have anal sex with him, provided they have not already done so before.
 				gt 'Katja_dorm', 'lazar_anal_talk'
 			else
@@ -168,7 +168,7 @@ if $ARGS[0] = 'talk':
 						!!This only triggers if the player have never kissed Katja.
 						gt 'KatjaHomeTalk', 'tender_kiss'
 					end
-				else 
+				else
 					if npc_pregtalk['A14'] = 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 1:
 						!! If Katja can see you are pregant and you haven''t already told her this will create a conflict with to different responses depending on if Katja is pregnant or not.
 						if kid > 0:
@@ -200,13 +200,13 @@ if $ARGS[0] = 'talk':
 						act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 					else
 						!!If no events triggers they you go to the part where the player can choose things to do with Katja.
-						gt 'katja_dorm', 'chat' 
+						gt 'katja_dorm', 'chat'
 					end
 				end
 			end
 		end
 	end
-	act 'Leave Katja''s dorm room': 
+	act 'Leave Katja''s dorm room':
 		if sofiaQW['know'] = 0 and university['semester_week'] > 0:
 			gt 'katja_dorm', 'soifa_meet'
 		else
@@ -266,7 +266,7 @@ if $ARGS[0] = 'chat':
 			gs 'stat'
 			'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'"So, who''s the boy you mentioned being interested in earlier?" you ask curiously.' 
+			'"So, who''s the boy you mentioned being interested in earlier?" you ask curiously.'
 			if katjaQW['slut'] >= 60 and npc_sex['A14'] > 0 and katjaQW['horny'] > 40:
 				'"Nobody, you dummy!" she laughs. "It was just an excuse so you would kiss me!"'
 				katjaQW['boy_lie'] = 2
@@ -395,14 +395,14 @@ if $ARGS[0] = 'sofia_meet':
 	'Just as you are about to leave, the door opens and a girl walks in.'
 	'"Hi, Katja! I''m home early since Maxim suddenly had a meeting with one of his professors. I swear that he''s doing so much to study hard; almost too much. Always trying to meet with his teachers. I told him that they might see it as..." She suddenly stops, having noticed you. "Oh, you have a guest."'
 	'"Sofia, this is <<$pcs_nickname>>, my '+iif($university['enrolled_in'] = 'teaching_studies', 'classmate and ', '')+'friend from school who was just about to leave," Katja replies before she turns to you. "<<$pcs_nickname>>, this is Sofia, my roommate."'
-	'"Hi <<$pcs_nickname>>, it''s so nice to meet Katja''s friends since she doesn''t seem to have a lot of them," Sofia says, which clearly makes Katja blush. "So '+iif( $university['enrolled_in'] = 'teaching_studies', 'you''re also studying to become a teacher like Katja', 'what are you studying')+'?" she asks.' 
+	'"Hi <<$pcs_nickname>>, it''s so nice to meet Katja''s friends since she doesn''t seem to have a lot of them," Sofia says, which clearly makes Katja blush. "So '+iif( $university['enrolled_in'] = 'teaching_studies', 'you''re also studying to become a teacher like Katja', 'what are you studying')+'?" she asks.'
 	''+iif( $university['enrolled_in'] = 'teaching_studies', '"yes" ', '"I''m '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university')+'" ')+'you answer.'
-	'"Cool. I''m '+iif($university['enrolled_in'] = 'nursing', 'also studying to become a nurse. I do think I''ve seen you in class now that I think about it.', 'studying to become a nurse.')+' You must tell me all about yourself and what naughty things Katja was up to in school," she says, making Katja blush even more.' 
+	'"Cool. I''m '+iif($university['enrolled_in'] = 'nursing', 'also studying to become a nurse. I do think I''ve seen you in class now that I think about it.', 'studying to become a nurse.')+' You must tell me all about yourself and what naughty things Katja was up to in school," she says, making Katja blush even more.'
 	*nl
 	'"I''m sorry, but <<$pcs_nickname>> was just leaving," Katja says, looking at you as if trying to say she''s sorry.'
-	'"That''s right, I''ll be leaving now," you say.' 
+	'"That''s right, I''ll be leaving now," you say.'
 	'"Nice meeting you," Sofia says "Wish we had more time to chat since I barely know anybody here; just Katja and my boyfriend Maxim. See you again soon. I''m sure we''ll become great friends," she continues.'
-	'You say goodbye to Katja and as you leave the room, you hear Sofia continuing to talk the ear off of Katja.' 
+	'You say goodbye to Katja and as you leave the room, you hear Sofia continuing to talk the ear off of Katja.'
 	act 'Leave': gt 'uni_dorm', 'second_floor'	
 end
 
@@ -414,11 +414,11 @@ if $ARGS[0] = 'lazar_pussy_talk':
 			'"You know, <<$pcs_nickname>>, meeting Lazar at the café got me thinking," Katja says.'
 			if katjaQW['QWstage'] = 4:
 				'"We talked about how I would like to try having... sex... with a guy," Katja says with some pause. "I know you said you didn''t want to arrange it, but I''m sure with Lazar that you wouldn''t have to arrange anything; just call him and I''m sure he''ll agree," she continues before you can say anything.'
-				act 'Agree': 
+				act 'Agree':
 					if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 					gt 'katja_dorm', 'lazar_agree'
 				end
-				act 'Refuse': 
+				act 'Refuse':
 					katjaQW['lazer_pussy_talk'] = 2
 					katjaQW['horny'] -= 5
 					minut += 5
@@ -451,7 +451,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 						gt 'katja_dorm', 'lazar_agree'
 					end
-					act 'Refuse': 
+					act 'Refuse':
 						katjaQW['lazer_pussy_talk'] = 2
 						gt 'katja_dorm', 'lazar_refuse', 'pussy'
 					end
@@ -469,7 +469,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 								if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 								gt 'katja_dorm', 'lazar_agree'
 							end
-							act 'Refuse': 
+							act 'Refuse':
 								katjaQW['lazer_pussy_talk'] = 2
 								gt 'katja_dorm', 'lazar_refuse', 'pussy'
 							end
@@ -480,13 +480,13 @@ if $ARGS[0] = 'lazar_pussy_talk':
 								cla
 								'"I''ve had sex before. In fact, I''ve had sex with Lazar before," you answer.'
 								'"How was it? Is he a good lover? Was he your first? Do you hook up with him often?" Katja asks, almost frantically.'
-								'"Wow. Why do I get the feeling that there is something else going on? Do you want to have sex with Lazar?" you ask' 
+								'"Wow. Why do I get the feeling that there is something else going on? Do you want to have sex with Lazar?" you ask'
 								'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally says.'
 								act 'Agree':
 									if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 									gt 'katja_dorm', 'lazar_agree'
 								end
-								act 'Refuse': 
+								act 'Refuse':
 									katjaQW['lazer_pussy_talk'] = 2
 									gt 'katja_dorm', 'lazar_refuse', 'pussy'
 								end
@@ -496,13 +496,13 @@ if $ARGS[0] = 'lazar_pussy_talk':
 								cla
 								'"I''ve had sex before," you answer.'
 								'"How was it?" Katja asks.'
-								'"It was good. Any particular reason you''re asking now?" you inquire.' 
+								'"It was good. Any particular reason you''re asking now?" you inquire.'
 								'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it... But I think I want to," she finally says.'
 								act 'Agree':
 									if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 									gt 'katja_dorm', 'lazar_agree'
 								end
-								act 'Refuse': 
+								act 'Refuse':
 									katjaQW['lazer_pussy_talk'] = 2
 									gt 'katja_dorm', 'lazar_refuse', 'pussy'
 								end
@@ -522,7 +522,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 						gt 'katja_dorm', 'lazar_agree'
 					end
-					act 'Refuse': 
+					act 'Refuse':
 						katjaQW['lazer_pussy_talk'] = 2
 						katjaQW['horny'] -= 5
 						minut += 5
@@ -554,7 +554,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 							if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 							gt 'katja_dorm', 'lazar_agree'
 						end
-						act 'Refuse': 
+						act 'Refuse':
 							katjaQW['lazer_pussy_talk'] = 2
 							gt 'katja_dorm', 'lazar_refuse', 'pussy'
 						end
@@ -570,7 +570,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 									if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 									gt 'katja_dorm', 'lazar_agree'
 								end
-								act 'Refuse': 
+								act 'Refuse':
 									katjaQW['lazer_pussy_talk'] = 2
 									gt 'katja_dorm', 'lazar_refuse', 'pussy'
 								end
@@ -581,13 +581,13 @@ if $ARGS[0] = 'lazar_pussy_talk':
 									cla
 									'"I''ve had vaginal sex before. In fact, I''ve had sex with Lazar before," you answer'
 									'"How was it? Is he a good lover? Was he you first? Do you hook up with him often?" Katja asks, almost frantically.'
-									'"Wow. Why do I get the feeling that there is something else going on? Do you want to have sex with Lazar?" you ask.' 
+									'"Wow. Why do I get the feeling that there is something else going on? Do you want to have sex with Lazar?" you ask.'
 									'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally says.'
 									act 'Agree':
 										if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 										gt 'katja_dorm', 'lazar_agree'
 									end
-									act 'Refuse': 
+									act 'Refuse':
 										katjaQW['lazer_pussy_talk'] = 2
 										gt 'katja_dorm', 'lazar_refuse', 'pussy'
 									end
@@ -597,13 +597,13 @@ if $ARGS[0] = 'lazar_pussy_talk':
 									cla
 									'"I''ve had vaginal sex before," you answer.'
 									'"How was it?" Katja asks.'
-									'"It was good. Any particular reason you''re asking that question now?" you ask.' 
+									'"It was good. Any particular reason you''re asking that question now?" you ask.'
 									'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally answers.'
 									act 'Agree':
 										if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 										gt 'katja_dorm', 'lazar_agree'
 									end
-									act 'Refuse': 
+									act 'Refuse':
 										katjaQW['lazer_pussy_talk'] = 2
 										gt 'katja_dorm', 'lazar_refuse', 'pussy'
 									end
@@ -623,10 +623,10 @@ if $ARGS[0] = 'lazar_pussy_talk':
 				act 'Say you aren''t in the mood':
 					cla
 					'"I''m sorry, but I''m not in the mood for a threesome right now," you tell Katja.'
-					'"Okay, another time then", she replies.' 
+					'"Okay, another time then", she replies.'
 					act 'Talk about something else': gt 'Katja_dorm_talk', 'talk'				
 				end
-				act 'Say you don''t want to have sex with Lazar': 
+				act 'Say you don''t want to have sex with Lazar':
 					cla
 					katjaQW['lazer_pussy_talk'] = 2
 					'"I''m not that into Lazar. I don''t think I want to have sex with him," you tell Katja.'
@@ -645,7 +645,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 				if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 				gt 'katja_dorm', 'lazar_agree'
 			end
-			act 'Stand firm': 
+			act 'Stand firm':
 				katjaQW['horny'] -= 5
 				minut += 5
 				'"I made myself clear the last time you asked and that hasn''t changed," you tell her. She doesn''t plead her case, but she doesn''t seem satisfied.'
@@ -673,7 +673,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 					if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 					gt 'katja_dorm', 'lazar_agree'
 				end
-				act 'Refuse': 
+				act 'Refuse':
 					katjaQW['lazer_pussy_talk'] = 2
 					gt 'katja_dorm', 'lazar_refuse', 'pussy'
 				end
@@ -731,7 +731,7 @@ if $ARGS[0] = 'lazar_agree':
 		'"Okay. We can include Lazar in our harem of hot guys," you say. Which gets Katja to start laughing.'
 		'When she stops, she looks very excited. "Great. I want his cock in my pussy!"'
 	end
-	if katjaQW['anal_quest'] = 2: 
+	if katjaQW['anal_quest'] = 2:
 		if katjaQW['lazer_anal_talk'] = 1:
 			if katjaQW['QWstage'] > 5:
 				'"And we''ll let him fuck our butts, like we said earlier?" Katja asks.'
@@ -799,11 +799,11 @@ if $ARGS[0] = 'lazar_anal_talk':
 			'"You know, <<$pcs_nickname>>, meeting Lazar at the café got me thinking," Katja says.'
 			if katjaQW['anal_quest'] = 1:
 				'"We''ve talked about that. I would like to try having... anal sex with a guy," Katja says with some pause. "I know you said you didn''t want to arrange it, but I''m sure with Lazar, you would not have to arrange anything; just call him and I am sure he will agree," she quickly continues before you can say anything.'
-				act 'Agree': 
+				act 'Agree':
 					katjaQW['anal_quest'] = 2
 					gt 'katja_dorm', 'lazar_agree'
 				end
-				act 'Refuse': 
+				act 'Refuse':
 					katjaQW['horny'] -= 5
 					katjaQW['lazer_anal_talk'] = 2
 					minut += 5
@@ -815,11 +815,11 @@ if $ARGS[0] = 'lazar_anal_talk':
 				if katjaQW['knows_anal'] = 1:
 					'"You told me how great having anal sex with a guy is, and with how Lazar was talking, he seemed very interested in us. So maybe we could..." she continues, but her voice drops off.'
 					'"You want to have Lazar be the first guy to fuck your butt?" you ask. Katja just bites her lips and slowly nods.'
-					act 'Agree': 
+					act 'Agree':
 						katjaQW['anal_quest'] = 2
 						gt 'katja_dorm', 'lazar_agree'
 					end
-					act 'Refuse': 
+					act 'Refuse':
 						katjaQW['lazer_anal_talk'] = 2
 						gt 'katja_dorm', 'lazar_refuse', 'anal'
 					end
@@ -833,11 +833,11 @@ if $ARGS[0] = 'lazar_anal_talk':
 							'"No. I''ve never had '+iif(stat['vaginal'] = 0, 'sex', 'anal sex')+' with a guy," you say.'
 							'"Me neither," Katja says. "Do you want to try?" she asks hesitantly.'
 							'"You want Lazar to be the first guy fucking our butts?" you ask, surprised. Katja just bites her lips and slowly nods.'
-							act 'Agree': 
+							act 'Agree':
 								katjaQW['anal_quest'] = 2
 								gt 'katja_dorm', 'lazar_agree'
 							end
-							act 'Refuse': 
+							act 'Refuse':
 								katjaQW['lazer_anal_talk'] = 2
 								gt 'katja_dorm', 'lazar_refuse', 'anal'
 							end
@@ -848,13 +848,13 @@ if $ARGS[0] = 'lazar_anal_talk':
 								cla
 								'"I''ve had anal sex before. In fact, I''ve had anal sex with Lazar before," you answer.'
 								'"How was it? Is he a good lover? Was he you first? Do you hook up with him often?" Katja asks, almost frantically.'
-								'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have anal sex with Lazar?" you ask.' 
+								'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have anal sex with Lazar?" you ask.'
 								'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally replies.'
-								act 'Agree': 
+								act 'Agree':
 									katjaQW['anal_quest'] = 2
 									gt 'katja_dorm', 'lazar_agree'
 								end
-								act 'Refuse': 
+								act 'Refuse':
 									katjaQW['lazer_anal_talk'] = 2
 									gt 'katja_dorm', 'lazar_refuse', 'anal'
 								end
@@ -864,13 +864,13 @@ if $ARGS[0] = 'lazar_anal_talk':
 								cla
 								'"I''ve had anal sex before," you answer.'
 								'"How was it?" Katja asks.'
-								'"It was good. Any particular reason you''re asking that now?" you inquire.' 
+								'"It was good. Any particular reason you''re asking that now?" you inquire.'
 								'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally replies.'
-								act 'Agree': 
+								act 'Agree':
 									katjaQW['anal_quest'] = 2
 									gt 'katja_dorm', 'lazar_agree'
 								end
-								act 'Refuse': 
+								act 'Refuse':
 									katjaQW['lazer_anal_talk'] = 2
 									gt 'katja_dorm', 'lazar_refuse', 'anal'
 								end
@@ -886,11 +886,11 @@ if $ARGS[0] = 'lazar_anal_talk':
 				'"You know, <<$pcs_nickname>>, meeting Lazar at the cafe got me thinking," Katja says.'
 				if katjaQW['anal_quest'] = 1:
 					'"We''ve talked about that. I would like to try having... anal sex with a guy," Katja says with some pause. "I know you said you didn''t want to arrange it, but I''m sure with Lazar that you wouldn''t have to arrange anything; just call him and I''m sure he''ll agree," she quickly continues before you can say anything.'
-					act 'Agree': 
+					act 'Agree':
 						katjaQW['anal_quest'] = 2
 						gt 'katja_dorm', 'lazar_agree'
 					end
-					act 'Refuse': 
+					act 'Refuse':
 						katjaQW['lazar_anal_talk'] = 2
 						katjaQW['horny'] -= 5
 						minut += 5
@@ -902,11 +902,11 @@ if $ARGS[0] = 'lazar_anal_talk':
 					if katjaQW['knows_anal'] = 1:
 						'"I''ve been thinking about it," Katja starts. "Since I''ve had sex with a guy and you''ve told me how good anal sex with a guy can be..." She trails off for a second. "Well, it''s just that based on the way that Lazar spoke, I think he''d be interested," she continues, but her voice drops off.'
 						'"You want to have Lazar be the first boy to fuck your ass?" you ask. Katja just bites her lips and slowly nods.'
-						act 'Agree': 
+						act 'Agree':
 							katjaQW['anal_quest'] = 2
 							gt 'katja_dorm', 'lazar_agree'
 						end
-						act 'Refuse': 
+						act 'Refuse':
 							katjaQW['lazer_anal_talk'] = 2
 							gt 'katja_dorm', 'lazar_refuse', 'anal'
 						end
@@ -918,11 +918,11 @@ if $ARGS[0] = 'lazar_anal_talk':
 								'"No. I''ve never had '+iif(stat['vaginal'] = 0, 'sex', 'anal sex')+' with a guy," you answer.'
 								'"Me neither," Katja says. "Do you want to try?" she asks hesitantly.'
 								'"You want Lazar to be the first guy fucking our butts?" you ask, surprised. Katja just bites her lips and slowly nods.'
-								act 'Agree': 
+								act 'Agree':
 									katjaQW['anal_quest'] = 2
 									gt 'katja_dorm', 'lazar_agree'
 								end
-								act 'Refuse': 
+								act 'Refuse':
 									katjaQW['lazer_anal_talk'] = 2
 									gt 'katja_dorm', 'lazar_refuse', 'anal'
 								end
@@ -933,13 +933,13 @@ if $ARGS[0] = 'lazar_anal_talk':
 									cla
 									'"I''ve had anal sex before. In fact, I''ve had anal sex with Lazar before," you answer.'
 									'"How was it? Is he a good lover? Was he you first? Do you hook up with him often?" Katja asks, almost frantically.'
-									'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have anal sex with Lazar?" you ask.' 
+									'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have anal sex with Lazar?" you ask.'
 									'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally responds.'
-									act 'Agree': 
+									act 'Agree':
 										katjaQW['anal_quest'] = 2
 										gt 'katja_dorm', 'lazar_agree'
 									end
-									act 'Refuse': 
+									act 'Refuse':
 										katjaQW['lazer_anal_talk'] = 2
 										gt 'katja_dorm', 'lazar_refuse', 'anal'
 									end
@@ -949,13 +949,13 @@ if $ARGS[0] = 'lazar_anal_talk':
 									cla
 									'"I''ve had anal sex before," you answer.'
 									'"How was it?" Katja asks.'
-									'"It was good. Any particular reason you''re asking that question now?" you inquire.' 
+									'"It was good. Any particular reason you''re asking that question now?" you inquire.'
 									'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally responds.'
-									act 'Agree': 
+									act 'Agree':
 										katjaQW['anal_quest'] = 2
 										gt 'katja_dorm', 'lazar_agree'
 									end
-									act 'Refuse': 
+									act 'Refuse':
 										katjaQW['lazer_anal_talk'] = 2
 										gt 'katja_dorm', 'lazar_refuse', 'anal'
 									end
@@ -968,16 +968,16 @@ if $ARGS[0] = 'lazar_anal_talk':
 			else
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'"You know, <<$pcs_nickname>>, when we talked with Lazar at the café, he seemed really into us," Katja says. "Maybe we should call him and see if he''s up for having some fun with us."'
-				act 'Agree': 
+				act 'Agree':
 					gt 'katja_dorm', 'lazar_agree'
 				end
 				act 'Say you''re not in the mood':
 					cla
 					'"I''m sorry, but I am not in the mood for a threesome right now," you tell Katja.'
-					'"Okay, another time then", she replies.' 
+					'"Okay, another time then", she replies.'
 					act 'Talk about something else': gt 'Katja_dorm_talk', 'talk'				
 				end
-				act 'Say you don''t want to have sex Lazar': 
+				act 'Say you don''t want to have sex Lazar':
 					cla
 					katjaQW['lazer_anal_talk'] = 2
 					'"I''m not that into Lazar. I don''t think I want to have sex with him," you tell Katja.'
@@ -991,13 +991,13 @@ if $ARGS[0] = 'lazar_anal_talk':
 	else
 		if katjaQW['lazer_anal_talk'] = 2:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'"I know you said earlier that you didn''t want to have anal sex with Lazar but'+iif(katjaQW['lazer_pussy'] > 0, ' we''ve had vaginal sex with him, so ', ' ')+'would you please reconsider? I really want to try anal with a guy, and I want you to be there. Please?" Katja pleads, looking at you with her big eyes,' 
-			act 'Agree': 
+			'"I know you said earlier that you didn''t want to have anal sex with Lazar but'+iif(katjaQW['lazer_pussy'] > 0, ' we''ve had vaginal sex with him, so ', ' ')+'would you please reconsider? I really want to try anal with a guy, and I want you to be there. Please?" Katja pleads, looking at you with her big eyes,'
+			act 'Agree':
 				katjaQW['lazer_anal_talk'] = 1
 				katjaQW['anal_quest'] = 2
 				gt 'katja_dorm', 'lazar_agree'
 			end
-			act 'Stand firm': 
+			act 'Stand firm':
 				katjaQW['horny'] -= 5
 				minut += 5
 				'"I made myself clear the last time you asked and that hasn''t changed," you tell her. She doesn''t plead her case, but she doesn''t seem satisfied.'
@@ -1021,11 +1021,11 @@ if $ARGS[0] = 'lazar_anal_talk':
 					'"I''ve never had anal sex with a guy," you tell Katja.'
 					'"So you want to try it together with me?" Katja says with a mockingly innocent look.'
 				end
-				act 'Agree': 
+				act 'Agree':
 					katjaQW['anal_quest'] = 2
 					gt 'katja_dorm', 'lazar_agree'
 				end
-				act 'Refuse': 
+				act 'Refuse':
 					katjaQW['lazer_anal_talk'] = 2
 					gt 'katja_dorm', 'lazar_refuse', 'anal'
 				end

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