瀏覽代碼

[fixed] save game mode to var '$start_loc'

Ethan99 1 年之前
父節點
當前提交
e468886041
共有 85 個文件被更改,包括 2151 次插入2168 次删除
  1. 4 4
      locations/Cheatmenu_din.qsrc
  2. 50 50
      locations/Komp.qsrc
  3. 132 132
      locations/MartinTalk.qsrc
  4. 21 21
      locations/bedrPar.qsrc
  5. 2 0
      locations/begin.qsrc
  6. 51 51
      locations/booty_call_after.qsrc
  7. 55 55
      locations/booty_call_leave.qsrc
  8. 90 90
      locations/booty_call_morning.qsrc
  9. 72 72
      locations/booty_call_pillow_talk2.qsrc
  10. 21 21
      locations/booty_call_stats.qsrc
  11. 17 17
      locations/booty_call_work_talk1.qsrc
  12. 1 1
      locations/brothel.qsrc
  13. 4 4
      locations/budilnik.qsrc
  14. 9 9
      locations/buklinik.qsrc
  15. 27 27
      locations/cikl.qsrc
  16. 16 16
      locations/city_coffee_hole.qsrc
  17. 6 6
      locations/city_drugden.qsrc
  18. 2 2
      locations/city_industrial.qsrc
  19. 2 2
      locations/city_island.qsrc
  20. 1 1
      locations/city_pharmacy.qsrc
  21. 4 4
      locations/city_sauna.qsrc
  22. 11 11
      locations/clothing.qsrc
  23. 19 19
      locations/clothing_QV.qsrc
  24. 2 2
      locations/dina.qsrc
  25. 5 5
      locations/dreams.qsrc
  26. 8 8
      locations/fit.qsrc
  27. 1 1
      locations/food_menu.qsrc
  28. 16 16
      locations/foto_albums.qsrc
  29. 37 37
      locations/foto_events.qsrc
  30. 90 90
      locations/foto_model_documentary.qsrc
  31. 2 2
      locations/gameover.qsrc
  32. 11 11
      locations/gdksport.qsrc
  33. 5 3
      locations/getrandom.qsrc
  34. 4 4
      locations/gkafe.qsrc
  35. 9 9
      locations/gschool_grounds.qsrc
  36. 103 103
      locations/hookup.qsrc
  37. 79 79
      locations/hookup_after.qsrc
  38. 41 41
      locations/hookup_morning.qsrc
  39. 22 22
      locations/intro_city_select.qsrc
  40. 16 16
      locations/intro_customization.qsrc
  41. 4 4
      locations/intro_initialization_city.qsrc
  42. 134 134
      locations/journal.qsrc
  43. 4 4
      locations/journal_quests.qsrc
  44. 46 46
      locations/katja_chat.qsrc
  45. 1 1
      locations/kuhrPar.qsrc
  46. 3 3
      locations/mainQW.qsrc
  47. 3 3
      locations/miroslava.qsrc
  48. 45 45
      locations/model_mari.qsrc
  49. 65 65
      locations/nichApartment.qsrc
  50. 4 4
      locations/obj_din.qsrc
  51. 26 26
      locations/pav_aptcourtev.qsrc
  52. 10 10
      locations/pav_clinic.qsrc
  53. 4 4
      locations/pav_commercial.qsrc
  54. 20 20
      locations/pav_complex.qsrc
  55. 1 1
      locations/pav_complexb3.qsrc
  56. 56 56
      locations/pav_disco.qsrc
  57. 17 17
      locations/pav_hotel.qsrc
  58. 12 12
      locations/pav_lake.qsrc
  59. 14 14
      locations/pav_lake_nude.qsrc
  60. 3 3
      locations/pav_library.qsrc
  61. 17 17
      locations/pav_market.qsrc
  62. 10 10
      locations/pav_park.qsrc
  63. 14 14
      locations/pav_residential.qsrc
  64. 2 2
      locations/pav_train_hall.qsrc
  65. 4 4
      locations/placer_sex.qsrc
  66. 3 3
      locations/saveupdater.qsrc
  67. 59 59
      locations/sex_ev_after.qsrc
  68. 95 95
      locations/sex_ev_leave.qsrc
  69. 102 102
      locations/sex_ev_morning.qsrc
  70. 86 86
      locations/sex_ev_pillow_talk2.qsrc
  71. 24 24
      locations/sex_ev_stats.qsrc
  72. 17 17
      locations/sex_ev_work_talk1.qsrc
  73. 7 7
      locations/sexshop.qsrc
  74. 6 6
      locations/sitrPar.qsrc
  75. 11 11
      locations/sleep.qsrc
  76. 9 9
      locations/soniadisco.qsrc
  77. 13 12
      locations/stat.qsrc
  78. 22 22
      locations/stat_display.qsrc
  79. 3 3
      locations/street_event.qsrc
  80. 20 20
      locations/telefon.qsrc
  81. 56 78
      locations/therapist.qsrc
  82. 3 3
      locations/tobiQW.qsrc
  83. 6 6
      locations/uni_admin.qsrc
  84. 14 14
      locations/uni_library.qsrc
  85. 8 8
      locations/wardrobe.qsrc

+ 4 - 4
locations/Cheatmenu_din.qsrc

@@ -1254,7 +1254,7 @@ $cheatmenu['stats'] = {
 	if workPTU > 1:*pl'<a href="exec:teachlevel += 10 & dynamic $cheatmenu[''stats'']">Reputation teacher+10: <<teachlevel>></a>'
 	if workPTU > 1:*pl'<a href="exec:teachlevel -= 10 & dynamic $cheatmenu[''stats'']">Reputation teacher-10: <<teachlevel>></a>'
 	*nl
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0:
 		*pl'<b>School:</b>'
 		if class['school_math_grade'] < 100:*pl'Math grade: <<class[''school_math_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''math'', 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''math'', -10 & dynamic $cheatmenu[''stats'']">-10</a>'
 		if class['school_rus_grade'] < 100:*pl'Russian grade: <<class[''school_rus_grade'']>> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''rus'', 10 & dynamic $cheatmenu[''stats'']">+10</a> <a href="exec:gs ''grades'', ''grade_award'',''school'', ''rus'', -10 & dynamic $cheatmenu[''stats'']">-10</a>'
@@ -1360,7 +1360,7 @@ $cheatmenu['reputation'] = {
 	end
 	*nl
 
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		'<font color="blue"><b>School</b></font>'
 		'<i>Popular Kids</i>'
 		if Enable_reputation_popular = 0:
@@ -1578,7 +1578,7 @@ $cheatmenu['reputation'] = {
 	end
 	*nl
 	if opusk > 0 or gnewQW > 0 or sipovka > 0:'<a href="exec:opusk = 0 & gnewQW = 0 & sipovka = 0 & dynamic $cheatmenu[''reputation'']">Clear reputation with Gopniks</a>'
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 
 		*nl
 		'<font color="red"><b>WARNING</b></font>: Clearing reputation flags with your family may cause bugs. Use at your own risk!'
@@ -1636,7 +1636,7 @@ $cheatmenu['documents'] = {
 	'<td width="300" cellspacing="0" cellpadding="20" valign="top">'
 	'<td width="400" cellspacing="0" cellpadding="20" valign="top">'
 	if SchoolAtestat = 0: '<a href="exec:SchoolAtestat = 1 & dynamic $cheatmenu[''documents'']">Get School Certificate</a>'
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
+	if $start_loc = 'sg' and SchoolAtestat = 0: '<font color="red"><b>WARNING!</b></font>: This will end your school year!' & *nl
 	if SchoolAtestat = 1:'Already have a School Certificate'
 	if university['diploma'] > 0:
 		'You already have a Diploma'

+ 50 - 50
locations/Komp.qsrc

@@ -9,13 +9,13 @@ 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 'Shut your computer down': 
+	act 'Shut your computer down':
 		killvar '$subs'
 		killvar 'access'
 		gt 'komp', 'fin'
 	end
 	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'):
 			act 'Check Albina''s flash drive': gt 'albina_house_events', 'flash_drive'
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 	!! arrived here from mobile net.
 	!! Sveta can access the internet if > 0
 	if subscription[$subs] > 0:
-		if access['metered'] = 0: 
+		if access['metered'] = 0:
 			act 'Browse the internet': gt 'komp', 'browse'
 		else
 			act 'Browse the internet - You have <<subscription[$subs]>> minutes of access left': gt 'komp', 'browse'
@@ -56,32 +56,32 @@ if $ARGS[0] = 'browse':
 	*clr & cla
 	gs 'stat'
 	menu_off = 0
-	
+
 	act 'Close the browser':
 		gt 'komp','start'
 	end
-	
+
 	!! TODO: Update
 	!! check if the original account still valid?
 	!! if account_used > 0
 	!! There are 3 ways this can happen during the use of the inernet:
 	!!  1. Sveta is using a minute based internet and ran out of minutes.
-	!!  2. Sveta is using a subscription, she didn''t have enough money to pay the monthly fee, grace period expired and 
+	!!  2. Sveta is using a subscription, she didn''t have enough money to pay the monthly fee, grace period expired and
 	!!		the interned service has been cut off
 	!!  3. Sveta is using a free internet and something went really, really wrong that set subscription[''free''] to 0.
 	if subscription[$subs] < 1:
 		'<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?')
-		
-		if  camwhore = 1 and access['nocamshow'] = 0 and webcamera = 1: 
+
+		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'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/komp.jpg"></center>'
 		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.'		
+		'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.'
 
 		if func('homes_properties', 'is_property_of_status', 'owned', 'city_apartment') and husband = 0: act 'Rent your apartment out': gt 'komp', 'sale'
@@ -106,15 +106,15 @@ if $ARGS[0] = 'browse':
 		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 ($start_loc = '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
 
 if $ARGS[0] = 'sale':
-	*clr & cla	
+	*clr & cla
 	!! TODO: Update time and internet
-	
+
 	!! IMPORTANT: What happens if an activity takes more time than the minutes Sveta has? We just say "You tried, but could not finish"?
 	if access['metered'] and subscription[$subs] < 15:
 		'You check the website, but realise that <<subscription[$subs]>> minutes won''t be enough to fill out all the forms.'
@@ -135,7 +135,7 @@ if $ARGS[0] = 'sale':
 				cla
 				if obkvsdam = 1:
 					'No one has responded to your offer to rent out your apartment just yet.'
-				elseif obkvsdam > 1: 
+				elseif obkvsdam > 1:
 					predsum = 14000 + (obkvsdam*1000)
 					'Someone wants to stay in your apartment for a month! They''re offering you <<predsumm>> <b>₽</b> in cash.'
 
@@ -198,7 +198,7 @@ end
 
 if $ARGS[0] = 'masturbate':
 	*clr & cla
-	
+
 	!! needs this because can arrive here from this code block and time can be gone
 	if subscription[$subs] < 1:
 		'You have no internet access, '+iif(access['metered'], ' you have to buy more minutes.', ' maybe you forgot to pay the internet bill?')
@@ -495,7 +495,7 @@ if $ARGS[0] = 'rabota':
 				'After a quick verification, you usually get paid immediately after a session ends. The tokens you earn will be converted to rubles, and paid to your bank account right away.'
 				'The website hides your stream for viewers from your region, so the chance of being recognized by someone you know in real life is very low.'
 				'If you''re interested in becoming a webcam girl, please fill in this questionnaire below.</i>'
-				
+
 				if bankAccount = 0:
 					'You need a valid bank account to be able to register for this job.'
 				else
@@ -567,7 +567,7 @@ if $ARGS[0] = 'agent' :
 	*nl
 	'<b>Property listing</b>:'
 	if func('homes_properties', 'is_property_of_status', 'rented', 'city_apartment') :
-		if func('homes_properties', 'get_rent_days', 'city_apartment') > 0: 
+		if func('homes_properties', 'get_rent_days', 'city_apartment') > 0:
 			'You have <B><<func(''homes_properties'', ''get_rent_days'', ''city_apartment'')>> days</B> remaining on the rental of your St. Petersburg apartment.'
 			*nl
 		end
@@ -590,13 +590,13 @@ if $ARGS[0] = 'agent' :
 		'Current sale price is listed at: <<func(''homes_properties'', ''get_property_sales_price'', ''village_cottage'')>> <b>₽</b>.'
 		*nl
 	end
-	
+
 	if func('homes_properties', 'is_property_of_status', 'rented', 'old_town_apartment'):
-		if func('homes_properties', 'get_rent_days', 'old_town_apartment') >= 0: 
+		if func('homes_properties', 'get_rent_days', 'old_town_apartment') >= 0:
 			'You have <B><<func(''homes_properties'', ''get_rent_days'', ''old_town_apartment'')>> days</B> remaining on the rental of your Pushkin apartment.'
 			*nl
 		end
-		
+
 		if karta + bankDebtLimit >= func('homes_properties', 'get_rent_amount', 'old_town_apartment'):
 			act 'Pay rent on Pushkin':
 				cla
@@ -667,7 +667,7 @@ if $ARGS[0] = 'mfc':
 			gs 'internet_mobile', 'use_internet', $subs, 2
 			gs 'stat'
 			gt 'komp','browse'
-		end	
+		end
 	end
 end
 
@@ -1079,7 +1079,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			webpopular += rand(-1,1)
 			mfcclients += rand(-1,1)
-			minut += 2	
+			minut += 2
 			gs 'internet_mobile', 'use_internet', $subs, 2
 			if webpopular < 15:
 				tokens += rand(0,15)
@@ -1112,7 +1112,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Refuse to take off your bra (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if backmfc = 1 and clientask >= 81 and clientask < 91:
 		*clr & cla
@@ -1123,7 +1123,7 @@ if $ARGS[0] = 'waitclients':
 			mfcclients -= 1
 			webpopular += 1
 			backmfc = 0
-			minut += 2	
+			minut += 2
 			gs 'internet_mobile', 'use_internet', $subs, 2
 			if webpopular < 15:
 				tokens += rand(10,25)
@@ -1182,7 +1182,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			webpopular += rand(-1,1)
 			mfcclients += rand(-1,1)
-			minut += 2	
+			minut += 2
 			gs 'internet_mobile', 'use_internet', $subs, 2
 			if webpopular < 15:
 				tokens += rand(0,15)
@@ -1201,10 +1201,10 @@ if $ARGS[0] = 'waitclients':
 			gs 'arousal', 'porn', 2, 'exhibitionism'
 			minut -=2
 			gs 'stat'
-			
+
 			act 'Continue': gt 'komp','waitclients'
 		end
-		
+
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse to take off your panties (<<will_cost>> Willpower)':
@@ -1216,7 +1216,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Refuse to take off your panties (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if topmfc = 0 and clientask >= 95 and clientask < 99:
 		menu_off = 1
@@ -1227,7 +1227,7 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 			webpopular += rand(hotcat/2 -2,hotcat/2)
 			backmfc = 0
-			minut += 2	
+			minut += 2
 			gs 'internet_mobile', 'use_internet', $subs, 2
 			if webpopular < 15:
 				tokens += rand(15,25)
@@ -1260,7 +1260,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Refuse to play with your boobs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if backmfc = 0 and clientask = 99:
 		menu_off = 1
@@ -1271,7 +1271,7 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			mfcclients = 0
 			webpopular += rand(hotcat/2 -2,hotcat/2)
-			minut += 2	
+			minut += 2
 			gs 'internet_mobile', 'use_internet', $subs, 2
 			if webpopular < 15:
 				tokens += rand(20,25)
@@ -1300,7 +1300,7 @@ if $ARGS[0] = 'waitclients':
 			end
 			act 'Continue': gt 'komp','waitclients'
 		end
-		
+
 		gs 'willpower', 'exhib', 'resist', 'hard'
 		if will_cost <= pcs_willpwr:
 			act 'Ignore him (<<will_cost>> Willpower)':
@@ -1312,7 +1312,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if backmfc = 0 and clientask = 100:
 		menu_off = 1
@@ -1322,8 +1322,8 @@ if $ARGS[0] = 'waitclients':
 			*clr & cla
 			mfcclients = 0
 			webpopular += rand(hotcat/2 -2,hotcat/2)
-			minut += 2	
-			gs 'internet_mobile', 'use_internet', $subs, 2			
+			minut += 2
+			gs 'internet_mobile', 'use_internet', $subs, 2
 			if webpopular < 15:
 				tokens += rand(10,25)
 			elseif webpopular >= 15 and webpopular < 35:
@@ -1368,7 +1368,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 	if backmfc = 0 and pcs_ass >= 30 and webpopular >= 50 and clientask = 80:
 		menu_off = 1
@@ -1379,7 +1379,7 @@ if $ARGS[0] = 'waitclients':
 			mfcclients = 0
 			webpopular += rand(hotcat/2-1,1+hotcat/2)
 			backmfc = 0
-			minut += 2	
+			minut += 2
 			gs 'internet_mobile', 'use_internet', $subs, 2
 			if pcs_apprnc > 100:
 				tokens += rand(50,100)
@@ -1407,7 +1407,7 @@ if $ARGS[0] = 'waitclients':
 					'At least the visitor who promised to donate did, so you''re a few tokens richer.'
 
 					gs 'arousal', 'porn', 2, 'exhibitionism'
-					minut -= 2 
+					minut -= 2
 					gs 'stat'
 
 				else
@@ -1445,7 +1445,7 @@ if $ARGS[0] = 'waitclients':
 			end
 		else
 			act 'Ignore him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 	end
 
 	if webpopular >= 15 and pcs_ass >= 15 and clientask = 89:
@@ -1471,7 +1471,7 @@ if $ARGS[0] = 'waitclients':
 		*clr & cla
 		gt 'kompMFCtwo', 86
 	end
-	
+
 	if webpopular >= 50 and pcs_vag + pcs_ass > 0 and alko >= 4 and clientask = 85:
 		menu_off = 1
 		*clr & cla
@@ -1525,7 +1525,7 @@ if $ARGS[0] = 'waitclients':
 		act 'Dance':
 			menu_off = 1
 			*clr & cla
-			minut += 5	
+			minut += 5
 			gs 'internet_mobile', 'use_internet', $subs, 5
 			gs 'stat'
 			if topmfc = 1 and backmfc = 1:
@@ -1579,14 +1579,14 @@ if $ARGS[0] = 'waitclients':
 				end
 				'<center><video autoplay loop src="images/pc/items/accessories/computer/webcam/strip5.mp4"></video></center>'
 				'Turning on some music you dance eroticly hoping to entice some viewers.'
-			end	
+			end
 			gs 'exp_gain', 'dancero', 1
 			gs 'arousal', 'porn', 5
 			minut -= 5
 			gs 'stat'
 			act 'Continue': gt 'komp','waitclients'
 		end
-	end	
+	end
 
 	if topmfc = 1 and backmfc = 1 and clientask < 74:
 		act 'Perform a striptease':
@@ -1614,11 +1614,11 @@ if $ARGS[0] = 'waitclients':
 			gs 'stat'
 			act 'Continue': gt 'komp','waitclients'
 		end
-	end	
+	end
 
 	if topmfc = 1 and clientask < 74:
 		act 'Take off your bra':
-			menu_off = 1 
+			menu_off = 1
 			*clr & cla
 			topmfc = 0
 			minut += 2
@@ -1752,7 +1752,7 @@ if $ARGS[0] = 'waitclients':
 	if backmfc = 0 and clientask < 74:
 		act'Play with your ass':
 			menu_off = 1
-			*clr & 
+			*clr &
 			minut += 4
 			gs 'internet_mobile', 'use_internet', $subs, 4
 			if webpopular < 15:
@@ -1894,7 +1894,7 @@ if $ARGS[0] = 'fuckornot':
 	if fuckornot = 2: fuckornot = 3
 	'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/fuckornot/fuckable_list.jpg"></center>'
 	gs 'gschool_groups', 'fuckornot'
-	
+
 	'10: Perfection - Would let her do whatever she wants to me.'
 	'9: Smoking Hot - Would eat her ass.'
 	'8: Hot - Would fuck that ass.'
@@ -1905,7 +1905,7 @@ if $ARGS[0] = 'fuckornot':
 	'3: Unattractive - Doable if I get myself drunk first. Good match for Petia.'
 	'2: Fugly - Has potential compared to a trash bin. Even Lesco could do better.'
 	'1: Hideous - Wouldn''t touch it with a stick.'
-	
+
 	act 'Leave the site':
 		if $view_location = 'school':
 			gt 'gschool_lessons', 'short_break'
@@ -1923,7 +1923,7 @@ if $ARGS[0] = 'hotornot':
 	if hotornot = 2: hotornot = 3
 	'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
 	gs 'gschool_groups', 'hotornot'
-	
+
 	'10: Perfection - Would let him do whatever he wants to me.'
 	'9: Smoking Hot - Arm candy.'
 	'8: Hot - Would ride him.'
@@ -1934,7 +1934,7 @@ if $ARGS[0] = 'hotornot':
 	'3: Unattractive - Not even Zinaida would be seen with him.'
 	'2: Fugly - Horribly ugly. Just being seen with him would lose you social standing.'
 	'1: Hideous - Wouldn''t touch it with a stick. Not even a whore would take his money.'
-	
+
 	act 'Leave the site':
 		if $view_location = 'school':
 			killvar 'access'
@@ -1948,4 +1948,4 @@ end
 if $ARGS[0] = 'fin': gt $loc, $loc_arg
 
 
---- komp ---------------------------------
+--- komp ---------------------------------

+ 132 - 132
locations/MartinTalk.qsrc

@@ -9,7 +9,7 @@ menu_off = 1
 if $ARGS[0] = '':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
-		
+
 	if MartinTalkVar = 0:
 		MartinTalkVar = 1
 		'"Sure, <<$pcs_firstname>>, coming right up", Martin says and pours you your drink.'
@@ -34,27 +34,27 @@ if $ARGS[0] = '':
 		'Martin is taken aback by your question at first, making you cringe in fear that you might have gone too far... but then he bursts into laughter. "That, mi amor, is a story for another day. Enjoy your drink before it gets warm."'
 		*nl
 		'With that, he directs his attention at another visitor of the bar. You notice that you''ve been holding your breath and release it now, glad you didn''t piss him off. Watching Martin from afar, you nurse on your beverage until you find it empty.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 1:
 		MartinTalkVar = 2
 		'"Of course, <<$pcs_firstname>>," Martin says and hands you your poison of choice.'
-		'"Thanks, Martin", you say with a smile. You hesitate for a moment, but the truth is that the barman has piqued your interest - he stands out of the sea of men you come across every day like a bottle of tequila in a Russian''s liquor cabinet, and you cannot help be straightforward about it:' 
+		'"Thanks, Martin", you say with a smile. You hesitate for a moment, but the truth is that the barman has piqued your interest - he stands out of the sea of men you come across every day like a bottle of tequila in a Russian''s liquor cabinet, and you cannot help be straightforward about it:'
 		'"Can I ask you something?"'
 		*nl
 		'Martin musters you for a long second before responding. "You wanna know why I''m here in Russia, don''t you?"'
 		'You blush slightly. "Is it that obvious?"'
-		'"Yes, it is, but I''m in no mood to tell a girl who practically just walked into my bar my entire life''s story." Martin''s words and tone are surprisingly harsh, so you probably hit a sore spot.' 
+		'"Yes, it is, but I''m in no mood to tell a girl who practically just walked into my bar my entire life''s story." Martin''s words and tone are surprisingly harsh, so you probably hit a sore spot.'
 		'"Sorry, I didn''t mean to pry." You quickly decide to drop the subject. "You just... stand out, you know?"'
 		'His features soften, and he seems appeased by your words. "Yeah, I guess I do." He sighs. "I''m sorry for snapping."'
 		*nl
 		'You look at each other for a little longer, but it''s awkward and neither of you really knows where to go from here.'
 		'"Guess I better get back to work," he says, and you agree, glad that he broke the uncomfortable silence and leaves you to your beverage.'
 		'Maybe you can satisfy your curiosity about him at a later date. If he talks to you at all, that is.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif MartinTalkVar = 2:
 		MartinTalkVar = 3
 		'The barman gives you nod and before you know it, your drink sits on the counter.'
@@ -86,9 +86,9 @@ if $ARGS[0] = '':
 		'He bursts into laughter. "Maybe you are, maybe you aren''t; but you are alright either way, corazón."'
 		*nl
 		'With that, he leaves you to your drink. Minutes pass as you enjoy your beverage, only stopping when you find your glass empty.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif MartinTalkVar = 3 and npc_rel['A216'] >= 20:
 		MartinTalkVar = 4
 		'Martin nods, and seconds later, a drink sits in front of you.'
@@ -102,25 +102,25 @@ if $ARGS[0] = '':
 		'"Yes, actually. After our last few chit chats, you must be bursting with curiosity. To be honest, I''m surprised you haven''t tried to ambush me while I close for the night."'
 		'"Uh, okay..."'
 		*nl
-		'You weren''t prepared for that at all, but he''s right: You DO have plenty of questions about him. "Why ar-"' 
+		'You weren''t prepared for that at all, but he''s right: You DO have plenty of questions about him. "Why ar-"'
 		'But you stop. You saw the corner of his mouth twitch. "You aren''t gonna <b>answer</b> whatever question I ask you, would you?"'
 		'"Oh no, of course not," he shakes his head with a sly grin, "we barely know each other."'
 		*nl
-		'You can feel the anger in your gut - what kind of stupid game is this? "Then why did you even-," you start but his laughter drowns out the rest of the thought and... despite how frustrated you felt a second ago, you can''t help it: You join him.' 
+		'You can feel the anger in your gut - what kind of stupid game is this? "Then why did you even-," you start but his laughter drowns out the rest of the thought and... despite how frustrated you felt a second ago, you can''t help it: You join him.'
 		*nl
 		'As gruff and menacing as Martin looks and acts sometimes, it''s good to know that he will pull your leg and laugh about just like anybody else. His shell may be hard but there''s definitely more to him than that. You''re not sure that his core is soft, but whatever it is, it''s bound to be interesting. And as strange as this episode was, it feels like something changed, like, after chipping away at it for a while, you finally broke the ice.'
 		*nl
 		'And armed with that knowledge and a newfound ease, you chat and joke with Martin a while longer before another patron demands his attention.'
 		$OpenInnerThought+'Hm... Maybe I really should try and talk to him when he''s starting to clean up and close for the night - I think he starts throwing people out around quarter to Midnight.'+$CloseInnerThought
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-				
+
 	elseif MartinTalkVar = 4 and npc_rel['A216'] >= 28:
 		MartinTalkVar = 5
 		'Martin wordlessly puts your usual drink in front of you, then examines you like he''s seeing you for the first time.'
 		*nl
 		'"You''re skinny," he observes.'
-		'"Excuse me?"' 
+		'"Excuse me?"'
 		'You ' + iif($body='skinny','would call yourself skinny, too, but','see yourself as <<$body>> rather than skinny, so') + ' you don''t really see why he would bring this up.'
 		*nl
 		'"Are you eating right, <<$pcs_firstname>>?" He inquires, completely ignoring your visible confusion.'
@@ -136,9 +136,9 @@ if $ARGS[0] = '':
 		'"That''s the one you should go to. The owners, Eugene and Angela, they are good people. Honest people. Give their place a visit sometime, you won''t regret it. Their shashlik is exceptional."'
 		'"Suuure," you say and watch Martin walk off.'
 		'Either there was a point to this that you missed completely, or you really look <b>that</b> skinny to him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 5:
 		MartinTalkVar = 6
 		'"Sure, <<$pcs_firstname>>." Martin prepares a drink for you and puts it down in front of you.'
@@ -163,9 +163,9 @@ if $ARGS[0] = '':
 		'"Martin musters you once more. "I can be both," he grins.'
 		'"And do you find me attractive?" You ask innocently.'
 		'"That''s for me to know and for you to find out, <<$pcs_nickname>>." With that, he turns and leaves you to drink and ponder his noncommittal answer.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 6 and npc_rel['A216'] >= 35:
 		MartinTalkVar = 7
 		'"Of course, <<$pcs_firstname>>," Martin says and prepares your poison of choice. "Here you go."'
@@ -190,18 +190,18 @@ if $ARGS[0] = '':
 		'"You should share that thought at the next book club meeting," you comment dryly.'
 		'"I''d rather not. It would only disturb the other housewives," Martin retorts.'
 		*nl
-		'You chuckle - it''s strange how these conversations with Martin always take the most extraordinary turns. You know that he doesn''t talk to his other regulars like this. Actually, from what you can tell, it seems like he''s acting different with every one of them, adapting to their character, maybe even to their needs. You suggested it before to him, but now you are really starting to understand why they keep coming here, what they see in this place and its scary-looking owner.' 
+		'You chuckle - it''s strange how these conversations with Martin always take the most extraordinary turns. You know that he doesn''t talk to his other regulars like this. Actually, from what you can tell, it seems like he''s acting different with every one of them, adapting to their character, maybe even to their needs. You suggested it before to him, but now you are really starting to understand why they keep coming here, what they see in this place and its scary-looking owner.'
 		'That thought is what makes you say: "If it''s any consolation: I didn''t think you were running anything bad. I think you''d rather feed the homeless than sell them heroin."'
 		'"Maybe I''m just a good actor," he suggests.'
 		'"Maybe," you concede, "or maybe there''s actually a nice guy hiding under those muscles and tattoos."'
 		*nl
 		'For a fraction of a second, it looks like he is going to say something, but instead he just gives you a warm smile and you respond in kind, before Martin has to go back to work, leaving you to enjoy your drink in peace.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 7:
 		MartinTalkVar = 8
-		'Martin gives you a nod and before you know it, your beverage sits in front of you.' 
+		'Martin gives you a nod and before you know it, your beverage sits in front of you.'
 		*nl
 		'As you grab hold of the glass, the bartender gives you a long look. "So..."'
 		'"So...?"'
@@ -210,7 +210,7 @@ if $ARGS[0] = '':
 		*nl
 		'"Let''s start with what you asked me last time, then: What do <b>you</b> do when you are not sitting here, drinking my booze and enjoying my company?"'
 		*nl
-		
+
 		act 'A lot of things':
 			cla
 			$MartinHobby = 'dark secret hobbies'
@@ -227,10 +227,10 @@ if $ARGS[0] = '':
 			'You size him up and nod emphatically. "Yeah, if this was an episode on a crime show, you''d be devoted father of three the police suspect first because of he looks the part."'
 			'"And what would you be? The murderous housewife? Or the overambitious new detective?"'
 			'"Why not both?" You laugh, and Martin joins you.'
-			
+
 			act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 		end
-		
+
 		if pcs_stren > 60 or pcs_agil > 60:
 			act 'Fitness training':
 				cla
@@ -240,11 +240,11 @@ if $ARGS[0] = '':
 				'"That''s good to know," you smile.'
 				'"You train at the gym?"'
 				'"I go to the gym sometime," you shrug, "but a lot of what I do I can do at home, when I have some a few hours to myself."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-				
+
 		if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0:
 			act 'Dancing':
 				cla
@@ -254,11 +254,11 @@ if $ARGS[0] = '':
 				'"It is, and it does," you agree, "but it''s really fulfilling to go on stage, do a routine and earn people''s applause."'
 				'"Ever thought about doing it professionally?" He asks.'
 				'"I don''t know. Maybe? Even when you''re really good, there are so many people who are better, so I don''t think it would be easy to make a living on dancing. But," you smile, "yeah, I guess I''d like to be good enough to do it professionally."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if swinbeggor > 0:
 			act 'Athletics':
 				cla
@@ -268,11 +268,11 @@ if $ARGS[0] = '':
 				'You roll your eyes at his awful joke. "Riiight, thank you for your support. And here I thought you''d approve of anything sportive."'
 				'"Oh, I do," he concurs. "I just never saw the appeal of dashes and marathons. And you didn''t strike me as the competitive type."'
 				'You shrug. "It''s part of what I like about it, I guess, but... I don''t know. It just feels right, in a way - the right mix of exhausting and satisfying."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if volleysostav > 0:
 			act 'Volleyball':
 				cla
@@ -282,11 +282,11 @@ if $ARGS[0] = '':
 				'"Oh no, it''s actually kind of a big deal here in St. Petersburg. And in Russia, I guess. When you do it professionally, anyway."'
 				'"And you do it professionally?"'
 				'"Uh, well... I''m in a team and... we don''t lose every game. Does that count?"'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_sewng > 40:
 			act 'Sewing':
 				cla
@@ -296,12 +296,12 @@ if $ARGS[0] = '':
 				'"Yeah, I did. What''s wrong with that?" You ask, irritated.'
 				'"I''m sorry." Martin puts up his hands defensively. "Nothing''s wrong with that. I was just surprised, is all. You didn''t strike me as the type who liked to sit down and make their own clothes."'
 				'"Well, I guess I am," you say firmly.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
-		if chess_rank > 0:		
+
+		if chess_rank > 0:
 			act 'Chess':
 				cla
 				$MartinHobby = 'latest chess game'
@@ -310,15 +310,15 @@ if $ARGS[0] = '':
 				'"Does it, now?" You give him a wry smile. "What part of it? The one where a horse tears down a tower?"'
 				'He laughs. "That too. But I was more thinking of preparation: A good chess player anticipates all the moves his opponent can make before they have even thought of them. Preparation and good memory will get you far in life."'
 				'"I guess you''re right. But it''s fun either way, and who knows: Maybe you can call me Galina Kasparova soon." You grin.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_vokal > 40 or pcs_instrmusic > 40:
 			act 'Making Music':
 				cla
-				if pcs_vokal >= pcs_instrmusic: 
+				if pcs_vokal >= pcs_instrmusic:
 					$MartinHobby = 'singing exercises'
 				else
 					$MartinHobby = 'finger exercises'
@@ -328,11 +328,11 @@ if $ARGS[0] = '':
 				'"Oh, stop it," you say, flattered by his compliment. "Would you like to, I don''t know, hear something sometime?"'
 				'Martin gives you a look of pure horror. "Oh god, please no."'
 				'If looks could kill, Martin would drop dead on the spot. "You are such an asshole, you know?" But his laugh is infectious, and you cannot help but join him.'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if kickbox['sash'] > 0:
 			act 'Kickboxing':
 				cla
@@ -342,15 +342,15 @@ if $ARGS[0] = '':
 				'"Yeah, that''s part of the reason why I started with that," you agree.'
 				'"But it''s not the only one, I assume?"'
 				'"Well, at first it was just fun learning how to beat the crap out of guys," you grin, "but it takes a lot of discipline and dedication, and there''s always room for improvement. No matter how good you are, it stays a challenge, and I think I want or maybe even need that in my life."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
 		end
-		
+
 		if pcs_photoskl > 40 or pcs_artskls > 40:
 			act 'Art':
 				cla
-				if pcs_artskls >= pcs_photoskl: 
+				if pcs_artskls >= pcs_photoskl:
 					$MartinHobby = 'drawings and paintings'
 				else
 					$MartinHobby = 'photography'
@@ -360,52 +360,52 @@ if $ARGS[0] = '':
 				'"Well, I don''t know if I have talent," you respond sheepishly.'
 				'"Nonsense," Martin insists, "I''m sure you are great. I couldn''t do what you do."'
 				'"Of course you could. It doesn''t matter if you feel like you can or can''t do it. I mean, I don''t know if I''m any good at it, but I really like the way it allows me to capture what I see and the way it feels, you know?" You look at your beverage, embarrassed. "God, just listen to me: I sound like one of those pretentious yuppies who glue two pieces of wood together and call it art."'
-				
+
 				act 'Continue':gt 'MartinTalk','MartinTalkHobby'
 			end
-		end		
-	
+		end
+
 	elseif MartinTalkVar = 8 and npc_rel['A216'] >= 42:
 		MartinTalkVar = 9
 		'Martin nods and a few seconds later, a drink sits in front of you.'
 		*nl
-		'"Thank you," you say, giving the barman a grateful look. He responds with a friendly nod, but he seems a little more thoughtful than usual today.' 
+		'"Thank you," you say, giving the barman a grateful look. He responds with a friendly nod, but he seems a little more thoughtful than usual today.'
 		*nl
 		'You don''t know if it''s that contemplative aura of his or a question that you''ve been subconsciously waiting to ask, but the question of questions is out before you even know it: "Do you believe in god, Martin?"'
-		'Strangely enough, Martin doesn''t seem surprised by that question at all - maybe he was wondering about that himself.' 
+		'Strangely enough, Martin doesn''t seem surprised by that question at all - maybe he was wondering about that himself.'
 		'"I used to," he admits after a moment. "I was brought up in the Catholic faith, at least. If you didn''t say your prayer, you didn''t get your supper." He smirks, but his eyes speak of fond memories.'
 		'"But you don''t believe in that anymore?"'
 		'He shakes his head wordlessly. Instead, he does something you don''t think you''ve ever seen him do while the bar is open: He pours himself a glass of tequila and, after regarding it for a moment, slams it back.'
 		*nl
 		'It''s fairly obvious that this is a sensitive topic, and you barely dare to raise your voice. "What happened?"'
 		'He sighs deeply; not at your question, you feel, but at his own answer: "Life happened, corazón. Life can make or break someone''s faith. Me, I eventually figured that either there was no god or the filio di puta had a really twisted sense of humor and didn''t deserve my faith." The bitterness in his voice is almost palpable.'
-		
+
 		act 'What happened to him?':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 			'The question is burning under your nails: What could have brought this man to the other end of the world? But you realize that he has opened up to you in good faith, not because you pressed him for answer. He would only tell you as much as he wanted to, and pushing him would get you nowhere.'
-			'So, you do what friends do: You try not to be an ass.' 
+			'So, you do what friends do: You try not to be an ass.'
 			'"That bad?" You ask carefully.'
 			*nl
-			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.' 
+			'His face darkens. "You have no idea. There is no good god in Colombia." It''s the first hint Martin has given you about his past since you met him, but beyond the obvious conclusion that something awful must have happened, you can''t draw any conclusions, and he doesn''t seem to want to linger there, either.'
 			'"What about you, <<$pcs_firstname>>? Do you believe in some higher power?"'
 			*nl
 			if $start_type[1] = 'nomagic':
-				'You ponder the question for a moment before you answer.' 
-				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."' 
+				'You ponder the question for a moment before you answer.'
+				'"I''m not sure, actually. I used to go to church more when I was younger. My parents would take me there, but I didn''t really think about it, you know? I just went because I had to."'
 				*nl
-				'You pause for a moment, still not sure what you believe.' 
+				'You pause for a moment, still not sure what you believe.'
 				'"Now... now there are times when I go to church and I don''t really know why I went there, like I was looking for something more, something new, but it''s not there. And sometimes," you smile awkwardly, "sometimes I walk around town, see something strange and amazing and I feel... good. Connected, somehow." You shrug. "So, am I religious? Am I crazy? You tell me."'
 			else
-				'"More than you can imagine," you murmur.' 
-				'For the first time since you discovered that magic exist, somebody who sees the world the way you used to is asking you about it - or, well, asking a question that confronts you with it. What are you gonna say?' 
+				'"More than you can imagine," you murmur.'
+				'For the first time since you discovered that magic exist, somebody who sees the world the way you used to is asking you about it - or, well, asking a question that confronts you with it. What are you gonna say?'
 				*nl
-				'You couldn''t possibly explain it all; even if you are allowed to, who would believe you? You wouldn''t even believe yourself, if you''re honest. Still, you feel the powerful urge to tell him something, anything, at least - it''s been there since that fateful day, bottled up, and now there''s finally someone who might listen:' 
+				'You couldn''t possibly explain it all; even if you are allowed to, who would believe you? You wouldn''t even believe yourself, if you''re honest. Still, you feel the powerful urge to tell him something, anything, at least - it''s been there since that fateful day, bottled up, and now there''s finally someone who might listen:'
 				'"I... I feel like- no, I <b>know</b> that there''s something most people can''t see, something that doesn''t make any logical sense, and yet it is there, all around us, all the time, and it affects us in so many ways."'
 				'You are struggling for words. It''s all so clear in your head, but putting it in a way that doesn''t get you admitted to an asylum is so hard.'
 				'"I used to believe that the world is what everybody can see, smell, feel, and that''s it. But I- I''ve experienced something, something I can''t..." You trail off and stop. You can hear yourself chuckle - you just can''t help it. "I can''t explain it, can''t even describe it, but... but it changed everything for me." You smile awkwardly. "God, I must be sounding like a complete lunatic to you."'
 			end
-			
+
 			act 'Raving lunacy':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
@@ -418,11 +418,11 @@ if $ARGS[0] = '':
 				'"I don''t know what you''re talking about, girl - I look fantastic." Martin laughs.'
 				*nl
 				'For a moment, you want to talk back, stop him from deflecting your heartfelt compliment like that, but then you just smile and hold your tongue because you notice that Martin hasn''t let go of your hand and, after his laughter has subsided, he''s giving you a smile full of gratitude.'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
+
 	elseif MartinTalkVar = 9 and npc_rel['A216'] >= 48:
 		MartinTalkVar = 10
 		'"Here you go." Martin puts your drink in front of you before you''ve even properly come to rest on the stool. '+$OpenInnerThought+'When your bartender has your drink ready by the time you order it, maybe you''ve been spending too much time in the bar,'+$CloseInnerThought+' you think to yourself.'
@@ -431,13 +431,13 @@ if $ARGS[0] = '':
 		'Martin shrugs. "Same as always: You kill a man, you move on."'
 		'You laugh at his remark, but when he doesn''t join in, you stop and look at him uncertainly. "You <b>are</b> joking, right?"'
 		'He gives you a mysterious smile but otherwise ignores the question. "How about you? Rough day at the office?" He pauses. "Wait, do you even work in an office?"'
-		
+
 		act 'Give a non-committal answer':
 			cla
 			npc_rel['A216'] -= 2
 			'"Oh, you know, this and that. Whatever covers the bills. I get by"'
 			*nl
-			
+
 			if fame['city_porn'] <= 30:
 				'"Is remaining mysterious part of the job description?"'
 				'"You''d like to know that, wouldn''t you?" You tease.'
@@ -449,7 +449,7 @@ if $ARGS[0] = '':
 				'"I know that you are... doing porn," Martin tells you quietly.'
 				'Your face falls. You try to keep your cool, but you''re feeling cold all of a sudden. Why is he bringing this up?'
 				*nl
-				'His eyes trace the outline of your body underneath your clothes, and you suddenly feel very exposed, and in a way that''s very different from screwing some guy in front of a camera.' 
+				'His eyes trace the outline of your body underneath your clothes, and you suddenly feel very exposed, and in a way that''s very different from screwing some guy in front of a camera.'
 				'"How in the world did a young, pretty girl like you end up doing that?" He asks.'
 				*nl
 				'You''re not sure if he''s genuinely interested in an answer or just hiding his disgust - or lechery - really well, but you respond: "I... well, I like exposing myself... and I like sex. And it pays really well. So, I thought..." You trail off.'
@@ -465,28 +465,28 @@ if $ARGS[0] = '':
 				'He gives you a careful smile. "Some girl I know told me that she believed in good people. So I figured, maybe he existed and was just a really good guy."'
 				'His smile infects you too. "Yeah, maybe."'
 				*nl
-				'Despite your relief, both of you fall silent for a while. It''s a lot to process, after all, and the question that goes through your head - if Martin had been jerking off to your videos - is annoyingly persistent. But with apparently nobody in the bar requiring his attention yet, Martin eventually feels like continuing the conversation somehow:' 
-				'"So, where do you live?"'	
+				'Despite your relief, both of you fall silent for a while. It''s a lot to process, after all, and the question that goes through your head - if Martin had been jerking off to your videos - is annoyingly persistent. But with apparently nobody in the bar requiring his attention yet, Martin eventually feels like continuing the conversation somehow:'
+				'"So, where do you live?"'
 			end
 			act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 		end
-			
-		if SchoolAtestat = 0: 
+
+		if SchoolAtestat = 0:
 			act '"I''m still going to school"':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 				'"No, actually, I''m still going to school."'
 				'You regret your words almost immediately when Martin''s face darkens. "Still going to school, huh? What about you being 18?"'
 				*nl
-				
+
 				if pcs_persuas < 30:
 					gs 'exp_gain', 'persuas', rand(2,5)
-					
+
 					if age >= 18:
 						gs 'npc_relationship', 'modify', 'A216', -10
 						pcs_mood -= rand(3,5)
 						'"I, uh... I''m <<age>> now," you stammer.'
-						'"You are <b>now</b>," he repeats. "So you weren''t 18 when you first came here? You lied to my face?"' 
+						'"You are <b>now</b>," he repeats. "So you weren''t 18 when you first came here? You lied to my face?"'
 						'He''s clearly angry with you, but he seems to be more disappointed than angry.'
 						'"I''m sorry," you say quietly. You don''t know what else you can say - there probably isn''t anything you could add or explain that wouldn''t make this worse.'
 						'Martin slowly shakes his head, but then, just when you think he''s gonna say something else, he just walks off to tend to another customer.'
@@ -494,7 +494,7 @@ if $ARGS[0] = '':
 						'You don''t think you''re off the hook - this definitely hurt your relationship with him. But it''s probably a good sign that he didn''t throw you out, so if you give him some space and keep your conversation with him light, you could probably recover from this.'
 
 						act 'Finish your drink': gt 'qwBarPolet', 'bar'
-					
+
 					else
 						gs 'npc_relationship', 'modify', 'A216', -20
 						pcs_mood -= rand(3,6)
@@ -516,10 +516,10 @@ if $ARGS[0] = '':
 						'With no choice but to comply, you get up and leave the bar.'
 						*nl
 						'This definitely could have gone better...'
-						
+
 						act 'Leave the bar': gt 'city_industrial'
 					end
-				
+
 				else
 					gs 'exp_gain', 'persuas', rand(4,6)
 					npc_rel['A216'] -= 2
@@ -533,13 +533,13 @@ if $ARGS[0] = '':
 					'Regardless of the rest, at least the last bit is definitely honest, and Martin seems satisfied with that. He gives you nod that''s slightly more curt than usual, then walks off to serve another customer.'
 					*nl
 					'You just about managed to save the situation, and you are pretty sure this could have gone A LOT worse, but Martin definitely needs a moment to cool it, and you are suddenly very grateful to have a drink in front of you and a moment to yourself.'
-					
+
 					act 'Finish your drink': gt 'qwBarPolet', 'bar'
 				end
 			end
 		end
-		
-		if func('uniutil', 'student', 'enrolled'): 
+
+		if func('uniutil', 'student', 'enrolled'):
 			act '"I''m a university student"':
 				cla
 				'"I''m going to university," you say, your voice somewhere between pride and shame: Pride over the privilege of receiving a higher education, and shame in the face of thinking of yourself as ''privileged'' while talking to Martin, who you think didn''t have that option... or did he?'
@@ -551,12 +551,12 @@ if $ARGS[0] = '':
 				'"Yeah. Well, I''ve got a room there, at least. I wouldn''t call it living."'
 				'"It can get pretty wild there during the weekend, I heard," Martin comments, "and drunk people can be unpredictable. You watch yourself, okay?"'
 				'"I always do," you reply with a smile, touched by his concern.'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
-		if work = 0: 
+
+		if work = 0:
 			act '"I don''t have a job"':
 				cla
 				'"I''m still trying to find the right thing for me," you say, fidgeting with your glass, almost certain about what he''s going to respond.'
@@ -569,11 +569,11 @@ if $ARGS[0] = '':
 				'"Well, here''s to the spirit of equality," you raise your glass and take a gulp.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, Martin presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
+
 		if tanwork = 1:
 			act '"I''m a maid"':
 				cla
@@ -592,12 +592,12 @@ if $ARGS[0] = '':
 				'"And did it get ''weird''?" Martin asks carefully.'
 				'"Like I said, I''m fine," you placate him once again. "It makes sense. I gotta make breakfast and all that, and I have a big room to myself, AND the apartment is right in the city center, so, really, it''s all I could ask for."'
 				'"Well, as long as you''re happy with it." Martin, however, doesn''t sound very happy. Could he be jealous of Nicholas?'
-				
+
 				act 'Finish your drink': gt 'qwBarPolet', 'bar'
 			end
 		end
-		
-		if leonidSecretary > 0 or BurgerQW['Secretary'] > 0 or workSec = 1: 
+
+		if leonidSecretary > 0 or BurgerQW['Secretary'] > 0 or workSec = 1:
 			act '"I''m a secretary"':
 				cla
 				'"I''m working as a secretary."'
@@ -612,16 +612,16 @@ if $ARGS[0] = '':
 				'It''s Martin who finally breaks it. "So, uh... How is your work?"'
 				'You shrug. "Lots and lots of paperwork, and my boss can be hard on me sometime."'
 				*nl
-				'You realize what you said the instant you look at Martin, who looks like he wants to comment on that. Thankfully, he holds his tongue and doesn''t make the joke he must have had on his mind.' 
+				'You realize what you said the instant you look at Martin, who looks like he wants to comment on that. Thankfully, he holds his tongue and doesn''t make the joke he must have had on his mind.'
 				'"Well, everybody''s gotta earn their salary somehow," he says instead, and you simply nod in response.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, and in an attempt to end this talk on a higher note, Martin presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workFabrika = 1: 
+
+		if workFabrika = 1:
 			act '"I work in a factory"':
 				cla
 				'"I''m working in a textile factory."'
@@ -634,12 +634,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workKafe['job'] = 1: 
+
+		if workKafe['job'] = 1:
 			act '"I work as a waitress"':
 				cla
 				'"I am a waitress in a cafe."'
@@ -654,12 +654,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if young_shop_work = 1: 
+
+		if young_shop_work = 1:
 			act '"I work in a clothing store"':
 				cla
 				'"I work in a clothing store."'
@@ -675,12 +675,12 @@ if $ARGS[0] = '':
 				'Martin nods understandingly.'
 				*nl
 				'With apparently nobody in the bar requiring his attention yet, he presses on. "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if workrin = 1: 
+
+		if workrin = 1:
 			act '"I''m working a market stand"':
 				cla
 				'"I work at a market stand in Pavlovsk."'
@@ -696,12 +696,12 @@ if $ARGS[0] = '':
 				*nl
 				'You two fall silent after that, letting the somewhat gloomy turn this talk took sink in as you try to think of something to lighten the mood.'
 				'With apparently nobody in the bar requiring his attention yet, Martin eventually asks: "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if stripwork = 1: 
+
+		if stripwork = 1:
 			act '"I work at a strip club"':
 				cla
 				'You blush slightly, but decide to be honest with Martin: "I work in a strip club... as a stripper."'
@@ -715,12 +715,12 @@ if $ARGS[0] = '':
 				*nl
 				'You two fall silent after that, letting your admission sink in and trying to find a topic that can lighten the mood a little.'
 				'With apparently nobody in the bar requiring his attention yet, Martin eventually asks: "So, where do you live?"'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
-		if fame['city_modelling'] > 30: 
+
+		if fame['city_modelling'] > 30:
 			act 'Tell him you''re a model':
 				pcs_horny += rand(1,5)
 				cla
@@ -736,16 +736,16 @@ if $ARGS[0] = '':
 				*nl
 				'It is strangely flattering to know that Martin looked at nude pictures of you. Perhaps he was even jerking off to them... not that he''d admit it.'
 				*nl
-				'Martin looks around as if he were hoping for another patron to serve, but with apparently nobody in the bar requiring his attention yet, he seems hard-pressed to change the topic:' 
+				'Martin looks around as if he were hoping for another patron to serve, but with apparently nobody in the bar requiring his attention yet, he seems hard-pressed to change the topic:'
 				'"So, uh... where do you live?"'
 				'You chuckle to yourself and decide to let him off the hook... for now.'
-					
+
 				act 'Continue': gt 'MartinTalk','MartinTalkApartment'
 			end
 		end
-		
+
 	elseif MartinTalkVar = 10 and MartinSex = 1:
-		MartinTalkVar = 11	
+		MartinTalkVar = 11
 		'"Sure, <<$pcs_firstname>>." Martin prepares a drink for you and puts it down in front of you.'
 		*nl
 		'You smile gratefully and take a gulp. Now that you are sitting here, right in front of him, it hits you all over again: You had sex with Martin!'
@@ -772,10 +772,10 @@ if $ARGS[0] = '':
 		'Do you have feelings for Martin beyond physical attraction?'
 		'Well, it doesn''t really matter now. It''s probably the best you could have hoped for: You have friend and experienced lover you can hook up with whenever you feel like it and who just told you that neither of you have to worry about the other''s feelings too much.'
 		'After all, you weren''t actually looking for a serious relationship with a man old enough to be your father, were you?'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
-		
+
+
 	elseif MartinTalkVar = 11 and MartinSex = 1 and npc_rel['A216'] >= 64:
 		MartinTalkVar = 12
 		'"Of course, <<$pcs_firstname>>," Martin says and hands you your poison of choice.'
@@ -802,9 +802,9 @@ if $ARGS[0] = '':
 		'That seems to shake him from his reverie. Grumbling, Martin goes about his duty, walking a little more stiffly than you are used to seeing him.'
 		*nl
 		'You cannot outright see the effect of your words, but the telltale hints of it alone somehow make your drink taste better.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinTalkVar = 12 and MartinSex = 1 and npc_rel['A216'] >= 70:
 		MartinTalkVar = 13
 		'Martin nods and a few seconds later, a drink sits in front of you.'
@@ -818,14 +818,14 @@ if $ARGS[0] = '':
 		'The warmth in his expression makes you forget about the actor. "Sounds like you and your siblings are close," you note, sharing his smile.'
 		'"Yeah, I guess we are. We don''t talk much, but," he taps his chest, just above the heart, "in here, where it counts, we care about each other. Always have."'
 		*nl
-		
-		if mid($start_type,1,2) = 'sg' and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
+
+		if $start_loc = 'sg' and (npc_rel['A33'] >= 50 or npc_rel['A34'] >= 50):
 			'"Yeah, I know what you mean," you nod, thinking of your own siblings. "No matter where they are, you always know that somebody''s there for you."'
 			'"You have siblings?"'
 			'"An older sister and a younger brother", you nod. "My ' + iif(npc_rel['A33']>=npc_rel['A34'],'sister','brother') + ' and I are really close, but I care about both of them."'
 			'"There''s always a favorite sibling," he chuckles. "Usually the one who shared the most candy with you."'
 
-		elseif mid($start_type,1,2) = 'sg':
+		elseif $start_loc = 'sg':
 			'"I wish I knew what that''s like. I have siblings, but we''re not very close."'
 			'"I was the same around your age," Martin admits, "but trust me: That can change quickly. Sometimes, the tiniest event can pull you closer together."'
 
@@ -848,24 +848,24 @@ if $ARGS[0] = '':
 		'He shrugs, trying to play it down. You can sense that he doesn''t like this topic at all, but he says: "It''s fine. We were four brothers, always getting in trouble together. We were known all over town..."'
 		'Martin falls silent again, and you don''t dare say something. It doesn''t look like he''s trying to find the right words, or like he doesn''t want to continue - he seems lost in thought, as if he had simply forgotten he was talking to you.'
 		*nl
-		'Careful and a little worried, you reach for his hand. The moment you touch it, he snaps out of it, a bewildered look on him.' 
+		'Careful and a little worried, you reach for his hand. The moment you touch it, he snaps out of it, a bewildered look on him.'
 		'"Are you okay?" You ask.'
 		'"I''m fine," he assures you, sounding anything but. "Enjoy your drink, mi amor."'
 		*nl
 		'With that, he turns around and, rather than serving patrons, retreats to wash some glasses and check the register, apparently needing some space to pull himself together again.'
 		'Whatever happened to his brothers seems to deeply trouble him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-		
+
 	elseif npc_rel['A216'] < 20:
 		'As usual, Martin brings you your drink of choice. He seems to be in a talkative mood today, though, because he stays with you and strikes up a conversation.'
 		*nl
 		'Mind you, it''s not a very deep one - after your first few attempts at smalltalk, you kinda feel like you have to tiptoe around subjects that may be sensitive, and despite you showing that you are quick on your feet and not one to take an insult lying down, he seems a little unsure about how to talk to you, too.'
 		*nl
 		'Still, you manage to keep it going for a while and by the time another patron wants to order something, you feel like you''ve gotten to know each other a little better, even if you''re still a ways away from becoming best friends.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	elseif MartinSex = 1:
 		pcs_horny += rand(0,1)
 		'As per usual, your favorite barman brings you your drink and, wouldn''t you know it, lingers to spend a little time with you.'
@@ -877,16 +877,16 @@ if $ARGS[0] = '':
 		'Still, as per your unspoken agreement, you are not acting on that while Martin is working behind the bar - the fantasy of giving him a blowjob while he''s pouring drinks has its appeal, but, the huge risk of getting caught aside, Martin has to move around too much for that to be practical.'
 		*nl
 		'So, when one of the regulars calls for Martin, you lick your <<$pc_desc[''lip size'']>> lips lasciviously and thank him for the drink in a low, sexy voice before Martin goes back to work, his walk a little funnier than before.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
-	
+
 	else
 		'As always, Martin brings you your beverage of choice. Rather then leave to look after his other patrons, though, he sticks around and the two of you chat for a while.'
 		*nl
 		'You keep the conversation light today, talking about how your respective day was, what has been going on in the bar and the area,' + iif($MartinHobby!'',' and, of course, your <<$MartinHobby>>,','') + ' but really, these subjects are little more than a facade for subtle and not-so-subtle quips, hidden and open insults you try to outwit the other with, and the occasional suggestive remark, usually followed by roaring laughter.'
 		*nl
 		'Neither of you finds out anything mindblowing about the other, but you still feel like you and Martin know each other a little better now, your friendship with him growing stronger the more time you spend with him.'
-		
+
 		act 'Finish your drink': gt 'qwBarPolet', 'bar'
 	end
 end
@@ -894,7 +894,7 @@ end
 if $ARGS[0] = 'MartinTalkHobby':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
-	'"All that counts is that you enjoy doing it," Martin comments encouragingly. He seems to want to say or ask something else, but both of you notice something out of the corner of your eyes:' 
+	'"All that counts is that you enjoy doing it," Martin comments encouragingly. He seems to want to say or ask something else, but both of you notice something out of the corner of your eyes:'
 	'A new patron is calling him over, so it looks like this heart-to-heart is coming to an end soon.'
 	*nl
 	'You lean on the counter, giving Martin a coquettish look, as you sometimes do to tease him. "Did that one question already satisfy your curiosity about me?" You ask.'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'MartinTalkHobby':
 end
 
 if $ARGS[0] = 'MartinTalkApartment':
-	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'	
+	'<center><img <<$set_imgh>> src="images/locations/city/industrial/bar/martintalk.jpg"></center>'
 	if func('homes_properties', 'has_access', 'city_apartment'):
 		'"Actually, I have a small apartment, on the other side of the park."'
 		*nl
@@ -917,7 +917,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'"Oh no, I''d never do that," you assure him, your tone still sarcastic.'
 		*nl
 		'From the laughter that follows, the conversation quickly moves away from work and, as per usual, lasts until somebody requires a new drink, leaving you to finish your beverage alone.'
-	
+
 	elseif tanwork = 1:
 		'"I live in the city center, actually."'
 		*nl
@@ -926,7 +926,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		'Martin laughs. "Well, you definitely make it sound complicated. Good for you. But," he turns serious once more, "nothing like that is ever truly ''free'', so... be careful."'
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still nod yes at him before he has to get back to work.'
-	
+
 	elseif func('uniutil', 'student', 'enrolled'):
 		'"I have a room in one of the university dormitories, actually. I wouldn''t call it ''living'', though."'
 		*nl
@@ -935,8 +935,8 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'Martin nods understandingly. "I get it. At least you have a place to live near the center. Though it can get pretty wild there during the weekend, I heard," he comments, "and drunk people can be unpredictable. So, you watch yourself, okay?"'
 		*nl
 		$OpenInnerThought+'He wouldn''t be Martin if he didn''t tell me to "watch out" at least once a day,'+$CloseInnerThought+' you think and roll your eyes, but still smile and say "I always do" before he has to get back to work.'
-	
-	elseif mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
+
+	elseif $start_loc = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
 		'"I still live with my parents, in Pavlovsk," you admit.'
 		*nl
 		'"Oh, well, that can''t be easy at your age."'
@@ -945,7 +945,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		*nl
 		'You sigh. "Yeah, it does. I''ll get an apartment of my own as soon as I can. In the city, I hope."'
 		'"You do that, corazón," Martin says, already a little distracted by a patron waving at him, and just like that, you''re alone with your drink.'
-		
+
 	else
 		'You do not want to talk about your current living situation, though. It''s just too embarrassing to talk to him about it while you''re sitting in his bar, so you have to make something up, and quick.'
 		*nl
@@ -958,7 +958,7 @@ if $ARGS[0] = 'MartinTalkApartment':
 		'"No no, it''s fine," you cut him off with a hint of panic in your voice. Realizing that, you add more calmly: "I''ll be moving out soon, anyway."'
 		'"Okay..." He says slowly, raising an eyebrow. Before he can make any further inquiries, a nearby patron calls for him, saving you from further embarrassment and giving you time to get your story straight, should he ask again.'
 	end
-	
+
 	act 'Finish your drink': gt 'qwBarPolet', 'bar'
 end
 

+ 21 - 21
locations/bedrPar.qsrc

@@ -4,7 +4,7 @@
 fromoutside = iif($loc = 'bedrPar',0,1)
 menu_off = 0
 minut += 1
-!!day check so mom doesn''t think you have been out all night if you get up very early 
+!!day check so mom doesn''t think you have been out all night if you get up very early
 motherworry[1] = daystart
 gs 'shortgs', 'setloc', 'bedrPar', $ARGS[0]
 $location_type = 'private'
@@ -40,7 +40,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'As soon as you enter the room, you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial into his water bowl. You hope this will work and keep him from spilling you and your sister''s bedroom secrets.'
 		ParrotQW['Level'] = 3
 		ParrotQW['Day'] = 3
-		
+
 		act 'Continue':gt $loc, $loc_arg
 	elseif ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1 and $home['current'] = 'parents_home':
 		*clr & cla
@@ -52,14 +52,14 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		ParrotQW['Day'] = 2
 		ParrotQW['Failed'] = 0
 		gs 'stat'
-		
+
 		act 'Continue':gt $loc, $loc_arg
 	elseif pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and locat['Anya_inroom'] = 0 and $home['current'] = 'parents_home':
 		gt 'tobiQW', 'start'
-		
-	elseif locat['Anya'] = 11 and $home['current'] = 'parents_home': 
+
+	elseif locat['Anya'] = 11 and $home['current'] = 'parents_home':
 		gt 'sisterQW', 'sisboyQW_expel'
-		
+
 	elseif locat['Anya_inroom'] = 1 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0 and $home['current'] = 'parents_home':
 		*clr & cla
 		menu_off = 1
@@ -100,22 +100,22 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 
 		if ParrotQW['Owned2'] = 1 and $home['current'] = 'parents_home':
 			'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
-			if daystart - ParrotQW['BuyDate'] <= 10: 
+			if daystart - ParrotQW['BuyDate'] <= 10:
 				'<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
-			elseif daystart - ParrotQW['BuyDate'] <= 20: 
+			elseif daystart - ParrotQW['BuyDate'] <= 20:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. It sounds almost like he is saying "<b>Hello <<$pcs_nickname>>!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 30: 
+			elseif daystart - ParrotQW['BuyDate'] <= 30:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is clearly saying "<b>Hello <<$pcs_nickname>>!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 35: 
+			elseif daystart - ParrotQW['BuyDate'] <= 35:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 40: 
+			elseif daystart - ParrotQW['BuyDate'] <= 40:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Great body, <<$pcs_nickname>>!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 50: 
+			elseif daystart - ParrotQW['BuyDate'] <= 50:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>You''re the best, Anya!</b>"'
-			elseif daystart - ParrotQW['BuyDate'] <= 55: 
+			elseif daystart - ParrotQW['BuyDate'] <= 55:
 				'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Yeah, that''s it Anya! Swallow it all!</b>"'
 			else
-				if ParrotQW['Level'] < 3: 
+				if ParrotQW['Level'] < 3:
 					'When <<$ParrotQW[''Name2'']>> sees you, he starts ''speaking''. He is saying "<b>Your pussy tastes great, Anya!</b>"'
 				else
 					parfixrand = rand(0,9)
@@ -145,8 +145,8 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			elseif prezik + prezikcount + preziksabo > 0:
 				'Your <a href="exec:gt ''stol'', ''bc''">condoms</a> are hidden in one of your desk drawers.'
 			end
-			
-			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
+
+			if $start_loc = 'sg' and SchoolAtestat = 0 and week = 6 and hour > 4 and hour < 9 and detention_set = 1 and detention_warning ! daystart:
 				detention_warning = daystart
 				msg 'You have detention this morning and must be at school before 09:00.'
 			end
@@ -194,7 +194,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			act 'Relax on your bed': gt 'bed', 'start'
 			act 'Open wardrobe': gt 'wardrobe', 'start'
 			gs 'prostitution_functions', 'prostitute_outfit_at_home'
-			
+
 			if pornMagazine > 0:'You have hidden your porn magazines under the mattress of your bed.'
 			!!Masturbation, allowed after sister threesome (when sis_watch is used for a message) or sister not here.
 			sis_watch = 0
@@ -217,9 +217,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			if tovarL > 0:'You currently have <<tovarL>> trinkets to sell at the station. The maximum you can carry is 30.'
 
 			if locat['Anya_inroom'] = 0: dynamic $palelady
-			
+
 			gs 'wardrobe', 'default_sport_options'
-			
+
 			gs 'exercise', 'start'
 
 			if sewing_kit = 1:
@@ -247,7 +247,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 							end
 						end
 					end
-				end	
+				end
 				if newgobelen>=1:
 					'Your tapestry is <<newgobelen/10>> percent finished.'
 					act 'Work on the tapestry':
@@ -300,7 +300,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		if $home['current'] = 'parents_home': gs 'subkid'
 		'</td></tr></table>'
 
-		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon. 
+		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon.
 		if $home['current'] = 'parents_home': gs 'music_actions', 'music_icon'
 	end
 end

+ 2 - 0
locations/begin.qsrc

@@ -63,6 +63,8 @@ if $ARGS[0] = 'start':
 		act '<center><b>Start</b></center>': gt 'intro_'+$start_type, 'start'
 	end
 
+	$start_loc = iif(instr($start_type,'_'),$STRFIND($start_type,'^\w*(?=_)'),$start_type)
+
 	act '<center><b>Change game settings</b></center>': settingmode = 1 & gs '$menu_setting'
 end
 

+ 51 - 51
locations/booty_call_after.qsrc

@@ -58,11 +58,11 @@ if $ARGS[0] = 'stop_here':
 				'"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
 			gs'booty_call_after', 'finish'
 		end
@@ -106,7 +106,7 @@ if $ARGS[0] = 'stop_here_options':
 			end
 		end
 	end
-	
+
 	gs'booty_call_after', 'well_continue'
 
 	act'I don''t have time':
@@ -129,8 +129,8 @@ if $ARGS[0] = 'stop_here_options':
 		gs'booty_call_after', 'after_sex1'
 		gs'booty_call_after', 'well_continue'
 	end
-	
-	if mid($start_type,1,2) = 'sg' and (hour >= 22 or hour < 3):
+
+	if $start_loc = 'sg' and (hour >= 22 or hour < 3):
 		act'Mom will kill me':
 			cla & *nl
 			booty_call['mom_kill'] += 1
@@ -144,7 +144,7 @@ if $ARGS[0] = 'stop_here_options':
 			else
 				'"I wish I could, but I need to get home <<$npc_firstname[$boy]>>," you shake your head. "My mom will kill me if I''m not back before midnight."'
 			end
-			
+
 			if npc_caretaker[$boy] = 1:
 				'"Well, I guess there''s always next time," he says softly.'
 				gs'booty_call_after', 'after_sex1'
@@ -161,7 +161,7 @@ if $ARGS[0] = 'stop_here_options':
 						'"Tell me about it," you roll your eyes. "At least you don''t have to live with her."'
 						gs'booty_call_after', 'after_sex1'
 					end
-					
+
 					act'Don''t talk about my mom like that':
 						cla & *nl
 						'"Hey!" you growl. "Don''t talk about my mom like that!"'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'stop_here_options':
 			end
 		end
 	end
-	
+
 	if booty_call['fuck_count'] > 3:
 		act'Sore pussy':
 			cla & *nl
@@ -206,7 +206,7 @@ if $ARGS[0] = 'well_continue':
 			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.'
@@ -245,7 +245,7 @@ if $ARGS[0] = 'tap_out':
 			else
 				'"I need to tap out," you pant breathlessly, wincing at the pain of the large cock still filling you up. "You''re just too big for me... I can''t keep going..."'
 			end
-			
+
 			if npc_selfish[$boy] = 1 or npc_abusive[$boy] = 1:
 				'"Come on, don''t be like that," <<$npc_firstname[$boy]>> moans. "You just need to get used to it. Don''t pussy out now."'
 				act'Force yourself to keep going':
@@ -258,7 +258,7 @@ if $ARGS[0] = 'tap_out':
 					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'I can''t':
 					cla & *nl
 					npc_dick_too_big[$boy] = 1
@@ -274,7 +274,7 @@ if $ARGS[0] = 'tap_out':
 					'"Thanks," you say, smiling gratefully at him. "Yeah... maybe another time..."'
 					gs'booty_call_after', 'after_sex1'
 				end
-				
+
 				act'Don''t be sorry':
 					cla & *nl
 					'"Don''t be sorry," you say, shaking your head. "It''s not your fault you''ve got such a big dick. Maybe it''s my fault for having a small pussy."'
@@ -320,7 +320,7 @@ if $ARGS[0] = 'fucked_out':
 			gs'booty_call_after', 'after_sex2'
 		end
 	end
-	
+
 	act'Sigh':
 		cla & *clr
 		$booty_call['end_comment'] = 'You sigh in disappointment.'
@@ -333,7 +333,7 @@ if $ARGS[0] = 'fucked_out':
 			gs'booty_call_after', 'after_sex2'
 		end
 	end
-	
+
 	act'Laugh':
 		cla & *clr
 		if booty_call['fuck_count'] > 0:
@@ -539,7 +539,7 @@ if $ARGS[0] = 'wipe_tits':
 end
 
 if $ARGS[0] = 'wipe_pussy':
-	
+
 end
 
 if $ARGS[0] = 'finish':
@@ -600,7 +600,7 @@ if $ARGS[0] = 'no_cum_end':
 					'"Because I want to," you scowl at him. "I have to explain what I want to do with <i>my</i> body?"'
 					gs'booty_call_after', 'after_sex1'
 				end
-				if mid($start_type,1,2) = 'sg':
+				if $start_loc = 'sg':
 					act'Ask my mom':
 						cla & *nl
 						'"I don''t know," you say, rolling your eyes in exhasperation. "Ask my mom why it''s so important."'
@@ -638,7 +638,7 @@ if $ARGS[0] = 'no_cum_end':
 			'"Let''s just not make a habit of it, all right?" you smirk back.'
 			gs'booty_call_after', 'after_sex1'
 		end
-		
+
 		if booty_call['virgin'] = 1:
 			act'Loss of virginity is enough':
 				cla & *nl
@@ -709,7 +709,7 @@ if $ARGS[0] = 'black_out':
 		'You collapse to the bed as soon as you gulp, no strength left for you to stay upright. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is the salty taste of <<$npc_firstname[$boy]>>''s cum on your lips, and then...'
 	elseif $booty_call['last_cum'] = 'spit':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_22.jpg"></center>'
-		'You collapse to the bed, <<$npc_firstname[$boy]>>''s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...'		
+		'You collapse to the bed, <<$npc_firstname[$boy]>>''s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...'
 	elseif $booty_call['last_cum'] = 'face_mouth':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/sleep4.jpg"></center>'
 		'You collapse to the bed, <<$npc_firstname[$boy]>>''s cum hot on your face, still running down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid dribbling from your lips, and then...'
@@ -757,14 +757,14 @@ end
 
 if $ARGS[0] = 'black_out_wake_options':
 	act'Find your clothes':gt'booty_call_after', 'black_out_wake2'
-	
+
 	act'Shower?':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"Ugh..." you moan, holding your hand to your head. "Can I borrow your shower first? I''m kind of-"'
 		'"No, no time," <<$npc_firstname[$boy]>> says, shaking his head. "If you wanted that, then you shouldn''t have fallen asleep on me."'
 		act'Get out of bed':gt'booty_call_after', 'black_out_wake2'
-		
+
 		act'Get out of bed (grumble)':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/leave_bed1.mp4"></video></center>'
@@ -787,7 +787,7 @@ if $ARGS[0] = 'black_out_wake_options':
 			end
 		end
 	end
-	
+
 	if pc_know_npc_has_girlfriend[$boy] ! 1 and booty_call['girlfriend_discover'] ! 1:
 		act'Girlfriend?':
 			booty_call['girlfriend_discover'] = 1
@@ -830,13 +830,13 @@ if $ARGS[0] = 'cum_clean':
 		act'Clean up':
 			cla
 			act'Never mind': cla & gs 'booty_call_sex', 'sex_end'
-			
+
 			act'Ask him if he has any wipes':
 				booty_call['cock_inserted'] = 0
 				gs 'cum_cleanup', 'cleanloc'
 				gs'stat'
 				cla & *clr
-				
+
 				if cum_loc['face'] > 0:
 					gs'booty_call_reactions', 'facial_smile_img'
 					'"Got anything for this?" you ask, smiling wryly as you point to the sticky strands of cum covering your face.'
@@ -863,7 +863,7 @@ if $ARGS[0] = 'cum_clean':
 					gs'booty_call_sex', 'sex_end'
 				end
 			end
-			
+
 			if salfetka > 0:
 				act'Use your wipes':
 					gs 'cum_cleanup', 'cleanloc'
@@ -1070,9 +1070,9 @@ if $ARGS[0] = 'after_sex2':
 			gs'booty_call_after', 'relax_together'
 		end
 	end
-	
+
 	act'Use his bathroom':gt'booty_call_after', 'boy_bathroom'
-		
+
 	if booty_call['cigarette'] = 0 and (siga > 0 or npc_smoker[$boy] > 0) and booty_call['npc_late'] ! 1:
 		act'Smoke a cigarette':cla & gs'booty_call_after', 'smoke_ciga1'
 	end
@@ -1091,7 +1091,7 @@ if $ARGS[0] = 'after_sex2':
 			gt'booty_call_after', 'wipes'
 		end
 	end
-	
+
 	gs'booty_call_after', 'cock_clean'
 	gs'booty_call_after', 'plan_b'
 	gs'booty_call_after', 'birth_control_pill_take'
@@ -1114,13 +1114,13 @@ if $ARGS[0] = 'after_sex_dressed':
 	end
 	gs'booty_call_leave', 'breakup_start'
 !!{
-	
+
 
 		act'This is getting too complicated':
 
 
 		end
-		
+
 	end
 	}
 end
@@ -1141,7 +1141,7 @@ if $ARGS[0] = 'boy_bathroom':
 		$locM_arg = 'boy_bathroom'
 		gt 'mirror', 'start'
 	end
-	
+
 	if (pcs_breath ! 1 or cumloc[12] = 1) and (travel_brush = 1 or overnight_bag[$boy] = 1):
 		menu_off = 1
 		*clr & cla
@@ -1197,7 +1197,7 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Continue':gs'booty_call_after', 'boy_bathroom'
 		end
 	end
-	
+
 	if cum_loc['vagina'] > 0:
 		act'Let the cum drain from your pussy (0:15)':
 			cumspclnt = 3
@@ -1213,7 +1213,7 @@ if $ARGS[0] = 'boy_bathroom':
 				'After about fifteen minutes, you figure you''re safe and grab some toilet paper to wipe the last strands from your labia.'
 				act'Continue':gs'booty_call_after', 'boy_bathroom'
 			end
-			
+
 			if siga > 0:
 				act'Smoke to pass the time':
 					gs 'drugs', 'smoke'
@@ -1236,19 +1236,19 @@ if $ARGS[0] = 'relax_together':
 	cla
 	booty_call['relax_after'] = 1
 	act'Stop relaxing':cla & gs'booty_call_after', 'after_sex2'
-	
+
 	act'Pillow talk':gt'booty_call_pillow_talk', 'start'
-	
+
 	if booty_call['after_kiss'] = 0:
 		act'Kiss <<$npc_firstname[$boy]>>':gt 'booty_call_after', 'kiss'
 	end
-	
+
 	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 $ARGS[0] = 'cock_clean':
@@ -1361,7 +1361,7 @@ if $ARGS[0] = 'plan_b2':
 		gs 'medical_din', 'morning_after_pill_function'
 		gs'booty_call_after', 'after_sex2'
 	end
-	
+
 	act'Take it sexily':
 		cla & *nl
 		'As <<$npc_firstname[$boy]>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.'
@@ -1442,7 +1442,7 @@ if $ARGS[0] = 'birth_control_pill_take2':
 		end
 		gs'booty_call_after', 'after_sex2'
 	end
-	
+
 	act'Take it sexily':
 		cla & *clr
 		if booty_call['get_up'] = 0:
@@ -1491,14 +1491,14 @@ if $ARGS[0] = 'smoke_ciga1':
 			gt'booty_call_after', 'smoke_ciga2'
 		end
 	end
-	
+
 	act'Bum a cigarette':
 		booty_call['bum_cigarette'] = 1
 		siga += 1
 		siga_bum = 1
 		gt'booty_call_after', 'smoke_ciga_bum'
 	end
-	
+
 	act'Bum a cigarette and play with your phone':
 		booty_call['bum_cigarette'] = 1
 		booty_call['cigarette'] = 3
@@ -1511,7 +1511,7 @@ end
 if $ARGS[0] = 'smoke_ciga2':
 	npc_know_pc_smoker[$boy] = 1
 	cla & *clr
-	
+
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
 	if npc_smoker[$boy] > 0 and booty_call['boy_smoked'] ! 1:
 		'Seeing <<$npc_firstname[$boy]>> inspires you to reach for your own cigarettes and light up too.'
@@ -1522,7 +1522,7 @@ if $ARGS[0] = 'smoke_ciga2':
 	else
 		'You pull a cigarette from your purse and place it in your mouth, sparking it with your lighter while inhaling deeply.'
 	end
-	
+
 	act'Smoke':
 		gs 'drugs', 'smoke'
 		if booty_call['phone'] = 2:gt'booty_call_after', 'smoke_phone'
@@ -1604,7 +1604,7 @@ if $ARGS[0] = 'spend_night_ask':
 			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]
@@ -1612,7 +1612,7 @@ if $ARGS[0] = 'spend_night_ask':
 				gs'booty_call_after', 'spend_night'
 			end
 
-			if mid($start_type,1,2) = 'sg':
+			if $start_loc = 'sg':
 				act'I''m sick of my mom':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -1620,9 +1620,9 @@ if $ARGS[0] = 'spend_night_ask':
 					gs'booty_call_after', 'spend_night'
 				end
 			end
-			
+
 			if hour < 5:
-				if mid($start_type,1,2) = 'sg':
+				if $start_loc = 'sg':
 					act'Avoid my mom':
 						cla & *clr
 						$npc_apt_bedroom[$boy]
@@ -1631,7 +1631,7 @@ if $ARGS[0] = 'spend_night_ask':
 					end
 				end
 			end
-			
+
 			if hour >= 22 or hour < 5:
 				act'It''s late':
 					cla & *clr
@@ -1640,7 +1640,7 @@ if $ARGS[0] = 'spend_night_ask':
 					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
@@ -1800,8 +1800,8 @@ if $ARGS[0] = 'sleep_function':
 			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
+		if $start_loc = '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 ---------------------------------
+--- booty_call_after ---------------------------------

+ 55 - 55
locations/booty_call_leave.qsrc

@@ -4,7 +4,7 @@ if $ARGS[0] = 'exit':
 	gs 'booty_call_leave', 'ending'
 	minut += 2
 	!! exit should be based on type of apartment and location
-	
+
 	if npc_residence[$boy] = 1:
 		!! Pav residential exit
 		gt 'pav_residential'
@@ -64,17 +64,17 @@ if $ARGS[0] = 'leaving_dialogue':
 		$booty_call['leave_dialogue'] = 'See ya'
 		gs'booty_call_leave', 'leaving_action'
 	end
-	
+
 	act'"Toodles"':
 		$booty_call['leave_dialogue'] = 'Toodles'
 		gs'booty_call_leave', 'leaving_action'
 	end
-	
+
 	act'"Text me"':
 		$booty_call['leave_dialogue'] = 'Text me'
 		gs'booty_call_leave', 'leaving_action'
 	end
-	
+
 	if npc_booty_call[$boy] = daystart and booty_call['sleepover'] = 1:
 		act'"See you soon"':
 			$booty_call['leave_dialogue'] = 'See you soon'
@@ -99,7 +99,7 @@ if $ARGS[0] = 'leaving_action':
 		$booty_call['leave_action'] = ' nonchalantly and head out the door without a second glance'
 		gs'booty_call_leave', 'leaving_end'
 	end
-	
+
 	act'Wave goodbye':
 		$booty_call['leave_action'] = ', waggling your fingers at him and head out the door'
 		gs'booty_call_leave', 'leaving_end'
@@ -109,12 +109,12 @@ if $ARGS[0] = 'leaving_action':
 		$booty_call['leave_action'] = ' with a wink as you close the door behind you'
 		gs'booty_call_leave', 'leaving_end'
 	end
-	
+
 	act'Blow him a kiss':
 		$booty_call['leave_action'] = ', blowing him a kiss just before the door closes behind you'
 		gs'booty_call_leave', 'leaving_end'
 	end
-	
+
 	act'Shake your ass':
 		$booty_call['leave_action'] = ', giving him a teasing shake of your ass just before you close the door behind you'
 		gs'booty_call_leave', 'leaving_end'
@@ -188,7 +188,7 @@ if $ARGS[0] = 'unsatisfied_breakup':
 				gs'booty_call_leave', 'isnt_going_to_work'
 			end
 		end
-		
+
 !!		act'You''re boring':
 	end
 end
@@ -210,7 +210,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'And with that, you head out the door.'
 					gs'booty_call_leave', 'break_up'
 				end
-				
+
 				act'Well...':
 					cla & *nl
 					'You pause, biting your lip in consideration.'
@@ -221,7 +221,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 						'"Thatta girl," <<$npc_firstname[$boy]>> grins from bed.'
 						gs'booty_call_after', 'cheating_end'
 					end
-					
+
 					act'Set some rules':
 						cla & *nl
 						'"Okay..." you say. "But there have to be rules!"'
@@ -237,7 +237,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'And with that, you head out the door.'
 					gs'booty_call_leave', 'break_up'
 				end
-				
+
 				act'No I won''t':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
@@ -248,7 +248,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 				end
 			end
 		end
-		
+
 		if pcs_lovers - pcs_girlfriends > 0:
 			act'I can''t keep cheating on my boyfriend':
 				cla & *clr
@@ -326,7 +326,7 @@ if $ARGS[0] = 'sneak_out1':
 			end
 			act'Leave':gt'booty_call_leave', 'exit'
 		end
-		
+
 		act'Leave your a note on your panties':
 			booty_call['panty_note'] = 1
 			npc_panty_give[$boy] += 1
@@ -354,7 +354,7 @@ if $ARGS[0] = 'sneak_out_note1':
 		$booty_call['note_desc1']
 		gs'booty_call_leave', 'sneak_out_note2'
 	end
-	
+
 	act'I had a good time':
 		cla & *clr
 		$npc_apt_hall[$boy]
@@ -362,7 +362,7 @@ if $ARGS[0] = 'sneak_out_note1':
 		$booty_call['note_desc1']
 		gs'booty_call_leave', 'sneak_out_note2'
 	end
-	
+
 	if booty_call['fuck_count'] > 0:
 		act'Thanks for the fuck':
 			cla & *clr
@@ -372,7 +372,7 @@ if $ARGS[0] = 'sneak_out_note1':
 			gs'booty_call_leave', 'sneak_out_note2'
 		end
 	end
-	
+
 end
 
 if $ARGS[0] = 'sneak_out_note2':
@@ -385,12 +385,12 @@ if $ARGS[0] = 'sneak_out_note2':
 		$booty_call['note_desc2'] = '<i>See ya later.</i>'
 		gs'booty_call_leave', 'sneak_out_note3'
 	end
-	
+
 	act'Text me':
 		$booty_call['note_desc2'] = '<i>Don''t forget to text me.</i>'
 		gs'booty_call_leave', 'sneak_out_note3'
 	end
-	
+
 	act'Till next time':
 		$booty_call['note_desc2'] = '<i>Until next time.</i>'
 		gs'booty_call_leave', 'sneak_out_note3'
@@ -408,7 +408,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'<<$booty_call[''note_desc1'']>> <<$booty_call[''note_desc2'']>> - <<$pcs_nickname>>'
 		gs'booty_call_leave', 'sneak_out_note_end'
 	end
-	
+
 	act'A smiley face':
 		cla & *clr
 		$npc_apt_hall[$boy]
@@ -417,7 +417,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'You leave a little face, unable to keep yourself from smiling as you dot two little eyes over the mouth.'
 		gs'booty_call_leave', 'sneak_out_note_end'
 	end
-	
+
 	act'A winky face':
 		cla & *clr
 		$npc_apt_hall[$boy]
@@ -426,7 +426,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'You leave a little face, unable to keep yourself from smiling as you dot little winky eyes over the mouth.'
 		gs'booty_call_leave', 'sneak_out_note_end'
 	end
-	
+
 	act'A heart':
 		cla & *clr
 		$npc_apt_hall[$boy]
@@ -435,7 +435,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'You punctuate the note with a tiny little heart, feeling warmth in your chest as you do.'
 		gs'booty_call_leave', 'sneak_out_note_end'
 	end
-	
+
 	if pcs_makeup > 2:
 		act'A kiss':
 			cla & *clr
@@ -519,7 +519,7 @@ if $ARGS[0] = 'dressing1':
 	cla & *clr
 !!	gs'booty_call_leave', 'dress'
 	gs'booty_call_leave', 'dress_loop'
-	
+
 	if booty_call['sleepover'] = 1 and npc_latesleeper[$boy] = 1 and booty_call['boy_asleep'] ! 0:
 		if booty_call['towel'] = 1:
 			booty_call['towel'] = 0
@@ -527,7 +527,7 @@ if $ARGS[0] = 'dressing1':
 		else
 			'You quietly reach down for where you left your clothes and try to pick them up without waking <<$npc_firstname[$boy]>>.'
 		end
-		
+
 		gs'booty_call_leave', 'dressing2'
 	else
 		gs'booty_call_leave', 'dress_start_desc'
@@ -639,7 +639,7 @@ if $ARGS[0] = 'going_disco':
 				end
 				!! add spontaneous disco date
 				gs 'booty_call_leave', 'dressing2'
-				
+
 				gs 'booty_call_leave', 'panty_gift'
 			end
 		else
@@ -655,7 +655,7 @@ if $ARGS[0] = 'going_disco':
 				end
 				!! add spontaneous club date
 				gs 'booty_call_leave', 'dressing2'
-				
+
 				gs 'booty_call_leave', 'panty_gift'
 			end
 		end
@@ -663,7 +663,7 @@ if $ARGS[0] = 'going_disco':
 end
 
 if $ARGS[0] = 'mom_late':
-	if mid($start_type,1,2) = 'sg' and hour >= 20:
+	if $start_loc = 'sg' and hour >= 20:
 		act'Mom will kill me':
 			booty_call['mom_kill'] = 1
 			cla & *clr
@@ -674,9 +674,9 @@ if $ARGS[0] = 'mom_late':
 				'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "I''m already going to be in trouble as it is, but if I don''t come home at all tonight, my mom will kill me."'
 			else
 				'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "My mom will kill me if I don''t come home before curfew."'
-			end			
+			end
 			gs 'booty_call_leave', 'dressing2'
-			
+
 			gs 'booty_call_leave', 'panty_gift'
 		end
 	end
@@ -724,7 +724,7 @@ if $ARGS[0] = 'something_to_do':
 			gs 'booty_call_leave', 'panty_gift'
 		else
 			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Have a few things I need to get done. Thanks for letting me spend the night."'
-			
+
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
 				gs'booty_call_morning', 'booty_call_invite_later'
 			else
@@ -748,7 +748,7 @@ if $ARGS[0] = 'see_a_friend':
 			gs 'booty_call_leave', 'panty_gift'
 		else
 			'"Yeah," you say, <<$booty_call[''dress_describe'']>>. "Need to see a friend later. Thanks for letting me spend the night."'
-			
+
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
 				gs'booty_call_morning', 'booty_call_invite_later'
 			else
@@ -776,7 +776,7 @@ if $ARGS[0] = 'another_fuckbuddy':
 end
 
 if $ARGS[0] = 'going_school':
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 		act'School':
 			cla & *clr
 			gs'booty_call_leave', 'dress_loop'
@@ -803,7 +803,7 @@ if $ARGS[0] = 'going_school':
 end
 
 if $ARGS[0] = 'school_night':
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7): 
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
 		act'It''s a school night':
 			cla & *clr
 			gs'booty_call_leave', 'dress_loop'
@@ -863,7 +863,7 @@ if $ARGS[0] = 'panty_gift2':
 			gs 'booty_call_leave', 'dressing2'
 		end
 	end
-	
+
 	act'Something to remember the occasion':
 		cla & *clr
 		gs'booty_call_leave', 'dress_loop'
@@ -881,7 +881,7 @@ if $ARGS[0] = 'panty_gift2':
 			gs 'booty_call_leave', 'dressing2'
 		end
 	end
-	
+
 	act'Consider it a trophy':
 		cla & *clr
 		gs'booty_call_leave', 'dress_loop'
@@ -895,7 +895,7 @@ if $ARGS[0] = 'panty_gift2':
 			gs 'booty_call_leave', 'dressing2'
 		end
 	end
-	
+
 	if booty_call['virgin'] = 1:
 		act'To remember my virginity':
 			cla & *clr
@@ -919,13 +919,13 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 		'"Just hide them," you say, <<$booty_call[''dress_describe'']>>. "If you can hide a fucking a girl in your bed, surely you can hide a pair of panties."'
 		gs 'booty_call_leave', 'dressing2'
 	end
-	
+
 	act'Say they''re hers':
 		cla & *nl
 		'"Tell her they''re hers," you shrug with a wry smirk, <<$booty_call[''dress_describe'']>>. "Maybe she''ll think she bought them."'
 		gs 'booty_call_leave', 'dressing2'
 	end
-	
+
 	act'Say they''re yours':
 		gs'booty_call_leave', 'dress_loop_code'
 		cla & *nl
@@ -941,7 +941,7 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 				'You move to <<$booty_call[''dress_describe'']>> but <<$npc_firstname[$boy]>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.'
 				gs 'booty_call_leave', 'dressing2'
 			end
-			
+
 			act'I was kidding (acerbic)':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -955,13 +955,13 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 			gs 'booty_call_leave', 'dressing2'
 		end
 	end
-	
+
 	act'Give them to her':
 		cla & *nl
 		'"Gift them to her," you say mischievously, <<$booty_call[''dress_describe'']>>. "Maybe she''ll put them on."'
 		gs 'booty_call_leave', 'dressing2'
 	end
-	
+
 	act'Throw them away':
 		cla & *nl
 		'"Throw them away then," you shrug, <<$booty_call[''dress_describe'']>>. "Do whatever you want with them.'
@@ -1061,7 +1061,7 @@ end
 
 if $ARGS[0] = 'dress_talk':
 	gs'booty_call_leave', 'dressing_finish'
-	
+
 	gs 'booty_call_leave', 'dress_talk_pc'
 	if booty_call['dress_end'] ! 1 and booty_call['plans_later_talk'] = 0 and rand(0,1) = 1:
 		gs 'booty_call_leave', 'npc_booty_call_invite'
@@ -1092,13 +1092,13 @@ if $ARGS[0] = 'dress_talk_boy':
 					gs'booty_call_after', 'npc_date_later_response'
 					'Your blush deepens in response.'
 				end
-				
+
 				act'Casual':
 					gs'booty_call_after', 'dress_image'
 					'"I have a date with my boyfriend later,"'
 					gs'booty_call_after', 'npc_date_later_response'
 				end
-				
+
 				act'Exhasperated':
 					gs'booty_call_after', 'dress_image'
 					'"I have a date with my boyfriend later,"'
@@ -1156,11 +1156,11 @@ if $ARGS[0] = 'dress_talk_pc':
 
 	end
 
-	
+
 	gs'booty_call_leave', 'had_a_good_time'
-	
+
 	gs'booty_call_leave', 'stay_over_thanks'
-	
+
 end
 
 !!if $ARGS[0] = '':
@@ -1240,7 +1240,7 @@ end
 if $ARGS[0] = 'ruined_panties':
 	if cum_loc['vagina'] > 0 and booty_call['ruin_my_panties'] = 0 and $lastwornpantytype['booty_call'] ! 'none' and booty_call['panty_wear'] ! 1:
 		act'':
-			
+
 		end
 	end
 end
@@ -1250,7 +1250,7 @@ if $ARGS[0] = 'npc_date_later_response':
 		if npc_fidelity[$boy] < 7:
 			'"You''re still with that stick in the mud?" <<$npc_firstname[$boy]>> scoffs.'
 		else
-		
+
 		end
 	else
 		npc_know_cheat[$boy] = 1
@@ -1259,7 +1259,7 @@ if $ARGS[0] = 'npc_date_later_response':
 		else
 			'"Oh." <<$npc_firstname[$boy]>> looks away uncomfortably.'
 		end
-		
+
 	end
 end
 
@@ -1320,7 +1320,7 @@ if $ARGS[0] = 'pc_booty_call_invite':
 end
 
 if $ARGS[0] = 'pc_booty_call_timeset':
-	act'How about...': 
+	act'How about...':
 		:invalid_timeset
 		npc_booty_call_time[$boy] = input ("When do you want to set your reminder? (Pick an hour 1 - 22. A reminder icon will appear in the stat display during that hour.)")
 		if npc_booty_call_time[$boy] < npc_start_free_time[$boy] or npc_booty_call_time[$boy] > 22:
@@ -1401,9 +1401,9 @@ if $ARGS[0] = 'npc_booty_call_invite':
 				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$booty_call[''dress_describe'']>>. "Want to come by and do this again?"'
 			end
 		end
-		
+
 		gs 'booty_call_leave', 'busy_tomorrow'
-		
+
 		act'What time?':
 			gs 'booty_call_leave', 'dress_loop'
 			'"That depends," you say, <<$booty_call[''dress_describe'']>>. "What time were you thinking?"'
@@ -1446,7 +1446,7 @@ if $ARGS[0] = 'booty_call_plan':
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
 		gs 'booty_call_leave', 'dress_talk'
 	end
-	
+
 	act'I''ve got nothing better to do':
 		gs 'booty_call', 'set_booty_call_date'
 		gs 'booty_call_leave', 'dress_loop'
@@ -1454,7 +1454,7 @@ if $ARGS[0] = 'booty_call_plan':
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
 		gs 'booty_call_leave', 'dress_talk'
 	end
-	
+
 	act'I could fit it in':
 		gs 'booty_call', 'set_booty_call_date'
 		gs 'booty_call_leave', 'dress_loop'

+ 90 - 90
locations/booty_call_morning.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'morning':
 				act'Kiss <<$npc_firstname[$boy]>>':gt'booty_call_morning', 'kiss_wake'
 			end
 	!!	end
-		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+		if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 			act'School!':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -30,7 +30,7 @@ if $ARGS[0] = 'morning':
 			end
 		end
 		if booty_call['pass_out'] = 1:
-			
+
 		end
 		if booty_call['sleep_fuck'] = 2:
 			act'Nice night':
@@ -47,7 +47,7 @@ if $ARGS[0] = 'morning':
 		end
 		if pcs_lovers - pcs_girlfriends > 0:act'Your boyfriend':$booty_call['cheat'] = 'boyfriend' & gt'booty_call_morning', 'guilt1'
 		if pcs_girlfriends > 0:act'Your girlfriend': $booty_call['cheat'] = 'girlfriend' & gt'booty_call_morning', 'guilt1'
-		
+
 		if pilldaychk < daystart - 1 and birth_control['using_bc'] = 1: gs'booty_call_morning', 'forgot_bc_pill'
 	end
 end
@@ -58,7 +58,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 	else
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/sleep4.jpg"></center>'
 	end
-	
+
 	'Your mind stirs and you slowly come to consciousness. The first thing you notice...'
 	*nl
 	if cum_loc['vagina'] > booty_call['sleep_cum_vagina']:
@@ -89,7 +89,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 !!		else
 !!			'<i>Was <<$npc_firstname[$boy]>> wearing a condom when you went to sleep last night?</i>'
 		end
-		
+
 		act'Did you fuck me in my sleep?':
 			cla & *nl
 			'"... did you fuck me while I was sleeping last night?" you ask.'
@@ -98,7 +98,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 				'"Was just wondering," you smirk.'
 				gs'booty_call_morning', 'wakeup1'
 			end
-			
+
 			act'Explains the dream':
 				cla & *nl
 				'"Well that explains the weird dreams I was having," you giggle.'
@@ -112,21 +112,21 @@ if $ARGS[0] = 'sleep_fuck_wake':
 					'"No promises," <<$npc_firstname[$boy]>> smirks mischievously.'
 					gs'booty_call_morning', 'wakeup1'
 				end
-				
+
 				act'Wake me up next time':
 					cla & *nl
 					npc_sleep_sex_okay[$boy] = 1
 					'"Wake me up next time," you smirk. "Maybe I want to get some too."'
 					gs'booty_call_morning', 'wakeup1'
 				end
-				
+
 				act'That''s fine':
 					cla & *nl
 					npc_sleep_sex_okay[$boy] = 2
 					'"That''s fine," you smile. "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
@@ -142,7 +142,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 						'"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."'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 				end
 			end
 		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.'
@@ -170,14 +170,14 @@ if $ARGS[0] = 'sleep_fuck_wake':
 					'"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
@@ -192,7 +192,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 						'"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."'
@@ -204,7 +204,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 						'"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
@@ -214,7 +214,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 				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."'
@@ -374,7 +374,7 @@ if $ARGS[0] = 'kiss_wake':
 				gs'booty_call_morning', 'bj_wake'
 			end
 		end
-		
+
 		act'His fault':
 			cla & *nl
 			'"It''s your fault," you smirk wryly. "You''re the one who plastered my face last night."'
@@ -415,7 +415,7 @@ if $ARGS[0] = 'bj_wake':
 			'"Too bad," you smirk, teasing his cock with your hand while you savour his taste. "Guess it''ll have to wait until later."'
 			gs'booty_call_morning', 'wakeup1'
 		end
-		
+
 		act'I''ll be fast':
 			booty_call['morning_fuck'] = 1
 			booty_call['extra_cum'] += npc_sexdrive[$boy]
@@ -445,7 +445,7 @@ if $ARGS[0] = 'bj_wake':
 				'"Fuck yes," he groans and you get back to work.'
 				act'Continue':gt'booty_call_start', 'bj_dom2'
 			end
-			
+
 			act'Keep sucking':
 				cla & *nl
 				'"Mmmm," you hum around the cock in your mouth, sending shivers through his body that you can feel between your lips. You never stop sucking.'
@@ -460,7 +460,7 @@ if $ARGS[0] = 'bj_wake':
 				'"Fuck no," he groans and you get back to work.'
 				act'Continue':gt'booty_call_start', 'bj_dom2'
 			end
-			
+
 			act'Guess':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
@@ -489,32 +489,32 @@ if $ARGS[0] = 'wakeup1':
 				'"Sorry, I don''t have time," you say. "I wish I could but I really need to get going."'
 				gs 'booty_call_morning', 'wakeup1'
 			end
-			
+
 			act'Not hungry':
 				cla & *nl
 				'"I''ll pass," you say. "I''m not all that hungry right now."'
 				gs 'booty_call_morning', 'wakeup1'
 			end
-			
+
 			act'Don''t eat breakfast':
 				cla & *nl
 				'"I''ll pass," you say. "I don''t really eat breakfast."'
 				gs 'booty_call_morning', 'wakeup1'
 			end
-			
+
 			act'On a diet':
 				cla & *nl
 				'"I''m on a diet," you say ruefully. "Gotta keep the calories down."'
 				gs 'booty_call_morning', 'wakeup1'
 			end
 		end
-		
+
 		act'Yes please (15 minutes)':
 			cla & *nl
 			'"That sounds great," you smile.'
 			act'Continue':gt'booty_call_morning', 'wait_for_breakfast1'
 		end
-		
+
 		act'Let me cook instead':
 			cla & *nl
 			if booty_call['get_up'] = 0:
@@ -524,7 +524,7 @@ if $ARGS[0] = 'wakeup1':
 			end
 			act'Make breakfast':gt'booty_call_morning', 'pc_make_breakfast'
 		end
-		
+
 		if booty_call['morning_fuck'] = 0:
 			act'Differnt kind of breakfast (sex)':
 				gs'arousal', 'bj', 1, 'no_orgasm_msg'
@@ -552,7 +552,7 @@ if $ARGS[0] = 'wakeup1':
 			end
 		end
 
-		
+
 		if npc_earlyriser[$boy] = 1 and booty_call['npc_morning_shower'] = 1 and booty_call['morning_shower'] = 0:
 			if npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
 				act'Join <<$npc_firstname[$boy]>> in the shower':gt'booty_call_shower', 'morning_shower_join1'
@@ -573,7 +573,7 @@ if $ARGS[0] = 'wakeup1':
 						'"Oh. Well have fun with that," he smiles.'
 						act'Continue':gt'booty_call_after', 'boy_bathroom'
 					end
-					
+
 					act'Take a shower':
 						cla & *nl
 						'"I need a shower," you say over your shoulder.'
@@ -584,7 +584,7 @@ if $ARGS[0] = 'wakeup1':
 								'"I could use some alone time right now," you reply shaking your head and lock the door behind you.'
 								act'Continue':gt'booty_call_after', 'boy_bathroom'
 							end
-							
+
 							act'Sure':
 								cla & *nl
 								'"I''d like that," you reply taking his hand as he gets up and drag him inside with you.'
@@ -600,7 +600,7 @@ if $ARGS[0] = 'wakeup1':
 							end
 						end
 					end
-					
+
 					if cum_loc > 0:
 						act'Clean up':
 							cla & *nl
@@ -614,31 +614,31 @@ if $ARGS[0] = 'wakeup1':
 				end
 			end
 		end
-		
+
 		if npc_latesleeper[$boy] ! 1 and booty_call['breakfast_eat'] = 0 and booty_call['npc_morning_shower'] ! 1:
 			gs'booty_call_morning', 'want_breakfast'
 			gs'booty_call_pillow_talk2', 'forgot_bc_talk1'
 		elseif npc_latesleeper[$boy] = 1 and booty_call['breakfast_eat'] = 0:
 			act'Make breakfast':gt'booty_call_morning', 'pc_make_breakfast'
 		end
-		
+
 		if booty_call['creampie_count'] > 0 and morning_after_pill > 0 and booty_call['plan_b'] = 0 and birth_control['think_safe'] = 0:
 			act'Take a morning after pill':
 				booty_call['plan_b'] = 2
 				cla & *clr
 				$npc_apt_bedroom[$boy]
-				
+
 				if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
 					'You reach down to your purse and pull out the morning after pill Luda gave you, popping it from the packaging and swallowing it dry.'
 				else
 					'You reach down to your purse and pull out the morning after pill you keep inside, popping it from the packaging and swallowing it dry.'
 				end
-				
+
 				gs 'medical_din', 'morning_after_pill_function'
 				gs'booty_call_morning', 'wakeup1'
 			end
 		end
-		
+
 		if booty_call['boy_asleep'] = 1 and booty_call['breakfast_eat'] = 0:
 			act'Wake <<$npc_firstname[$boy]>> with a blowjob':
 				cla & *clr
@@ -801,9 +801,9 @@ if $ARGS[0] = 'dressing1':
 		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 		gs'booty_call_after', 'dress_loop'
 
-		
-		
-		
+
+
+
 	!!	act'Talk while you dress':
 	!!		gs'booty_call_morning', 'dress_talk'
 	!!	end
@@ -828,11 +828,11 @@ if $ARGS[0] = 'booty_call_invite_later':
 			'"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
 	end
-	
+
 	gs 'booty_call_after', 'dress_loop'
-	
+
 	gs 'booty_call_morning', 'busy_today'
-	
+
 	act'What time?':
 		cla & *nl
 		'"That depends," you say, <<$booty_call[''dress_describe'']>>. "What time were you thinking?"'
@@ -874,7 +874,7 @@ if $ARGS[0] = 'booty_call_plan':
 		gs 'booty_call_after', 'dress_loop'
 		gs 'booty_call_morning', 'end_morning'
 	end
-	
+
 	act'I''ve got nothing better to do':
 		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
@@ -883,7 +883,7 @@ if $ARGS[0] = 'booty_call_plan':
 		gs 'booty_call_after', 'dress_loop'
 		gs 'booty_call_morning', 'end_morning'
 	end
-	
+
 	act'I could fit it in':
 		gs 'booty_call', 'set_booty_call_date'
 		cla & *nl
@@ -929,7 +929,7 @@ if $ARGS[0] = 'cumshot_wakeup1':
 		'"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>'
@@ -940,7 +940,7 @@ if $ARGS[0] = 'cumshot_wakeup1':
 			'"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.'
@@ -948,7 +948,7 @@ if $ARGS[0] = 'cumshot_wakeup1':
 			gs'booty_call_morning', 'cumshot_wakeup_clean2'
 		end
 	end
-	
+
 	if npc_cumshot_wake[$boy] > 0:
 		act'Again?! (annoyed)':
 			cla & *clr
@@ -968,7 +968,7 @@ if $ARGS[0] = 'cumshot_wakeup_clean1':
 		'"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>'
@@ -986,7 +986,7 @@ if $ARGS[0] = 'cumshot_wakeup_clean2':
 		'"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>'
@@ -1041,7 +1041,7 @@ if $ARGS[0] = 'forgot_bc_pill':
 			end
 			gs'booty_call_morning', 'forgot_bc_pill2'
 		end
-		
+
 		act'Calm down':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
@@ -1103,13 +1103,13 @@ if $ARGS[0] = 'forgot_bc_pill2':
 					'"It''s nothing," you mumble, flashing a smile to pretend like everything is fine.'
 					gs'booty_call_morning', 'wakeup1'
 				end
-				
+
 				act'Tell him':
 					cla & *nl
 					'"I forgot my birth control yesterday," you sigh. "I fucked up. I''m sorry."'
 					gs'booty_call_talk', 'forgot_bc_talk'
 				end
-				
+
 				if morning_after_pill > 0:
 					act'Take your morning after pill':
 						gs 'medical_din', 'morning_after_pill_function'
@@ -1168,7 +1168,7 @@ if $ARGS[0] = 'guilt1':
 			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:
@@ -1176,9 +1176,9 @@ if $ARGS[0] = 'guilt1':
 			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': 
+			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
@@ -1216,7 +1216,7 @@ if $ARGS[0] = 'guilt_excuses':
 		'All your excuses 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>'
@@ -1225,7 +1225,7 @@ if $ARGS[0] = 'guilt_excuses':
 		'You''re not sure whether you believe yourself.'
 		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>'
@@ -1282,15 +1282,15 @@ if $ARGS[0] = 'guilt3':
 				'"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
@@ -1372,7 +1372,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Okay, now food," you grin.'
 			gs'booty_call_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Just coffee (no food)':
 			cla & *nl
 			'"Coffee," you say. "Give me coffee."'
@@ -1391,7 +1391,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Mmmm," you smile with a full mouth. "That''s good toast."'
 			gs'booty_call_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Butter':
 			cla & *clr
 			gs'booty_call_morning', 'breakfast_image'
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Mmmm," you smile with a full mouth. "That''s good toast."'
 			gs'booty_call_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Jam':
 			cla & *clr
 			gs'booty_call_morning', 'breakfast_image'
@@ -1407,7 +1407,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Mmmm," you smile with a full mouth. "That''s good toast."'
 			gs'booty_call_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Sour cream':
 			cla & *clr
 			gs'booty_call_morning', 'breakfast_image'
@@ -1433,7 +1433,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 				'You giggle at the dirty joke, struggling to fit the fork into your mouth as you take your first bite of egg. It''s perfectly fried, the edges crispy but the the yolk is runny and delicious.'
 				gs'booty_call_morning', 'eat_breakfast1'
 			end
-			
+
 			act'Maybe later':
 				cla & *nl
 				booty_call['sex_after_breakfast'] = 1
@@ -1461,7 +1461,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 				'You giggle at the dirty joke, struggling to fit the fork into your mouth as you bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.'
 				gs'booty_call_morning', 'eat_breakfast1'
 			end
-			
+
 			act'Maybe later':
 				cla & *nl
 				booty_call['sex_after_breakfast'] = 1
@@ -1520,7 +1520,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 	booty_call['out_of_bed'] = 1
 !!	if booty_call['cooking_time'] = 0:
 !!		act'Give up':
-!!		
+!!
 !!		end
 !!	else
 		act'Start cooking':gt 'booty_call_morning', 'pc_make_breakfast_cooking'
@@ -1535,7 +1535,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'A little too basic. Maybe not.'
 				gs'booty_call_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (2 minutes)':
 				booty_call['cooking_time'] += 2
 				booty_call['coffee_make'] = 1
@@ -1546,7 +1546,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if booty_call['toast_make'] = 0:
 		act'Toast':
 			cla & *clr
@@ -1557,7 +1557,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'A little too basic. Maybe not.'
 				gs'booty_call_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (2 minutes)':
 				booty_call['cooking_time'] += 2
 				booty_call['toast_make'] = 1
@@ -1568,7 +1568,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if booty_call['eggs_make'] = 0:
 		act'Fried eggs':
 			cla & *clr
@@ -1579,7 +1579,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'Not really in the mood. Maybe skip the eggs.'
 				gs'booty_call_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (5 minutes)':
 				booty_call['cooking_time'] += 5
 				booty_call['eggs_make'] = 1
@@ -1590,7 +1590,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if booty_call['kolbasa_make'] = 0:
 		act'Kolbasa':
 			cla & *clr
@@ -1601,7 +1601,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'A little simple. A little boring.'
 				gs'booty_call_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (10 minutes)':
 				booty_call['cooking_time'] += 10
 				booty_call['kolbasa_make'] = 1
@@ -1612,7 +1612,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if booty_call['pancakes_make'] = 0:
 		act'Pancakes':
 			cla & *clr
@@ -1623,7 +1623,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'Too much work. Better do something else.'
 				gs'booty_call_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (15 minutes)':
 				booty_call['cooking_time'] += 15
 				booty_call['pancakes_make'] = 1
@@ -1706,7 +1706,7 @@ if $ARGS[0] = 'pc_make_breakfast_done':
 				'"Hey," you smile at him. "Just finished up. Help yourself."'
 			end
 			gs'booty_call_morning', 'eat_breakfast1'
-			
+
 		end
 	end
 end
@@ -1728,7 +1728,7 @@ if $ARGS[0] = 'eat_breakfast1':
 	act'Eat a small portion':gs'booty_call_morning', 'eat_breakfast2'
 	act'Eat a medium portion':gs'booty_call_morning', 'eat_breakfast3'
 	act'Eat a lot':gs'booty_call_morning', 'eat_breakfast4'
-		
+
 	if booty_call['cooking_total'] > 1:
 		if booty_call['coffee_make'] = 1:
 			act'Just drink coffee':gs'booty_call_morning', 'eat_breakfast_coffee'
@@ -1761,14 +1761,14 @@ if $ARGS[0] = 'eat_breakfast2':
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'booty_call_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Keep it light':
 		cla & *nl
 		'"I just like to keep my portions light," you smile. "But you go ahead. Don''t hold back on account of me."'
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'booty_call_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Not into breakfast':
 		cla & *nl
 		if booty_call['boy_make_breakfast'] = 1:
@@ -1780,7 +1780,7 @@ if $ARGS[0] = 'eat_breakfast2':
 		end
 		act'Clear your dishes':gt'booty_call_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Dieting':
 		cla & *nl
 		'"I''m on a diet so I''m trying not to eat much," you reply. "But you go ahead. Don''t hold back on account of me."'
@@ -1852,21 +1852,21 @@ if $ARGS[0] = 'eat_breakfast_coffee':
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'booty_call_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Not that hungry':
 		cla & *nl
 		'"I''m just not very hungry right now," you reply. "But you go ahead. Don''t hold back on account of me."'
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'booty_call_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Not into breakfast':
 		cla & *nl
 		'"I''m not much into breakfast," you admit. "But this is for you more than me. Enjoy it."'
 		'He smiles, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'booty_call_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Dieting':
 		cla & *nl
 		'"I''m on a diet," you reply. "But you go ahead. Don''t hold back on account of me."'
@@ -1897,7 +1897,7 @@ if $ARGS[0] = 'breakfast_dishes':
 			if rand(1,10) < npc_sexdrive[$boy] and (npc_sexdrive[$boy] < (booty_call['cum_count'] + booty_call['extra_cum'])) and (stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0) or booty_call['sex_after_breakfast'] = 1:
 				'"I can think of something nicer," he says, stepping up behind you, hands caressing your hips and something hard poking you in the back.'
 				gs'booty_call_morning', 'after_breakfast_sex'
-				
+
 			else
 				if booty_call['cooking_total'] > 0:
 					'"Thanks for breakfast," he smiles back, piling up the rest.'
@@ -1932,14 +1932,14 @@ if $ARGS[0] = 'after_breakfast_sex':
 			'"Tsk! Down boy!" you chide, rolling your eyes and taking his hands to forcibly pull them off your body. "I don''t have time for this."'
 			gs'booty_call_morning', 'wakeup1'
 		end
-		
+
 		act'Not in the mood':
 			cla & *nl
 			'"Tsk! Down boy!" you chide, rolling your eyes and taking his hands to forcibly pull them off your body. "I had fun earlier but I''m not in the mood right now."'
 			gs'booty_call_morning', 'wakeup1'
 		end
 	end
-	
+
 	act'Giggle':
 		cla
 		gs'arousal', 'foreplay', 1, 'no_orgasm_msg'
@@ -1954,13 +1954,13 @@ if $ARGS[0] = 'after_breakfast_sex':
 			'"You''re gonna make me late," you giggle uncontrollably as <<$npc_firstname[$boy]>> gets friskier, dragging you back to bed to do what he wants to you.'
 			gs 'booty_call_start', 'bed_start'
 		end
-		
+
 		act'Let him do what he wants':
 			cla & *nl
 			'You giggle uncontrollably, giving <<$npc_firstname[$boy]>> the non-verbal go ahead and you let him drag you back to the bed to do what he wants to you.'
 			gs 'booty_call_start', 'bed_start'
 		end
-		
+
 		if booty_call['wake_fuck'] = 1 or booty_call['morning_fuck'] = 1:
 			act'Again?!':
 				cla & *nl
@@ -1970,9 +1970,9 @@ if $ARGS[0] = 'after_breakfast_sex':
 				gs 'booty_call_start', 'bed_start'
 			end
 		end
-		
+
 	end
-	
+
 	if booty_call['cooking_total'] ! 1 or booty_call['coffee_make'] ! 1:
 		act'Not after eating':
 			cla & *nl

+ 72 - 72
locations/booty_call_pillow_talk2.qsrc

@@ -40,26 +40,26 @@ if $ARGS[0] = 'weather_talk':
 						'You smile softly at <<$npc_firstname[$boy]>> who grins back confidently, wrapping his arm around you.'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Grin':
 						cla
 						'You grin at <<$npc_firstname[$boy]>> who grins back just as wide as he wraps his arm around you.'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Demure':
 						cla
 						'You snuggle in closer to <<$npc_firstname[$boy]>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
 				end
-				
+
 				act'Sometimes':
 					cla & *nl
 					'"Sometimes yes, sometimes no. I think I''m just like anybody else," you shrug, snuggling closer into <<$npc_firstname[$boy]>>''s warmth.'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I''m always cold':
 					cla & *nl
 					pc_gets_chilly[$boy] = 1
@@ -84,7 +84,7 @@ if $ARGS[0] = 'fav_body_part':
 	!!			else
 					'"Your breasts," he smiles, glancing down to admire them.'
 	!!			end
-				
+
 				act'Really?':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'fav_body_part':
 					end
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Boobs are great," he grins. "And your boobs are especially great because you let me fuck you."'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like them too':
 					cla & *nl
 					'"Me too," you grin. "I love my boobs!"'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'fav_body_part':
 				else
 					'"I love your ass," he smiles, running his hand up your thigh to give your bottom a firm squeeze.'
 				end
-				
+
 				act'Really?':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -155,7 +155,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"No way." He shakes his head. "Ass is the sexiest thing about a girl, and it''s the sexiest thing about you."'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -163,14 +163,14 @@ if $ARGS[0] = 'fav_body_part':
 					'"There''s something irresistible about a good ass," he grins, grabbing another handful of yours.'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like it too':
 					cla & *nl
 					'"Me too," you grin. "It''s my best <i>ass</i>et," you add with a wink.'
 					'"Damn right," he says, unable to resist giving it another grab.'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Oh you''re one of those':
 					cla & *nl
 					'"Oh," you say. "You''re one of <i>those</i>."'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Damn right," he grins, unable to resist giving it another grab.'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 			elseif $npc_fav_body_part[$boy] = 'pussy':
 				gs 'arousal', 'foreplay', 1, 'no_orgasm_msg'
 				gs 'stat'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Yeah..." he says, giving a predatory smile as he draws his hand away trailing strands of your juices. "Your pussy is the best."'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'fav_body_part':
 					end
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like it too':
 					cla & *nl
 					if booty_call['fuck_count'] > 0 or npc_fuck_times[$boy] > 0:
@@ -219,7 +219,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Glad we''re in agreement," he grins back.'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				if stat['think_virgin'] ! 1 or booty_call['fuck_count'] > 0 or npc_fuck_times[$boy] > 0:
 					act'You just like fucking it':
 						cla & *nl
@@ -318,11 +318,11 @@ if $ARGS[0] = 'made_me_late1':
 				end
 				gs'booty_call_pillow_talk2', 'made_me_late2'
 			end
-			
+
 			act'Not mad':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				
+
 			end
 		end
 	elseif schoolprogul > 0:
@@ -338,18 +338,18 @@ if $ARGS[0] = 'made_me_late1':
 				end
 				gs'booty_call_pillow_talk2', 'made_me_late2'
 			end
-			
+
 			act'Not mad':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				
+
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'made_me_late2':
-	
+
 end
 
 if $ARGS[0] = 'plans_later':
@@ -401,7 +401,7 @@ if $ARGS[0] = 'pc_plans_later':
 		'"Thinking about going to see a movie later."'
 		gs'booty_call_pillow_talk2', 'small_talk'
 	end
-	
+
 	act'Go to the library':
 		cla
 		act'To study':
@@ -409,14 +409,14 @@ if $ARGS[0] = 'pc_plans_later':
 			'"I was planning on doing some studying at the library later."'
 			gs'booty_call_pillow_talk2', 'small_talk'
 		end
-		
+
 		act'To read':
 			cla & *nl
 			'"Wanted to go to the library, see if I can find any new books to borrow."'
 			gs'booty_call_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if lernHome > 0:
 		act'Do my homework':
 			booty_call['homework_after'] = 1
@@ -425,7 +425,7 @@ if $ARGS[0] = 'pc_plans_later':
 			gs'booty_call_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1 and hour < 15) or gsAboDance > 0 or (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] ! 0):
 		act'Dance practice':
 			cla & *nl
@@ -441,7 +441,7 @@ if $ARGS[0] = 'pc_plans_later':
 				'"Thinking about going to the disco later," you reply.'
 				gs'booty_call_pillow_talk2', 'disco_club_dancing'
 			end
-			
+
 			act'Go clubbing':
 				cla & *nl
 				booty_call['club_after'] = 1
@@ -496,7 +496,7 @@ if $ARGS[0] = 'club_wasted':
 			'"Thinking about going clubbing later," you reply. "I kinda want to get wasted tonight."'
 			gs'booty_call_pillow_talk2', 'small_talk'
 		end
-		
+
 	end
 end
 
@@ -530,7 +530,7 @@ if $ARGS[0] = 'day_events':
 				'"Oh. I see..." you murmur uncomfortably. You leave it at that, unsure of what else to say.'
 				gs'booty_call_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'How was it?':
 				cla & *nl
 				'"Oh, that''s cool," you reply pleasantly. "How was it? Your date?"'
@@ -564,16 +564,16 @@ if $ARGS[0] = 'pc_day_events':
 		'"I didn''t do much. Just you," you smirk back.'
 		gs'booty_call_pillow_talk2', 'small_talk'
 	end
-	
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 		act'School':
 			cla & *nl
 			'"I spent most of the day in class," you shrug. "It''s school. It''s whatever."'
 			gs'booty_call_pillow_talk2', 'small_talk'
 		end
 	end
-	
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and lernHome = 0 and kanikuli = 0:
+
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and lernHome = 0 and kanikuli = 0:
 		act'Homework':
 			cla & *nl
 			'"Just did my homework," you shrug. "Got the boring stuff out of the way so I could enjoy my fun without worry."'
@@ -581,7 +581,7 @@ if $ARGS[0] = 'pc_day_events':
 			gs'booty_call_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1 and hour < 15) or (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] ! 0):
 		act'Dance practice':
 			cla & *nl
@@ -595,10 +595,10 @@ if $ARGS[0] = 'pc_day_events':
 			gs'booty_call_pillow_talk2', 'dance_talk'
 		end
 	end
-	
+
 !!{	if shot_porn = daystart:
 		act'Filmed a porno':
-		
+
 		end
 	end}
 end
@@ -623,7 +623,7 @@ if $ARGS[0] = 'dance_talk':
 				act'Keep talking':cla & gs'booty_call_pillow_talk2', 'small_talk'
 				gs'booty_call_pillow_talk2', 'show_dance'
 			end
-			
+
 			act'Irritation':
 				npc_rel[$boy] -= 2
 				cla & *nl
@@ -639,7 +639,7 @@ if $ARGS[0] = 'dance_talk':
 				act'Keep talking':cla & gs'booty_call_pillow_talk2', 'small_talk'
 				gs'booty_call_pillow_talk2', 'show_dance'
 			end
-			
+
 			act'Sensual':
 				$booty_call['dance_type'] = 'sexy'
 				cla & *nl
@@ -667,7 +667,7 @@ if $ARGS[0] = 'dance_talk':
 						act'Keep talking':cla & gs'booty_call_pillow_talk2', 'small_talk'
 						gs'booty_call_pillow_talk2', 'show_dance'
 					end
-				end					
+				end
 			end
 			gs'booty_call_pillow_talk2', 'show_dance'
 		end
@@ -709,7 +709,7 @@ if $ARGS[0] = 'dance_talk':
 					'<<$npc_firstname[$boy]>> just nods back, too busy enjoying the show.'
 					gs'booty_call_pillow_talk2', 'show_dance_end'
 				end
-				
+
 				act'A sexy one':
 					gs 'stat'
 					cla & *clr
@@ -766,7 +766,7 @@ if $ARGS[0] = 'show_dance':
 		if $booty_call['dance_type'] ! 'sexy' and $booty_call['dance_type'] ! 'starlet':gs'booty_call_pillow_talk2', 'show_shuffle'
 		if $booty_call['dance_type'] ! 'modern' and $booty_call['dance_type'] ! 'starlet':gs'booty_call_pillow_talk2', 'show_sexy'
 		if $booty_call['dance_type'] ! 'modern' and $booty_call['dance_type'] ! 'sexy':gs'booty_call_pillow_talk2', 'show_starlets'
-		
+
 	end
 end
 
@@ -843,7 +843,7 @@ if $ARGS[0] = 'show_starlets':
 						'"I''m glad you enjoyed it," you smile back, finally managing to catch your breath as you stand up straight.'
 						gs'booty_call_pillow_talk2', 'show_dance_end'
 					end
-					
+
 					act'Not usually naked':
 						cla & *nl
 						'"Kind of weird doing it naked," you smile, easing out of the pose. "Usually all the guys are trying to stare <i>through</i> our clothes. They don''t get to see what you do."'
@@ -866,7 +866,7 @@ if $ARGS[0] = 'show_dance_end':
 		end
 		gs'booty_call_pillow_talk2', 'small_talk'
 	end
-	
+
 	act'Do something else':
 		cla & *clr
 		$npc_apt_bedroom
@@ -1025,7 +1025,7 @@ if $ARGS[0] = 'dick_compliment':
 				'<<$npc_firstname[$boy]>> looks more than a little smug after your compliment.'
 				gs'booty_call_pillow_talk2', 'dick_talk_topics'
 			end
-			
+
 			if $npc_dick_desc[$boy] = 'thick' or $npc_dick_desc[$boy] = 'long' or $npc_dick_desc[$boy] = 'huge' or $npc_dick_desc[$boy] = 'enormous' or $npc_dick_desc[$boy] = 'lengthy' or $npc_dick_desc[$boy] = 'gigantic' or $npc_dick_desc[$boy] = 'monster':
 				act'It''s huge':
 					cla & *nl
@@ -1088,14 +1088,14 @@ if $ARGS[0] = 'morning_start_day':
 					'"It feels really good," you giggle, rubbing your thighs together, maybe still a little dick drunk.'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'I know you like it':
 					npc_rel[$boy] += 2
 					cla & *nl
 					'"I know you like doing it," you smile fondly. "It makes you happy, so it makes me happy too."'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'You''re my favorite alarm cock':
 					cla & *nl
 					'"You''re my favorite alarm cock," you giggle. "It''s the best way to wake up."'
@@ -1109,19 +1109,19 @@ if $ARGS[0] = 'morning_start_day':
 					'"Maybe next time," you smirk wryly.'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'I didn''t mind':
 					cla & *nl
 					'"I didn''t mind," you smile fondly. "It felt nice."'
 					gs'booty_call_pillow_talk2', 'morning_sleep_fuck_okay'
 				end
-				
+
 				act'I loved it':
 					cla & *nl
 					'"Don''t be sorry," you say, grinning openly. "I loved it."'
 					gs'booty_call_pillow_talk2', 'morning_sleep_fuck_okay'
 				end
-				
+
 				act'You should do it more often':
 					npc_sleep_sex_okay[$boy] = 2
 					cla & *nl
@@ -1144,27 +1144,27 @@ if $ARGS[0] = 'morning_sore_pussy':
 				booty_call['morning_sore_pussy'] = 1
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+				if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 					'"We might have overdone it," you half smile, rubbing your thighs together over your sore pussy. "I still have to go to school today. My classmates are going to know you fucked me silly just by the way I walk," you giggle.'
 				else
 					'"We might have overdone it," you say with a half smile, rubbing your thighs together over your sore pussy. "I''m going to walk funny for the rest of the day because of you," you giggle.'
 				end
 				gs'booty_call_pillow_talk', 'topics'
 			end
-			
+
 			act'Hard time sitting down':
 				gs'booty_call_pillow_talk', 'talk_time_add'
 				booty_call['morning_sore_pussy'] = 1
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+				if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 					'"We might have overdone it," you half smile, rubbing your thighs together over your sore pussy. "I still have to go to school. I''m going to have a hard time sitting through class the rest of the day."'
 				else
 					'"We might have overdone it," you say with a half smile, rubbing your thighs together over your sore pussy. "I''m going to have a hard time sitting down today."'
 				end
 				gs'booty_call_pillow_talk', 'topics'
 			end
-			
+
 			act'Twice in one day is too much':
 				gs'booty_call_pillow_talk', 'talk_time_add'
 				booty_call['morning_sore_pussy'] = 1
@@ -1180,7 +1180,7 @@ if $ARGS[0] = 'morning_sore_pussy':
 				booty_call['morning_sore_pussy'] = 1
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+				if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 					'"How am I going to get through my classes today?" you say, giving <<$npc_firstname[$boy]>> a loopy smile. "If I fall asleep in school today, it''s your fault."'
 					'"I''ll take credit for that," <<$npc_firstname[$boy]>> grins.'
 				else
@@ -1193,14 +1193,14 @@ if $ARGS[0] = 'morning_sore_pussy':
 				end
 				gs'booty_call_pillow_talk', 'topics'
 			end
-			
+
 		end
 	end
 end
 
 
 if $ARGS[0] = 'wakeup_sex_late_for_school':
-	if booty_call['late_for_school'] = 0 and kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and (hour = 7 or hour = 8):
+	if booty_call['late_for_school'] = 0 and kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and (hour = 7 or hour = 8):
 		act'Late for school':
 			booty_call['late_for_school'] = 1
 			gs'booty_call_pillow_talk', 'talk_time_add'
@@ -1229,13 +1229,13 @@ if $ARGS[0] = 'wakeup_sex_late_for_school':
 						gs'booty_call_pillow_talk', 'topics'
 					end
 				end
-				
+
 				act'I need to hurry':
 					cla & *nl
 					'"I gotta get out of here," you say. "I really don''t want to be late'
 					gs'booty_call_pillow_talk', 'topics'
 				end
-				
+
 				act'Worth it':
 					cla & *nl
 					'"If I am, it was still worth it," you smirk.'
@@ -1255,26 +1255,26 @@ if $ARGS[0] = 'wakeup_sex_late_for_school':
 				else
 					'"Sorry," <<$npc_firstname[$boy]>> says, the grin on his face making him not look like he means it at all.'
 				end
-				
+
 				act'I need to hurry':
 					cla & *nl
 					'"I gotta get out of here," you say. "I can''t afford to be absent too many times."'
 					gs'booty_call_morning', 'wakeup2'
 				end
-				
+
 				act'Worth it':
 					cla & *nl
 					'"Oh well," you smirk. "That fuck was worth it."'
 					gs'booty_call_pillow_talk2', 'morning_sex_talk'
 				end
-				
+
 				if schoolprogul = 2:
 					act'I''m gonna get kicked out of school':
 						cla & *nl
 						'"Fuck!" you swear again. "If I don''t make it by the end of first period, I''m gonna get expelled!"'
 						gs'booty_call_morning', 'wakeup2'
 					end
-				end				
+				end
 			end
 			if cum_loc['vagina'] > 0:
 				act'Gonna leak all day':
@@ -1327,14 +1327,14 @@ if $ARGS[0] = 'morning_sleep_fuck_okay':
 		'"No," you roll your eyes. "It was fine this time, but you should still wait till I wake up."'
 		gs'booty_call_pillow_talk', 'topics'
 	end
-	
+
 	act'Yes':
 		npc_sleep_sex_okay[$boy] = 2
 		cla & *nl
 		'"Sure," you smirk wryly. "Why not?"'
 		gs'booty_call_pillow_talk', 'topics'
 	end
-	
+
 	act'Do whatever you want to me':
 		npc_sleep_sex_okay[$boy] = 2
 		cla & *nl
@@ -1350,13 +1350,13 @@ if $ARGS[0] = 'new_with_you_boy':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 	'"So, anything new going on with you?" <<$npc_firstname[$boy]>> asks.'
-	
+
 	act'Nothing new':
 		cla & *nl
 		'"Not really," you shrug. "Same old same old."'
 		gs'booty_call_pillow_talk', 'topics'
 	end
-	
+
 	if npc_know_have_girlfriend[$boy] = 1 or npc_know_have_boyfriend[$boy] = 1:
 		if pcs_lovers + pcs_girlfriends = 0:
 			act'Single now':
@@ -1367,28 +1367,28 @@ if $ARGS[0] = 'new_with_you_boy':
 					act'My boyfriend':
 						cla & *nl
 						'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
-						
+
 					end
-					
+
 					act'My girlfriend':
 						cla & *nl
 						'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
-						
+
 					end
 				end
-				
+
 			!!{	act'Got broken up with...':
 					cla
 					act'By my boyfriend':
-					
+
 					end
-					
+
 					act'By my girlfriend':
-					
+
 					end
 				end}
 			end
 		end
 	end
 end
---- booty_call_pillow_talk2 ---------------------------------
+--- booty_call_pillow_talk2 ---------------------------------

+ 21 - 21
locations/booty_call_stats.qsrc

@@ -43,62 +43,62 @@ 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 had sex with an npc
 	npc_fuck_times[$boy] += booty_call['fuck']
 	npc_kuni_times[$boy] += booty_call['kuni']
-	
+
 	!! number of times you have made your fuckbuddy cum
 	npc_cum_count[$boy] += booty_call['cum_count']
-	
+
 	!! number of times your fuckbuddy has brought you to orgasm
 	npc_orgasm_count[$boy] += booty_call['orgasm_count']
-	
+
 	!! number of times you have faked an orgasm
 	npc_fake_orgasm_count[$boy] += booty_call['fake_orgasm_count']
-	
+
 	!! number of times you have been creampied by your fuckbudy
 	npc_creampie_count[$boy] += booty_call['creampie']
-	
+
 	!! number of times you have cum together with your fuckbuddy
 	npc_cum_together_count[$boy] += booty_call['creampie_orgasm']
-	
+
 	!! number of times your fuckbuddy has cum on your face
 	npc_facial_count[$boy] += booty_call['facial']
-	
+
 	!! number of times your fuckbuddy has cum on your tits
 	npc_creampie_count[$boy] += booty_call['tit_cum']
-	
+
 	!! number of times your fuckbuddy has pulled out
 	npc_pullout_count[$boy] += booty_call['pullout']
-	
+
 	!! number of times your fuckbuddy has cum in your mouth
 	npc_mouth_cum_count[$boy] += booty_call['mouth_cum']
-	
+
 	!! number of times you have jerked him to completion
 	npc_cum_hand_count[$boy] += booty_call['cum_hand']
-	
+
 	!! number of times you have swallowed for your fuckbuddy
 	npc_swallow_count[$boy] += booty_call['swallow_count']
-	
+
 	!! number of times you have spit out his cum
 	npc_spit_count[$boy] += booty_call['spit_count']
-	
+
 	!! number of times you have fucked in the shower
 	npc_shower_sex_count[$boy] += booty_call['shower_sex']
-	
+
 	!! number of times your fuckbuddy has cum in your mouth
 	npc_mouth_cum_count[$boy] += booty_call['mouth_cum']
-	
+
 	!! number of times you have denied letting your fuckbuddy take your virginity
 	npc_virgin_deny[$boy] += booty_call['virgin_deny']
-	
+
 	!! if your fuckbuddy takes your virginity without consent
 	npc_virgin_rapist[$boy] += booty_call['virgin_rape']
-	
+
 	if booty_call['sleep_fuck'] > 0: npc_sleep_fuck += 1
-	
-	if hour >= 8 and hour < 14 and week < 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
+
+	if hour >= 8 and hour < 14 and week < 6 and $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
 		!!absence from school
 		npc_school_absences[$boy] = schoolprogul
 	end
@@ -131,4 +131,4 @@ if $ARGS[0] = 'sleep_check':
 end
 
 
---- booty_call_stats ---------------------------------
+--- booty_call_stats ---------------------------------

+ 17 - 17
locations/booty_call_work_talk1.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'job_talk':
 		gs'booty_call_work_talk1', 'whats_your_job'
 	else
 !!		act'Ask him about work':
-		
+
 !!		end
 	end
 end
@@ -52,7 +52,7 @@ if $ARGS[0] = 'whats_your_job':
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
 				gs'booty_call_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'Tease him':
 				cla & *nl
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
@@ -70,7 +70,7 @@ if $ARGS[0] = 'whats_your_job':
 				end
 				gs'booty_call_pillow_talk2', 'small_talk'
 			end
-			
+
 		elseif $npc_occupation[$boy] = 'masseuse_sexual':
 			'"I work as a masseuse in the city," <<$npc_firstname[$boy]>> says.'
 			act'That''s cool':
@@ -78,7 +78,7 @@ if $ARGS[0] = 'whats_your_job':
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
 				gs'booty_call_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'Tease him':
 				cla & *nl
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
@@ -90,7 +90,7 @@ if $ARGS[0] = 'whats_your_job':
 					'"Oh..." you trail off, not really sure what else to say.'
 					gs'booty_call_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Do you fuck too?':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh..." you trail off, not really sure what else to say.'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Do I get a discount?':
 						cla & *nl
 						'"So if I show up at you work do I get a fuckbuddy discount?" you grin.'
@@ -116,7 +116,7 @@ if $ARGS[0] = 'whats_your_job':
 				'"I work at the textile factory," <<$npc_firstname[$boy]>> says.'
 			else
 				'"I work at the textile factory in the next town over," <<$npc_firstname[$boy]>> says.'
-				if mid($start_type,1,2) = 'sg':
+				if $start_loc = 'sg':
 					'"The one in Pavlovsk?"'
 					'"Yeah, how''d you know?"'
 					'"I grew up in Pav."'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'whats_your_job':
 				end
 				gs'booty_call_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'Tease him':
 				cla & *nl
 				'"Oh, that''s cool. So you train lots of MILFs and cougars and young fuckable girls like me, right? In all tight pants that let you see their ass right through the spandex?" You grin, bouncing your eyebrows at him.'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh." You gulp uncomfortably, unsure of what else to say.'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Nonchallant':
 						cla & *nl
 						'"Oh, all right. That''s cool I guess."'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Cool, cool."'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Impressed':
 						cla & *nl
 						'"Seriously?" You sit up on the bed.'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Not as much as you''d think," he shrugs. "Bosses gotta get their cut. I only make a percentage of what sells."'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 				elseif $npc_crime_type[$boy] = 'enforcer':
 					'"I''m an enforcer for a gang," <<$npc_firstname[$boy]>> says blatantly.'
 					act'Uncomfortable':
@@ -205,7 +205,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh." You gulp uncomfortably, unsure of what else to say.'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Nonchallant':
 						cla & *nl
 						'"Oh, all right. That''s cool I guess."'
@@ -215,7 +215,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Cool, cool."'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Impressed':
 						cla & *nl
 						'"Seriously?" You sit up on the bed.'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh." You gulp uncomfortably, unsure of what else to say.'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Nonchallant':
 						cla & *nl
 						'"Oh, all right. That''s cool I guess."'
@@ -243,7 +243,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Cool, cool."'
 						gs'booty_call_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Impressed':
 						cla & *nl
 						'"Seriously?" You sit up on the bed.'
@@ -256,7 +256,7 @@ if $ARGS[0] = 'whats_your_job':
 			else
 				if $npc_crime_type[$boy] = 'drug_dealer':
 					'"I work in pharmaceuticals," <<$npc_firstname[$boy]>> says.'
-					if mid($start_type,1,2) = 'sg':
+					if $start_loc = 'sg':
 						'"That''s cool. My aunt is a pharmacist too."'
 						'"Oh. Good to know."'
 					else
@@ -314,4 +314,4 @@ if $ARGS[0] = 'whats_your_job':
 	end
 end
 
---- booty_call_work_talk1 ---------------------------------
+--- booty_call_work_talk1 ---------------------------------

+ 1 - 1
locations/brothel.qsrc

@@ -282,7 +282,7 @@ if $ARGS[0] = 'abducted4':
 	pcs_hairbsh = -1
 	InSleep = 1
 	pain['killer'] = 0
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0:
 		notathomesleep += 1
 	else
 		notathomesleep = 0

+ 4 - 4
locations/budilnik.qsrc

@@ -24,19 +24,19 @@ if $ARGS[0] = 'start':
 	'<center><b>Currently set for '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' </b></center>'
 	'<center><b><a href="exec:  bud_weekend = 1 & gt ''budilnik'', ''Reset''">Reset weekend alarm</a> <a href="exec: bud_weekend = 1 & gt ''budilnik'', ''Time''">Set</a> weekend alarm to this time</b></center>'
 	'<center><b>Currently set for '+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b></center>'
-	if mid($start_type,1,2) = 'sg' and alarm_holiday = 0:
+	if $start_loc = 'sg' and alarm_holiday = 0:
 		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 1 & gt ''budilnik'', ''start''">OFF</a></b></center>'
-	elseif mid($start_type,1,2) = 'sg' and alarm_holiday = 1:
+	elseif $start_loc = 'sg' and alarm_holiday = 1:
 		'<center><b>Use weekend alarm for holidays - <a href="exec:  alarm_holiday = 0 & gt ''budilnik'', ''start''">ON</a></b></center>'
 	end
 
-	
+
 	*nl
 	if budilnikOn = 0:
 		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 1 & gt ''budilnik'', ''start''"><b>OFF</a></b></center>'
 	else
 		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 0 & gt ''budilnik'', ''start''"><b>ON</b></a></center>'
-		'<center>The alarm is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' during the week and to '+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+' during the weekend.</center>'		
+		'<center>The alarm is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' during the week and to '+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+' during the weekend.</center>'
 	end
 	act 'Clear time display':
 		cla

+ 9 - 9
locations/buklinik.qsrc

@@ -5,7 +5,7 @@ if $ARGS[0] = 'start':
 	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
-	minut += 5	
+	minut += 5
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b>Mercy clinic</b></center>'
@@ -26,7 +26,7 @@ if $ARGS[0] = 'start':
 	if temp = 10:'Surprisingly, there is no one around the shelter...'
 
 	act 'Leave':gt 'city_industrial'
-	
+
 	if hour >= 9 and hour <= 17: act 'Enter the shelter':gt 'buklinik', 'holl'
 end
 
@@ -41,7 +41,7 @@ if $ARGS[0] = 'holl':
 	'<center><b>Entrance</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_holl.jpg"></center>'
 	'The interior is even worse than the exterior, the paint on the wall is falling off and hasn''t been repainted for quite a while. There are some lights working but not all of them and there is this weird smell that you can''t really pinpoint what it is.'
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and bumtolik >= 5:
 		'You can volunteer here on the weekends.'
 	else
 		if bumtolik > 4:'The <a href="exec:gt ''buklinik'', ''sklad''">storage</a> room is locked.'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'registr':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_reg.jpg"></center>'
 	'As you approach the counter there are two women chatting with each other, and laughing.'
 
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and bumtolik < 5:
 		!r125
 		'You clear you throat, "Hello, my name is <<$pcs_firstname>>, I found a note that you were looking for volunteers..."'
 		'One of the women cheerfully replies, "Welcome to our little humble shelter. As you''ve probably noticed the place is run down and we''re really in need of some volunteers." They point further down the corridor, "What you see here is just a small part of the operation that we provide. We also help out with the elderly and the less fortunate outside the shelter."'
@@ -138,15 +138,15 @@ if $ARGS[0] = 'olga':
 	gs 'themes', 'indoors'
 	'<center><b>Olga</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_olga.jpg"></center>'
-	
+
 	if bumtolik = 5:
 		'You manage to find Olga and walk up to her, "Hi Olga! I don''t know if you remember me, it''s <<$pcs_nickname>>. You told me about this place and that you were looking volunteers and I decided to see if I could help out. The women at the reception told me that I would find you here."'
 		'Olga looks at you, "<<$pcs_nickname>>..., good afternoon! Glad to have you on board! Well as you can see we are swamped so any help is very welcome!" Smiling, she continues, "Since you got sent here that means I''ll be your mentor, feel free to ask me whenever you have a question."'
 		'You nod, "I will do that!"'
 		'Olga, still smiling, "Good, lets start off with a tour. If we start off here, the storage room. Every donation we receive ends up here and gets sorted depending on where they need to end up. Next up the managers'' office!"'
-		
+
 		act 'Visit the managers office':gt 'buklinik', 'sec'
-	
+
 	else
 		'You look around, "Is there someone named Olga here?!"'
 		'A woman looks up, "Right here, honey! And who might you be?"'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'olga':
 		'Olga crosses her arms, "Is that so?! They are keen on sending everyone to me. Well, nothing to worry about, and since you were looking specifically for me, you''re a new volunteer?"'
 		'You nod.'
 		'Olga smiles, "Good, well, lets start off with a tour. If we start off here, the storage room. Every donation we receive ends up here and gets sorted depending on where they need to end up. Next up the managers'' office!"'
-		
+
 		act 'Visit the managers office':gt 'buklinik', 'sec'
 	end
 end
@@ -188,7 +188,7 @@ if $ARGS[0] = 'dir':
 	gs 'themes', 'indoors'
 	'<center><b>Coordinators'' office</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/bukli_dir.jpg"></center>'
-	
+
 	if bumtolik = 5:
 		'Olga barges in without even knocking, "And this is our head coordinator Vera..."'
 		'Vera sighs, "Again Olga?! Haven''t I told you to knock when you''re about to enter the and I told you, just call me Vera."'

+ 27 - 27
locations/cikl.qsrc

@@ -30,10 +30,10 @@ if day > monthsEnd[month]:
 	month += 1
 
 	!! Changing the year at new year and making sure February have the correct number of days.
-	if month > 12: 
+	if month > 12:
 		month = 1
 		year += 1
-		if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0): 
+		if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):
 			monthsend[2] = 29
 		else
 			monthsend[2] = 28
@@ -200,8 +200,8 @@ nymphosex_flag = 0
 !!------------------------------------------------------------------------------------------------------------
 
 !!bimbo flag set in stat_display if bimbo clothing, shoes and makeup are worn at same time
-if succubusflag = 0 or CheatBimbo2 = 1: 
-	if cheatBimbo = 0 and bimbo_flag = 1: 
+if succubusflag = 0 or CheatBimbo2 = 1:
+	if cheatBimbo = 0 and bimbo_flag = 1:
 		bimbo += 1
 	end
 end
@@ -757,7 +757,7 @@ killvar 'pcs_drank'
 !!Suspension ends
 if suspended['day'] = daystart:	suspended['on'] = 0
 
-if mid($start_type,1,2) = 'sg':
+if $start_loc = 'sg':
 !!Party refresh if you didn''t see sis
 	if week = 1 and sisboyparty ! 2:
 		if sisterQW['party'] = -1: sisterQW['party'] = 0
@@ -835,7 +835,7 @@ if mid($start_type,1,2) = 'sg':
 			killvar 'first_time_outside_in_cold_weather'
 			killvar 'first_time_doing_basketball'
 			killvar 'first_time_spring_football_match'
-!! end inc  
+!! end inc
 		elseif month = 10 and day >= 29:
 			$holyday = '<b>Autumn Break starts in <<35-day>> days.</b>'
 		elseif month = 11:
@@ -858,14 +858,14 @@ if mid($start_type,1,2) = 'sg':
 			if week = 1:
 				!!The start and end values for i have to be changed if more female schoolgirl npcs are added to the game
 				i = 11
-				
+
 				:hotcat_calc_jump
 				i += 1
-				
+
 				if hotcat_rating['A<<i>>'] = 0 and i < 145: jump 'hotcat_calc_jump'
-				
+
 				switch_rand = rand(1,100)
-				
+
 				if hotcat_movement['A<<i>>'] = 0 and switch_rand < 21:
 					hotcat_rating['A<<i>>'] -= 1
 					hotcat_movement['A<<i>>'] -= 1
@@ -883,14 +883,14 @@ if mid($start_type,1,2) = 'sg':
 				killvar 'i'
 				killvar 'switch_rand'
 			end
-			
+
 			!! Resetting the late flag
 			if late = 1: late = 0
-			
-		end	
+
+		end
 
 		!!Social grup changes
-		
+
 		!!Change from relatonship with other students.
 		gs 'gschool_socialchg', 'group_student_rel_change'
 
@@ -942,7 +942,7 @@ if mid($start_type,1,2) = 'sg':
 		old_grupvalue[2] = grupvalue[2]
 		old_grupvalue[3] = grupvalue[3]
 		old_grupvalue[4] = grupvalue[4]
-		
+
 	elseif SchoolAtestat = -1:
 		if func('homes_properties', 'has_access', 'parents_home') = 0:
 			$holyday = '<b>You missed your graduation. You could pick up your diploma at the school.</b>'
@@ -1042,7 +1042,7 @@ if blizoruk < 0: blizoruk = 0
 
 
 !!------------------------------------------------------------------------------------------------------------------------
-!!C and b array cleaning 
+!!C and b array cleaning
 
 if InSleep = 1: gs 'npc','cleanarrays'
 
@@ -1063,7 +1063,7 @@ end
 
 if $status['dog'] ! 'blocked' and rex['owned'] = 1:
 	rex['timer_day'] = daystart
-	
+
 	!!Daily decay
 	rex['relationship'] -= 1
 
@@ -1077,7 +1077,7 @@ if $status['dog'] ! 'blocked' and rex['owned'] = 1:
 	rex['timer_walk'] = 0
 	rex['count_feed'] = rex['count_feed_base']
 	rex['timer_feed'] = 0
-		
+
 	if week = 1:
 		if cheat['dog_rel'] = 0:
 			npc_rel['A29'] -= rex['count_bath']
@@ -1085,7 +1085,7 @@ if $status['dog'] ! 'blocked' and rex['owned'] = 1:
 		end
 		rex['count_bath'] = rex['count_bath_base']
 	end
-end	
+end
 
 !!------------------------------------------------------------------------------------------------------------
 
@@ -1099,7 +1099,7 @@ if starlets['late_message'] = 1: starlets['late_message'] = 0
 
 !!---------- Starlet Content ---------------------------------------------------------------------------------
 if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0:
-	if starlets_practice = daystart - 1: 
+	if starlets_practice = daystart - 1:
 		starlets_missed = 1
 		starlets_practice = 0
 	end
@@ -1117,7 +1117,7 @@ if month  = 11 and day = 19 and (AlbinaQW['StarletsJoined'] <= 0 or (AlbinaQW['S
 !! Setting Del Parco initial variables
 if daystart < 2:
 	ml_delparcoQW['Stage'] = 0
-	ml_delparcoQW['Zariyah Trust'] = 50 
+	ml_delparcoQW['Zariyah Trust'] = 50
 end
 
 
@@ -1132,15 +1132,15 @@ if ml_guitarlesson['nextlesson'] < daystart and ml_guitarlesson['lessonday'] ! 8
 	ml_guitarlesson['lessonday'] = 8
 end
 
-!! Calculating the fame increase from the uploaded songs and removing ones that do not effect fame anymore to keep the 
+!! Calculating the fame increase from the uploaded songs and removing ones that do not effect fame anymore to keep the
 !! data at a sane level
 if ml_onlinesongcount > 0:
 	i = 0
 	j = -1
-    
-	:looponlinesongs        
-!!      this so every song counts only every 7 days and only for a limited number of weeks 
-		if ml_onlinesong_freshness[i] > 0:		
+
+	:looponlinesongs
+!!      this so every song counts only every 7 days and only for a limited number of weeks
+		if ml_onlinesong_freshness[i] > 0:
 			j += 1
 			ml_tempsong_freshness[j] = ml_onlinesong_sfreshness[i]
 			ml_tempsong_lastcalcday[j] = ml_onlinesong_lastcalcday[i]
@@ -1165,7 +1165,7 @@ if ml_onlinesongcount > 0:
 	killvar 'ml_onlinesong_uploaded'
 
 	i = 0
-	
+
 	if j >= 0:
 		:looprebuildsongs
 			ml_onlinesong_freshness[i] = ml_tempsong_freshness[i]

+ 16 - 16
locations/city_coffee_hole.qsrc

@@ -33,20 +33,20 @@ if $ARGS[0]= 'inner':
 		locat['A144'] = 9
 		'You see a familiar face working behind the counter, your former classmate <a href="exec:gt ''city_coffee_hole'', ''anushka_work''">Anushka.</a>'
 	end
-	if locat['katja'] = 30 and (katjaQW['know_going_to_teaching_degree'] = 1 or mid($start_type,1,2) = 'sg'):
+	if locat['katja'] = 30 and (katjaQW['know_going_to_teaching_degree'] = 1 or $start_loc = 'sg'):
 		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'
 	end
-	!!if locat['albina'] = 17 and AlbinaQW['know_albina_uni'] > 0 or mid($start_type,1,2) = 'sg'):
+	!!if locat['albina'] = 17 and AlbinaQW['know_albina_uni'] > 0 or $start_loc = 'sg'):
 		!!'You see <a href="exec:gt ''city_coffee_hole'', ''albina''">Albina</a> sitting at a table with a woman who has her back turned to you.'
 	!!end
-	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and day = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18:
+	if $start_loc = 'sg' and yearstart >= 2 and day = 2 and nerd_game['fixed_uni_day'] = 0 and hour >= 18:
 		'You see some familiar faces sitting in one of the corners. Some of the <a href="exec:gt ''nerd_game_night'', ''crash_gamenight_uni''">nerds</a> you went to school with back in Pavlovsk are gathered around a table. It looks like they''re playing some sort of game.'
 	end
 
 	if nerd_game['game_day'] = daystart and hour = 18: act '<b>Join nerds</b>': gt 'nerd_game_night','game'
 	if week < 6 and hour >= 17:
 		temprand = rand(1,10)
-		if mid($start_type,1,2) = 'sg' and yearstart = 2:
+		if $start_loc = 'sg' and yearstart = 2:
 			if temprand = 1:
 				'You see a familiar face sitting at one of the tables, your classmate <a href="exec:gt ''city_coffee_hole'',''lazar''">Lazar.</a>'
 			elseif temprand = 2:
@@ -73,7 +73,7 @@ if $ARGS[0]= 'inner':
 			else
 				'As you look around, you see an attractive young black man sitting at one of the tables. He notices you and gives you a quick once-over before returning to what he is doing. After a few minutes, he finishes his drink before getting up and leaving.'
 			end
-		else 
+		else
 			'As you look around, you don''t see anyone you recognize hanging out today.'
 		end
 	end
@@ -148,9 +148,9 @@ if $args[0]= 'counter':
 	menu_off = 0
 	minut += 5
 	gs 'stat'
-	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
+	if $start_loc = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
 		gt 'city_coffee_hole','anushka_work'
-	else 
+	else
 		temprand = rand(1,2)
 		if temprand = 1:
 			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
@@ -188,7 +188,7 @@ if $args[0]= 'anushka_work':
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
 				'"Hey, I''ve been meaning to ask. Which dorm are you in? Maybe I can stop by and visit some time?" you ask.'
-				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."'
 				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 			if anushkaQW['photoshoot'] >= 1 and hour = 22:
@@ -225,7 +225,7 @@ if $args[0]= 'anushka_work':
 			if anushkaCityQW['first_visit'] = 0:
 				anushkaCityQW['first_visit'] = 1
 				'"Nice. Which dorm are you in by the way? Maybe I can stop by and visit some time?" you ask.'
-				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."' 
+				'"I''m not," she replies. "I''ve got a apartment with the boys." She then shrugs. "Yeah, it''s as bad as you think, but you can stop by sometime if you want."'
 				'She gives you her address and you chat about the university before you notice the line forming behind you and start looking at the menu on the wall to see if you want to order something.'
 			end
 		elseif npc_rel['A144'] <= 20:
@@ -274,7 +274,7 @@ if $ARGS[0] = 'photo_shoot':
 				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose4.jpg"></center>'
-				'She turns around, her top around her waist, and pulls her apron aside so you get a view of her firm little breasts. You snap a few more photos. "Lose the apron."' 
+				'She turns around, her top around her waist, and pulls her apron aside so you get a view of her firm little breasts. You snap a few more photos. "Lose the apron."'
 				'She tosses it aside, and you take a few more snaps of her. "Now the top." She pulls off the top and throws it on a nearby table. "Now the shorts."'
 				act 'Keep taking photos':
 					*clr & cla
@@ -322,12 +322,12 @@ if $ARGS[0] = 'photo_shoot':
 										'She sits in various poses, some fully exposed and others not, before you finally think you have the perfect final image. She''s leaning back on her elbows with her legs together, pointing up in the air. The angle you pick doesn''t show off much of her naked body, yet is still erotic, and she looks so happy and alive. It seems especially fitting with the Coffee Hole sign behind her; it''s the perfect image to end this photo session.'
 										*nl
 										'With the image taken, you lower the camera. "Thanks, Nush, that was amazing. This place made for an amazing place to take photos in. You can get dressed now."'
-										'She gets off the counter and grabs her panties off the floor before pulling them back on. "My pleasure. I love modelling almost as much as I love my music."' 
+										'She gets off the counter and grabs her panties off the floor before pulling them back on. "My pleasure. I love modelling almost as much as I love my music."'
 										'You review the photos on your camera as she gets dressed again. "Well, I should really finish cleaning up so I can go home and get some sleep before classes tomorrow."'
 										gs 'arousal', 'voyeur', 5
 										gs 'arousal', 'end'
 										gs 'stat'
-										act 'Head out': 
+										act 'Head out':
 											*clr & cla
 											minut +=5
 											gs 'stat'
@@ -361,7 +361,7 @@ if $ARGS[0]= 'lazar':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if fame['pav_slut'] > 300:
-		'You notice Lazar sitting at a table. As you approach, he says "Well, look who it is; The Queen of Cocks." You sit and talk to him for a few minutes, but all he does is talk about how easy you were back in school. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should come sometime and hang out, so we can have some fun."' 
+		'You notice Lazar sitting at a table. As you approach, he says "Well, look who it is; The Queen of Cocks." You sit and talk to him for a few minutes, but all he does is talk about how easy you were back in school. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should come sometime and hang out, so we can have some fun."'
 		'How he says it leaves no doubt about what he means by fun. Even moving to a new city won''t let get away from your reputation as a slut. He tells you where they live before he heads outside and walks away.'
 	else
 		if npc_rel['A149'] >= 60:
@@ -492,7 +492,7 @@ if $ARGS[0]= 'kendra':
 			meet_kendra = 1
 			npc_rel['A84'] = 45
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
-			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+			if $start_loc = 'sg' and SchoolAtestat = 0:
 			  'You start talking with her, telling her that you live in Pavlovsk and are in your final year of school. She replies by saying she''s a student from the Republic of Congo who attends the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
 			  'You start talking with her and tell her a bit about yourself, and she replies by saying that she''s a student from the Republic of Congo attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says, "You''re beautiful. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
@@ -541,11 +541,11 @@ if $ARGS[0]= 'djibril':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 	if DjibrilQW['invite'] = 1:
-		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
+		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'
 	elseif DjibrilQW['meet'] = 1 and DjibrilQW['invite'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
 		'You notice Djibril sitting at a table. He smiles as you approach. "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
-		
+
 	elseif hotcat >= 5:
 		DjibrilQW['meet'] = 1
 		'As you approach him, the young African man sitting at the table introduces himself. "I am Djibril Maina. What''s your name?"'

+ 6 - 6
locations/city_drugden.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
 		act 'Ask for weed': gt 'city_drugden', 'joints'
 		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
-		if mid($start_type,1,2) = 'sg' and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
+		if $start_loc = 'sg' and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
 	elseif drugUser = 0:
 		'"Ahhh, what do you have?" you ask.'
 		'His eyes light up at a freshy and smiles wildy, "Well I have some H and amphetamine."'
@@ -284,7 +284,7 @@ if $ARGS[0] = 'drugslut':
 	if NarkShmaraTimes > 0:
 		'"Bobka, please! You remember me, right? I''m good for it, you can trust me!" you beg him, but he gives you a wicked grin.'
 		'"Come on, <<$pcs_nickname>>! You know I don''t do credit!" he snorts.'
-		
+
 		gs 'willpower', 'drugs', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Leave dejectedly (<<will_cost>> Willpower)':
@@ -297,7 +297,7 @@ if $ARGS[0] = 'drugslut':
 		else
 			act 'Leave dejectedly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		act 'Keep begging, promising you''ll do anything':
 			*clr & cla
 			minut += 5
@@ -327,7 +327,7 @@ if $ARGS[0] = 'drugslut':
 				'You keep begging Bobka to give you some heroin, while you follow him to an empty room. He just laughs at you and says: <<$bobtalk>>'
 
 				act '<<$bobtext>>':	NarkShmaraTimes += 1 & gt 'city_bobka', bobrand
-				
+
 				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
 					act 'Change your mind and leave (<<will_cost>> Willpower)':
@@ -395,7 +395,7 @@ if $ARGS[0] = 'drugslut':
 	elseif NarkShmaraTimes = 0:
 		'You beg the man: "Please! I need a hit... I need it badly! Please, I''ll pay you back! I promise!"'
 		'The guy laughs: "Yea, sure. Do you know how many times a day I hear that? If I had a ruble for every time someone told me that, I would''ve retired by now! I don''t do credit, simple as that. Get lost."'
-		
+
 		gs 'willpower', 'drugs', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Leave dejectedly (<<will_cost>> Willpower)':
@@ -408,7 +408,7 @@ if $ARGS[0] = 'drugslut':
 		else
 			act 'Leave dejectedly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		act 'Keep begging, promising you''ll do anything':
 			*clr & cla
 			minut += 5

+ 2 - 2
locations/city_industrial.qsrc

@@ -108,9 +108,9 @@ if $ARGS[0] = '':
 		'The community centre is currently closed. It''s only open during the week between 09:00 and 17:00.'
 	end
 
-	if hour >= 9 and hour <= 17 and (mid($start_type,1,2) ! 'sg' or SchoolAtestat = 0) or bumtolik > 3: 
+	if hour >= 9 and hour <= 17 and ($start_loc ! 'sg' or SchoolAtestat = 0) or bumtolik > 3:
 		'<a href="exec: gt ''buklinik'',''start''">Mercy clinic</a> is open.'
-	elseif (hour < 9 or hour > 17) and (mid($start_type,1,2) ! 'sg' or SchoolAtestat = 0) or bumtolik > 3:
+	elseif (hour < 9 or hour > 17) and ($start_loc ! 'sg' or SchoolAtestat = 0) or bumtolik > 3:
 		'Mercy clinic is closed.'
 	end
 	if hour >= 8 and hour <= 20:

+ 2 - 2
locations/city_island.qsrc

@@ -83,14 +83,14 @@ if anushkaCityQW['first_visit'] > 0:
 	'Anushka lives in <a href="exec:minut += 1 & gt ''anushapt_city'', ''home''">a shared apartment</a> around the corner.'
 end
 
-act 'Go to the university campus': 
+act 'Go to the university campus':
 	minut += 1
 	gt 'uni_grounds', 'main'
 end
 
 if func('homes_properties', 'has_access', 'university_dorm') or university['student'] = 1 or hour >= 6:'The <a href="exec:gt ''uni_dorm'', ''start''">University dorms</a> offers small, but cheap, living space, for university students.'
 
-if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,3) = 'uni':
+if pcs_magik >= 1 and mainQW = 0 and $start_loc = 'uni':
 	*clr & cla
 	menu_off = 1
 	mainQW = 1

+ 1 - 1
locations/city_pharmacy.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	if pcs_knows_nipplecream > 0:
 		*P func ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $curloc, $ARGS[0])
 	end
-	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], iif(mid($start_type,1,2) = 'sg',1,0), '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''city_pharmacy'', ''buy_antifungal''">buy</a>','')+'')
+	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], iif($start_loc = 'sg',1,0), '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''city_pharmacy'', ''buy_antifungal''">buy</a>','')+'')
 	*P '</table></center>'
 end
 

+ 4 - 4
locations/city_sauna.qsrc

@@ -113,7 +113,7 @@ if $ARGS[0] = 'saunaroom':
 	*nl
 
 	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to <b>'+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'</b> during the week and <b>'+iif(timerEnd < 10,'0<<timerEnd>>','<<timerEnd>>')+':'+iif(timerEndM < 10,'0<<timerEndM>>','<<timerEndM>>')+'</b> during the weekend. It is currently turned '+iif(budilnikOn = 0, '<a href="exec: budilnikOn = 1 & gt ''city_sauna'', ''saunaroom''">OFF</a>.', '<a href="exec: budilnikOn = 0 & gt ''city_sauna'', ''saunaroom''">ON</a>.')
-	
+
 	*nl
 
 	'If you run out of personal hygeine or beauty products, you can ask for more at a cost.'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'saunaroom':
 				gt 'city_sauna', 'saunaroom'
 			end
 		end
-		
+
 	end
 
 	if workDolg <= 0 and SaunaWhore > 0:
@@ -228,9 +228,9 @@ if $ARGS[0] = 'saunaroom':
 						money -= 850
 					end
 					if disable_autosave = 0:
-						if mid($start_type,1,4) = 'city':
+						if $start_loc = 'city':
 							savegame 'autosave_city.sav'
-						elseif mid($start_type,1,3) = 'uni':
+						elseif $start_loc = 'uni':
 							savegame 'autosave_uni.sav'
 						else
 							savegame 'autosave_sg.sav'

+ 11 - 11
locations/clothing.qsrc

@@ -67,22 +67,22 @@ $clothing_list_line = {
 		else
 			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''dest2'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/unwanted_off.png"></a></center></TD>'
 		end
-		
+
 		if ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6) and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') <= 0 and pcs_sewng >= 60 and tkan > 0:
 			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''qrepair'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/repair.png"></a></center></TD>'
 		else
 			$RESULT += '<TD><center><img src="images/system/icons/clothing/repair_off.png"></center></TD>'
 		end
-		
+
 		if pcs_sewng >= 50 and money >= 500 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < pcs_hips - 8 or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > pcs_hips + 8):
 			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''qresize'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/resize.png"></a></center></TD>'
 		else
 			$RESULT += '<TD><center><img src="images/system/icons/clothing/resize_off.png"></center></TD>'
 		end
-		
+
 		if ($ARGS[1] ! 'gm_school' or ARGS[2] ! 6):
 			$RESULT += '<TD><center><a href="exec:gt ''clothing'', ''qdelete'', ''<<$ARGS[0]>>'', ''<<$ARGS[1]>>'', <<ARGS[2]>> "><img src="images/system/icons/clothing/delete_on.png"></a></center></TD>'
-		end	
+		end
 
 	else
 		$RESULT += '<TD></TD><TD></TD><TD></TD><TD></TD><TD></TD>'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'view_clothing_list':
 	!! ARGS 0 - view_clothing_list
 	!! ARGS 1 - action type (wardrobe, resize)
 	!! ARGS 2 - Shop name (kats, moncheri, gm, etc)
-	
+
 	if $ARGS[1] = 'wardrobe':
 		$ward_list_page = $ARGS[1]
 		'<center><table><TH><a href="exec:gt ''wardrobe'', ''main''"><img src="images/system/icons/clothing/clothes.png" height="50"></TH><TH><a href="exec:gt ''wardrobe'', $wloc"><img src="images/system/icons/clothing/default.png" height="50"></a></TH><TH><b>Your Wardrobe</b></TH></table></center>'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'clothing_list':
 
 	$ward_list_file = 'clothing'
 	$bgcolor='#f3f4ee'
-	
+
 
 	if $args[1] = 'all':
 		$ward_list_store = 'all'
@@ -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 ($clothingworntype ! 'gm_school' or clothingwornnumber ! 6):
+		if $start_loc = '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
 
@@ -1218,7 +1218,7 @@ if $ARGS[0] = 'clothing_list':
 		act 'Return': killvar '$ward_list_store' & gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>'
 		gs 'clothing', 'clothwidth'
 	end
-	
+
 	if $args[1] = 'sports' or $args[1] = 'all':
 		if $args[1] ! 'all':
 			$ward_list_store = $args[1]
@@ -1362,7 +1362,7 @@ if $ARGS[0] = 'clothinglist_header':
 end
 
 if $ARGS[0] = 'clothwidth':
-	act 'Set image size for this view': 
+	act 'Set image size for this view':
 		Enable_clothwidth = input("Enter height in pixels you want for images on this page <br>(Default 150, min 50, max 500)")
 		if Enable_clothwidth < 50:
 			Enable_clothwidth = 50
@@ -1624,7 +1624,7 @@ if $args[0] = 'school_check':
 		if CloInhibit >= 30 or CloTopCut = 4:
 			'<font color="red">This uniform, despite meeting the school uniform regulations, is too risqué. Everybody in school will think that you''re a slut apart from the gopniks who will respect you for beating the school rules.</font>'
 		elseif CloStyle = 2:
-			'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that only the Gopniks will approve of.</font>'	
+			'<font color="blue">This uniform follows the school regulation on skirt length but is of a style that only the Gopniks will approve of.</font>'
 		elseif CloQuality >= 4:
 			'<font color="blue">This uniform complies with the regulations and is of good quality. It would certainly help you with your standing with the cool kids and jocks.</font>'
 		else
@@ -1634,7 +1634,7 @@ if $args[0] = 'school_check':
 		if CloInhibit >= 35:
 			'<font color="red">This uniform slightly breaches the school uniform regulations and it is too risqué. Everybody in school apart from the gopniks will think that you''re a slut.</font>'
 		elseif CloStyle = 2:
-			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that only the Gopniks will approve of.</font>'	
+			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that only the Gopniks will approve of.</font>'
 		elseif CloQuality >= 4:
 			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of good quality. Everybody apart from the nerds would approve of you wearing it.</font>'
 		else

+ 19 - 19
locations/clothing_QV.qsrc

@@ -29,7 +29,7 @@ if $ARGS[0] = 'list':
 	if ARRSIZE('gm_outfits') > 0 or ARRSIZE('gm_dress'):'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm''"><img src="images/locations/city/citycenter/mall/gm.png"></a></center>'
 
 	if ARRSIZE('gm_school') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_school''"><img src="images/pc/items/gm/school.png"></a></center>'
- 
+
 	if ARRSIZE('gm_office') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_office''"><img src="images/pc/items/gm/officewear.png"></a></center>'
 
 	if ARRSIZE('gm_maid') > 0:'<center><a href="exec:gt ''clothing_QV'', ''clothing_list'', ''gm_maid''"><img src="images/pc/items/gm/maid.png"></a></center>'
@@ -276,7 +276,7 @@ if $ARGS[0] = 'clothing_list':
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0:
 					!! Default school uniform
 					if i = 6:
-						if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
+						if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and gm_school_s[6] = 0: *p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', 6"><img src="images/pc/items/gm/school/6.jpg" 	height="250" /></a>'
 					elseif CloInhibit <= pcs_inhib:
 						if gm_school_s[i] = 0 and gm_school_h[i] > 0 and gm_school_b[i] >= (pcs_hips - 8) and gm_school_b[i] <= (pcs_hips + 8):*p '<a href="exec:gt ''clothing_QV'', ''change'', ''gm_school'', <<i>>"><img src="images/pc/items/gm/school/<<i>>.jpg" 	height="250" /></a>'
 					end
@@ -739,7 +739,7 @@ if $ARGS[0] = 'clothing_list':
 		end
 		i += 1
 		if i <= ARRSIZE('eroto_dress'):jump 'looperoto_dress'
-	
+
 		i = 1
 		:looperoto_outfits
 		if eroto_outfits[i] = 1:
@@ -1151,8 +1151,8 @@ if $ARGS[0] = 'clothing_list':
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
-	
-	
+
+
 	if $args[1] = 'all':
 		clo_i += 1
 		if clothingfilter['quality'] = 0 and clo_i <= 7:
@@ -1295,14 +1295,14 @@ if $ARGS[0] = 'change':
 		if CloInhibit > 10:
 			if CloInhibit + 10 > pcs_inhib: 'You find this outfit more revealing than you are completely comfortable with but that makes it quite exciting too.'
 		end
-		
+
 		!!Therapist force exhibitionist clothing check
 		if hypnoClothes > 0:
 			if CloStyle2 = 4:
-				if CloThinness < 3:		
+				if CloThinness < 3:
 					act 'Wear this outfit':
 						cla
-						*clr		
+						*clr
 						'You pick up the uniform and think about trying them on... but you don''t really like wearing these type of uniform. You wonder if you can find more revealing uniform.'
 						gs 'willpower', 'misc', 'resist', 'easy'
 						will_cost += hypnoTime/CloThinness
@@ -1328,7 +1328,7 @@ if $ARGS[0] = 'change':
 								gt 'clothing_QV', 'gym'
 							end
 						end
-					end	
+					end
 				else
 					act 'Wear this outfit':
 						gs 'clothing', 'wear', $ARGS[1], ARGS[2]
@@ -1341,10 +1341,10 @@ if $ARGS[0] = 'change':
 					end
 				end
 			else
-				if CloThinness < 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':	
+				if CloThinness < 6 or $clothingworntype = 'salacious_outfits' or $clothingworntype = 'salacious_dress':
 					act 'Wear this outfit':
 						cla
-						*clr		
+						*clr
 						'You pick up the outfit and think about trying them on... but you don''t really like wearing these type of outfits'
 						gs 'willpower', 'misc', 'resist', 'easy'
 						will_cost += hypnoTime
@@ -1370,7 +1370,7 @@ if $ARGS[0] = 'change':
 								gt 'clothing_QV', 'gym'
 							end
 						end
-					end	
+					end
 				else
 					act 'Wear this outfit':
 						gs 'clothing', 'wear', $ARGS[1], ARGS[2]
@@ -1382,7 +1382,7 @@ if $ARGS[0] = 'change':
 						end
 					end
 				end
-			end	
+			end
 		else
 			act 'Wear this outfit':
 				gs 'clothing', 'wear', $ARGS[1], ARGS[2]
@@ -1393,7 +1393,7 @@ if $ARGS[0] = 'change':
 				end
 			end
 		end
-		
+
 
 	end
 end
@@ -1492,21 +1492,21 @@ if $ARGS[0] = 'filter_header':
 	else
 		$Headerstring += '<a href="exec:clothingfilter[''number''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 1 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
 	end
-	
+
 	$Headerstring += '<TD>'
 	if clothingfilter['quality'] = 0:
 		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
 	else
 		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
 	end
-	
+
 	$Headerstring += '<TD>'
 	if clothingfilter['inhibition'] = 0:
 		$Headerstring += '<img src="images/system/icons/clothing/inhibition.png"></TD>'
 	else
 		$Headerstring += '<a href="exec:clothingfilter[''inhibition''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''number''] = 1 & gt $ward_list_file, ''clothing_list'', $ward_list_store"><img src="images/system/icons/clothing/inhibition_off.png"></a></TD>'
 	end
-	
+
 !! Show only filers
 	$Headerstring[1] = '<TD>'
 	if clothingfilter['prost_only'] = 0:
@@ -1756,14 +1756,14 @@ if $ARGS[0] = 'shop_filter_header':
 	else
 		$Headerstring += '<a href="exec:clothingfilter[''number''] = 0 & clothingfilter[''quality''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/number_off.png"></a></TD>'
 	end
-	
+
 	$Headerstring += '<TD>'
 	if clothingfilter['quality'] = 0:
 		$Headerstring += '<img src="images/system/icons/clothing/quality.png"></TD>'
 	else
 		$Headerstring += '<a href="exec:clothingfilter[''quality''] = 0 & clothingfilter[''number''] = 1 & clothingfilter[''inhibition''] = 1 & gt $loc, $loc_arg"><img src="images/system/icons/clothing/quality_off.png"></a></TD>'
 	end
-	
+
 	$Headerstring += '<TD>'
 	if clothingfilter['inhibition'] = 0:
 		$Headerstring += '<img src="images/system/icons/clothing/inhibition.png"></TD>'

+ 2 - 2
locations/dina.qsrc

@@ -12,7 +12,7 @@ $brodila = {
 }
 
 $brodilr = {
-	if mid($start_type,1,2) = 'sg' and accessible_property['parents_home'] = 4:
+	if $start_loc = 'sg' and accessible_property['parents_home'] = 4:
 		gt 'pav_residential'
 	elseif accessible_property['old_town_apartment'] = 1:
 		gt'pushkin_sq'
@@ -36,7 +36,7 @@ $brodils = {
 		gt'sitr','start'
 	elseif accessible_property['old_town_apartment'] = 1:
 		gt'sitr2x','start'
-	elseif mid($start_type,1,2) = 'sg' and accessible_property['parents_home'] = 4:
+	elseif $start_loc = 'sg' and accessible_property['parents_home'] = 4:
 		gt 'sitrPar'
 	else
 		gt'city_residential', 'start'

+ 5 - 5
locations/dreams.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'start':
 		'Today you had a very strange dream: You were blindfolded, having sex with a stranger. After the two of you are done you remove the blindfold and recognize the stranger to be your stepfather.'
 		pcs_horny = 100
 		stepdadqw += 1
-	elseif canBraidHair = 0 and mid($start_type,1,2) ! 'sg' and pcs_hairlng > 80:
+	elseif canBraidHair = 0 and $start_loc ! 'sg' and pcs_hairlng > 80:
 		canBraidHair = 1
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/braid.jpg"></center>'
 		'You dream about the time your sister taught you how to braid your hair. She was happy to help you out and teach you how to do it, it was one of your more memorable sister bonding moments the two of you had not long before you moved out.'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'start':
 			end
 		else
 			'You sleep without dreaming.'
-		end   
+		end
 	end
 	exit
 end
@@ -88,7 +88,7 @@ if $ARGS[0] = 'hypno_dreams':
 	else
 		ivrand = rand(1,7)
 	end
-	
+
 	if ivrand = 1:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/schoolSitBlow2.mp4"></video></center>'
 		'You dream that you''re sucking someone''s cock.'
@@ -115,7 +115,7 @@ if $ARGS[0] = 'hypno_dreams':
 		end
 	elseif ivrand = 4:
 		'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/sex/hypnoRide4.mp4"></video></center>'
-		
+
 		if dreamedOfTherapistFucking = 2:
 			'You dream that you are riding your therapist''s cock. You keep slaming your pussy into his massive rod as hard as you can and your tits flop around wildly as you do so.'
 			'His huge cock bumps against your cervix. It feels wonderful. You feel a deep craving to feel his seed pump into you.'
@@ -248,7 +248,7 @@ if $ARGS[0] = 'sex_dreams':
 	elseif ivrand = 4:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/sex4.jpg"></center>'
 		'You dream that you are bent over a couch with a man behind you pushing his cock in and out of you, while firmly grasping your ass. You are biting your lips from the pleasure.'
-		
+
 	elseif ivrand = 5:
 		'<center><img <<$set_imgh>> src="images/shared/home/bedroom/dream/sex/sex5.jpg"></center>'
 		'You dream that you are sitting on top of a guy, bouncing up and down on his cock.'

+ 8 - 8
locations/fit.qsrc

@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 	'Sportswear is required for all available classes.'
 
 	act 'Leave': killvar 'epayments' & minut += 5 & gt 'city_center'
-	
+
 	if abonement > 0:
 		act 'Go to the dressing room': gt 'fit', 'dressing_room'
 
@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 		'How long do you want to subscribe for?'
 	else
 		'Extend your subscription:'
-	end	
+	end
 
 	$epayments['method'] = ''
 	$epayments['item_variable'] = 'abonement'
@@ -64,7 +64,7 @@ if $ARGS[0] = 'start':
 	$epayments['loc_arg'] = 'start'
 	$epayments['banner']= 'locations/city/citycenter/gym/desk.jpg'
 
-	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top">'	
+	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top">'
 	if money >= 3000 or karta + bankDebtLimit => 3000:
 		'<tr><td> <a href="exec: epayments[''value''] = 3000 & epayments[''quantity''] = 30 & gs ''shortgs'',''payments'' ">3,000<b> ₽</b> for 30 lessons</a></td>'
 	end
@@ -198,7 +198,7 @@ if $ARGS[0] = 'dressing_room':
 			end
 		end
 	end
-	
+
 	if deodorant > 0 and deodorant_on = 0:
 		'Your deodorant will last you for <b><<deodorant>></b> more '+iif(deodorant = 1, 'application.', 'applications.')
 		act 'Apply deodorant (0:01)':
@@ -342,7 +342,7 @@ if $ARGS[0] = 'gym':
 	*nl
 	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		if hour >= 10 and hour < 12 and week = 7 and centr = 1: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
 		if hour >= 10 and hour < 12 and week = 7 and centr = 2 and ricewine < 2: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Guang</a>'
 	end
@@ -537,12 +537,12 @@ if $ARGS[0] = 'exercise_end':
 					gt 'fit', 'dressing_room'
 
 					'Event text'
-					
+
 					act 'Next action': gt 'farawayistan'
 				end
 			else
 				act 'Hit him in the balls (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 
 			act 'Enjoy':
 				cla
@@ -857,7 +857,7 @@ if $ARGS[0] = 'kickboxing':
 	end
 end
 
-if $ARGS[0] = 'FMR':    
+if $ARGS[0] = 'FMR':
     *clr & cla
 	killvar '$locclass'
     menu_off = 0

+ 1 - 1
locations/food_menu.qsrc

@@ -71,7 +71,7 @@ elseif $loc = 'gkafe':
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/menus/borislav.jpg"</center><br>'
 	!'<center><img <<$set_imgh>> src="images/shared/drinks/cafedrinks.jpg"</center><br>'
-	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
+	if $start_loc = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
 		$_eat['0,name'] = 'Vegetarian Piroshki'
 		$_eat['0,type'] = 'pirosh'
 		$_eat['0,price'] = 'Free'

+ 16 - 16
locations/foto_albums.qsrc

@@ -3,7 +3,7 @@
 menu_off = 1
 
 if $ARGS[0] = 'model_portraits':
-	
+
 	if model['rank'] = 1:
 		gt 'foto_albums','sveta_10'
 	elseif model['rank'] = 2:
@@ -24,7 +24,7 @@ if $ARGS[0] = 'model_portraits':
 		gt 'foto_albums','sveta_3'
 	elseif model['rank'] = 10:
 		gt 'foto_albums','sveta_1'
-	end	
+	end
 
 	*clr & cla
 	act'Move away':gt'foto','studio'
@@ -345,7 +345,7 @@ if $ARGS[0] = 'anushka':
 	if anushka['model'] >= 1:
 		'You open up the ninth album and browse through some of the pictures of Anushka placed inside. Well she did say she modeled here, so you are not really surprised to see a album of her here.'
 		'The photo''s all seem to be single pictures taken from past photo shoots.'
-	elseif mid($start_type,1,2) = 'sg':
+	elseif $start_loc = 'sg':
 		anushka['model'] = 1
 		'You open up the ninth album and are surprised to see pictures of Anushka placed inside. She is one of the prettier girls in school and it is not surprising she would like being a model, she loves attention, still you are surprised no one has mentioned it at school, surely someone else has to know right?'
 		'The photo''s all seem to be single pictures taken from past photo shoots.'
@@ -407,7 +407,7 @@ if $ARGS[0] = 'sveta_10':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
 	'Here is the shelf that has the albums of the top 10 models. You saw it before when you first joined the studio, but something has changed. You read the names from left to right and your heart stops when you see the final name.'
-	'"<<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>."' 
+	'"<<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>."'
 	'That''s your name! You''re one of the top 10 models of the studio!'
 	'<a href="exec:gt ''foto_albums'',''anastasia''">1. Anastasia P.</a>'
 	'<a href="exec:gt ''foto_albums'',''katherine''">2. Katherine A.</a>'
@@ -420,8 +420,8 @@ if $ARGS[0] = 'sveta_10':
 	'<a href="exec:gt ''foto_albums'',''anushka''">9. Anushka K.</a>'
 	'<a href="exec:gt ''foto_albums'',''sveta''">10. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	act'Move away':gt'foto','studio'
-end	
-	
+end
+
 if $ARGS[0] = 'sveta_9':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
@@ -436,10 +436,10 @@ if $ARGS[0] = 'sveta_9':
 	'<a href="exec:gt ''foto_albums'',''mari''">8. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''sveta''">9. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
-	
+
 	act'Move away':gt'foto','studio'
 end
-	
+
 if $ARGS[0] = 'sveta_8':
 	*clr & cla
 
@@ -474,7 +474,7 @@ if $ARGS[0] = 'sveta_7':
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	act'Move away':gt'foto','studio'
 end
-	
+
 if $ARGS[0] = 'sveta_6':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
@@ -491,7 +491,7 @@ if $ARGS[0] = 'sveta_6':
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	act'Move away':gt'foto','studio'
 end
-	
+
 if $ARGS[0] = 'sveta_5':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
@@ -508,7 +508,7 @@ if $ARGS[0] = 'sveta_5':
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	act'Move away':gt'foto','studio'
 end
-	
+
 if $ARGS[0] = 'sveta_4':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'sveta_4':
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	act'Move away':gt'foto','studio'
 end
-	
+
 if $ARGS[0] = 'sveta_3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
@@ -542,7 +542,7 @@ if $ARGS[0] = 'sveta_3':
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
 	act'Move away':gt'foto','studio'
 end
-	
+
 if $ARGS[0] = 'sveta_2':
 	*clr & cla
 
@@ -558,14 +558,14 @@ if $ARGS[0] = 'sveta_2':
 	'<a href="exec:gt ''foto_albums'',''mila''">8. Mila A.</a>'
 	'<a href="exec:gt ''foto_albums'',''mari''">9. Mari E.</a>'
 	'<a href="exec:gt ''foto_albums'',''anushka''">10. Anushka K.</a>'
-	
+
 	act'Move away':gt'foto','studio'
 end
 
-	
+
 if $ARGS[0] = 'sveta_1':
 	*clr & cla
-	
+
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/albums.jpg"></center>'
 	'Here is the shelf that has the albums of the top 10 models. You finally did it! Listed at the very front of all of the albums is your name. Women wish they were you, men want to fuck you, and you''re likely to start getting offers in other parts of the entertainment industry. You''re the top model!'
 	'<a href="exec:gt ''foto_albums'',''sveta''">1. <<$model[''firstname'']>> <<mid($model[''lastname''],1,1)>>.</a>'

+ 37 - 37
locations/foto_events.qsrc

@@ -265,7 +265,7 @@ if $ARGS[0] = 'underwear_steal2':
 		if studio_underwear_steal = 3:'But it''s a bodysuit... You''d have to get completely undressed to put it back on...'
 		'But also, doing that here in front of him? He already forced you to undress, you suppose. Getting dressed can''t be worse than that right?'
 		act'Go to the back room and re-dress':gt'foto_events','re-dress'
-		
+
 		act'Leave':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
@@ -275,7 +275,7 @@ if $ARGS[0] = 'underwear_steal2':
 		end
 	end
 end
-		
+
 if $ARGS[0] = 're-dress':
 	cla & *clr
 	'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -446,7 +446,7 @@ if $ARGS[0] = 'fashion_persuasion':
 	else
 		will_cost = 0
 	end
-	
+
 	if will_cost <= pcs_willpwr:
 		act'No thanks (<<will_cost>> Willpower)':
 			cla & *clr
@@ -486,11 +486,11 @@ if $ARGS[0] = 'fashion_persuasion':
 	else
 		act'No thanks (<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':
 		cla & *clr
 		foto_persuade = 2
-		
+
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 		'"That sounds really good actually! I''ll do it!"'
 		'The manager smiles wide at you.'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'lingerie_persuasion':
 	elseif foto_persuade = 1:
 		'"We can do a fashion shoot today if you like, but the studio would still really love to see you do that lingerie shoot. What do you say?"'
 	end
-	
+
 	if foto['suborn'] >= 5:
 		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
 	elseif foto['suborn'] >= 3:
@@ -534,11 +534,11 @@ if $ARGS[0] = 'lingerie_persuasion':
 	else
 		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	if foto_persuade = 2 and pcs_inhib < 20:
 		act'I guess so':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess it turned out well last time..."'
 			'The manager smiles wide at you.'
@@ -549,7 +549,7 @@ if $ARGS[0] = 'lingerie_persuasion':
 		act'Yes':
 			cla & *clr
 			foto_persuade = 2
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"That sounds really good actually! I''ll do it!"'
 			'The manager smiles wide at you.'
@@ -573,7 +573,7 @@ if $ARGS[0] = 'glamour_persuasion':
 	elseif foto_persuade = 3:
 		'"Hey I''m sorry to bother you like this again, but we would still really love to see you do that glamour shoot. What do you say? Willing to give it a try today?"'
 	end
-	
+
 	if foto_persuade = 3:
 		if foto['suborn'] >= 5:
 			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
@@ -600,7 +600,7 @@ if $ARGS[0] = 'glamour_persuasion':
 			act'I guess I could try it...':
 				cla & *clr
 				foto_persuade = 2
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"I guess I could try it..."'
 				'"Great! Thank you so much <<$model[''firstname'']>>! Just go to this set and we''ll set somebody up for you."'
@@ -609,7 +609,7 @@ if $ARGS[0] = 'glamour_persuasion':
 		else
 			act'Yes, I''m ready':
 				cla & *clr
-				
+
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 				'"You know what? Yeah, I think I''ll give it a try today. I think I''m ready."'
 				'The manager smiles wide at you.'
@@ -640,14 +640,14 @@ if $ARGS[0] = 'glamour_persuasion':
 		else
 			act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		act'What kind of glamour shoot?':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... maybe..." you say slowly. "What kind of shoot were you thinking?"'
 			'"Well how about a fashion shoot with transparent clothing? You''ve never shown your breasts before yet, have you?"'
 			gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'easy'
-			
+
 			if will_cost <= pcs_willpwr:
 				act'No way! (<<will_cost>> Willpower)':
 					cla
@@ -671,7 +671,7 @@ if $ARGS[0] = 'glamour_persuasion':
 					act'That''s not so bad...':
 						cla & *clr
 						foto_persuade = 4
-						
+
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 						'"That''s not so bad I guess... I''m already doing lingerie so that''s not much of a difference."'
 						'"Yes, exactly! Think of it just like that. Thanks for this <<$model[''firstname'']>>. Just go to this set and we''ll set somebody up for you."'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'glamour_persuasion':
 			if foto_persuade = 2 and pcs_inhib < 45:
 				act'I guess so':
 					cla & *clr
-					
+
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'"Well... I guess it turned out well last time... I could give it a try..."'
 					'The manager smiles wide at you.'
@@ -696,7 +696,7 @@ if $ARGS[0] = 'glamour_persuasion':
 				act'I guess I could try it...':
 					cla & *clr
 					foto_persuade = 2
-					
+
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'"I guess I could try it..."'
 					'"Great! Thank you so much <<$model[''firstname'']>>! Just go to this set and we''ll set somebody up for you."'
@@ -705,7 +705,7 @@ if $ARGS[0] = 'glamour_persuasion':
 			else
 				act'Yes':
 					cla & *clr
-					
+
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 					'"That sounds really good actually! I''ll do it!"'
 					'The manager smiles wide at you.'
@@ -732,7 +732,7 @@ if $ARGS[0] = 'trans_persuasion':
 	elseif foto_persuade = 4:
 		'"Hey <<$model[''firstname'']>>, the staff have been talking again. I know I asked before, but I was wondering if you might be more comfortable now. Is it possible that you might consider doing a transparent clothing shoot today instead of a basic glamour one? No pressure if not, but I just wanted to check and see if you''re ready."'
 	end
-	
+
 	if foto['suborn'] >= 5:
 		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
 	elseif foto['suborn'] >= 3:
@@ -755,11 +755,11 @@ if $ARGS[0] = 'trans_persuasion':
 	else
 		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	if foto_persuade > 1 and foto_persuade < 4 and pcs_inhib < 45:
 		act'I guess so':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess it turned out well last time..."'
 			'The manager smiles wide at you.'
@@ -770,7 +770,7 @@ if $ARGS[0] = 'trans_persuasion':
 	elseif foto_persuade = 1 or foto_persuade = 4:
 		act'I guess I could try':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess I could give it a try..."'
 			'The manager smiles wide at you.'
@@ -778,10 +778,10 @@ if $ARGS[0] = 'trans_persuasion':
 			foto_persuade = 2
 			act'Do the transparent shoot':gt'foto_shoot','transparent'
 		end
-		
+
 		act'Yes, I''m ready':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"You know what? I think I <i>am</i> ready. I''ll give it a try."'
 			'The manager smiles wide at you.'
@@ -792,7 +792,7 @@ if $ARGS[0] = 'trans_persuasion':
 	else
 		act'Yes':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"That sounds really good actually! I''ll do it!"'
 			'The manager smiles wide at you.'
@@ -814,7 +814,7 @@ if $ARGS[0] = 'topless_persuasion':
 	elseif foto_persuade = 2:
 		'"Hey <<$model[''firstname'']>>, you seem to be doing really well with the transparent shoots, just like we thought. I know that initially took some convincing, but we got here didn''t we? Now, I was wondering if you''d like to try go a step further just like before and take the whole top off? You''ve never done a topless shoot and it isn''t much different from what we''re doing now. Our rates for topless shoots are better and you''ll get a lot more exposure than what you''re doing now. Want to try it?"'
 	end
-	
+
 	if foto['suborn'] >= 5:
 		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
 	elseif foto['suborn'] >= 3:
@@ -841,11 +841,11 @@ if $ARGS[0] = 'topless_persuasion':
 	else
 		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	if foto_persuade = 2 and pcs_inhib < 50:
 		act'I guess so':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"Well... I guess you''re right, it isn''t that much different. I suppose I can give it a shot..."'
 			'The manager smiles wide at you.'
@@ -856,7 +856,7 @@ if $ARGS[0] = 'topless_persuasion':
 	elseif foto_persuade = 1:
 		act'Yes, I''m ready':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"You know what? Yeah, I think I''ll give it a try today. I think I <i>am</i> ready!"'
 			'The manager smiles wide at you.'
@@ -867,7 +867,7 @@ if $ARGS[0] = 'topless_persuasion':
 	else
 		act'Yes':
 			cla & *clr
-			
+
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'"That sounds really good actually! Let''s do it!"'
 			'The manager smiles wide at you.'
@@ -889,7 +889,7 @@ if $ARGS[0] = 'nude_persuasion':
 	elseif foto_persuade = 2:
 		'"Hey <<$model[''firstname'']>>, I''ve got a new offer from the studio for you. They''ve really loved your willingness to try new things like with the past shoots and all and they wanted to know if you would like to step it up to the final level. Would you be willing to do a full frontal nude shoot with us? As a special bonus, the studio said they''re willing to double your pay for your full debut. I have to say, this is a great offer. What do you think of it?"'
 	end
-	
+
 	if foto['suborn'] >= 5:
 		gs 'willpower', 'skill', 'pcs_inhib', 'resist', 'hard'
 	elseif foto['suborn'] >= 3:
@@ -918,7 +918,7 @@ if $ARGS[0] = 'nude_persuasion':
 	else
 		act'No thanks (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	if foto_persuade = 2 and pcs_inhib < 60:
 		act'Wow! I... I guess I''ll take it':
 			cla & *clr
@@ -1661,7 +1661,7 @@ if $ARGS[0] = 'pool1':
 					act'"I''m not interested in getting famous" (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			
+
 			gs 'willpower', 'exhib', 'resist'
 			if will_cost <= pcs_willpwr:
 				act'"Sorry, I had other plans" (<<will_cost>> Willpower)':
@@ -1763,7 +1763,7 @@ if $ARGS[0] = 'tennis':
 					act'"I''m not actually that into tennis..." (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 			end
-			
+
 			gs 'willpower', 'exhib', 'resist'
 			if will_cost <= pcs_willpwr:
 				act'"Not today" (<<will_cost>> Willpower)':
@@ -2067,7 +2067,7 @@ if $ARGS[0] = 'runway1':
 		'As you turn you see a photographer running towards you, waving you over. You walk over to talk to him.'
 		act'"What''s up?"':
 			*clr & cla
-			
+
 		end
 	end
 end
@@ -2188,7 +2188,7 @@ if $ARGS[0] = 'runway2':
 								modelfoto['earnings'] += modelpayfin
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
-								if mid($start_type,1,2) = 'sg' and age < 18:
+								if $start_loc = 'sg' and age < 18:
 									'Another hour later, the show is over, the clothes are taken back, and you''re left naked in the studio, counting the <<modelpayfin>> <b>₽</b> you''ve been paid and musing over the happenings of the night. Working the runway isn''t too bad. But at the same time, this kind of thing has the tendency to circle around and you <i>really</i> hope nobody in Pavlovsk hears about this...'
 									act'Back in the studio':gt'foto','studio'
 								else
@@ -2224,7 +2224,7 @@ if $ARGS[0] = 'wet1':
 				*clr & cla
 				'"And the shoot is...?"'
 				'He looks awkward like he doesn''t know what to say for a moment until he finally explains, "Well, it''s a normal full exposure shoot... we''re just going to spray you with a hose while we do it. A lot of girls say no when we tell them what we''re going to do because they find it unpleasent. So? How about it? We''ll pay you for it and it won''t count as your weekly job."'
-				
+
 				gs 'willpower', 'exhib', 'resist'
 				if will_cost <= pcs_willpwr:
 					act'"Thanks but no thanks" (<<will_cost>> Willpower)':

+ 90 - 90
locations/foto_model_documentary.qsrc

@@ -20,7 +20,7 @@ if $ARGS[0] = '1st_documentary':
 	'<i>You mean naked...</i> you think to yourself.'
 	*nl
 	'"They''re paying the equivalent of a two hour nude shoot for every model that participates. Do you want in?"'
-	
+
 	if modelfoto['nip']  < 1:
 		act'No way! I''ve never been naked on camera before!':
 			cla & *clr
@@ -50,7 +50,7 @@ if $ARGS[0] = '1st_documentary':
 			else
 				act 'Still 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'I guess I could...':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -60,7 +60,7 @@ if $ARGS[0] = '1st_documentary':
 			end
 		end
 	end
-	
+
 	act'No thanks, not interested':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -86,7 +86,7 @@ if $ARGS[0] = '1st_documentary':
 		else
 			act 'Still 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'I guess I could...':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -95,7 +95,7 @@ if $ARGS[0] = '1st_documentary':
 			act'Go to the set':gt'foto_model_documentary','documentary_1'
 		end
 	end
-	
+
 	act'No thanks, I''m here to model':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -121,7 +121,7 @@ if $ARGS[0] = '1st_documentary':
 		else
 			act 'Still 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'I guess I could...':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
@@ -131,14 +131,14 @@ if $ARGS[0] = '1st_documentary':
 		end
 	end
 
-!!	if mid($start_type,1,2) = 'sg' and age < 18:
+!!	if $start_loc = 'sg' and age < 18:
 !!		act'No thanks (don''t want people to find out)':
 !!			cla & *clr
 !!			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 !!			'"Ehh, no thanks. I''m here to model, not do interviews."'
 !!		end
 !!	end
-	
+
 	act'Sure, I''ll take part':
 		cla
 		*nl
@@ -168,7 +168,7 @@ if $ARGS[0] = 'documentary_1':
 		'"Okay, we''re all set. Ready?"'
 		'You nod.'
 		'"Okay, first question then. What''s your name, how old are you, and what is your job?"'
-	
+
 		act'I''m <<$model[''firstname'']>>':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
@@ -180,7 +180,7 @@ if $ARGS[0] = 'documentary_1':
 			*nl
 			gs 'foto_model_documentary','documentary_2'
 		end
-		
+
 		act'I''m <<$model[''nickname'']>>':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
@@ -209,7 +209,7 @@ if $ARGS[0] = 'documentary_2':
 		*nl
 		gs 'foto_model_documentary','documentary_3'
 	end
-	
+
 	act'I''ve always wanted to be a model':
 		foto_documentary['question_2'] = 2
 		cla & *clr
@@ -220,7 +220,7 @@ if $ARGS[0] = 'documentary_2':
 		*nl
 		gs 'foto_model_documentary','documentary_3'
 	end
-	
+
 	act'I just wanted some extra cash':
 		foto_documentary['question_2'] = 3
 		cla & *clr
@@ -232,7 +232,7 @@ if $ARGS[0] = 'documentary_2':
 		*nl
 		gs 'foto_model_documentary','documentary_3'
 	end
-	
+
 	act'I was desperate and needed money':
 		foto_documentary['question_2'] = 4
 		cla & *clr
@@ -243,7 +243,7 @@ if $ARGS[0] = 'documentary_2':
 		*nl
 		gs 'foto_model_documentary','documentary_3'
 	end
-	
+
 	act'I love attention':
 		foto_documentary['question_2'] = 5
 		cla & *clr
@@ -254,7 +254,7 @@ if $ARGS[0] = 'documentary_2':
 		*nl
 		gs 'foto_model_documentary','documentary_3'
 	end
-	
+
 	if pcs_inhib < 20 or studio_inhib > 0:
 		act'To build confidence':
 			foto_documentary['question_2'] = 5
@@ -271,7 +271,7 @@ if $ARGS[0] = 'documentary_2':
 			gs 'foto_model_documentary','documentary_3'
 		end
 	end
-	
+
 	if Exhibitionist_lvl > 0:
 		act'It turns me on':
 			foto_documentary['question_2'] = 6
@@ -301,7 +301,7 @@ if $ARGS[0] = 'documentary_3':
 		*nl
 		gs 'foto_model_documentary','documentary_4'
 	end
-	
+
 	act'I want to be the number one model in the city':
 		foto_documentary['question_3'] = 2
 		cla & *clr
@@ -318,7 +318,7 @@ if $ARGS[0] = 'documentary_3':
 			*nl
 			gs 'foto_model_documentary','documentary_4'
 		end
-		
+
 		act'Personal':
 			foto_documentary['question_3.2'] = 2
 			cla & *clr
@@ -329,7 +329,7 @@ if $ARGS[0] = 'documentary_3':
 			gs 'foto_model_documentary','documentary_4'
 		end
 	end
-	
+
 	act'No, I hate dieting':
 		foto_documentary['question_3'] = 3
 		cla & *clr
@@ -345,7 +345,7 @@ if $ARGS[0] = 'documentary_3':
 			gs 'foto_model_documentary','documentary_4'
 		end
 	end
-	
+
 	act'As long as it pays the bills':
 		foto_documentary['question_3'] = 4
 		cla & *clr
@@ -355,7 +355,7 @@ if $ARGS[0] = 'documentary_3':
 		*nl
 		gs 'foto_model_documentary','documentary_4'
 	end
-	
+
 	act'Yes! I love this job!':
 		foto_documentary['question_3'] = 5
 		cla & *clr
@@ -365,7 +365,7 @@ if $ARGS[0] = 'documentary_3':
 		*nl
 		gs 'foto_model_documentary','documentary_4'
 	end
-	
+
 	act'I''m not sure yet':
 		foto_documentary['question_3'] = 6
 		cla & *clr
@@ -393,7 +393,7 @@ if $ARGS[0] = 'documentary_4':
 			gs 'foto_model_documentary','documentary_5'
 		end
 	end
-	
+
 	if studio_inhib > 0:
 		act'It used to be worse but I''m still a little shy':
 			foto_documentary['question_4'] = 2
@@ -403,7 +403,7 @@ if $ARGS[0] = 'documentary_4':
 			*nl
 			gs 'foto_model_documentary','documentary_5'
 		end
-		
+
 		act'I used to be shy but now I''m not':
 			foto_documentary['question_4'] = 3
 			cla & *clr
@@ -413,7 +413,7 @@ if $ARGS[0] = 'documentary_4':
 			gs 'foto_model_documentary','documentary_5'
 		end
 	end
-	
+
 	act'I haven''t been shy since I was little':
 		foto_documentary['question_4'] = 4
 		cla & *clr
@@ -422,7 +422,7 @@ if $ARGS[0] = 'documentary_4':
 		*nl
 		gs 'foto_model_documentary','documentary_5'
 	end
-	
+
 	act'I''ve never been shy':
 		foto_documentary['question_4'] = 5
 		cla & *clr
@@ -431,8 +431,8 @@ if $ARGS[0] = 'documentary_4':
 		*nl
 		gs 'foto_model_documentary','documentary_5'
 	end
-	
-	
+
+
 	act'I''m fucking hot and I know it':
 		foto_documentary['question_4'] = 6
 		cla & *clr
@@ -455,7 +455,7 @@ if $ARGS[0] = 'documentary_5':
 		*nl
 		gs 'foto_model_documentary','documentary_6'
 	end
-	
+
 	act'It''s really embarrassing':
 		foto_documentary['question_5'] = 2
 		cla & *clr
@@ -464,7 +464,7 @@ if $ARGS[0] = 'documentary_5':
 		*nl
 		gs 'foto_model_documentary','documentary_6'
 	end
-	
+
 	act'I''m not very comfortable with it':
 		foto_documentary['question_5'] = 3
 		cla & *clr
@@ -473,7 +473,7 @@ if $ARGS[0] = 'documentary_5':
 		*nl
 		gs 'foto_model_documentary','documentary_6'
 	end
-	
+
 	if studio_inhib > 0:
 		act'I got used to it eventually':
 			foto_documentary['question_5'] = 4
@@ -483,7 +483,7 @@ if $ARGS[0] = 'documentary_5':
 			*nl
 			gs 'foto_model_documentary','documentary_6'
 		end
-		
+
 		act'I think it really helped me':
 			foto_documentary['question_5'] = 5
 			cla & *clr
@@ -493,7 +493,7 @@ if $ARGS[0] = 'documentary_5':
 			gs 'foto_model_documentary','documentary_6'
 		end
 	end
-	
+
 	act'I don''t really mind it':
 		foto_documentary['question_5'] = 6
 		cla & *clr
@@ -502,7 +502,7 @@ if $ARGS[0] = 'documentary_5':
 		*nl
 		gs 'foto_model_documentary','documentary_6'
 	end
-	
+
 	act'I love it!':
 		foto_documentary['question_5'] = 7
 		cla & *clr
@@ -511,7 +511,7 @@ if $ARGS[0] = 'documentary_5':
 		*nl
 		gs 'foto_model_documentary','documentary_6'
 	end
-	
+
 	act'I think it promotes camaraderie':
 		foto_documentary['question_5'] = 8
 		cla & *clr
@@ -520,15 +520,15 @@ if $ARGS[0] = 'documentary_5':
 		*nl
 		gs 'foto_model_documentary','documentary_6'
 	end
-	
-	
+
+
 !!	if Exhibitionist_lvl > 0:
 !!		act'It gets me wet':
 !!			foto_documentary['question_5'] = 8
 !!			cla & *clr
 !!			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
-!!			
-!!			
+!!
+!!
 !!			gs 'foto_model_documentary','documentary_6'
 !!		end
 !!	end
@@ -546,7 +546,7 @@ if $ARGS[0] = 'documentary_6':
 		*nl
 		gs 'foto_model_documentary','documentary_7'
 	end
-	
+
 	act'Sports':
 		foto_documentary['question_6'] = 2
 		cla & *clr
@@ -557,7 +557,7 @@ if $ARGS[0] = 'documentary_6':
 		*nl
 		gs 'foto_model_documentary','documentary_7'
 	end
-	
+
 	act'Dancing':
 		foto_documentary['question_6'] = 3
 		cla & *clr
@@ -566,7 +566,7 @@ if $ARGS[0] = 'documentary_6':
 		*nl
 		gs 'foto_model_documentary','documentary_7'
 	end
-	
+
 	act'I''m a foodie':
 		foto_documentary['question_6'] = 4
 		cla & *clr
@@ -579,7 +579,7 @@ if $ARGS[0] = 'documentary_6':
 		*nl
 		gs 'foto_model_documentary','documentary_7'
 	end
-	
+
 	act'Going clubbing':
 		foto_documentary['question_6'] = 5
 		cla & *clr
@@ -588,7 +588,7 @@ if $ARGS[0] = 'documentary_6':
 		*nl
 		gs 'foto_model_documentary','documentary_7'
 	end
-	
+
 	act'Having sex (clean answer)':
 		foto_documentary['question_6'] = 6
 		cla & *clr
@@ -603,7 +603,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		if husband > 0:
 			act'With my husband':
 				cla & *clr
@@ -620,7 +620,7 @@ if $ARGS[0] = 'documentary_6':
 				*nl
 				gs 'foto_model_documentary','documentary_7'
 			end
-			
+
 			act'With <b>a</b> boyfriend':
 				cla & *clr
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/9.mp4"></video></center>'
@@ -629,7 +629,7 @@ if $ARGS[0] = 'documentary_6':
 				gs 'foto_model_documentary','documentary_7'
 			end
 		end
-		
+
 		act'Why not girlfriends?':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
@@ -638,7 +638,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		act'Group sex':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/4.mp4"></video></center>'
@@ -647,7 +647,7 @@ if $ARGS[0] = 'documentary_6':
 			gs 'foto_model_documentary','documentary_7'
 		end
 	end
-	
+
 	act'Having sex (slutty answer)':
 		foto_documentary['question_6'] = 6
 		cla & *clr
@@ -663,7 +663,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		if husband > 0:
 			act'With my husband':
 				cla & *clr
@@ -680,7 +680,7 @@ if $ARGS[0] = 'documentary_6':
 				*nl
 				gs 'foto_model_documentary','documentary_7'
 			end
-			
+
 			act'With <b>a</b> boyfriend':
 				cla & *clr
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/12.mp4"></video></center>'
@@ -690,7 +690,7 @@ if $ARGS[0] = 'documentary_6':
 				gs 'foto_model_documentary','documentary_7'
 			end
 		end
-		
+
 		act'Why not girlfriends?':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/1.mp4"></video></center>'
@@ -699,7 +699,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		act'Group sex':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
@@ -709,7 +709,7 @@ if $ARGS[0] = 'documentary_6':
 			gs 'foto_model_documentary','documentary_7'
 		end
 	end
-	
+
 	act'Masturbating':
 		foto_documentary['question_6'] = 7
 		cla & *clr
@@ -727,7 +727,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		act'... with my dildo':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
@@ -738,7 +738,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		act'... in the shower':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
@@ -748,7 +748,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		act'... in the bath':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
@@ -758,7 +758,7 @@ if $ARGS[0] = 'documentary_6':
 			*nl
 			gs 'foto_model_documentary','documentary_7'
 		end
-		
+
 		act'... with my shower dildo':
 			cla & *clr
 			'<center><video autoplay loop src="images/locations/city/citycenter/photo/special/interview/6.mp4"></video></center>'
@@ -767,9 +767,9 @@ if $ARGS[0] = 'documentary_6':
 			'"Masturbating! Honestly, my interests are pretty all over the place so I don''t know if any of those really classify as hobbies, but the one thing I do all the time is masturbate with my shower dildo. Nice steamy room, hot water, a shower head to use for vibrations, a nice rubber dick to fill me up, oh man. I could spend hours in there."'
 			*nl
 			gs 'foto_model_documentary','documentary_7'
-		end		
+		end
 	end
-	
+
 	act'Nothing in particular':
 		foto_documentary['question_6'] = 8
 		cla & *clr
@@ -794,7 +794,7 @@ if $ARGS[0] = 'documentary_7':
 		*nl
 		gs 'foto_model_documentary','documentary_8'
 	end
-	
+
 	act'Something fun with lots of activities':
 		foto_documentary['question_7'] = 2
 		cla & *clr
@@ -803,7 +803,7 @@ if $ARGS[0] = 'documentary_7':
 		*nl
 		gs 'foto_model_documentary','documentary_8'
 	end
-	
+
 	act'Dinner and a movie':
 		foto_documentary['question_7'] = 3
 		cla & *clr
@@ -812,7 +812,7 @@ if $ARGS[0] = 'documentary_7':
 		*nl
 		gs 'foto_model_documentary','documentary_8'
 	end
-	
+
 	act'A long walk with scenery':
 		foto_documentary['question_7'] = 4
 		cla & *clr
@@ -821,7 +821,7 @@ if $ARGS[0] = 'documentary_7':
 		*nl
 		gs 'foto_model_documentary','documentary_8'
 	end
-	
+
 	act'Something thrilling':
 		foto_documentary['question_7'] = 5
 		cla & *clr
@@ -830,7 +830,7 @@ if $ARGS[0] = 'documentary_7':
 		*nl
 		gs 'foto_model_documentary','documentary_8'
 	end
-	
+
 	act'A romantic evening that ends in sex':
 		foto_documentary['question_7'] = 6
 		cla & *clr
@@ -855,7 +855,7 @@ if $ARGS[0] = 'documentary_8':
 		*nl
 		gs 'foto_model_documentary','documentary_9'
 	end
-	
+
 	act'Day drinking':
 		foto_documentary['question_8'] = 2
 		cla & *clr
@@ -864,7 +864,7 @@ if $ARGS[0] = 'documentary_8':
 		*nl
 		gs 'foto_model_documentary','documentary_9'
 	end
-	
+
 	act'Binge watching':
 		foto_documentary['question_8'] = 3
 		cla & *clr
@@ -873,7 +873,7 @@ if $ARGS[0] = 'documentary_8':
 		*nl
 		gs 'foto_model_documentary','documentary_9'
 	end
-	
+
 	act'Bad romcoms':
 		foto_documentary['question_8'] = 4
 		cla & *clr
@@ -882,7 +882,7 @@ if $ARGS[0] = 'documentary_8':
 		*nl
 		gs 'foto_model_documentary','documentary_9'
 	end
-	
+
 	act'Social media':
 		foto_documentary['question_8'] = 5
 		cla & *clr
@@ -891,7 +891,7 @@ if $ARGS[0] = 'documentary_8':
 		*nl
 		gs 'foto_model_documentary','documentary_9'
 	end
-	
+
 	act'Sleeping in':
 		foto_documentary['question_8'] = 6
 		cla & *clr
@@ -914,7 +914,7 @@ if $ARGS[0] = 'documentary_9':
 		*nl
 		gs 'foto_model_documentary','documentary_10'
 	end
-	
+
 	act'Panties':
 		foto_documentary['question_9'] = 2
 		cla & *clr
@@ -923,7 +923,7 @@ if $ARGS[0] = 'documentary_9':
 		*nl
 		gs 'foto_model_documentary','documentary_10'
 	end
-	
+
 	act'I sleep naked':
 		foto_documentary['question_9'] = 3
 		cla & *clr
@@ -932,7 +932,7 @@ if $ARGS[0] = 'documentary_9':
 		*nl
 		gs 'foto_model_documentary','documentary_10'
 	end
-	
+
 	act'Negligee':
 		foto_documentary['question_9'] = 4
 		cla & *clr
@@ -941,7 +941,7 @@ if $ARGS[0] = 'documentary_9':
 		*nl
 		gs 'foto_model_documentary','documentary_10'
 	end
-	
+
 	act'A big t-shirt and panties':
 		foto_documentary['question_9'] = 5
 		cla & *clr
@@ -950,7 +950,7 @@ if $ARGS[0] = 'documentary_9':
 		*nl
 		gs 'foto_model_documentary','documentary_10'
 	end
-	
+
 	act'Just a big t-shirt':
 		foto_documentary['question_9'] = 6
 		cla & *clr
@@ -961,7 +961,7 @@ if $ARGS[0] = 'documentary_9':
 		*nl
 		gs 'foto_model_documentary','documentary_10'
 	end
-	
+
 	act'Pajamas':
 		foto_documentary['question_9'] = 7
 		cla & *clr
@@ -983,7 +983,7 @@ if $ARGS[0] = 'documentary_10':
 		*nl
 		gs 'foto_model_documentary','documentary_11'
 	end
-	
+
 	act'Early morning to do chores':
 		foto_documentary['question_10'] = 2
 		cla & *clr
@@ -994,7 +994,7 @@ if $ARGS[0] = 'documentary_10':
 		*nl
 		gs 'foto_model_documentary','documentary_11'
 	end
-	
+
 	act'Early morning with a light breakfast':
 		foto_documentary['question_10'] = 3
 		cla & *clr
@@ -1003,7 +1003,7 @@ if $ARGS[0] = 'documentary_10':
 		*nl
 		gs 'foto_model_documentary','documentary_11'
 	end
-	
+
 	act'Anything involving coffee':
 		foto_documentary['question_10'] = 4
 		cla & *clr
@@ -1013,7 +1013,7 @@ if $ARGS[0] = 'documentary_10':
 		*nl
 		gs 'foto_model_documentary','documentary_11'
 	end
-	
+
 	act'Anything involving coffee (slightly crude/slutty)':
 		foto_documentary['question_10'] = 5
 		cla & *clr
@@ -1023,7 +1023,7 @@ if $ARGS[0] = 'documentary_10':
 		*nl
 		gs 'foto_model_documentary','documentary_11'
 	end
-	
+
 	act'Sleeping in followed by brunch':
 		foto_documentary['question_10'] = 6
 		cla & *clr
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'documentary_10':
 		*nl
 		gs 'foto_model_documentary','documentary_11'
 	end
-	
+
 	act'Wakeup sex':
 		foto_documentary['question_10'] = 7
 		cla & *clr
@@ -1056,7 +1056,7 @@ if $ARGS[0] = 'documentary_11':
 		*nl
 		act'Finish interview':gt'foto_model_documentary','1st_documentary_end'
 	end
-	
+
 	act'Early morning to do chores':
 		foto_documentary['question_11'] = 2
 		cla & *clr
@@ -1065,7 +1065,7 @@ if $ARGS[0] = 'documentary_11':
 		*nl
 		act'Finish interview':gt'foto_model_documentary','1st_documentary_end'
 	end
-	
+
 	act'Early morning with a light breakfast':
 		foto_documentary['question_11'] = 3
 		cla & *clr
@@ -1074,7 +1074,7 @@ if $ARGS[0] = 'documentary_11':
 		*nl
 		act'Finish interview':gt'foto_model_documentary','1st_documentary_end'
 	end
-	
+
 	act'Anything involving coffee':
 		foto_documentary['question_11'] = 4
 		cla & *clr
@@ -1083,7 +1083,7 @@ if $ARGS[0] = 'documentary_11':
 		*nl
 		act'Finish interview':gt'foto_model_documentary','1st_documentary_end'
 	end
-	
+
 	act'Anything involving coffee (slightly crude/slutty)':
 		foto_documentary['question_11'] = 5
 		cla & *clr
@@ -1092,7 +1092,7 @@ if $ARGS[0] = 'documentary_11':
 		*nl
 		act'Finish interview':gt'foto_model_documentary','1st_documentary_end'
 	end
-	
+
 	act'Sleeping in followed by brunch':
 		foto_documentary['question_11'] = 6
 		cla & *clr
@@ -1101,7 +1101,7 @@ if $ARGS[0] = 'documentary_11':
 		*nl
 		act'Finish interview':gt'foto_model_documentary','1st_documentary_end'
 	end
-	
+
 	act'':
 		foto_documentary['question_11'] = 7
 		cla & *clr
@@ -1131,9 +1131,9 @@ if $ARGS[0] = '1st_documentary_end':
 	'"No problem! You were a very good interviewer."'
 	*nl
 	'After exchanging a few more pleasantries, they hand you an envelope filled with bills that count out to <<modelpayfin>> <b>₽</b> and call the next girl in from the side.'
-	
+
 	foto['1st_documentary'] = 1
-	
+
 	act'Leave':gt'foto','studio'
 end
 

+ 2 - 2
locations/gameover.qsrc

@@ -90,9 +90,9 @@ if $ARGS[0] = 'endscreen':
 end
 
 if $ARGS[0] = 'load_autosave':
-	if mid($start_type,1,4) = 'city':
+	if $start_loc = 'city':
 		opengame 'autosave_city.sav'
-	elseif mid($start_type,1,3) = 'uni':
+	elseif $start_loc = 'uni':
 		opengame 'autosave_uni.sav'
 	else
 		opengame 'autosave_sg.sav'

+ 11 - 11
locations/gdksport.qsrc

@@ -23,7 +23,7 @@ if $ARGS[0] = 'start':
 	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and cheerleaders_on = 1: 'Albina is at cheerleading, so there is no Starlets training today.'
 
 	if kotovLoveQW > 0 and hour = 16: 'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
-	
+
 	if npc_rel['A3'] >= 60 and hour = 17 and ivansportday ! daystart: 'You see <a href="exec:minut += 3 & gt ''IvanEv''">Ivan Prokhorov</a> with a large sports bag entering the sports club.'
 
 	if npc_rel['A5'] >= 80 and fedorKozlovQW = 0 and hotcat >= 5 and fedorkozbreak < 2 and fame['pav_slut'] <= 75: gt 'gdksport', 'Fedor First Date'
@@ -66,7 +66,7 @@ if $ARGS[0] = 'start':
 
 	gs 'wardrobe', 'default_sport_options'
 
-	if shampoo > 0 or (mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
+	if shampoo > 0 or ($start_loc = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0)):
 		act 'Take a shower': gt 'gdksport', 'shower'
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
@@ -149,9 +149,9 @@ if $ARGS[0] = 'start':
 			end
 		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
 			if hour = 15 and starlets_on = 1:
-				if func('body_din','pregnancyVisibility') = 1:  
+				if func('body_din','pregnancyVisibility') = 1:
 					act 'Train with Starlets': gt 'albina_starlets', 'Starletsreact'
-				elseif grupTipe = 5: 
+				elseif grupTipe = 5:
 					act 'Train with Starlets': gt 'albina_starlets', 'StarletsEnd'
 				elseif starlets_missed = 1:
 					starlets_missed = 0
@@ -271,7 +271,7 @@ if $ARGS[0] = 'dance2':
 		'There is nothing you can learn from this dance class with your current skill. You need to find a new teacher or travel to the city to find better dance classes if you wish to improve further, it is still good exercise.'
 
 		act 'Leave':
-			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
+			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and $start_loc = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
 				if alterstrtimg = 13:
 					gt 'albina_starlets', 'albina3'
 				elseif (grupTipe = 1 or grupTipe = 2) and npc_rel['A23'] >= 60:
@@ -580,7 +580,7 @@ if $ARGS[0] = 'shower':
 	menu_off = 1
 	*clr & cla
 	$location_type = 'bathroom'
-	if mid($start_type,1,2) = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
+	if $start_loc = 'sg' and (SchoolAtestat = 0 or SchoolBlock = 0): noShampoo = 1
 	dynamic $showerdin
 	minut += 15
 	pcs_horny += 1
@@ -645,7 +645,7 @@ if $ARGS[0] = 'shower':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/shower2.jpg"></center>'
 			'Completely surprised and confused by Ivan''s sudden appearance, you are struck speechless. Ivan takes your inaction and silence as consent, and he walks into the shower room and closes the door behind him.'
-			
+
 			gs 'willpower', 'bj', 'resist', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Escape from the shower (<<will_cost>> Willpower)':
@@ -821,7 +821,7 @@ if $ARGS[0] = 'Ivan_bored':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/ivan/School/ivan2.jpg"></center>'
 	'You look at Ivan for a long moment and bite your lower lip and then whisper just loud enough that he can barely hear you. "I''m bored..." He looks at you for a moment then smiles. He looks around, then takes you by the hand and leads you away from the others, into one of the lesser used areas of the school. He stops at one of the boys restrooms, going inside and leaving you outside. A few moments later, two younger boys are sent packing by Ivan. Once they round the corner, he pulls you into the bathroom.'
-	
+
 	gs 'willpower', 'anal', 'resist'
 	if will_cost <= pcs_willpwr:
 		act 'Leave (<<will_cost>> Willpower)':
@@ -923,7 +923,7 @@ if $ARGS[0] = 'Fedor First Date':
 
 				act 'Leave': gt 'pav_residential'
 			end
-			
+
 			act 'Refuse':
 				*clr & cla
 				if fedorkozbreak = 0:fedorKozlovQW = 0
@@ -947,7 +947,7 @@ if $ARGS[0] = 'Fedor First Date':
 			end
 		end
 	end
-	
+
 	act 'Refuse':
 		*clr & cla
 		if npc_rel['A5'] > 70:
@@ -970,7 +970,7 @@ if $ARGS[0] = 'vballreact':
 	'As you approach the team, your coach notices you and calls you aside. "<<$pcs_firstname>>, are you pregnant? I can''t let you play like that. Also, a pregnant teenager would definitely reflect poorly on me and the rest of the team. Sorry, but off the team." Tears welling in your eyes, you leave.'
 	minut += 5
 	gs 'stat'
-	
+
 	act 'Continue':npc_pregtalk['A69'] = 1 & gt 'pav_commcenter'
 end
 

+ 5 - 3
locations/getrandom.qsrc

@@ -1,12 +1,14 @@
 # getrandom
 !! ARGS 0 - execution code flag
 
+startindex = iif(count, count + 1, 0)
 count = ARRSIZE('$randomArr')
 count -= 1
 if ARGS[0] = 1:
-	dynamic $randomArr[rand(0,count)]
+	dynamic $randomArr[rand(startindex,count)]
 else
-	$result = $randomArr[rand(0,count)]
+	$result = $randomArr[rand(startindex,count)]
 end
-killvar 'count' & killvar '$randomArr'
+killvar 'startindex' & killvar 'count' & killvar '$randomArr'
+
 --- getrandom ---------------------------------

+ 4 - 4
locations/gkafe.qsrc

@@ -71,12 +71,12 @@ if $ARGS[0] = '':
 			'A small shabby cafe attached to the train station.'
 
 			act 'Leave':gt 'pav_market'
-			
+
 			gs 'gkafe', 'menu'
 
-			if mid($start_type,1,2) = 'sg':
+			if $start_loc = 'sg':
 				if SchoolBlock = 0:
-					if func('homes_properties', 'has_access', 'parents_home'): 
+					if func('homes_properties', 'has_access', 'parents_home'):
 						'Since your <<$npc_nickname[''A29'']>> works here, you can eat-in for free.'
 					else
 						'Since you left home, you can no longer eat here for free.'
@@ -116,7 +116,7 @@ if $ARGS[0] = '':
 				act '"Drink tea" with Misha':gs 'boyStat', 'A54' & sexpartkno = 1 & gt 'gevent', '1-1'
 			end
 		end
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+		if $start_loc = 'sg' and SchoolAtestat = 0:
 			if (sunWeather = 0 or temper <= 0) and (hour >= 18 and hour < 20 and week < 6) or (week >= 6 and hour >= 9 and hour < 20):
 				'<a href="exec:minut += 3 & gt ''gopskver''">Vitek, Dan and Vasily</a> are sitting at a table in the far corner.'
 			end

+ 9 - 9
locations/gschool_grounds.qsrc

@@ -25,11 +25,11 @@ if $ARGS[0] = 'main':
 	'Pavlovsk''s only school, where all the local children go for their education. Next to the school is the athletic field and a parking lot for the teachers, with a large grove of trees just beyond them.'
 	'Hidden behind these trees is the old school building, which was supposed to be renovated and used for advance classes after the new one was built, but budget cuts meant the project was cancelled and now the old building stands empty and abandoned. It''s a popular spot for students to skip class or hang out outside of school.'
 
-	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
+	if ((hour = 6 and minut >= 30) or (hour >= 7 and hour < 18)) and $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and suspended['on'] ! 1:
 		'With the school open you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 	end
 
-	if day = nyp_day and month = 12 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+	if day = nyp_day and month = 12 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 		if hour >= 14 and hour < 17:
 			'All of the boys and girls are standing near the school. Everyone did their best to look good today, wearing their nicest clothes. Someone calls out to you. "Hey <<$pcs_nickname>>, are you coming to the New Year''s Eve party or not? You haven''t paid the 1000 <b>₽</b> entry fee yet!"'
 
@@ -87,7 +87,7 @@ if $ARGS[0] = 'main':
 			gs 'stat'
 
 			if func('homes_properties', 'has_access', 'parents_home'):
-				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'				
+				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. You turn your head and see your mother and your brother sitting among them.'
 			else
 				'Everyone from your year is assembled in the auditorium of the school. Your teachers are standing on a platform in front of several rows of chairs where you and your classmates are sitting. Some parents and siblings are sitting in the back rows. Nobody from your family showed up.'
 			end
@@ -143,7 +143,7 @@ if $ARGS[0] = 'main':
 
 !!	act 'Go to the Principals Office': gt
 
-	if week < 6 and hour >= 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
+	if week < 6 and hour >= 6 and $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and SchoolBlock = 0 and suspended['on'] ! 1:
 		if PCloStyle2 = 4 or Enable_sforma = 1:
 			if hour = 6:
 				if minut < 30:
@@ -190,7 +190,7 @@ if $ARGS[0] = 'main':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint behind the school building': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	if week = 6 and hour = 8 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
+	if week = 6 and hour = 8 and $start_loc = 'sg' and SchoolAtestat = 0 and detention_set = 1 and SchoolBlock = 0: act 'Go to detention': gt 'gschool_detention', 'start'
 
 	if christinaQW['pre_fight'] = 1 and week < 6 and hour = 14 and kanikuli = 0:
 		act 'Attack Christina':
@@ -375,7 +375,7 @@ if $ARGS[0] = 'sports':
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
-	if hour >= 9 and hour < 18 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0: 'With the school open, you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
+	if hour >= 9 and hour < 18 and $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0: 'With the school open, you can go to the <a href="exec: minut += 1 & gt ''gschool_grounds'', ''change_room''">changing rooms</a> by the gym and change your outfit.'
 
 	if week = 6 and SchoolSorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl
@@ -822,7 +822,7 @@ if $ARGS[0] = 'Family extension':
 					'"Hey, don''t worry about it. As I said well done, but I''d be interested to hear what''s going on with you so don''t worry about disturbing me."'
 					'"Okay, thanks Anya... I''ll try." You give her a hug.'
 				end
-				
+
 				'Your stepfather now joins the conversation. "Come on <<$pcs_nickname>>, get showered and changed and we''ll meet you outside. We''re all going out for dinner to celebrate."'
 				'"You don''t have to! I know money is tight and I''m already so happy you all took the time to come and support me. It means a lot."'
 				'"No, I insist. I''ve talked about this with your <<$npc_nickname[''A29'']>> and she agrees. It''s not often we get the chance to do something like this and we think that some quality family time would be good for all of us."'
@@ -926,7 +926,7 @@ if $ARGS[0] = 'Family extension':
 							'Unsure how to respond, you sigh. "Okay <<$npc_nickname[''A29'']>>, I''ll try. It''s just that it can get a bit overbearing."'
 							'Your mother continues. "Okay, let''s just try to get our relationship back to a good place. Please promise me that you''ll do your best in school too. Also, no matter what please know that you can always talk to me if something is worrying you. Please know that I do love you and want the best for you."'
 							'This is the closest you''ve felt to your mother for ages, so you get up and give her a hug. "Thanks <<$npc_nickname[''A29'']>>. I''m glad we had this chat to clear the air. I love you too and it''ll be good to have my <<$npc_nickname[''A29'']>> back." She hugs you back and you both finish your meals with some more relaxed conversation.'
-							'After that, you both feel much relieved and emotionally drained, but happier.'					
+							'After that, you both feel much relieved and emotionally drained, but happier.'
 						end
 						npc_rel['A29'] = 50
 						minut += 60
@@ -958,7 +958,7 @@ if $ARGS[0] = 'Family extension':
 				gs 'stat'
 				'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 				'A few minutes later, you reappear showered and changed and head off to the station cafe.'
-				
+
 				act 'Have a drink with Anya':
 					*clr & cla
 					gs 'drugs', 'alcohol', 'beer', 4

+ 103 - 103
locations/hookup.qsrc

@@ -74,16 +74,16 @@ if $ARGS[0] = 'start':
 					'Your smirk turns into a full blown grin and you give him just a few more jerks to make sure he''s as erect as possible before dipping your head down and doing as he asks.'
 					act'Blow him':gt'hookup','bj'
 				end
-				
+
 				!!{act'69 him instead':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/bed_jerk.jpg"></center>'
 					'You give him another kiss and smile back at him before sitting up and reversing yourself on the bed, throwing one leg over his head and getting to work on the hard cock in front of you.'
 					act'Enjoy yourself':gt'hookup','69_1'
-					
+
 					act'Go through the motions':gt'hookup','69_2'
 				end}
-				
+
 				act'How about we skip the foreplay?':
 					cla & *nl
 					'"How about we skip the foreplay and instead of putting this cock in my mouth, you stuff it in my pussy?"'
@@ -96,9 +96,9 @@ if $ARGS[0] = 'start':
 				gs'hookup','position_choose'
 			end
 		end
-			
+
 		act'Suck his cock':gt'hookup','bj'
-		
+
 		act'Skip the foreplay':
 			cla & *nl
 			'"Let''s skip the foreplay," you say, heading towards the bed. "I wanna fuck <i>now</i>."'
@@ -106,15 +106,15 @@ if $ARGS[0] = 'start':
 			gs'hookup','condoms'
 			gs'hookup','position_choose'
 		end
-		
+
 		act'Let him lead':
 			cla & *clr
 			hookup['position'] = rand(1,4)
 			if $npc_fav_pos[$boy] = 'blowjob' or (hookup['position'] = 4 and ($npc_fav_pos[$boy] ! 'missionary' or $npc_fav_pos[$boy] ! 'doggy' or $npc_fav_pos[$boy] ! 'cowgirl')):
 				hookup['he_choose_bj'] = 1
-				gt'hookup','bj'	
+				gt'hookup','bj'
 			elseif ($npc_fav_pos[$boy] = 'missionary' or $npc_fav_pos[$boy] = 'doggy' or $npc_fav_pos[$boy] = 'cowgirl') or (hookup['position'] < 4 and ($npc_fav_pos[$boy] ! 'missionary' or $npc_fav_pos[$boy] ! 'doggy' or $npc_fav_pos[$boy] ! 'cowgirl')):
-				gt'hookup','position_he_choose'	
+				gt'hookup','position_he_choose'
 			end
 		end
 	else
@@ -122,10 +122,10 @@ if $ARGS[0] = 'start':
 			hookup['position'] = rand(1,4)
 			if $npc_fav_pos[$boy] = 'blowjob' or (hookup['position'] = 4 and ($npc_fav_pos[$boy] ! 'missionary' or $npc_fav_pos[$boy] ! 'doggy' or $npc_fav_pos[$boy] ! 'cowgirl')):
 				hookup['he_choose_bj'] = 1
-				gt'hookup','bj'	
+				gt'hookup','bj'
 			elseif ($npc_fav_pos[$boy] = 'missionary' or $npc_fav_pos[$boy] = 'doggy' or $npc_fav_pos[$boy] = 'cowgirl') or (hookup['position'] < 4 and ($npc_fav_pos[$boy] ! 'missionary' or $npc_fav_pos[$boy] ! 'doggy' or $npc_fav_pos[$boy] ! 'cowgirl')):
 				hookup['he_choose_position'] = 1
-				gt'hookup','position_he_choose'	
+				gt'hookup','position_he_choose'
 			end
 		end
 	end
@@ -134,7 +134,7 @@ end
 if $ARGS[0] = 'bj':
 	gs 'arousal','bj',rand(2,5)
 	gs 'stat'
-	
+
 	if hookup['bj'] > 0:
 		if daystage = 1 or daystage = 4:
 			$hookup['tonight_or_today'] = 'tonight'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'bj':
 			hookup['cum_choice'] = rand(1,3)
 			act'Continue':gs'hookup','bj_cum'
 		end
-		
+
 		act'Just go through the motions':
 			cla & *nl
 			if hookup['return_bj'] = 1:
@@ -199,7 +199,7 @@ if $ARGS[0] = 'bj':
 					gs'hookup','position_choose'
 				end
 			end
-			
+
 			act'Getting kind of tired down here...':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/blowjob/bj47.mp4"></video></center>'
@@ -210,7 +210,7 @@ if $ARGS[0] = 'bj':
 				gs'hookup','position_choose'
 			end
 		end
-		
+
 		act'Let''s get to the good part':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/foreplay/jerk.mp4"></video></center>'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'bj_cum':
 			gs'hookup','bj_react2'
 			gs'hookup','bj_react3'
 		end
-		
+
 		act'Take it in stride (spit)':
 			hookup['bj_cum'] = 2
 			gs'cum_call', 'mouth', $boy, 1
@@ -260,7 +260,7 @@ if $ARGS[0] = 'bj_cum':
 				gs'hookup','bj_react3'
 			end
 		end
-		
+
 		act'Panic swallow!':
 			hookup['bj_cum'] = 3
 			hookup['swallow'] = 1
@@ -272,14 +272,14 @@ if $ARGS[0] = 'bj_cum':
 			gs'hookup','bj_react1.1'
 			gs'hookup','bj_react3'
 		end
-!!{		
+!!{
 		act'Yelp and jump back':
 			gs'cum_call', 'mouth', $boy, 1
 			gs'cum_call', 'mouth_swallow', $boy, 1
 			hookup['bj_cum'] = 4
 			cla & *clr
 			!! IMAGE HERE
-			
+
 		end}
 	elseif hookup['cum_choice'] = 2:
 		'"I''m gonna cum!"'
@@ -296,7 +296,7 @@ if $ARGS[0] = 'bj_cum':
 			gs'hookup','bj_react2'
 			gs'hookup','bj_react4'
 		end
-		
+
 		act'Finish him off (spit)':
 			hookup['bj_cum'] = 2
 			$hookup['cum_choice'] = 'face'
@@ -309,7 +309,7 @@ if $ARGS[0] = 'bj_cum':
 			'You draw back until your lips are right at the tip of his cock and rapidly start working it with your hands until you feel hot sperm shooting into your mouth. You pull back, immediately spitting it out onto his stomach even as he continues to cum, a stray shot hitting you square in the chin as you wipe your mouth.'
 			gs'hookup','bj_react1.2'
 		end
-		
+
 		act'Trade places':
 			cla & *clr
 			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -317,7 +317,7 @@ if $ARGS[0] = 'bj_cum':
 			'"Hang on there big boy, can''t have you blowing your load on me just yet," you smile. You lay back and spread your legs, baring your pussy. "Your turn to show me what you''re made of."'
 			act'Get licked':gt'hookup','lick_pussy'
 		end
-			
+
 		act'Let''s fuck':
 			cla & *clr
 			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -352,7 +352,7 @@ if $ARGS[0] = 'bj_cum':
 				gs'hookup','bj_react3'
 				gs'hookup','bj_react4'
 			end
-			
+
 			act'Spit it out':
 				$hookup['cum_choice'] = 'face'
 				hookup['bj_cum'] = 2
@@ -367,7 +367,7 @@ if $ARGS[0] = 'bj_cum':
 				gs'hookup','bj_react3'
 			end
 		end
-		
+
 		act'Then let''s fuck':
 			cla & *clr
 			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -391,7 +391,7 @@ if $ARGS[0] = 'bj_react1.1':
 		elseif hookup['bj_cum'] = 3:
 			'"A little warning next time?!" you gulp again, feeling like there''s still cum sliming the back of your throat.'
 		elseif hookup['bj_cum'] = 4:
-			
+
 		end
 		'"You saying there''s going to be a next time?"'
 		act'Maybe':
@@ -401,7 +401,7 @@ if $ARGS[0] = 'bj_react1.1':
 			'"Maybe," you say, giving him a dirty smile.'
 			gs 'hookup','bj2'
 		end
-		
+
 		act'Sure':
 			cla & *clr
 			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -410,7 +410,7 @@ if $ARGS[0] = 'bj_react1.1':
 			'He returns your grin.'
 			gs 'hookup','bj2'
 		end
-		
+
 		if hookup['bj'] < 2:
 			act'Right now?':
 				cla & *nl
@@ -435,7 +435,7 @@ if $ARGS[0] = 'bj_react1.1':
 						end
 						gs'hookup_after','pre'
 					end
-					
+
 					act'Disappointing':
 						cla & *clr
 						'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -474,7 +474,7 @@ if $ARGS[0] = 'bj_react1.2':
 			else
 				'"Ugh! Seriously?" Despite just blowing his load in your mouth, he looks somewhat upset. "I told you, I wanted to fuck, not just get a blowjob."'
 			end
-			
+
 			if stat['think_virgin'] = 1:
 				act'Sorry, saving myself for marriage':
 					hookup['virgin'] = 1
@@ -486,7 +486,7 @@ if $ARGS[0] = 'bj_react1.2':
 						gs'hookup','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if mid($start_type,1,2) = 'sg': 
+						if $start_loc = 'sg':
 							'"I don''t know," you shrug. "Ask my mom why it matters so much."'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -495,14 +495,14 @@ if $ARGS[0] = 'bj_react1.2':
 					end
 				end
 			end
-			
+
 			act'Not what I wanted':
 				cla & *nl
 				hookup['get_out'] = 1
 				'"Sorry," you shrug. "Just wasn''t in the cards for you today. My pussy, my mouth. My choice."'
 				gs'hookup_after','start'
 			end
-			
+
 			act'We could keep going':
 				cla & *nl
 				'"Well, we could just keep going," you suggest, crawling over to <<$npc_firstname[$boy]>>. "Think you can get it up again for me?" Grabbing hold of his semi-flaccid cock, you lean into his ear.'
@@ -522,7 +522,7 @@ if $ARGS[0] = 'bj_react1.2':
 				'"Fuck, that was hot," he breathes.'
 				'"Glad you enjoyed it," you smirk back.'
 				gs $hookup['next_act1'],$hookup['next_act2']
-			end	
+			end
 		end
 	end
 end
@@ -546,7 +546,7 @@ if $ARGS[0] = 'bj_react2':
 						gs'hookup','generous_lick'
 					else
 						'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-						if mid($start_type,1,2) = 'sg': 
+						if $start_loc = 'sg':
 							'"I don''t know. Ask my mom why it matters so much," you shrug.'
 						else
 							'You shrug. "I''m still a virgin aren''t I?"'
@@ -593,7 +593,7 @@ if $ARGS[0] = 'bj_react3':
 				'<i>Well he''s being a bit rude himself,</i> you think, but at least his ego seems less bruised.'
 				gs 'hookup','bj2'
 			end
-			
+
 			act'Fuck you!':
 				cla & *clr
 				'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -637,7 +637,7 @@ if $ARGS[0] = 'bj2':
 		'"A turn what?"'
 		'"Getting head." <<$npc_firstname[$boy]>> begins creeping down towards your legs, kissing them all along the way until he''s between them.'
 		act'Get eaten out':gt'hookup','lick_pussy'
-		
+
 		act'I''d rather just fuck':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -646,8 +646,8 @@ if $ARGS[0] = 'bj2':
 			'"Well, shit. Hang on, gimme a minute to get hard again."'
 			act'Wait':gt'hookup','wait'
 		end
-		
-		
+
+
 		act'I''m okay (stop here)':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -663,7 +663,7 @@ if $ARGS[0] = 'bj2':
 				'"Oh. Well, if you say so." He pulls back and lays down on the bed next to you.'
 				gs'hookup_after','pre'
 			end
-			
+
 			act'You''re a stranger':
 				cla & *nl
 				hookup['get_out'] = 2
@@ -671,7 +671,7 @@ if $ARGS[0] = 'bj2':
 				'"Makes sense," he nods, withdrawing and laying down on the bed next to you.'
 				gs'hookup_after','pre'
 			end
-			
+
 			if stat['bj'] > 10:
 				act'I prefer giving head':
 					cla & *nl
@@ -705,7 +705,7 @@ if $ARGS[0] = 'bj2':
 						'"Sorry, but I''m saving myself for marriage," you say apologetically, reaching for your clothes.'
 						if rand(0,1) = 1:
 							'"Saving yourself for marriage but still give blowjobs to strangers?" he asks pointedly.'
-							if mid($start_type,1,2) = 'sg': 
+							if $start_loc = 'sg':
 								'"I don''t know. Ask my mom why it matters so much," you shrug.'
 							else
 								'You shrug. "I''m still a virgin aren''t I?"'
@@ -736,7 +736,7 @@ if $ARGS[0] = 'bj2':
 								'You get dressed in silence and give an awkward goodbye, closing the door behind you and stepping out into the hall.'
 								act'Leave':gt'hookup_after','exit'
 							end
-							
+
 							act'Call me sometime?':
 								cla & *nl
 								hookup['contact_info'] = 1
@@ -760,7 +760,7 @@ if $ARGS[0] = 'bj2':
 									act'Leave':gt'hookup_after','exit'
 								end
 							end
-							
+
 							act'Such as?':
 								cla & *nl
 								'"Such as?" you ask amusedly.'
@@ -777,7 +777,7 @@ if $ARGS[0] = 'bj2':
 										'You get dressed in silence and give an awkward goodbye, closing the door behind you and stepping out into the hall.'
 										act'Leave':gt'hookup_after','exit'
 									end
-									
+
 									act'That sounds nice':
 										cla & *clr
 										'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -792,7 +792,7 @@ if $ARGS[0] = 'bj2':
 						end
 					end
 				end
-				
+
 				act'Got stuff to do tomorrow':
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -802,7 +802,7 @@ if $ARGS[0] = 'bj2':
 					'You get dressed in silence and give an awkward goodbye, seeing yourself out.'
 					act'Leave':gt'hookup_after','exit'
 				end
-				
+
 				act'Leave your number':
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -822,10 +822,10 @@ if $ARGS[0] = 'bj2':
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
 					$npc_apt_bedroom[$boy]
 					'"Well I''m glad you enjoyed yourself," you smirk, throwing your clothes on while <<$npc_firstname[$boy]>> watches you get dressed from his bed. Once you''re finished, you see yourself out, waving goodbye just before you shut the door behind you.'
-					
+
 					act'Leave':gt'hookup_after','exit'
 				end
-				
+
 				act'Leave your number':
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -837,7 +837,7 @@ if $ARGS[0] = 'bj2':
 				end
 			end
 		end
-		
+
 		act'Wanna fuck now?':
 			if daystage = 1 or daystage = 4:
 				$hookup['tonight_or_today'] = 'tonight'
@@ -864,7 +864,7 @@ if $ARGS[0] = 'bj2':
 					end
 					gs'hookup_after','pre'
 				end
-				
+
 				act'Disappointing':
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -885,7 +885,7 @@ if $ARGS[0] = 'bj2':
 				act'Wait':gt'hookup','wait'
 			end
 		end
-		
+
 		act'Ask him to return the favor':
 			cla & *clr
 			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -900,7 +900,7 @@ if $ARGS[0] = 'bj2':
 					'"Uhh... Whatever, I guess..." you mumble quietly. He seems oblivious.'
 					gs'hookup_after','pre'
 				end
-				
+
 				act'Annoyed':
 					cla & *nl
 					hookup['selfish'] = 2
@@ -908,7 +908,7 @@ if $ARGS[0] = 'bj2':
 					'"Ugh, rude much?" you huff quietly, rolling your eyes. He seems oblivious.'
 					gs'hookup_after','pre'
 				end
-				
+
 				act'Get angry and leave':
 					cla & *nl
 					hookup['selfish'] = 2
@@ -930,9 +930,9 @@ if $ARGS[0] = 'bj2':
 						*nl
 						'<i>Fucking ridiculous!</i> you fume to yourself on your way out the door.'
 						act'Leave':gt'hookup_after','exit'
-					end			
+					end
 				end
-				
+
 				act'... then can we fuck?':
 					cla & *nl
 					hookup['selfish'] = 1
@@ -970,7 +970,7 @@ if $ARGS[0] = 'bj2':
 				act'Continue':gt'hookup','lick_pussy'
 			end
 		end
-		
+
 		act'End it there':
 			if daystage = 1 or daystage = 4:
 				$hookup['tonight_or_today'] = 'tonight'
@@ -1011,7 +1011,7 @@ if $ARGS[0] = 'bj2':
 							'"Well, if you''re really okay..." <<$npc_firstname[$boy]>> returns your smile, laying back in bed and relaxing.'
 							gs'hookup_after','pre'
 						end
-						
+
 						act'Well, if you''re offering':
 							cla & *nl
 							'"Well..." you bite your lip. "If you''re offering..."'
@@ -1055,7 +1055,7 @@ if $ARGS[0] = 'lick_pussy':
 					else
 						'"You''re welcome," he grins back.'
 					end
-					
+
 					if rand(0,1) = 1:
 						'You can''t help but notice the return of <<$npc_firstname[$boy]>>''s hardon. Seems he''s managed to get it up again while eating you out.'
 						act'I''m tired':
@@ -1132,15 +1132,15 @@ if $ARGS[0] = 'lick_pussy':
 									'"I just wanted to get off first," you smile, crawling towards him and dipping your head towards his cock.'
 									act'Blow him':gt'hookup','bj'
 								end
-								
+
 								act'It always ends when the guy cums':
 									cla & *nl
 									'"It always ends when the guy cums," you roll your eyes. "Didn''t want you running off before I got mine." Crawling towards him, you flash a grin before leaning down to take his cock in your mouth.'
 									act'Blow him':gt'hookup','bj'
 								end
-								
+
 								!!{act'Just don''t like cum':
-								
+
 								end}
 							end
 						elseif npc_generous[$boy] = 1:
@@ -1159,7 +1159,7 @@ if $ARGS[0] = 'lick_pussy':
 					'"You... you sure...?" <<$npc_firstname[$boy]>> looks down at his hardon as if contemplating'
 					gs'hookup_after','pre'
 				end}
-				
+
 				gs'hookup','condoms'
 				gs'hookup','position_choose'
 			end
@@ -1252,7 +1252,7 @@ if $ARGS[0] = 'lick_pussy':
 							'You get up, quickly grabbing your things and getting dressed before hussling out the door. At least you got off before he kicked you out though.'
 							act'Leave':gt'hookup_after','exit'
 						end
-						
+
 						!! act'Make a scene':
 					end
 					act'Guys do it all the time':
@@ -1283,7 +1283,7 @@ if $ARGS[0] = 'lick_pussy':
 						'"Well... I guess it''s only fair," you say. You motion for him to join you on the bed. Then taking his cock in your hand, you bend down to give him some head.'
 						act'Blow him':gt'hookup','bj'
 					end
-					
+
 					act'You earned it':
 						cla & *nl
 						'"Well... I guess you did earn it," you smile tiredly, motioning for him to join you on the bed.'
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'lick_pussy':
 						gs'hookup','position_choose'
 					end
 				end
-				
+
 				act'Want to fuck now?':
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'lick_pussy':
 				end
 			end
 		end
-		
+
 		if hookup['bj_cum'] > 0:
 			if stat['think_virgin'] = 1 and hookup['virgin'] = 1:
 				gs'hookup_virgin','virginity_take2'
@@ -1336,7 +1336,7 @@ end
 if $ARGS[0] = 'generous_lick':
 	'"Well, then how about I do this instead?" <<$npc_firstname[$boy]>> begins creeping downward, leaving a trail of kisses all along the way until he''s between them your legs.'
 	act'Get eaten out':gt'hookup','lick_pussy'
-	
+
 	act'I''m okay (stop here)':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
@@ -1352,7 +1352,7 @@ if $ARGS[0] = 'generous_lick':
 			'"Oh. Well, if you say so." He pulls back and lays down on the bed next to you.'
 			gs'hookup_after','pre'
 		end
-		
+
 		act'You''re a stranger':
 			cla & *nl
 			hookup['get_out'] = 2
@@ -1360,7 +1360,7 @@ if $ARGS[0] = 'generous_lick':
 			'"Makes sense," he nods, withdrawing and laying down on the bed next to you.'
 			gs'hookup_after','pre'
 		end
-		
+
 		if stat['bj'] > 10:
 			act'I prefer giving head':
 				cla & *nl
@@ -1402,12 +1402,12 @@ if $ARGS[0] = 'lick_pussy2':
 		'"I can''t!" you gasp. "Too much! Too sensitive!"'
 		'You snap your legs closed, one of your hands between them, shuddering as you wait for your sensitivity to die down.'
 	end
-	
+
 	act'You really like eating pussy':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"You... really like... eating pussy... huh...?" you pant, still quivering in sensitivity.'
-		'"I guess," he grins. "I suppose I just like giving more than receiving."'		
+		'"I guess," he grins. "I suppose I just like giving more than receiving."'
 		act'I''ve heard of guys like you':
 			cla & *nl
 			'"I''ve... heard of... guys like you..." You take a few deep breaths, finally managing to calm down a little bit. "Not gonna lie, that''s kind of weird."'
@@ -1419,7 +1419,7 @@ if $ARGS[0] = 'lick_pussy2':
 				'"Actually... that makes sense. Seeing how a guy reacts when you go down on him is like... the best part of going down on him. I guess I just didn''t think it applied to boys. Usually they only want to get off."'
 				gs'hookup_after','pre'
 			end
-			
+
 			act'Yeah, that''s weird':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -1431,12 +1431,12 @@ if $ARGS[0] = 'lick_pussy2':
 			end
 		end
 	end
-	
+
 	act'You''re really okay with not getting off?':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
 		'"You... you''re... you''re really... okay... with not... getting off?" you pant, still quivering in sensitivity.'
-		'"Not okay with it exactly," he shrugs. "I''ll probably jack off in the shower, thinking about eating you out later. And I like fucking girls. But yeah I guess I like making girls get off more."'		
+		'"Not okay with it exactly," he shrugs. "I''ll probably jack off in the shower, thinking about eating you out later. And I like fucking girls. But yeah I guess I like making girls get off more."'
 		act'I''ve heard of guys like you':
 			cla & *nl
 			'"I''ve... heard of... guys like you..." You take a few deep breaths, finally managing to calm down a little bit. "Not gonna lie, that''s kind of weird."'
@@ -1448,7 +1448,7 @@ if $ARGS[0] = 'lick_pussy2':
 				'"Actually... that makes sense. Seeing how a guy reacts when you go down on him is like... the best part of going down on him. I guess I just didn''t think it applied to boys. Usually they only want to get off."'
 				gs'hookup_after','pre'
 			end
-			
+
 			act'Yeah, that''s weird':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -1497,31 +1497,31 @@ end
 					'You wrap your lips back around his cock to continue the job, mewing through when he gets back to work too.'
 					act'Continue':gt'hookup','69_cum'
 				end
-				
+
 				act'Why don''t we fuck instead?':
-				
+
 				end
 			else
 				'"Ready to fuck now?" <<$npc_firstname[$boy]>> asks. "I''m done licking this pussy out, I want to see you stuffed with my cock instead."'
-				
+
 			end
 		end
 	else
-	
+
 		act'Keep going till he cums':
-		
+
 		act'Time for sex':
 			'You climb off of him preparing to fuck.'
 			gs'hookup','condoms'
 			gs'hookup','position_choose'
-		
+
 		end
 	end
 end}
 
 !!{if $ARGS[0] = '69_2':
 	!! IMAGE HERE
-	
+
 	hookup['orgasm'] = orgasm
 	!! AROUSAL HERE
 	if hookup['orgasm'] < orgasm:
@@ -1529,14 +1529,14 @@ end}
 	else
 		'Enjoyment description.'
 	end
-	
+
 	act'Keep going till he cums':
-	
+
 	act'Time for sex':
 		'You climb off of him preparing to fuck.'
 		gs'hookup','condoms'
 		gs'hookup','position_choose'
-	
+
 	end
 end}
 
@@ -1584,7 +1584,7 @@ if $ARGS[0] = 'condoms':
 						!! he said he put on a condom but he didn''t
 						'"I already put one on, don''t worry about it."'
 						gs'hookup_sex','insert'
-						
+
 					else
 						'"Don''t have any left. I''m all out."'
 						gs'hookup','no_condom2'
@@ -1609,7 +1609,7 @@ if $ARGS[0] = 'condoms':
 						gs'hookup_sex','insert'
 					end
 				end
-				
+
 				act'Put a condom on him with your mouth':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
@@ -1624,7 +1624,7 @@ if $ARGS[0] = 'condoms':
 					end
 				end
 			end
-			
+
 			!!{if preziksabo > 0:
 				act'Put a sabotaged condom on him':
 					'<center><img <<$set_imgh>> src="images/shared/sex/misc/condom_put.jpg"></center>'
@@ -1672,7 +1672,7 @@ if $ARGS[0] = 'condoms2':
 			gs'hookup_sex','insert'
 		end
 	end
-	
+
 	act'Put it on for him':
 		cla & *clr
 		gs 'arousal', 'foreplay_give', -2
@@ -1686,7 +1686,7 @@ if $ARGS[0] = 'condoms2':
 			gs'hookup_sex','insert'
 		end
 	end
-	
+
 	act'Put it on with your mouth':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/misc/condom_mouth.mp4"></video></center>'
@@ -1739,14 +1739,14 @@ if $ARGS[0] = 'no_condom1':
 			act'Leave':gt'hookup_after','exit'
 		end
 	end
-	
+
 	act'Maybe just this once':
 		hookup['condom'] = 2
 		cla & *nl
 		'"Well... Maybe just this once..." you say.'
 		gs'hookup','position_choose'
 	end
-	
+
 	act'Just don''t cum inside me':
 		hookup['condom'] = 3
 		cla & *nl
@@ -1768,7 +1768,7 @@ if $ARGS[0] = 'no_condom2':
 			gs'hookup','position_choose'
 		end
 	end
-	
+
 	act'Then we''re done here':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
@@ -1795,7 +1795,7 @@ if $ARGS[0] = 'no_condom2':
 					'The nerve of some people.'
 					act'Leave':gt'hookup_after','exit'
 				end
-				
+
 				act'Right':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -1819,7 +1819,7 @@ if $ARGS[0] = 'no_condom2':
 							act'Leave':gt'hookup_after','exit'
 						!!end
 					end
-					
+
 					act'Give in':
 						cla & *nl
 						hookup['condom'] = 2
@@ -1828,7 +1828,7 @@ if $ARGS[0] = 'no_condom2':
 						gs'hookup','position_choose'
 					end
 				end
-				
+
 				act'... fine':
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -1841,14 +1841,14 @@ if $ARGS[0] = 'no_condom2':
 			end
 		end
 	end
-	
+
 	act'Maybe just this once':
 		cla & *nl
 		hookup['condom'] = 2
 		'"Well... Maybe just this once..." you say.'
 		gs'hookup','position_choose'
 	end
-	
+
 	act'Just don''t cum inside me':
 		cla & *nl
 		hookup['condom'] = 3
@@ -1862,7 +1862,7 @@ if $ARGS[0] = 'position_choose':
 		act'How do you want to fuck me?': hookup['how_do_you'] = 1 & gt'hookup','position_he_choose'
 
 !!	end
-	
+
 	act'Lay back on the bed and spread your legs':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/miss1.jpg"></center>'
@@ -1889,7 +1889,7 @@ if $ARGS[0] = 'position_choose':
 !!		end
 		gs 'hookup', 'virgin_stop'
 	end
-		
+
 	act'Get on all fours':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/doggy1.jpg"></center>'
@@ -1906,7 +1906,7 @@ if $ARGS[0] = 'position_choose':
 		end
 		gs 'hookup', 'virgin_stop'
 	end
-	
+
 	act'Climb on top of him':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/foreplay/cowgirl1.jpg"></center>'
@@ -1922,7 +1922,7 @@ if $ARGS[0] = 'position_choose':
 			'<center><video autoplay loop src="images/shared/sex/vag/cowgirl/enter1.mp4"></video></center>'
 			'Grabbing hold of his cock, you carefully line it up with your pussy, easing down onto it until you feel his full length standing up inside you.'
 			act'Ride him':gt'hookup_sex','cowgirl_norm1'
-			
+
 			act'Ride him <i>hard</i>':gt'hookup_sex','cowgirl_hard1'
 		end
 		gs 'hookup', 'virgin_stop'
@@ -1947,7 +1947,7 @@ if $ARGS[0] = 'position_he_choose':
 				'<<$npc_firstname[$boy]>> pushes you back onto the bed, opening your legs and crawls on top of you, placing his cock just above your pussy.'
 				hookup['sex_jump'] = 1
 				gs'hookup','condoms'
-			end		
+			end
 		end
 !!		:hookup_sex_jump1
 		act'Continue':
@@ -2013,7 +2013,7 @@ if $ARGS[0] = 'position_he_choose':
 				gt'hookup_sex','cowgirl_hard1'
 			end
 		end
-		
+
 		!! gs 'hookup', 'where_foreplay'
 		gs 'hookup', 'virgin_stop'
 	end

+ 79 - 79
locations/hookup_after.qsrc

@@ -8,14 +8,14 @@ if $ARGS[0] = 'exit':
 	npc_last_sex[$boy] = daystart
 	if hookup['virgin'] = 1 and hookup['fuck'] > 0: npc_virgin_take[$boy] = 1
 	gs 'hookup_after', 'dress'
-			
+
 	if hookup['fuckbuddy'] > 0:
 		know_virgin[$boy] = hookup['virgin']
 		gs 'lover', 'add fuckbuddy',$boy
 		npc_fuckbuddy[$boy] = 1
 		npc_no_booty_call[$boy] = daystart
 	end
-	
+
 	killvar 'hookup'
 	minut += 2
 	!! exit should be based on type of apartment and location
@@ -122,13 +122,13 @@ if $ARGS[0] = 'creampie_mad':
 				'"It''s fine," you sigh, taking another deep breath. "I''ll just buy a morning after pill tomorrow. I shouldn''t have freaked out so much. Sorry."'
 				gs 'hookup_after', 'pre'
 			end
-			
+
 			act'I''ll buy a morning after pill (calm)':
 				cla & *nl
 				'"It''s fine," you say, shaking your head. "I''ll just buy a morning after pill."'
 				gs 'hookup_after', 'pre'
 			end
-			
+
 			act'I''ll buy a morning after pill (nervous)':
 				cla & *nl
 				'"Everything will be okay," you say, still taking deep breaths. "I''ll just buy a morning after pill. I won''t get pregnant, everything will be fine..." You keep repeating the words to yourself and eventually your heartrate decreases and you feel calm again.'
@@ -165,7 +165,7 @@ if $ARGS[0] = 'creampie_panic':
 		'"Ohmygodohmygodohmygodohmygod!" You cut him off with a torrent of words that spill from your mouth and globs of cum spill from your pussy, causing you to hyperventilate. "You said-! You promised-!"'
 	elseif hookup['condom'] = 4:
 		!! he promised he wouldn''t cum inside you
-		'"Ohmygodohmygodohmygodohmygod!" You cut him off with a torrent of words that spill from your mouth and globs of cum spill from your pussy, causing you to hyperventilate. "You said-! I told you-!"'		
+		'"Ohmygodohmygodohmygodohmygod!" You cut him off with a torrent of words that spill from your mouth and globs of cum spill from your pussy, causing you to hyperventilate. "You said-! I told you-!"'
 	else
 		'"Ohmygodohmygodohmygodohmygod!" You cut him off with a torrent of words that spill from your mouth and globs of cum spill from your pussy, causing you to hyperventilate.'
 	end
@@ -229,7 +229,7 @@ if $ARGS[0] = 'creampie_panic':
 		end
 		act'Leave':gt 'hookup_after', 'exit'
 	end
-	
+
 	act'That''s not what I''m concerned about! (STDs)':
 		cla & *clr
 		'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -347,7 +347,7 @@ if $ARGS[0] = 'creampie_react':
 				end
 				gs 'hookup_after', 'creampie_react2'
 			end
-			
+
 		end
 		if orgasm = hookup['orgasm']:
 			act'Come':
@@ -371,12 +371,12 @@ if $ARGS[0] = 'creampie_react':
 			end
 		end
 	end
-	
-	
+
+
 !!{		if hookup['creampie_ask'] = 0:
 			act'Did you just cum inside me?':
 				gs 'cum_call', 'hands',$boy,1
-				
+
 				if $hookup['position'] = 'miss':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/oops.jpg"></center>'
@@ -400,21 +400,21 @@ if $ARGS[0] = 'creampie_react':
 				else
 					'"Yeah, your pussy was so tight, I just couldn''t help it."'
 				end
-				
+
 				act'What the fuck!':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum111.jpg"></center>'
 					'"What the fuck!" you shout, scrambling backwards off the bed to look down at your pussy, horrified by the white liquid dripping from your snatch.'
 					gs 'hookup_after', 'creampie_mad'
 				end
-				
+
 				act'Panic!':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum111.jpg"></center>'
 					'"Holy shit!" you shout, scrambling backwards off the bed to look down at your pussy, horrified by the white liquid dripping from your snatch.'
 					gs 'hookup_after', 'creampie_panic'
 				end
-				
+
 				if hookup['not_inside'] = 1 or hookup['condom'] = 2 or hookup['condom'] = 3:
 					act'Forgive the mistake':
 						cla & *clr
@@ -424,7 +424,7 @@ if $ARGS[0] = 'creampie_react':
 						gs 'hookup_talk', 'pillow_talk1'
 					end
 				end
-				
+
 				act'Just wondering':
 					cla & *clr
 					if $hookup['position'] = 'miss':
@@ -440,7 +440,7 @@ if $ARGS[0] = 'creampie_react':
 					gs 'hookup_after', 'pre'
 					gs 'hookup_talk', 'pillow_talk1'
 				end
-				
+
 				act'That''s hot':
 					cla & *clr
 					if $hookup['position'] = 'miss':
@@ -461,7 +461,7 @@ if $ARGS[0] = 'creampie_react':
 						gs 'hookup_after', 'pre'
 						gs 'hookup_talk', 'pillow_talk1'
 					end
-					
+
 					if hookup['creampie_surprise'] = 1:
 						act'Premature ejaculation is hot':
 							cla & *nl
@@ -474,7 +474,7 @@ if $ARGS[0] = 'creampie_react':
 						end
 					end
 				end}
-				
+
 				!!{act'Prank him':
 					cla & *clr
 					if $hookup['position'] = 'miss':
@@ -523,7 +523,7 @@ if $ARGS[0] = 'creampie_react':
 			else
 				'"Yeah, your pussy was so tight, I just couldn''t help it."'
 			end
-			
+
 			act'What the fuck!':
 				gs 'cum_call', 'hands',$boy,1
 				cla & *clr
@@ -537,7 +537,7 @@ if $ARGS[0] = 'creampie_react':
 				end
 				gs 'hookup_after', 'creampie_mad'
 			end
-			
+
 			act'Panic!':
 				gs 'cum_call', 'hands',$boy,1
 				cla & *clr
@@ -551,7 +551,7 @@ if $ARGS[0] = 'creampie_react':
 				end
 				gs 'hookup_after', 'creampie_panic'
 			end
-			
+
 			act'Just wondering':
 				cla & *clr
 				if $hookup['position'] = 'miss':
@@ -567,7 +567,7 @@ if $ARGS[0] = 'creampie_react':
 				gs 'hookup_after', 'pre'
 				gs 'hookup_talk', 'pillow_talk1'
 			end
-			
+
 			act'That''s hot':
 				cla & *clr
 				if $hookup['position'] = 'miss':
@@ -601,14 +601,14 @@ if $ARGS[0] = 'creampie_react':
 					end
 				end
 			end
-			
-!!{			if orgasm = hookup['orgasm'] 
+
+!!{			if orgasm = hookup['orgasm']
 				act'Ugh, two pump chump':
-				
-				
+
+
 				end
 			end}
-			
+
 			if hookup['not_inside'] = 1 or hookup['condom'] = 2 or hookup['condom'] = 3:
 				act'Forgive the mistake':
 					cla & *clr
@@ -621,7 +621,7 @@ if $ARGS[0] = 'creampie_react':
 						'<i>I''ll probably be fine. I mean, what are the odds that something bad happens, right?</i>'
 						gs 'hookup_after', 'pre'
 					end
-					
+
 					act'I''ll buy a morning after pill':
 						cla & *nl
 						'You bite your lip for a moment considering the situation.'
@@ -629,7 +629,7 @@ if $ARGS[0] = 'creampie_react':
 						'<i>Well... that probably isn''t good... I''ll have to buy a morning after pill tomorrow. As long as I don''t forget it should be fine, right?</i>'
 						gs 'hookup_after', 'pre'
 					end
-					
+
 					if tabletkishot > 0 or birth_control['think_safe'] = 1:
 						gs 'hookup_after', 'birth_control'
 					else
@@ -649,9 +649,9 @@ if $ARGS[0] = 'creampie_react2':
 	gs 'hookup_after', 'birth_control'
 	gs 'hookup_after', 'birth_control_lie'
 	gs 'hookup_after', 'preg_responsibility_tease'
-	
+
 	gs 'hookup_after', 'have_to_ask'
-	
+
 	if npc_selfish[$boy] > 0 or npc_abusive[$boy] > 0:
 		if hookup['did_you_cum_inside'] = 0 and hookup['take_in_stride'] ! 1:'"Ahh yeah. Cumming inside is the best."'
 		act'Glad you enjoyed yourself':
@@ -661,7 +661,7 @@ if $ARGS[0] = 'creampie_react2':
 			gs 'hookup_after', 'pre'
 			gs 'hookup_talk', 'pillow_talk1'
 		end
-		
+
 		act'It was hot':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk1.mp4"></video></center>'
@@ -681,7 +681,7 @@ if $ARGS[0] = 'creampie_react2':
 			gs 'hookup_after', 'pre'
 			gs 'hookup_talk', 'pillow_talk1'
 		end
-		
+
 		act'It was cute':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk2.mp4"></video></center>'
@@ -692,7 +692,7 @@ if $ARGS[0] = 'creampie_react2':
 			gs 'hookup_after', 'pre'
 			gs 'hookup_talk', 'pillow_talk1'
 		end
-		
+
 		act'It was hot':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/pillow_talk1.mp4"></video></center>'
@@ -850,7 +850,7 @@ if $ARGS[0] = 'light_cigarette':
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 				'"Any chance I could get one of those?" you ask in the most sultry way you can.'
 				'"Cost is one fuck per," <<$npc_firstname[$boy]>> says, grinning.'
-				'"Well it''s a good thing I paid up front then," you smile back, plucking one from his pack.' 
+				'"Well it''s a good thing I paid up front then," you smile back, plucking one from his pack.'
 				act'Continue':
 					cla & *clr
 					siga += 1
@@ -908,7 +908,7 @@ if $ARGS[0] = 'light_cigarette2':
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 		'"Any chance I could get one of those?" you ask in the most sultry way you can.'
 		'"Cost is one fuck per," <<$npc_firstname[$boy]>> says, grinning.'
-		'"Well it''s a good thing I paid up front then," you smile back, plucking one from his pack.' 
+		'"Well it''s a good thing I paid up front then," you smile back, plucking one from his pack.'
 		act'Continue':
 			cla & *clr
 			siga += 1
@@ -965,7 +965,7 @@ if $ARGS[0] = 'pre':
 						end
 						gs 'cum_cleanup'
 						cla & *clr
-						
+
 						if cum_loc['vagina'] > 0 or $hookup['cum_choice'] = 'creampie':
 							!! vagina
 							if hypnoAddict > 0:
@@ -1006,7 +1006,7 @@ if $ARGS[0] = 'pre':
 								'"Oh yeah, right here." <<$npc_firstname[$boy]>> reaches over to his nightstand, pulling a packet of tissues and tossing them over to you. Gratefully accepting them, you pull out a handful and get to work cleaning yourself up.'
 							end
 							*nl
-							
+
 							if cum_loc['hair'] > 0:
 								!! hair
 								'You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<$npc_firstname[$boy]>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.'
@@ -1033,7 +1033,7 @@ if $ARGS[0] = 'pre':
 							else
 								'You really need to clean yourself after up after that. Reaching down to your purse, you pull some wipes out of your purse.'
 							end
-						end						
+						end
 						act'Get dressed':
 							cla & *clr
 							'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -1045,7 +1045,7 @@ if $ARGS[0] = 'pre':
 							act'Leave':gt 'hookup_after', 'exit'
 						end
 					end
-					
+
 					act'Borrow your shower?':
 						cla & *clr
 						$npc_apt_bedroom[$boy]
@@ -1111,7 +1111,7 @@ if $ARGS[0] = 'pre':
 					end
 				end
 			end
-			
+
 			act'Seriously?':
 				cla & *nl
 				'"Seriously?" you ask in disbelief.'
@@ -1237,7 +1237,7 @@ if $ARGS[0] = 'pre':
 			end
 			gs 'hookup_after', 'start'
 		end
-		
+
 		act'Get up':
 			hookup['get_up'] = 1
 			cla & *clr
@@ -1247,7 +1247,7 @@ if $ARGS[0] = 'pre':
 			*nl
 			'You swing your legs over the side and scooting forward until your feet touch the ground and allow you to stand up from the bed.'
 		end
-		
+
 		act'Play with your phone':
 			cla & *clr
 			minut += rand(2,5)
@@ -1268,7 +1268,7 @@ if $ARGS[0] = 'pre':
 			end
 			gs 'hookup_after', 'start'
 		end
-		
+
 		if siga > 0 and hookup['cigarette'] = 0:
 			act'Have a smoke':
 				cla & *clr
@@ -1277,7 +1277,7 @@ if $ARGS[0] = 'pre':
 				hookup['cigarette'] = 1
 				act'Smoke':gt 'hookup_after', 'start'
 			end
-			
+
 			act'Have a smoke and play with your phone':
 				hookup['cigarette'] = 3
 				gs 'hookup_after', 'start'
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'pre':
 					gt 'hookup_after', 'wipes'
 				end
 			end
-			
+
 			act'Clean yourself up (ask him for wipes)':
 				hookup['wipes'] = 2
 				gt 'hookup_after', 'wipes'
@@ -1318,7 +1318,7 @@ if $ARGS[0] = 'wipes':
 			'You reach up and poke at the sperm coating your face. Ew. You really need to clean that up before you do anything else. Reaching down to your purse, you pull some wipes out of your purse.'
 		end
 		*nl
-		
+
 		if cum_loc['hair'] > 0:
 			!! hair
 			'You carefully wipe the cum from your face, making sure to get every last drop, including getting the tangled web that <<$npc_firstname[$boy]>> managed to get in your hair. About a minute later, you can still feel a faintly sticky layer over the top of your skin, but at least nobody is going to give you funny looks walking down the street.'
@@ -1374,13 +1374,13 @@ if $ARGS[0] = 'wipes':
 			end
 		end
 	end
-		
+
 	if cum_loc['hands'] > 0:
 		*nl
 		!! hands
 		'Once you''re satisfied that the rest of your body is clean, you wipe your hands off and toss the wipes into the trash.'
 	end
-	
+
 	hookup['wipes'] = 0
 	gs 'cum_cleanup'
 	gs 'hookup_after', 'start'
@@ -1437,7 +1437,7 @@ if $ARGS[0] = 'start':
 		*nl
 		'<<$npc_firstname[$boy]>> is just laying back on his bed, relaxing in the afterglow of your little encounter together.'
 	end
-	
+
 	act'Can I borrow your shower?':
 		cla & *clr
 		$npc_apt_bathroom[$boy]
@@ -1454,17 +1454,17 @@ if $ARGS[0] = 'start':
 			!!	'Joins you in the shower'
 			dynamic $showerdin
 			'You turn on the faucet, relaxing as the hot water pours down over your skin. After a few minutes, you turn the tap off, towelling off using what you can only assume to be <<$npc_firstname[$boy]>>''s towel and walk naked back into his room. <<$npc_firstname[$boy]>> is still there, relaxing in his bed'
-			
+
 			gs 'hookup_after', 'gotta_go'
-			
+
 			act'Crawl back into bed':gt 'hookup_after', 'cuddle'
 		end
 	end
 	if hookup['get_up'] ! 1:
 		if hour > 20 or hour < 5:act'Rest your eyes':gt 'hookup_after', 'bed'
-		
+
 		act'Cuddle up with <<$npc_firstname[$boy]>>':gt 'hookup_after', 'cuddle'
-			
+
 		if npc_smoker[$boy] > 0 and hookup['cigarette'] = 0:
 			act'Ask to bum a cigarette':
 				cla & *nl
@@ -1474,7 +1474,7 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	
+
 	gs 'hookup_after', 'gotta_go'
 end
 
@@ -1526,13 +1526,13 @@ if $ARGS[0] = 'bed':
 		if $hookup['cum_choice'] = 'face':
 			!! face
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/sleep<<rand(1,3)>>.jpg"></center>'
-			
+
 		elseif $hookup['cum_choice'] = 'stomach':
 			!! stomach
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/sleep1.jpg"></center>'
 		elseif $hookup['cum_choice'] = 'ass' or $hookup['cum_choice'] = 'back':
 			!! butt
-			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'			
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 		elseif $hookup['cum_choice'] = 'creampie':
 			!! vagina
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/after2.jpg"></center>'
@@ -1566,7 +1566,7 @@ if $ARGS[0] = 'cuddle':
 		'Hair still wet from the shower, you crawl back into bed with <<$npc_firstname[$boy]>> and cuddle up, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other''s breathing.'
 	else
 		'Scootching over, you cuddle up with <<$npc_firstname[$boy]>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other''s breathing.'
-	end	
+	end
 
 	gs 'hookup_after', 'gotta_go'
 	if hour > 20 or hour < 2:
@@ -1599,7 +1599,7 @@ if $ARGS[0] = 'gotta_go':
 		gs 'hookup_after', 'dress_loop'
 		gs 'hookup_after', 'hookup_continuation'
 	end
-	
+
 	act'Thanks for the <<$hookup[''fun'']>>':
 		hookup['thank_for_fun'] = 1
 		gs 'hookup_after', 'dress_loop'
@@ -1610,7 +1610,7 @@ if $ARGS[0] = 'gotta_go':
 		else
 			'"Well, thanks for the <<$hookup[''fun'']>>," you say, bending down to pick up your clothes.'
 		end
-		
+
 		if hookup['bj'] > 0 and hookup['fuck'] < 1:
 			if hookup['virgin'] > 0:
 				'"Thanks for the blowjob," he smirks back. "You give pretty good head. You sure you''re a virgin?" You don''t respond, <<$hookup[''dress_describe'']>>, but roll your eyes at his commentary.'
@@ -1661,7 +1661,7 @@ if $ARGS[0] = 'spend_the_night':
 			'"... no," you sigh. "I really shouldn''t. I want to, but I can''t."'
 			gs 'hookup_after', 'hookup_continuation'
 		end
-		
+
 		act'I guess I could...':
 			cla & *clr
 			'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -1670,16 +1670,16 @@ if $ARGS[0] = 'spend_the_night':
 			act'Undress and get into bed with him':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
-				'After pulling off your clothes again, you slip back into bed and cuddle up with <<$npc_firstname[$boy]>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other''s breathing.'						
+				'After pulling off your clothes again, you slip back into bed and cuddle up with <<$npc_firstname[$boy]>>, resting your naked body on top of his. He wraps his arms around you in return and the two of your relax, listening to the sound of each other''s breathing.'
 				act'Fall asleep':
 					cla & *nl
 					'As you lay there together, your eyelids slowly grow heavier until they close completely and your consciousness drifts slowly into darkness...'
 					act'. . .':gt 'hookup_after', 'sleep'
 				end
 			end
-		end				
+		end
 	end
-	
+
 	act'I really need to go':
 		cla & *clr
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
@@ -1760,7 +1760,7 @@ if $ARGS[0] = 'pc_date_request':
 end
 
 if $ARGS[0] = 'npc_fuckbuddy_request':
-	if hookup['thank_for_fun'] = 1:		
+	if hookup['thank_for_fun'] = 1:
 		'"You want to do it again sometime? Nothing serious, just sex. No strings."'
 		'"Like what?" you ask back, <<$hookup[''dress_describe'']>>. "Friends with benefits? Fuckbuddies? Booty callers?"'
 		'"Yeah, just like that," he grins.'
@@ -1831,7 +1831,7 @@ if $ARGS[0] = 'npc_date_request':
 			'<i>Holy fuck this is awkward,</i> you think to yourself as you pull the last of your clothes on. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
 			act'Leave':gt 'hookup_after', 'exit'
 		end
-		
+
 		act'If we were fuckbuddies...':
 			cla & *nl
 			'"If it were something purely physical, like fuckbuddies or something, I wouldn''t mind getting together for some fun, but I''m just not interested in dating."'
@@ -1851,7 +1851,7 @@ if $ARGS[0] = 'npc_date_request':
 					'"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards out the door.'
 					act'Leave':gt 'hookup_after', 'exit'
 				end
-				
+
 				act'It''s to be expected':
 					cla & *clr
 					'<center><b><font color="maroon"><<$npc_firstname[$boy]>>''s Bedroom</font></b></center>'
@@ -2003,7 +2003,7 @@ if $ARGS[0] = 'dress_loop':
 		gs 'panties', 'wear', $lastwornpantytype['hookup'], lastwornpantynumber['hookup']
 		killvar 'lastwornpantytype'
 		killvar 'lastwornpantynumber'
-		
+
 		if $lastwornbratype['hookup'] ! 'none':
 			$hookup['dress_describe'] += 'fastening your bra around your chest'
 			if $clothingworntype = 'nude': $hookup['dress_describe'] += ' then '
@@ -2105,7 +2105,7 @@ if $ARGS[0] = 'panty_gift2':
 			gs 'hookup_after', 'later'
 		end
 	end
-	
+
 	act'Something to remember the occassion':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
@@ -2123,7 +2123,7 @@ if $ARGS[0] = 'panty_gift2':
 			gs 'hookup_after', 'later'
 		end
 	end
-	
+
 	act'Consider it a trophy':
 		cla & *clr
 		$npc_apt_bedroom[$boy]
@@ -2164,7 +2164,7 @@ if $ARGS[0] = 'panty_gift2':
 				gs 'hookup_after', 'later'
 			end
 		end
-		
+
 	end
 end
 
@@ -2175,13 +2175,13 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 		'"Just hide them," you say, <<$hookup[''dress_describe'']>>. "If you can hide a fucking a girl in your bed, surely you can hide a pair of panties."'
 		gs 'hookup_after', 'finish_dressing'
 	end
-	
+
 	act'Say they''re hers':
 		cla & *nl
 		'"Tell her they''re hers," you snicker, <<$hookup[''dress_describe'']>>. "Maybe she''ll think she bought them."'
 		gs 'hookup_after', 'finish_dressing'
 	end
-	
+
 	act'Say they''re yours':
 		gs 'hookup_after', 'dress_loop'
 		cla & *nl
@@ -2196,7 +2196,7 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 				'You move to <<$hookup[''dress_describe'']>> but <<$npc_firstname[$boy]>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.'
 				gs 'hookup_after', 'later'
 			end
-			
+
 			act'I was kidding (acerbic)':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -2210,13 +2210,13 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 			gs 'hookup_after', 'later'
 		end
 	end
-	
+
 	act'Give them to her':
 		cla & *nl
 		'"Gift them to her," you say mischievously, <<$hookup[''dress_describe'']>>. "Maybe she''ll put them on."'
 		gs 'hookup_after', 'later'
 	end
-	
+
 	act'Throw them away':
 		cla & *nl
 		'"Throw them away then," you shrug, <<$hookup[''dress_describe'']>>. "Do whatever you want with them.'
@@ -2235,9 +2235,9 @@ if $ARGS[0] = 'sleep':
 		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
+	end
+
+	if $start_loc = 'sg' and func('homes_properties', 'has_access', 'parents_home'): sveta_punishment['no_come_home'] = 1
 	gt 'hookup_morning', 'morning'
 end
---- hookup_after ---------------------------------
+--- hookup_after ---------------------------------

+ 41 - 41
locations/hookup_morning.qsrc

@@ -32,7 +32,7 @@ if $ARGS[0] = 'morning':
 		'Your mind stirs and you slowly come to consciousness. Your first thoughts are...'
 		act'<i>Yawn</i>':gt'hookup_morning','yawn_wake'
 	end
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 		act'School!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -40,9 +40,9 @@ if $ARGS[0] = 'morning':
 			gs'hookup_morning','late_for_school'
 		end
 	end
-	
+
 	act'Confusion':gs'hookup_morning','confused'
-	
+
 	if pcs_lovers - pcs_girlfriends > 0:act'Your boyfriend':$hookup['cheat'] = 'boyfriend' & gt'hookup_morning','guilt1'
 	if pcs_girlfriends > 0:act'Your girlfriend': $hookup['cheat'] = 'girlfriend' & gt'hookup_morning','guilt1'
 end
@@ -185,9 +185,9 @@ if $ARGS[0] = 'confused':
 			gs'hookup_morning','late_wakeup'
 		end
 	else
-		
+
 	end}
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		act'Mom!':gt'hookup_morning','mom'
 	end
 end
@@ -248,14 +248,14 @@ if $ARGS[0] = 'guilt_excuses':
 		'They ring hollow in your ears.'
 		gs'hookup_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'hookup_morning','guilt2'
 	end
-	
+
 	act'You''re a whore':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock3.mp4"></video></center>'
@@ -292,7 +292,7 @@ if $ARGS[0] = 'guilt2':
 				'"It''s nothing," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
 				gs'hookup_morning','wakeup'
 			end
-			
+
 			act'I have to go':gt'hookup_morning','have_to_go'
 		else
 			'"Hey," he stretches, looking over at you. "You just wake up too?"'
@@ -337,7 +337,7 @@ if $ARGS[0] = 'mom':
 				'No time to say goodbye! You finish getting dressed, quickly give yourself a once over and grab your stuff before heading out the door, accidentally slamming it behind you in your rush.'
 				act'Leave':gs'hookup_after','exit'
 			end
-			
+
 			act'Leave your number for hooking up':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -349,12 +349,12 @@ if $ARGS[0] = 'mom':
 				'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
 				*nl
 				'Hastily signing it, you grab your stuff and rush out the door, accidentally slamming it behind you along the way.'
-				
+
 				if npc_goal[$boy] = 1:gs'lover','add fuckbuddy',$boy
-				
+
 				act'Leave':gs'hookup_after','exit'
 			end
-			
+
 			act'Leave your number for dating':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -366,12 +366,12 @@ if $ARGS[0] = 'mom':
 				'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
 				*nl
 				'Hastily signing it, you grab your stuff and rush out the door, accidentally slamming it behind you along the way.'
-				
+
 				if npc_goal[$boy] > 1:gs'lover','add fuckbuddy',$boy
-				
+
 				act'Leave':gs'hookup_after','exit'
 			end
-			
+
 		elseif npc_latesleeper = 1:
 				'You frantically haul yourself out of bed and start grabbing your clothes and throwing them on. The guy you slept with last night (<<$npc_firstname[$boy]>>? Was that his name?) is still completely knocked out in his bed, your wild movements apparently not disturbing his sleep at all.'
 			if cum_loc['face'] > 0:
@@ -384,7 +384,7 @@ if $ARGS[0] = 'mom':
 				'You definitely don''t feel like waking him up and besides, there''s no time to say goodbye! You finish getting dressed, quickly give yourself a once over and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.'
 				act'Leave':gs'hookup_after','exit'
 			end
-			
+
 			act'Leave your number for hooking up':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -396,12 +396,12 @@ if $ARGS[0] = 'mom':
 				'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
 				*nl
 				'Hastily signing it, you leave it on his nightstand and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.'
-				
+
 				if npc_goal[$boy] = 1:gs'lover','add fuckbuddy',$boy
-				
+
 				act'Leave':gs'hookup_after','exit'
 			end
-			
+
 			act'Leave your number for dating':
 				cla & *clr
 				$npc_apt_bedroom[$boy]
@@ -413,9 +413,9 @@ if $ARGS[0] = 'mom':
 				'<i>(xxx) xxx-xx-xx - <<$pcs_nickname>> <3</i>'
 				*nl
 				'Hastily signing it, you leave it on his nightstand and grab your stuff before sneaking towards the door as quickly as possible, trying not to slam it behind you on your way out.'
-				
+
 				if npc_goal[$boy] > 1:gs'lover','add fuckbuddy',$boy
-				
+
 				act'Leave':gs'hookup_after','exit'
 			end
 		else
@@ -435,7 +435,7 @@ if $ARGS[0] = 'mom':
 					'You finish getting dressed as quickly as possible and give yourself a once over before grabbing your stuff and rushing out the door, accidentally slamming it behind you.'
 					act'Leave':gs'hookup_after','exit'
 				end
-				
+
 				act'Ask to hook up again later':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -457,10 +457,10 @@ if $ARGS[0] = 'mom':
 						'"That''s uhh... Well it''s not really something I''m interested in."'
 						'"Your loss," you shrug, yanking your bag out from underneath the bed. How did it even get down there anyways?! Without another word, you run out the door, slamming it behind you.'
 					end
-					
+
 					act'Leave':gs'hookup_after','exit'
 				end
-				
+
 				act'Ask to go on a date':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -482,7 +482,7 @@ if $ARGS[0] = 'mom':
 						'"That''s uhh... I''m not really interested in anything like that. I''m really just in it for sex to be honest."'
 						'"Oh... Okay then..." you reply, stiffling your hurt feelings. You finally yank your bag out from underneath the bed. How did it even get down there anyways?! "See you later, I guess..." you say awkwardly, running out the door and slamming it behind you.'
 					end
-					
+
 					act'Leave':gs'hookup_after','exit'
 				end
 			else
@@ -499,7 +499,7 @@ if $ARGS[0] = 'mom':
 					'"Yeah?" you reply absentmindedly, looking for your bag.'
 					'"Could I see you again sometime? Take you out on a date or something?"'
 				end
-				
+
 				act'I don''t have time for this!':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -507,7 +507,7 @@ if $ARGS[0] = 'mom':
 					'With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
 					act'Leave':gt'hookup_after','exit'
 				end
-				
+
 				act'<i>Sure!Callme!</i>':
 					cla & *clr
 					$npc_apt_bedroom[$boy]
@@ -519,7 +519,7 @@ if $ARGS[0] = 'mom':
 						'"Call me when you want to hang out!" you shout over your shoulder as you run out the door.'
 					end
 					act'Leave':gt'hookup_after','exit'
-				end						
+				end
 			end
 		end
 	end
@@ -546,13 +546,13 @@ if $ARGS[0] = 'earlyriser1':
 		else
 			'You''re alone'
 		end
-	end 
+	end
 	!!(breakfast in bed)
 end
 if $ARGS[0] = 'coffee_for_you':
 	!! breakfast in bed
 	hookup['b_i_b'] = 1
-	
+
 	'Turning over, you look around and realize that you''re alone in the bed.'
 	*nl
 	if npc_apt_type[$boy] = 2:
@@ -568,18 +568,18 @@ if $ARGS[0] = 'coffee_for_you':
 		cla & *clr
 		!! IMAGE HERE
 		'Geez, clingy much?'
-		
+
 	end
-	
+
 	act'I prefer tea (teasing)':
 		cla & *clr
 		$hookup['small_talk'] = '<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
 		'"I actually prefer tea," you say with a wry smile on your lips, but accept the mug anyways.'
 		'"Sorry," he smiles back, taking your teasing in stride. "I''ll try to remember if I find you in my bed again."'
-		
+
 	end
-	
+
 	act'Thanks':
 		cla & *clr
 		$hookup['small_talk'] = '<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
@@ -587,7 +587,7 @@ if $ARGS[0] = 'coffee_for_you':
 		'"Thanks" you say, accepting the mug gratefully. "It''s always nice to get coffee in bed."'
 		'"No problem," he smiles back, going back to get himself a mug.'
 	end
-	
+
 	act'Wow!':
 		cla & *clr
 		$hookup['small_talk'] = '<center><img <<$set_imgh>> src="images/pc/activities/drinking/coffee_bed1.jpg"></center>'
@@ -705,7 +705,7 @@ if $ARGS[0] = 'wakeup':
 !!		gs'hookup_morning','latesleeper'
 !!	else
 		act'I have to go':gt'hookup_morning','have_to_go'
-		
+
 		act'I need coffee':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -874,7 +874,7 @@ if $ARGS[0] = 'late_sneakout':
 				'All your clothes on and possessions gathered, you sneak out the front door, leaving whatshisface sleeping alone in his bed.'
 				act'Leave':gs'hookup_after','exit'
 			end
-			
+
 			act'Leave your number (fuckbuddy)':
 				hookup['fuckbuddy'] = rand(0,1)
 				cla & *clr
@@ -894,7 +894,7 @@ if $ARGS[0] = 'late_sneakout':
 					act'Leave':gs'hookup_after','exit'
 				end
 			end
-		end		
+		end
 	end
 end
 
@@ -1419,14 +1419,14 @@ if $ARGS[0] = 'continuation_reponse1':
 		'"If you say so," you shrug, <<$hookup[''dress_describe'']>>'
 		gs'hookup_morning','continuation_reponse2'
 	end
-	
+
 	if $pantyworntype ! 'none' and $braworntype = 'none' and $clothingworntype = 'nude' and hookup['mad'] = 0 and hookup['fuck_count'] > 0:
-	
+
 	end
 end
 
 if $ARGS[0] = 'continuation_reponse2':
-	
+
 	if hookup['continuation'] = 1:
 		!! FWB/Booty calls?
 		gs 'hookup_after', 'dress_loop'

+ 22 - 22
locations/intro_city_select.qsrc

@@ -56,7 +56,7 @@ if $ARGS[0] = 'start':
 	pcs_sleep = 100
 	willpowermax = 60
 
-	if mid($start_type,1,4) = 'city':
+	if $start_loc = 'city':
 		gs 'homes_properties', 'give_access', 'parents_home'
 		SchoolAtestat = 1
 		gs 'homes_properties', 'rent_property', 'city_apartment', 61
@@ -127,8 +127,8 @@ if $ARGS[0] = 'start':
 	killvar '$temp_nickname'
 
 	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_1.jpg"></center>'
-	'You are <<$pcs_firstname>> <<$pcs_lastname>>, nicknamed <<$pcs_nickname>> for short.' 
-	'Your mother''s name is <<$npc_firstname[''A29'']>> and your biological father left when you were a baby, your mother marrying your stepfather, <<$npc_firstname[''A28'']>>, shortly afterwards.' 
+	'You are <<$pcs_firstname>> <<$pcs_lastname>>, nicknamed <<$pcs_nickname>> for short.'
+	'Your mother''s name is <<$npc_firstname[''A29'']>> and your biological father left when you were a baby, your mother marrying your stepfather, <<$npc_firstname[''A28'']>>, shortly afterwards.'
 	'<<$npc_firstname[''A33'']>> is your older sister, who is two years older than you, but is still living at home while working at the local grocery store. She chose not to attend university and instead spends most of her free time drinking and going to parties with her friends, much to your mother''s dismay.'
 	'You also have a younger half-brother, <<$npc_firstname[''A34'']>>, who is really into sports, especially football, and is shaping up to be a fine athlete. He is a year younger than you and his father is your stepfather.'
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'nerd':
 	npc_rel['A129'] += 10
 	npc_rel['A28'] += 10
 	npc_rel['A29'] += 10
-	genbsize = 13 
+	genbsize = 13
 !!b cup for ideal bmi
 	pcs_traits['nerd_points'] = 60
 	pcs_traits['nerd_status'] = 2
@@ -384,7 +384,7 @@ end
 if $ARGS[0] = 'nerdqueen':
 	'<center><h4><font color="maroon">Queen of the nerds</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_1.jpg"></center>'
-	'While you love all things nerdy or geeky, what you loved the most was hanging out with your fellow nerds and doing nerdy things together. This made you fairly social for a nerd and more general in your areas of knowledge.' 
+	'While you love all things nerdy or geeky, what you loved the most was hanging out with your fellow nerds and doing nerdy things together. This made you fairly social for a nerd and more general in your areas of knowledge.'
 	'As you got older and started to develop as a woman, it also made you much more aware of your sexuality than most nerds are comfortable with. As such, you cultivated that awareness more than most and were more at ease with your body than the other nerds. By nerd standards, you were confident, dynamic and attractive. This led to you being the leader of your group of friends, and you were more acceptable to other social groups as a result, especially the cool kids, who seemed to respect your social skills and looks.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'nerd'
@@ -442,8 +442,8 @@ end
 if $ARGS[0] = 'goodstudent':
 	'<center><h4><font color="maroon">Good student</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_2.jpg"></center>'
-	'You just loved school, and your grades were more than good enough to attend the university of your choosing after graduation. You have always tried to absorb every bit of knowledge possible and did everything you could to excel in school.' 
-	'While this attitude gained you a lot of respect from the other nerds, it didn''t earn you a lot of friends and you never found the time for sports. You were often asked to be a tutor and sometimes found yourself forced to do others'' homework for them.' 
+	'You just loved school, and your grades were more than good enough to attend the university of your choosing after graduation. You have always tried to absorb every bit of knowledge possible and did everything you could to excel in school.'
+	'While this attitude gained you a lot of respect from the other nerds, it didn''t earn you a lot of friends and you never found the time for sports. You were often asked to be a tutor and sometimes found yourself forced to do others'' homework for them.'
 	'Now you are in the big city with a whole new world to absorb, although a part of you already misses school.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'nerd'
@@ -484,8 +484,8 @@ end
 if $ARGS[0] = 'computergeek':
 	'<center><h4><font color="maroon">Computer geek</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_3.jpg"></center>'
-	'You were always into computers, whether it be by playing video games, taking computers apart or learning programing and even hacking. You love everything about computers, but this passion left you little time to make friends - real-life friends, at least.' 
-	'You managed to befriend many online players that you talked to while playing various video games, however, and you rarely spent any time outdoors, nor money on clothes or other girly stuff. You were far more interested in saving your money for a better computer in order to play even better games.' 
+	'You were always into computers, whether it be by playing video games, taking computers apart or learning programing and even hacking. You love everything about computers, but this passion left you little time to make friends - real-life friends, at least.'
+	'You managed to befriend many online players that you talked to while playing various video games, however, and you rarely spent any time outdoors, nor money on clothes or other girly stuff. You were far more interested in saving your money for a better computer in order to play even better games.'
 	'Now you are on your own in the big city, and you will need most of your money to live on instead.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'nerd'
@@ -528,7 +528,7 @@ end
 if $ARGS[0] = 'chessplayer':
 	'<center><h4><font color="maroon">Avid chess player</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/nerd_4.jpg"></center>'
-	'You were always into chess as a child, and have studied all the great chess masters. You can name them all, as well as their favorite strategies! You find nothing more interesting than matching your wits against someone else''s in a game of chess. It has left you with the ability to often see the consequences of your actions better than most as you are used to looking several moves ahead. All of this left you with little time to make many friends, or spend much time outdoors.' 
+	'You were always into chess as a child, and have studied all the great chess masters. You can name them all, as well as their favorite strategies! You find nothing more interesting than matching your wits against someone else''s in a game of chess. It has left you with the ability to often see the consequences of your actions better than most as you are used to looking several moves ahead. All of this left you with little time to make many friends, or spend much time outdoors.'
 	'Now you are on your own living in the big city. You had already planned things out, but now that you''re here, you have more options than you thought. You can get a job now or go to the university and get a better education like you had originally planned.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'nerd'
@@ -615,7 +615,7 @@ end
 if $ARGS[0] = 'volleyball':
 	'<center><h4><font color="maroon">Volleyball player</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_1.jpg"></center>'
-	'Ever since you first played volleyball, you have been in love with the sport. You spent a lot of your free time trying to improve your ability, and it paid off; you''re actually quite good now! Your obsession with volleyball, however, had some repercussions on your school performance. You were a sub-par student, and didn''t make many friends outside of your fellow jocks.' 
+	'Ever since you first played volleyball, you have been in love with the sport. You spent a lot of your free time trying to improve your ability, and it paid off; you''re actually quite good now! Your obsession with volleyball, however, had some repercussions on your school performance. You were a sub-par student, and didn''t make many friends outside of your fellow jocks.'
 	'Now that you are in the big city, it seems your talent for volleyball is less respected. Perhaps it''s time to find something other than sports to be passionate about?'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'jock'
@@ -652,7 +652,7 @@ end
 if $ARGS[0] = 'dancer':
 	'<center><h4><font color="maroon">Avid dancer</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_2.jpg"></center>'
-	'You fell in love with dancing at an early age and never looked back. You spent a lot of your free time trying to improve your skills, and it paid off; you''re actually quite good now! Your obsession with dancing, however, had some repercussions on your school performance. You were a sub-par student and didn''t make many friends other than the jocks, but you were good friends with Albina Barlovskaya, a girl who was even more passionate about dancing than you.' 
+	'You fell in love with dancing at an early age and never looked back. You spent a lot of your free time trying to improve your skills, and it paid off; you''re actually quite good now! Your obsession with dancing, however, had some repercussions on your school performance. You were a sub-par student and didn''t make many friends other than the jocks, but you were good friends with Albina Barlovskaya, a girl who was even more passionate about dancing than you.'
 	'Now that you are in the big city, it seems your dancing talent is less respected. Perhaps it''s time to find something other than sports to be passionate about?'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'jock'
@@ -704,7 +704,7 @@ end
 if $ARGS[0] = 'runner':
 	'<center><h4><font color="maroon">Track runner</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_3.jpg"></center>'
-	'Ever since you first tried track, you have been in love with the sport. When you’re running, the rest of the world fades away and you experience a natural high like no other. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with running, however, had some repercussions on your school performance. You were a sub-par student, and you didn''t make many friends other than the jocks and your coach.' 
+	'Ever since you first tried track, you have been in love with the sport. When you’re running, the rest of the world fades away and you experience a natural high like no other. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with running, however, had some repercussions on your school performance. You were a sub-par student, and you didn''t make many friends other than the jocks and your coach.'
 	'Now that you are in the big city, it seems your running talents are less respected. Perhaps it''s time to find something other than sports to be passionate about?'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'jock'
@@ -743,7 +743,7 @@ end
 if $ARGS[0] = 'football':
 	'<center><h4><font color="maroon">Football player</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/jock_4.jpg"></center>'
-	'Ever since your first football game, you have been in love with the sport. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with football had some repercussions on your school performance, however, and you were a sub-par student. You didn''t make many friends other than the jocks, especially <<$npc_firstname[''A149'']>> and your coach.' 
+	'Ever since your first football game, you have been in love with the sport. You spent a lot of your free time trying to get better at it, and it paid off; you''re actually quite good now! Your obsession with football had some repercussions on your school performance, however, and you were a sub-par student. You didn''t make many friends other than the jocks, especially <<$npc_firstname[''A149'']>> and your coach.'
 	'Now that you are in the big city, it seems your talent for football is less respected. Perhaps it''s time to find something other than sports to be passionate about?'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'jock'
@@ -819,7 +819,7 @@ end
 if $ARGS[0] = 'socialite':
 	'<center><h4><font color="maroon">Sociable</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_1.jpg"></center>'
-	'You were friends with all of the important kids at school, which is what really mattered. You were very social growing up and enjoyed being around others, often becoming the center of attention. You have always had a knack for knowing the right thing to say at the right moment, which led to many other students wanting to be your friend. You can, with a little work, get along with nearly anyone.' 
+	'You were friends with all of the important kids at school, which is what really mattered. You were very social growing up and enjoyed being around others, often becoming the center of attention. You have always had a knack for knowing the right thing to say at the right moment, which led to many other students wanting to be your friend. You can, with a little work, get along with nearly anyone.'
 	'Now you find yourself in the big city and you no longer feel like the big important fish in a small pond. Everyone is more busy and there is just so many more people.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'cool'
@@ -863,7 +863,7 @@ end
 if $ARGS[0] = 'beautiful':
 	'<center><h4><font color="maroon">Beautiful</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/popular_2.jpg"></center>'
-	'You might not have been the smartest, the most social, the most athletic or had the toughest attitude - but what you did have were natural good looks. That’s not something you can earn! You blossomed earlier than most girls and the boys took note. As you got older your looks only improved, and you were often considered one of the best looking girls in school.' 
+	'You might not have been the smartest, the most social, the most athletic or had the toughest attitude - but what you did have were natural good looks. That’s not something you can earn! You blossomed earlier than most girls and the boys took note. As you got older your looks only improved, and you were often considered one of the best looking girls in school.'
 	'Now that you are in the city, you are still better looking than most, but you can''t help but notice the occasional girl that is even better looking than you. It seems the boys are also not as impressed at your looks as they once were.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'cool'
@@ -967,7 +967,7 @@ end
 if $ARGS[0] = 'gopnikstart':
 	'<center><h4><font color="maroon">Gopnik</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/gopnik_1.jpg"></center>'
-	'You were a gopnik in school. While you were still low in the gopnik pecking order, you had already proven yourself to them and most of them accepted you as an equal. You had problems at home and school due to your antisocial behavior, especially with your mother and stepfather, who seen you going down the wrong path.' 
+	'You were a gopnik in school. While you were still low in the gopnik pecking order, you had already proven yourself to them and most of them accepted you as an equal. You had problems at home and school due to your antisocial behavior, especially with your mother and stepfather, who seen you going down the wrong path.'
 	'Now you are in the big city, a whole new playground to find trouble in.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'gopnik'
@@ -1014,7 +1014,7 @@ end
 if $ARGS[0] = 'troublemaker':
 	'<center><h4><font color="maroon">Troublemaker</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/gopnik_2.jpg"></center>'
-	'You were a troublemaker in school. Nothing made you happier than causing problems, whether it be petty larceny, getting into fights or vandalism. You lived for the thrill of breaking the rules and got along fairly well with the gopniks, who accepted you as a kindred spirit. If you couldn''t find any trouble, you would happily make your own. You had problems at home and school due to your antisocial behavior, especially with your mother and stepfather, who see you going down the wrong path.' 
+	'You were a troublemaker in school. Nothing made you happier than causing problems, whether it be petty larceny, getting into fights or vandalism. You lived for the thrill of breaking the rules and got along fairly well with the gopniks, who accepted you as a kindred spirit. If you couldn''t find any trouble, you would happily make your own. You had problems at home and school due to your antisocial behavior, especially with your mother and stepfather, who see you going down the wrong path.'
 	'Now you are in the big city, a whole new playground to find trouble in.'
 	act 'Confirm this starting option':
 		pcs_traits['nerd_points'] = -50
@@ -1074,7 +1074,7 @@ if $ARGS[0] = 'alternative':
 !!can choose two more starting tattoo''s
 	'<center><h4><font color="maroon">Alternative</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/gopnik_4.jpg"></center>'
-	'You marched to your own tune. You did what you wanted when you wanted, and did it with a fuck-it-all attitude. The gopniks respected you even though you weren''t one of them, but you had problems at home and school due to your behavior, especially with your mother and stepfather, who seen you going down the wrong path.' 
+	'You marched to your own tune. You did what you wanted when you wanted, and did it with a fuck-it-all attitude. The gopniks respected you even though you weren''t one of them, but you had problems at home and school due to your behavior, especially with your mother and stepfather, who seen you going down the wrong path.'
 	'That doesn''t matter now since you''re out in the city on your own, ready to do as you please.'
 	act 'Confirm this starting option':
 		pcs_traits['nerd_points'] = -20
@@ -1184,7 +1184,7 @@ end
 if $ARGS[0] = 'friendless':
 	'<center><h4><font color="maroon">Friendless</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/outcast_1.jpg"></center>'
-	'You were never very social and never learned how to make friends. You were often made fun of or bullied by the other kids as you grew up. As such, you naturally shielded away from them, an action that only served to isolate you even further.' 
+	'You were never very social and never learned how to make friends. You were often made fun of or bullied by the other kids as you grew up. As such, you naturally shielded away from them, an action that only served to isolate you even further.'
 	'Now that you have moved to the city, you have a chance to do things differently and make new friends.'
 	act 'Confirm this starting option':
 		gs 'intro_city_select', 'outcast'
@@ -1194,7 +1194,7 @@ if $ARGS[0] = 'friendless':
 !!b cup for ideal bmi
 		pcs_chrsm = 20
 		pcs_observ = 20
-		pcs_skin = 300 
+		pcs_skin = 300
 		pcs_makupskl = 10
 		npc_rel['A11'] -= 20
 		willpowermax = 60
@@ -1264,7 +1264,7 @@ end
 if $ARGS[0] = 'goodgirl':
 	'<center><h4><font color="maroon">Good girl</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/system/1_openings/2_sg/outcast_3.jpg"></center>'
-	'You were the good girl who parents, teachers and adults loved and the other kids hated. You always reminded the teacher to give out homework and would snitch on anyone for doing anything. You also regularly attended church.' 
+	'You were the good girl who parents, teachers and adults loved and the other kids hated. You always reminded the teacher to give out homework and would snitch on anyone for doing anything. You also regularly attended church.'
 	'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 'Confirm this starting option':
 		pcs_traits['nerd_points'] = 100

+ 16 - 16
locations/intro_customization.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'start':
 	act 'Set purse': gt 'intro_customization','modpur'
 	act 'Set items': gt 'intro_customization','modite'
 	act 'Set money (<<money>>₽)': money = input 'Set Cash Amount' & gt'intro_customization','start'
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		gs 'intro_sg_select_custom', 'start'
 	else
 		act 'Confirm these options':
@@ -41,13 +41,13 @@ if $ARGS[0] = 'modapp':
 	else
 		'<a href="exec:genbsize = 7 & gt ''intro_customization'',''modapp''">Below average</a>'
 	end
-	
+
 	if genbsize = 12:
 		'Average - Currently set'
 	else
 		'<a href="exec:genbsize = 12 & gt ''intro_customization'',''modapp''">Average</a>'
 	end
-	
+
 	if genbsize = 17:
 		'Above average - Currently set'
 	else
@@ -95,13 +95,13 @@ if $ARGS[0] = 'modapp':
 	else
 		'<a href="exec:genbsize = 57 & gt ''intro_customization'',''modapp''">Freakishly big</a>'
 	end
-	
+
 	if genbsize = 67:
 		'Will struggle to open doors or see the ground big - Currently set'
 	else
 		'<a href="exec:genbsize = 67 & gt ''intro_customization'',''modapp''">Will struggle to open doors or see the ground big</a>'
 	end
-	
+
 	if genbsize = 87:
 		'You''ve been eclipsed by 2 small moons - Currently set'
 	else
@@ -141,7 +141,7 @@ if $ARGS[0] = 'modite':
 	act 'Computer (<<komp>>/1)':
 		if komp = 0:
 			komp = 1
-		else 
+		else
 			komp = 0
 		end
 		gt 'intro_customization','modite'
@@ -235,7 +235,7 @@ if $ARGS[0] = 'modpur':
 		currentpursenumber = ARGS[2]
 	end
 	*clr & cla
-	if $currentpursetype = '': 
+	if $currentpursetype = '':
 		'You do not own a purse.'
 	else
 		bag = 1
@@ -254,7 +254,7 @@ if $ARGS[0] = 'modpur':
 		*p '<a href="exec:gt ''intro_customization'', ''modpur'', ''gm'', <<i>>"><img src="images/pc/items/gm/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 20:jump 'loopgmpurses'
-	end	
+	end
 	act 'Get Danilovich':
 		*clr & cla
 		'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
@@ -263,7 +263,7 @@ if $ARGS[0] = 'modpur':
 		*p '<a href="exec:gt ''intro_customization'', ''modpur'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/purses/<<i>>.jpg" 	height="300" /></a>'
 		i += 1
 		if i <= 20:jump 'loopdanilovichpurses'
-	end	
+	end
 	act 'Get Dolls':
 		*clr & cla
 		'<center><img src="images/locations/city/island/dolls/shop_name.png"></center>'
@@ -323,7 +323,7 @@ if $ARGS[0] = 'modpur':
 		$currentpursetype = ''
 		currentpursenumber = ''
 		gt 'intro_customization','modpur'
-	end	
+	end
 end
 !!This is used to set value, is used to avoid any values that go below 5.
 if $ARGS[0] = 'setval':
@@ -462,7 +462,7 @@ if $ARGS[0] = 'modskl_men':
 
 	act 'Return':
 		gt 'intro_customization','modskl'
-	end 
+	end
 end
 
 if $ARGS[0] = 'modskl_spo':
@@ -568,7 +568,7 @@ if $ARGS[0] = 'hair':
 		'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
 	end
 	*nl
-	
+
 	if player_avatar = 1:
 		'<center>Adjust your hair to match your avatar.</center>'
 		'<center>Please note that this choice is given only once and you will not be able to change it without starting a new game!</center>'
@@ -676,7 +676,7 @@ if $ARGS[0] = 'eyes':
 
 	if player_avatar = 1:
 		'<center>Adjust your eyes and eyelashes to match your avatar.</center>'
-	end	
+	end
 	*nl
 	'<center><i><<$glaza>></i></center>'
 	*nl
@@ -686,8 +686,8 @@ if $ARGS[0] = 'eyes':
 	if pcs_eyesize > 0:'<center><a href="exec:pcs_eyesize -= 1 & gs ''intro_customization'', ''eyes''">Smaller eyes</a></center>'
 	if glass = 0:'<center><a href="exec:glass = 1 & gs ''intro_customization'', ''eyes''">Wear glasses</a></center>'
 	if glass = 1:'<center><a href="exec:glass = 0 & gs ''intro_customization'', ''eyes''">Remove glasses</a></center>'
-	
-	
+
+
 	act'<center><b>Done</b></center>': gt $loc, $loc_arg
 end
 
@@ -715,7 +715,7 @@ if $ARGS[0] = 'birthday':
 	if birthday = 0: birthday = 1
 
 	if birthmonth = 2:
-		if ((birthyear mod 4 = 0) and (birthyear mod 100 ! 0)) or (birthyear mod 400 = 0): 
+		if ((birthyear mod 4 = 0) and (birthyear mod 100 ! 0)) or (birthyear mod 400 = 0):
 			monthdays = 29
 		else
 			monthdays = 28

+ 4 - 4
locations/intro_initialization_city.qsrc

@@ -3,7 +3,7 @@
 !!	Final Initializations
 !!	Top area for things that need to be done before setting the variables for either start
 
-if mid($start_type,1,3) ! 'uni':
+if $start_loc ! 'uni':
 	month = 6
 	$month = 'June'
 	day = 4
@@ -38,7 +38,7 @@ $excer_name[4] = 'Default 4'
 $excer_name[5] = 'Default 5'
 
 monthsend[1] = 31
-if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0): 
+if ((year mod 4 = 0) and (year mod 100 ! 0)) or (year mod 400 = 0):
 	Leapyear = 1 & monthsend[2] = 29
 else
 	Leapyear = 0 & monthsend[2] = 28
@@ -63,7 +63,7 @@ $monthName[6] = 'June'
 $monthName[7] = 'July'
 $monthName[8] = 'August'
 $monthName[9] = 'September'
-$monthName[10] = 'October' 
+$monthName[10] = 'October'
 $monthName[11] = 'November'
 $monthName[12] = 'December'
 $month = $monthName[month]
@@ -78,7 +78,7 @@ age = year - ((pcs_dob - (pcs_dob mod 10000)) / 10000)
 if ((month * 100) + day) < pcs_dob mod 10000: age -= 1
 
 !! apartment access and two months of rent paid
-if mid($start_type,1,4) = 'city':
+if $start_loc = 'city':
 	gs 'homes_properties', 'give_access', 'parents_home'
 	SchoolAtestat = 1
 	gs 'homes_properties', 'rent_property', 'city_apartment', 61

+ 134 - 134
locations/journal.qsrc

@@ -4,7 +4,7 @@
 ! Refactored 24 Aug 22
 ! Amended by Hooded Silence
 ! Game Character Journal - central core game data area for players.
-! V .01 Refactored to enable menu bar navigation for UI consistency. 
+! V .01 Refactored to enable menu bar navigation for UI consistency.
 ! V .02 Redesign and integration of content areas.
 ! V .03 Bug fixes.
 !
@@ -14,7 +14,7 @@
 ! 2 Work - calls in journal_work
 ! 3 Quests - calls in journal_quest section
 ! 4 Relations / Current Group - pulls in various elements refactored from other areas to make tracking relationships easier. To be expanded on.
-! 5 General Information 
+! 5 General Information
 ! 6 User Notes - custom function
 !
 ! Menu Variables
@@ -37,24 +37,24 @@ if $ARGS[0]='journalmenu':
 	gs 'stat'
 	if $start_type[1] ! 'nomagic':
         $tablebody = '<tr><th><a href="exec:menutrack = 0 & gs ''journal'', ''magictab''">Magic</a></th><th><a href="exec:menutrack = 1 & gs ''Journal'', ''housingtab''">Housing</a></th><th><a href="exec:menutrack = 2 & gs ''journal_work'', ''start''">Work</a></th><th><a href="exec:menutrack = 2 & gs ''journal_quests'', ''start''">Quests</a></th><th><a href="exec:menutrack = 4 & gs ''journal'', ''relationstab''">Relations</a></th><th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th><th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th></tr>'
-    
+
     else
         $tablebody ='<tr><th><a href="exec:menutrack = 1 & gs ''Journal'', ''housingtab''">Housing</a></th><th><a href="exec:menutrack = 2 & gs ''journal_work'', ''start''">Work</a></th><th><a href="exec:menutrack = 2 & gs ''journal_quests'', ''start''">Quests</a></th><th><a href="exec:menutrack = 4 & gs ''journal'', ''relationstab''">Relations</a></th><th><a href="exec:menutrack = 5 & gs ''journal'', ''generaltab''">Game Information</a></th><th><a href="exec:menutrack = 6 & gs ''journal'', ''notestab''">Notes</a></th></tr>'
     ! menu
     end
 	!display the table here.
-	
+
 	'<center><table width="90%" align="center" width="90%" cellspacing="0" cellpadding="0" valign="top"><tr><<$tablebody>></tr></table></center>'
-	
-	if $jumploc = '' or jclose = 1: 
-		if $start_type[1] ! 'nomagic': 
+
+	if $jumploc = '' or jclose = 1:
+		if $start_type[1] ! 'nomagic':
 			menutrack = 0
 			jclose = 0
 			gt 'journal', 'magictab'
 		else
 			menutrack = 1
 			jclose = 0
-			gt 'journal', 'housingtab'  
+			gt 'journal', 'housingtab'
 		end
 	end
 	gs 'journal', 'leaveactions'
@@ -66,19 +66,19 @@ end
 if $ARGS[0] = 'magictab':
 	$jumploc = 'magictab'
 	gs 'journal', 'journalmenu'
-	
+
 	'<center><h2>Spells</h2></center><br>'
 	'<center><h2>Spells to Cast</h2></center><br>'
-	func('spellBook','cast','$nonComSpells', 'gt ''journal'', ''magictab''', 'jclose = 1') 
+	func('spellBook','cast','$nonComSpells', 'gt ''journal'', ''magictab''', 'jclose = 1')
 	!!''''
 	'<br><center><h2>Spell Learning</h2></center><br>'
 	'<br><center><h3>Combat</h3></center><br>'
-	func('spellBook','learn','$combatSpells') 
+	func('spellBook','learn','$combatSpells')
 	'<br><center><h3>Non-Combat</h3></center><br>'
-	func('spellBook','learn','$nonComSpells') 
+	func('spellBook','learn','$nonComSpells')
 	delact 'Never mind'
-	
-	
+
+
 ! magic
 end
 
@@ -87,7 +87,7 @@ if $ARGS[0] = 'housingtab':
 	gs 'journal', 'journalmenu'
 
 	'<center><h2>Housing</h2></center>'
-	
+
 	*nl
 	if accessible_property['shared_apartment'] = 4:'You share an apartment with three others in Pavlovsk. Your bills are paid by the other tenants in exchange for your house services'
 	if accessible_property['city_apartment'] = 1:'You rent a two room apartment in the city residential area. Your rent for the apartment is subtracted automatically in sum of <<accessible_property[''city_apartment-rent'']>> <b>₽</b> us electric bill on 25th of each month. You are currently paid up for <b><<accessible_property[''city_apartment-days-left'']>></b> days'
@@ -140,26 +140,26 @@ if $ARGS[0] = 'relationstab':
 
 	'<center><h2>Relationships</h2></center>'
 	'<h2>Family</h2>'
-		
+
 	'Mother:'
-		
+
 	gs 'journal', 'relindex', 'A29'
-	
+
 	'Stepfather:'
-	
+
 	gs 'journal', 'relindex', 'A28'
-	
+
 	'Sister:'
 
 	gs 'journal', 'relindex', 'A33'
-	
+
 	'Brother:'
-	
+
 	gs 'journal', 'relindex', 'A34'
 
-	
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
-	
+
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+
 		'<center><h2>Standings by Social Group</h2></center>'
 
 		if grupTipe < 5 and grupvalue[grupTipe] > 700:
@@ -186,7 +186,7 @@ if $ARGS[0] = 'relationstab':
 			'Your school social group consists of losers, teacher''s pets, sluts and the ugly.'
 		end
 		*nl
-		
+
 		'Cool Kids'
 
 		gs 'indik', '4', grupvalue[1]/10, grupvalue[1], 1 & '<<$ind>>'
@@ -199,129 +199,129 @@ if $ARGS[0] = 'relationstab':
 
 		'Gopnik'
 		gs 'indik', '4', grupvalue[4]/10, grupvalue[4], 4 & '<<$ind>>'
-			
+
 		'<center><h2>Popular Kids Relations</h2></center>'
-		
-		if npc_rel['A1'] > 0: 'Friendship with Dimka:' & gs 'journal', 'relindex', 'A1' 
-		if npc_rel['A4'] > 0: 'Friendship with Igor:' & gs 'journal', 'relindex', 'A4' 
-		if npc_rel['A14'] > 0: 'Friendship with Katja:' & gs 'journal', 'relindex', 'A14' 
-		if npc_rel['A15'] > 0: 'Friendship with Vicky:' & gs 'journal', 'relindex', 'A15' 
+
+		if npc_rel['A1'] > 0: 'Friendship with Dimka:' & gs 'journal', 'relindex', 'A1'
+		if npc_rel['A4'] > 0: 'Friendship with Igor:' & gs 'journal', 'relindex', 'A4'
+		if npc_rel['A14'] > 0: 'Friendship with Katja:' & gs 'journal', 'relindex', 'A14'
+		if npc_rel['A15'] > 0: 'Friendship with Vicky:' & gs 'journal', 'relindex', 'A15'
 		if npc_rel['A17'] > 0: 'Friendship with Irina:' & gs 'journal', 'relindex', 'A17'
-		if npc_rel['A22'] > 0: 'Friendship with Bella:' & gs 'journal', 'relindex', 'A22' 
-		if npc_rel['A146'] > 0: 'Friendship with Marcus:' & gs 'journal', 'relindex', 'A146' 
-		if npc_rel['A147'] > 0: 'Friendship with Andrey:' & gs 'journal', 'relindex', 'A147' 
-		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:' & gs 'journal', 'relindex', 'A148' 
-		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
-		if npc_rel['A139'] > 0: 'Friendship with Stasya:' & gs 'journal', 'relindex', 'A139' 
-		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140' 
-		
+		if npc_rel['A22'] > 0: 'Friendship with Bella:' & gs 'journal', 'relindex', 'A22'
+		if npc_rel['A146'] > 0: 'Friendship with Marcus:' & gs 'journal', 'relindex', 'A146'
+		if npc_rel['A147'] > 0: 'Friendship with Andrey:' & gs 'journal', 'relindex', 'A147'
+		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:' & gs 'journal', 'relindex', 'A148'
+		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if npc_rel['A139'] > 0: 'Friendship with Stasya:' & gs 'journal', 'relindex', 'A139'
+		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140'
+
 		'<center><h2>Jocks Relations</h2></center>'
-		
-		if npc_rel['A3'] > 0: 'Friendship with Ivan:' & gs 'journal', 'relindex', 'A3' 
-		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
-		if npc_rel['A8'] > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8' 
-		if npc_rel['A13'] > 0: 'Friendship with Lariska:' & gs 'journal', 'relindex', 'A13' 
+
+		if npc_rel['A3'] > 0: 'Friendship with Ivan:' & gs 'journal', 'relindex', 'A3'
+		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+		if npc_rel['A8'] > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8'
+		if npc_rel['A13'] > 0: 'Friendship with Lariska:' & gs 'journal', 'relindex', 'A13'
 		if npc_rel['A18'] > 0: 'Friendship with Christina:' & gs 'journal', 'relindex', 'A18'
 		if npc_rel['A19'] > 0: 'Friendship with Lina:' & gs 'journal', 'relindex', 'A19'
-		if npc_rel['A23'] > 0: 'Friendship with Albina:' & gs 'journal', 'relindex', 'A23' 
-		if npc_rel['A149'] > 0: 'Friendship with Lazar:' & gs 'journal', 'relindex', 'A149' 
-		if npc_rel['A150'] > 0: 'Friendship with Erast:' & gs 'journal', 'relindex', 'A150' 
-		if npc_rel['A141'] > 0: 'Friendship with Veronika:' & gs 'journal', 'relindex', 'A141' 
-		if npc_rel['A165'] > 0: 'Friendship with Vanya:' & gs 'journal', 'relindex', 'A165' 
-		
+		if npc_rel['A23'] > 0: 'Friendship with Albina:' & gs 'journal', 'relindex', 'A23'
+		if npc_rel['A149'] > 0: 'Friendship with Lazar:' & gs 'journal', 'relindex', 'A149'
+		if npc_rel['A150'] > 0: 'Friendship with Erast:' & gs 'journal', 'relindex', 'A150'
+		if npc_rel['A141'] > 0: 'Friendship with Veronika:' & gs 'journal', 'relindex', 'A141'
+		if npc_rel['A165'] > 0: 'Friendship with Vanya:' & gs 'journal', 'relindex', 'A165'
+
 		'<center><h2>Nerds Relations</h2></center>'
-		
-		if npc_rel['A2'] > 0: 'Friendship with Artem:' & gs 'journal', 'relindex', 'A2' 
-		if npc_rel['A6'] > 0: 'Friendship with Petka:' & gs 'journal', 'relindex', 'A6' 
-		if npc_rel['A12'] > 0: 'Friendship with Julia:' & gs 'journal', 'relindex', 'A12' 
-		if npc_rel['A16'] > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16' 
+
+		if npc_rel['A2'] > 0: 'Friendship with Artem:' & gs 'journal', 'relindex', 'A2'
+		if npc_rel['A6'] > 0: 'Friendship with Petka:' & gs 'journal', 'relindex', 'A6'
+		if npc_rel['A12'] > 0: 'Friendship with Julia:' & gs 'journal', 'relindex', 'A12'
+		if npc_rel['A16'] > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16'
 		if npc_rel['A151'] > 0: 'Friendship with Evgeny:' & gs 'journal', 'relindex', 'A151'
 		if npc_rel['A152'] > 0: 'Friendship with Feofan:' & gs 'journal', 'relindex', 'A152'
-		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153' 
-		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142' 
-		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240' 
-		
+		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153'
+		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142'
+		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240'
+
 		'<center><h2>Gopnik Relations</h2></center>'
-		
-		if npc_rel['A9'] > 0: 'Friendship with Vitek:' & gs 'journal', 'relindex', 'A9' 
-		if npc_rel['A10'] > 0: 'Friendship with Dan:' & gs 'journal', 'relindex', 'A10' 
-		if npc_rel['A11'] > 0: 'Friendship with Vasily:' & gs 'journal', 'relindex', 'A11' 
-		if npc_rel['A20'] > 0: 'Friendship with Lena:' & gs 'journal', 'relindex', 'A20' 
+
+		if npc_rel['A9'] > 0: 'Friendship with Vitek:' & gs 'journal', 'relindex', 'A9'
+		if npc_rel['A10'] > 0: 'Friendship with Dan:' & gs 'journal', 'relindex', 'A10'
+		if npc_rel['A11'] > 0: 'Friendship with Vasily:' & gs 'journal', 'relindex', 'A11'
+		if npc_rel['A20'] > 0: 'Friendship with Lena:' & gs 'journal', 'relindex', 'A20'
 		if npc_rel['A21'] > 0: 'Friendship with Lera:' & gs 'journal', 'relindex', 'A21'
-		if npc_rel['A24'] > 0: 'Friendship with Pauline:' & gs 'journal', 'relindex', 'A24' 
-		if npc_rel['A154'] > 0: 'Friendship with Radomir:' & gs 'journal', 'relindex', 'A154' 
-		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:' & gs 'journal', 'relindex', 'A155' 
-		if npc_rel['A156'] > 0: 'Friendship with Arkadi:' & gs 'journal', 'relindex', 'A156' 
-		if npc_rel['A157'] > 0: 'Friendship with Roman:' & gs 'journal', 'relindex', 'A157' 
-		if npc_rel['A158'] > 0: 'Friendship with Valentin:' & gs 'journal', 'relindex', 'A158' 
-		if npc_rel['A143'] > 0: 'Friendship with Alyona:' & gs 'journal', 'relindex', 'A143' 
-		if npc_rel['A144'] > 0: 'Friendship with Anushka:' & gs 'journal', 'relindex', 'A144' 
-		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145' 
-		if npc_rel['A189'] > 0: 'Friendship with Niko:' & gs 'journal', 'relindex', 'A189' 
-		
+		if npc_rel['A24'] > 0: 'Friendship with Pauline:' & gs 'journal', 'relindex', 'A24'
+		if npc_rel['A154'] > 0: 'Friendship with Radomir:' & gs 'journal', 'relindex', 'A154'
+		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:' & gs 'journal', 'relindex', 'A155'
+		if npc_rel['A156'] > 0: 'Friendship with Arkadi:' & gs 'journal', 'relindex', 'A156'
+		if npc_rel['A157'] > 0: 'Friendship with Roman:' & gs 'journal', 'relindex', 'A157'
+		if npc_rel['A158'] > 0: 'Friendship with Valentin:' & gs 'journal', 'relindex', 'A158'
+		if npc_rel['A143'] > 0: 'Friendship with Alyona:' & gs 'journal', 'relindex', 'A143'
+		if npc_rel['A144'] > 0: 'Friendship with Anushka:' & gs 'journal', 'relindex', 'A144'
+		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145'
+		if npc_rel['A189'] > 0: 'Friendship with Niko:' & gs 'journal', 'relindex', 'A189'
+
 		'<center><h2>Outcast/Loner Relations</h2></center>'
-		
-		if npc_rel['A7'] > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7' 
-		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159' 
-		if soniaPS > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
-		if fedormasha = 1 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
-		
+
+		if npc_rel['A7'] > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7'
+		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159'
+		if soniaPS > 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25'
+		if fedormasha = 1 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5'
+
 		'<center><h2>Teachers/Coaches/School Staff Relations</h2></center>'
-		
-		if npc_rel['A26'] > 0: 'Friendship with Anatoly Tsarev (Math Teacher):' & gs 'journal', 'relindex', 'A26' 
-		if npc_rel['A69'] > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):' & gs 'journal', 'relindex', 'A69' 
-		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):' & gs 'journal', 'relindex', 'A128' 
+
+		if npc_rel['A26'] > 0: 'Friendship with Anatoly Tsarev (Math Teacher):' & gs 'journal', 'relindex', 'A26'
+		if npc_rel['A69'] > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):' & gs 'journal', 'relindex', 'A69'
+		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):' & gs 'journal', 'relindex', 'A128'
 		if npc_rel['A129'] > 0: 'Friendship with Serafim Ivanov (Computer Science Teacher):' & gs 'journal', 'relindex', 'A129'
-		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):' & gs 'journal', 'relindex', 'A130' 
+		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):' & gs 'journal', 'relindex', 'A130'
 		if npc_rel['A131'] > 0: 'Friendship with Viktor Pavlovich (P.E. Teacher):' & gs 'journal', 'relindex', 'A131'
-		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):' & gs 'journal', 'relindex', 'A132' 
-		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):' & gs 'journal', 'relindex', 'A133' 
-		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):' & gs 'journal', 'relindex', 'A134' 
+		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):' & gs 'journal', 'relindex', 'A132'
+		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):' & gs 'journal', 'relindex', 'A133'
+		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):' & gs 'journal', 'relindex', 'A134'
 		if npc_rel['A135'] > 0: 'Friendship with Yeva Sokoloff (Geography Teacher):' & gs 'journal', 'relindex', 'A135'
-		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):' & gs 'journal', 'relindex', 'A136' 
-		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):' & gs 'journal', 'relindex', 'A137' 
+		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):' & gs 'journal', 'relindex', 'A136'
+		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):' & gs 'journal', 'relindex', 'A137'
 		if npc_rel['A138'] > 0: 'Friendship with Arina Orlov (Biology Teacher):' & gs 'journal', 'relindex', 'A138'
-		
+
 
 		!!!WD: Formatting
 		if (npc_rel['A93'] + npc_rel['A41'] + npc_rel['A42'] + npc_rel['A43'] + gosh + npc_rel['A220'] + npc_rel['A219'] + npc_QW['A192'] + npc_rel['A218']) > 0:*nl
 		*nl
-		
+
 	end
-			
+
 	'<center><h2>Pavlovsk Relations</h2></center>'
-	if npc_rel['A54'] > 0: 'Friendship with Uncle Misha:' & gs 'journal', 'relindex', 'A54' 	 
-	if npc_rel['A57'] > 0: 'Friendship with Rex:' & gs 'journal', 'relindex', 'A57' 
-	if npc_rel['A217'] > 0: 'Friendship with Pavlin:' & gs 'journal', 'relindex', 'A217'  	 
-	if npc_rel['A112'] > 0: 'Friendship with Sergey Shulgin:' & gs 'journal', 'relindex', 'A112'   	 
-	if npc_rel['A119'] > 0: 'Friendship with Borislav:' & gs 'journal', 'relindex', 'A119' 
-		
+	if npc_rel['A54'] > 0: 'Friendship with Uncle Misha:' & gs 'journal', 'relindex', 'A54'
+	if npc_rel['A57'] > 0: 'Friendship with Rex:' & gs 'journal', 'relindex', 'A57'
+	if npc_rel['A217'] > 0: 'Friendship with Pavlin:' & gs 'journal', 'relindex', 'A217'
+	if npc_rel['A112'] > 0: 'Friendship with Sergey Shulgin:' & gs 'journal', 'relindex', 'A112'
+	if npc_rel['A119'] > 0: 'Friendship with Borislav:' & gs 'journal', 'relindex', 'A119'
+
 	'<center><h2>Gadukino Relations</h2></center>'
-	if npc_rel['A31'] > 0: 'Friendship with Elena (your great-grandmother):' & gs 'journal', 'relindex', 'A31' 
-	if npc_rel['A32'] > 0: 'Friendship with Zlatek (your great-grandfather):' & gs 'journal', 'relindex', 'A32' 
-	if npc_rel['A60'] > 0: 'Friendship with Mira:' & gs 'journal', 'relindex', 'A60' 
-	if npc_rel['A61'] > 0: 'Friendship with Kolyamba:' & gs 'journal', 'relindex', 'A61' 
-	if npc_rel['A62'] > 0: 'Friendship with Vasyan:' & gs 'journal', 'relindex', 'A62' 
-	if npc_rel['A63'] > 0: 'Friendship with Mitka:' & gs 'journal', 'relindex', 'A63' 
-	if npc_rel['A64'] > 0: 'Friendship with Afanasiy:' & gs 'journal', 'relindex', 'A64' 
-	if npc_rel['A65'] > 0: 'Friendship with Vtialiy:' & gs 'journal', 'relindex', 'A65' 
-	if npc_rel['A221'] > 0: 'Friendship with Grigory:' & gs 'journal', 'relindex', 'A221' 		 	
-	if npc_rel['A172'] > 0: 'Friendship with Andrei (hunter):' & gs 'journal', 'relindex', 'A172' 	 	
-	if npc_rel['A173'] > 0: 'Friendship with Igor (hunter):' & gs 'journal', 'relindex', 'A173'  	
-	if npc_rel['A174'] > 0: 'Friendship with Sergei (hunter):' & gs 'journal', 'relindex', 'A174' 
-	
+	if npc_rel['A31'] > 0: 'Friendship with Elena (your great-grandmother):' & gs 'journal', 'relindex', 'A31'
+	if npc_rel['A32'] > 0: 'Friendship with Zlatek (your great-grandfather):' & gs 'journal', 'relindex', 'A32'
+	if npc_rel['A60'] > 0: 'Friendship with Mira:' & gs 'journal', 'relindex', 'A60'
+	if npc_rel['A61'] > 0: 'Friendship with Kolyamba:' & gs 'journal', 'relindex', 'A61'
+	if npc_rel['A62'] > 0: 'Friendship with Vasyan:' & gs 'journal', 'relindex', 'A62'
+	if npc_rel['A63'] > 0: 'Friendship with Mitka:' & gs 'journal', 'relindex', 'A63'
+	if npc_rel['A64'] > 0: 'Friendship with Afanasiy:' & gs 'journal', 'relindex', 'A64'
+	if npc_rel['A65'] > 0: 'Friendship with Vtialiy:' & gs 'journal', 'relindex', 'A65'
+	if npc_rel['A221'] > 0: 'Friendship with Grigory:' & gs 'journal', 'relindex', 'A221'
+	if npc_rel['A172'] > 0: 'Friendship with Andrei (hunter):' & gs 'journal', 'relindex', 'A172'
+	if npc_rel['A173'] > 0: 'Friendship with Igor (hunter):' & gs 'journal', 'relindex', 'A173'
+	if npc_rel['A174'] > 0: 'Friendship with Sergei (hunter):' & gs 'journal', 'relindex', 'A174'
+
 	'<center><h2>Saint Petersburg Relations</h2></center>'
-	if npc_QW['A192'] > 0: 'Friendship with Nastya:' & gs 'journal', 'relindex', 'A192' 
-	if npc_rel['A218'] > 0: 'Friendship with Tanya:' & gs 'journal', 'relindex', 'A218'  
-	if npc_rel['A219'] > 0: 'Friendship with Kat:' & gs 'journal', 'relindex', 'A219' 
-	if npc_rel['A220'] > 0: 'Friendship with Vika:' & gs 'journal', 'relindex', 'A220' 
-	if npc_rel['A93'] > 0: 'Friendship with Ira:'  & gs 'journal', 'relindex', 'A93' 
-	if npc_rel['A43'] > 0: 'Friendship with Tamara:' & gs 'journal', 'relindex', 'A43' 
-	if npc_rel['A35'] > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35' 
-	if npc_rel['A169']> 0: 'Friendship with Dima:'  & gs 'journal', 'relindex', 'A169' 		 		
-	if npc_rel['A89']> 0: 'Friendship with Eugene:'  & gs 'journal', 'relindex', 'A89' 			 		
-	if npc_rel['A216']> 0: 'Friendship with Martin:'  & gs 'journal', 'relindex', 'A216'  	 		
-	
+	if npc_QW['A192'] > 0: 'Friendship with Nastya:' & gs 'journal', 'relindex', 'A192'
+	if npc_rel['A218'] > 0: 'Friendship with Tanya:' & gs 'journal', 'relindex', 'A218'
+	if npc_rel['A219'] > 0: 'Friendship with Kat:' & gs 'journal', 'relindex', 'A219'
+	if npc_rel['A220'] > 0: 'Friendship with Vika:' & gs 'journal', 'relindex', 'A220'
+	if npc_rel['A93'] > 0: 'Friendship with Ira:'  & gs 'journal', 'relindex', 'A93'
+	if npc_rel['A43'] > 0: 'Friendship with Tamara:' & gs 'journal', 'relindex', 'A43'
+	if npc_rel['A35'] > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35'
+	if npc_rel['A169']> 0: 'Friendship with Dima:'  & gs 'journal', 'relindex', 'A169'
+	if npc_rel['A89']> 0: 'Friendship with Eugene:'  & gs 'journal', 'relindex', 'A89'
+	if npc_rel['A216']> 0: 'Friendship with Martin:'  & gs 'journal', 'relindex', 'A216'
+
 	! '<center><h2>Other Relations</h2></center>'
 	! Uncomment if re-introduced into the game ensure you use NPC ID to update them
 	! if alla > 0: 'Friendship with Alla <<alla>>'
@@ -390,16 +390,16 @@ end
 if $ARGS[0] = 'generaltab':
 	$jumploc = 'generaltab'
 	gs 'journal', 'journalmenu'
-	
+
 ! generaltab
 	'<center><h2>General Information</h2></center>'
-	
+
 	if ARRSIZE('$portfolio_locations') > 0 or ARRSIZE('$portfolio_people') > 0:
 		act 'View your photography portfolio': gt 'journal_portfolio'
 	end
 	'<br><center><a href="exec: gs ''journal'', ''locations''">Locations</a></center>'
 	'<br><center><a href="exec: gs ''journal'', ''friends_family''">Friends & Family</a></center>'
-	if SchoolAtestat = 0 and mid($start_type,1,2) = 'sg' and SchoolBlock = 0: '<br><center><a href="exec: gs ''journal_school'', ''school''">School</a></center><br><center><a href="exec: gs ''journal_school'', ''coursesinfo''">School Courses and Grades</a></center>'
+	if SchoolAtestat = 0 and $start_loc = 'sg' and SchoolBlock = 0: '<br><center><a href="exec: gs ''journal_school'', ''school''">School</a></center><br><center><a href="exec: gs ''journal_school'', ''coursesinfo''">School Courses and Grades</a></center>'
 	if university['student'] = 1: '<br><center><a href="exec: gs ''journal'', ''uni''">University</a></center>'
 	'<br><center><a href="exec: gs ''journal'', ''clothing''">Clothing information</a></center>'
 end
@@ -421,11 +421,11 @@ if $ARGS[0] = 'notestab':
 		jump 'jur_loop'
 	end
 	killvar 'jur_temp'
-	
+
 ! notes
 end
 
-! ---- Other Sections ---- 
+! ---- Other Sections ----
 
 if $ARGS[0] = 'clothing':
 	$jumploc = 'generalsub'
@@ -481,7 +481,7 @@ if $ARGS[0] = 'uni':
 	j += 1
 	if j < 8: jump 'semester_loop'
 	killvar 'j'
-	
+
 	if university['semester_passed'] = university['enrolled_in_semester'] and university['diploma'] = 0:
 		*nl
 		'You need to register for your next semester at the university administration'
@@ -638,10 +638,10 @@ if $ARGS[0] = 'relindex':
 end
 
 if $ARGS[0] = 'leaveactions':
-	act 'Put your notebook down': 		 
+	act 'Put your notebook down':
 		killvar 'jumploc'
 		jclose = 1
 		gt $loc, $loc_arg
-	end	
+	end
 end
---- journal ---------------------------------
+--- journal ---------------------------------

+ 4 - 4
locations/journal_quests.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'start':
 
 
 	'<center><h2>Quests</h2></center>'
-	
+
 	if npc_known['A60'] = 1:
 		if meadow > 0:
 			'<center><h3>Miroslava Maximova</h3></center>'
@@ -63,7 +63,7 @@ if $ARGS[0] = 'start':
 
 
 !!to check Sveta is at school. All school quests must pass this and it should become a category as we expand
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 		'<center><h3>Cheerleading</h3></center>'
 		*nl
 		if (month > 11 or month < 6) and cheerleadingQW['quest_stage'] = 0:
@@ -452,7 +452,7 @@ if $ARGS[0] = 'start':
 						'Katja is not comfortable with trying the stap-on again. She needs to loose some more inhibition.'
 					else
 						'You need to get Katja to lose some more of her inhibition before you can use your strap-on on her.'
-					end	
+					end
 				elseif katjaQW['strapon_vag'] + katjaQW['strapon_ass'] + katjaQW['strapon_bj'] < 3:
 					'You should' +iif(katjaQW['strapon_bj'] = 0, '; make Katja give your strap-on a blowjob', '')+ +iif( katjaQW['strapon_vag'] = 0, '; fuck Katja''s pussy with your strap-on', '')+ +iif(katjaQW['strapon_ass'] = 0, '; fuck Katja in the ass with your strap-on', '')+'.'
 				end
@@ -556,7 +556,7 @@ if yearstart > 1 and university['enrolled_in_semester'] > university['semester_p
 				end
 
 				if katjaQW['lazar_uni_meet'] = 0 and university['semester_week'] + university['exam_week'] > 0:
-					'If you have lunch at the university cafe with Katja Monday to Thursday, then you might meet somebody interesting' 
+					'If you have lunch at the university cafe with Katja Monday to Thursday, then you might meet somebody interesting'
 				else
 					if (katjaQW['lazer_pussy_talk'] = 0 and katjaQW['lazer_pussy'] = 0 and katjaQW['slut'] >= 50) or (katjaQW['lazer_anal_talk'] = 0 and katjaQW['lazer_anal'] = 0 and katjaQW['slut'] >= 60):
 						'Katja wants to ask you something at her home, but she needs to be in the right mood before she will ask.'

+ 46 - 46
locations/katja_chat.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 				act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 				act 'Say you can''t stay to chat': gt $loc, $loc_arg
 			else
-				act 'Leave': gt $loc, $loc_arg			
+				act 'Leave': gt $loc, $loc_arg
 			end
 		elseif npc_rel['A14'] > 60:
 			'"Hi, <<$pcs_nickname>>. Great to see you. How is it going?" she asks.'
@@ -107,7 +107,7 @@ if $ARGS[0] = 'uni_cafe':
 					act 'Say you can''t stay to chat': gt 'uni_cafe'
 				end
 			else
-				act 'Leave': gt 'uni_cafe'		
+				act 'Leave': gt 'uni_cafe'
 			end
 		elseif npc_rel['A14'] > 60:
 			'"Hi <<$pcs_nickname>>, great to see you. How''s it going?" she asks.'
@@ -139,7 +139,7 @@ if $ARGS[0] = 'uni_cafe':
 end
 
 if $ARGS[0] = 'chat':
-	gs 'katja_meynold_schedule' 
+	gs 'katja_meynold_schedule'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if locat['katja'] = 26:
@@ -165,9 +165,9 @@ if $ARGS[0] = 'chat':
 			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
-		end		
+		end
 	elseif locat['katja']  = 28:
-		if hotcat >6 and rand(0,5)= 0 and katjaQW['slut'] > 30 and katjaQW['lazar_uni_meet'] = 0: 
+		if hotcat >6 and rand(0,5)= 0 and katjaQW['slut'] > 30 and katjaQW['lazar_uni_meet'] = 0:
 			gt 'katja_uni', 'katja_lazar_cafe'
 		else
 			gs 'katja_procedural', 'face_color'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'chat':
 			else
 				gt 'katja_chat', 'chat1'
 			end
-		end		
+		end
 	elseif locat['katja'] = 24 or locat['katja'] = 25 or locat['katja'] = 44 or locat['katja'] = 28:
 		gs 'katja_procedural', 'face_color'
 		if katjaQW['QWstage'] >= 2 and pcs_makeup < 2:
@@ -196,10 +196,10 @@ if $ARGS[0] = 'chat1':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	!! If you had a threesome with Katja at th nightclub before you started her quest.
 	if katjaQW['first_time_in_nightclub'] > 0 and npc_sex['A14'] = 0: gt 'katja_chat', 'nightclub_sex_follow_up'
-	
+
 	!! Reaction on the first time you meet Sofia, Katja''s roommate.
 	if sofiaQW['know'] = 1 and sofiaQW['QWstage'] = 0: gt 'katja_chat', 'sofia1'
-		
+
 	if katjaQW['know_katja_uni'] = 0: gt 'katja_chat', 'first_meet'
 
 	if katjaQW['QWstage'] >= 2 and katjaQW['knows_dorm_room_number'] = 0:
@@ -215,7 +215,7 @@ if $ARGS[0] = 'chat1':
 	!!	act 'Show Katja you''re not wearing panties': gt 'katja_procedural', 'makeup', 'katja_chat', 'chat'
 	!!end
 
-	if locat['katja'] = 24: 
+	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 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'
@@ -232,7 +232,7 @@ if $ARGS[0] = 'chat1':
 			act 'Suggest trying on some clothes': gt 'katja_city', 'clothes_start1'
 		end
 	end
-	act 'Say goodbye and leave': 
+	act 'Say goodbye and leave':
 		minut += 5
 		if katjaQW['QWstage'] >= 2 and locat['katja'] = 44 and rand(0,3) = 0 and katjaQW['shopping_day'] ! daystart:
 			gt 'katja_city', 'clothes_start2'
@@ -250,7 +250,7 @@ if $ARGS[0] = 'first_meet':
 	'"Yes, I''m '+iif(year = 2017 and month < 10, 'going to study', 'studying')+' to become a teacher," she 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 reply.'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'
-end	
+end
 
 
 if $ARGS[0] = 'sofia1':
@@ -310,7 +310,7 @@ if $ARGS[0] = 'brunch':
 		gs 'katja_procedural', 'makeup', 'katja_chat', 'brunch'
 	end
 	'You sit down and start chatting with Katja.'+iif(npc_rel['A14'] < 40 and katjaQW['QWstage'] = 0, ' Your talk is a little awkward since you don''t know each other that well, but it''s a nice conversation anyway', ' You have so much fun talking that Katja seems to forget that she was studying')+'.'
-	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
+	if $start_loc = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)):
 		if npc_rel['A144'] >= 60:
 			'After a while, Anushka comes over and gives you a friendly smile. "Welcome to the Coffee Hole. Need your hole filled with something hot and black again? We also have <i>freshly glazed</i> pastries if that''s more your thing," she says with a wink, even making ordering coffee sound dirty.'
 			'You smile at her. "You are so bad."'
@@ -334,7 +334,7 @@ if $ARGS[0] = 'brunch':
 			'"Well, I would like a ....." Katja starts to reply, only to stop and turn completely red in the face when she finally gets the innuendo.'
 			'Anushka turns and half sits on the table next to her before leaning forward and crowding Katja ever so slightly. "You would like a....." She pauses dramatically before continuing. "Let me guess, the usual. One... hot... black... coffee coming up. I know you like getting the cream yourself," She adds with a wink before getting up to get the order. It didn''t seem possible, but after that last comment Katja manages to turn even more red.'
 		end
-	else 
+	else
 		'After a while, a heavily tattooed waitress with short blond hair shaved on one side comes over to your table. "Welcome to the Coffee Hole, what can I get you?" she asks in a bored and monotone voice.'
 	end
 	act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
@@ -344,7 +344,7 @@ end
 if $ARGS[0] = 'coffee_hole_event':
 	minut += 5
 	!! This is to have random events when you are sitting with Katja
-	if mid($start_type,1,2) = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)) and katjaQW['brunch_bought'] = 1:
+	if $start_loc = 'sg' and yearstart >= 2 and (((week = 2 or week = 4 or week = 7) and hour >= 18) or (week = 5 and hour >= 10 and hour < 16)) and katjaQW['brunch_bought'] = 1:
 		katjaQW['brunch_bought'] = 0
 		'You and Katja spend a few minutes chatting about school, what you''ve both been up to and gossiping about your old school mates while waiting on Anushka to return with the order. Minutes later, Anushka comes back with a tray carrying the order.'
 		if npc_rel['A144'] >= 60:
@@ -354,7 +354,7 @@ if $ARGS[0] = 'coffee_hole_event':
 			'Before he can finish, Anushka turns and interrupts him. "Oh my god, do you mind?! I''m having a conversation with my friends here. You think I only exist to wait on you? Am I not entitled to a small break now and again?" Her over the top tone and body language adds to her rant.'
 			*nl
 			'She just stares at him from that point on, and you can tell he''s getting flustered and nervous of what to say or do. "No... I mean... Yes, you''re entitled to that. I didn''t mean to imply... I mean... You know what, I can wait, it''s okay." He quickly turns back around and Anushka glances at the two of you with an amused look on her face, obviously fighting hard to not start giggling.'
-			'Katja looks shocked by Anushka''s behavior. "You can''t treat customers like that!" she says while looking at you for confirmation.' 
+			'Katja looks shocked by Anushka''s behavior. "You can''t treat customers like that!" she says while looking at you for confirmation.'
 			act 'Agree with Katja':
 				*clr & cla
 				gs 'npc_relationship', 'modify', 'A14', 'like'
@@ -389,7 +389,7 @@ if $ARGS[0] = 'coffee_hole_event':
 			'Before he can finish, Anushka turns and interrupts him. "Oh my god, do you mind?! I''m having a conversation with my friends here. You think I only exist to wait on you? Am I not entitled to a small break now and again?" Her over the top tone and body language adds to her rant.'
 			*nl
 			'She just stares at him from that point on, and you can tell he''s getting flustered and nervous of what to say or do. "No... I mean... Yes, you''re entitled to that. I didn''t mean to imply... I mean... You know what, I can wait, it''s okay." He quickly turns back around and Anushka glances at the two of you with an amused look on her face, obviously fighting hard to not start giggling.'
-			'Katja looks shocked by Anushka''s behavior "You can''t treat customers like that!" she says while looking at you for confirmation.' 
+			'Katja looks shocked by Anushka''s behavior "You can''t treat customers like that!" she says while looking at you for confirmation.'
 			act 'Agree with Katja':
 				*clr & cla
 				gs 'npc_relationship', 'modify', 'A14', 'like'
@@ -456,7 +456,7 @@ if $ARGS[0] = 'coffee_hole_event':
 				'"I don''t know, for what?" Katja asks.'
 				'"For the next con. You two should totally come. You would make a perfect Triss Marigold, Katja," he says. "I can help you with that. See, <<$pcs_nickname>> is ready to go as Yennefer."'
 				'"What! Who?!" Katja says, looking completely confused.'
-				'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.' 
+				'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.'
 				'But before he can explain further, a voice behind him calls out. "Geralt, my friend!"'
 				'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
 				'You explain to Katja what was going on, making sure that she does not feel like she was supposed to know anything about the game as you continue drinking your coffee.'
@@ -467,7 +467,7 @@ if $ARGS[0] = 'coffee_hole_event':
 				'"I don''t know, for what?" Katja asks.'
 				'"For the next con. You two should totally come. You would make a perfect Triss Marigold, Katja," he says. "I can help you with that. See, <<$pcs_nickname>> is ready to go as Ciri."'
 				'"What! Who?!" Katja says, looking completely confused.'
-				'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.' 
+				'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.'
 				'But before he can explain further, a voice behind him calls out. "Geralt, my friend!"'
 				'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
 				'You explain to Katja what was going on, making sure that she does not feel like she was supposed to know anything about the game as you continue drinking your coffee.'
@@ -482,12 +482,12 @@ if $ARGS[0] = 'coffee_hole_event':
 					act 'Cosplaying as Yennefer is cool':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
-						gs 'npc_relationship', 'modify', 'A152', 'love'			
+						gs 'npc_relationship', 'modify', 'A152', 'love'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 						'"Yennefer is cool, I '+iif(nerdvana_cosplay[149] = 1 , 'actually already have a cosplay outfit.', ' but I would need to get a costume.')+' It would be fun dressings up as her."'
 						'Feofan eyes light up. "Great, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
-						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.' 
+						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.'
 						'But before he can explain further, a voice behind him calls out. "Geralt, my friend!"'
 						'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
 						'You explain to Katja what was going on, making sure that she does not feel like she was supposed to know anything about the game as you continue drinking your coffee.'
@@ -500,7 +500,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						'"I think that Ciri is cooler, I '+iif(nerdvana_cosplay[150] = 1 , 'actually already own a Ciri cosplay outfit.', ' but I don''t have a costume.')+' It would be more fun dressing up as her."'
 						'Feofan eyes light up when you show your knowledge about the characters, but you can''t help feel he is a little disappointed by your choice. "Cool, cool, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
-						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.' 
+						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.'
 						'But before he can explain further, a voice behind him calls out. "Geralt, my friend!"'
 						'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
 						'You explain to Katja what was going on, making sure that she does not feel like she was supposed to know anything about the game as you continue drinking your coffee.'
@@ -510,12 +510,12 @@ if $ARGS[0] = 'coffee_hole_event':
 					act 'Suggest you cosplay as Yennefer':
 						*clr & cla
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
-						gs 'npc_relationship', 'modify', 'A152', 'like'			
+						gs 'npc_relationship', 'modify', 'A152', 'like'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 						'"I could dress up as Yennefer.'+iif(nerdvana_cosplay[149] = 1 , ' I actually already have her cosplay outfit.', ' but I would need to get a costume.')+' It would be fun dressing up as her."'
 						'Feofan eyes light up when you show your knowledge about the characters. "Great, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
-						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.' 
+						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.'
 						'But before he can explain further, a voice behind him calls out. "Geralt, my friend!"'
 						'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
 						'You explain to Katja what was going on, making sure that she does not feel like she was supposed to know anything about the game as you continue drinking your coffee.'
@@ -529,7 +529,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						'"I could dress up as Ciri,'+iif(nerdvana_cosplay[150] = 1 , ' I actually already have her cosplay outfit.', ' but I would need to get a costume.')+' It would be more fun dressings up as her."'
 						'Feofan eyes light up when you show your knowledge about the characters. "Great, then we just need to get Katja into a Triss costume!"'
 						'"What are you two talking about?" Katja says in a tone that makes it clear she does not like being out of the loop.'
-						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.' 
+						'"From The Witcher. You know, the best video game series ever. Have you been living under a rock?" Feofan says, looking at Katja with mild astonishment.'
 						'But before he can explain further, a voice behind him calls out. "Geralt, my friend!"'
 						'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
 						'You explain to Katja what was going on, making sure that she does not feel like she was supposed to know anything about the game as you continue drinking your coffee.'
@@ -543,7 +543,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/cosplay_feofan_garalt6.jpg"></center>'
 					'"What are you talking about, Feofan?" you ask.'
 					'"You know, Triss'+iif(hotcat > 4, ' and Yennefer ', ' ')+'from the Witcher." Feofan tries to explain.'
-					'"The what?" Katja asks, looking no wiser.' 
+					'"The what?" Katja asks, looking no wiser.'
 					'"The Witcher, the video game series. Help me out, <<$pcs_nickname>>! You know it, don''t you?" he asks.'
 					'"No, I don''t," you answer.'
 					'"I don''t believe it. '+iif(grupTipe = 3 or  nerd_game['stage'] > 0, 'You disappoint me, <<$pcs_nickname>>. I thought you were one of us.', 'How can you not know, do you people not notice what''s happening around you?')+'" he says in an exasperated voice.'
@@ -562,7 +562,7 @@ if $ARGS[0] = 'coffee_hole_event':
 					'"Maybe, but it''s not for me," you shrug.'
 					'He stands there with his mouth open looking in disbelief, but before he says anything else, a voice behind him calls out. "Geralt, my friend!"'
 					'Feofan turns around. "Dandelion!" he says to a boy you don''t know, also dressed up. They start talking and Feofan completely forgets about you and Katja.'
-					act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'					
+					act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 				end
 			end
 		elseif katjaQW['coffee_hole_rand'] = 4:
@@ -576,7 +576,7 @@ if $ARGS[0] = 'coffee_hole_event':
 						katjaQW['know_dandd'] = 1
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
 						'"It''s ''Dungeons and Dragons is what the game''," you tell Katja, who looks at you a little surprised. "I''m part of their group, it''s a lot of fun," you says.'
-						'"I didn''t know that. How does it work, Julia told me you are taking on roles like in a fantasy movie. Do you dress up? How is that even a game?" Katja asks, and you spend time trying to explain how the game works.' 
+						'"I didn''t know that. How does it work, Julia told me you are taking on roles like in a fantasy movie. Do you dress up? How is that even a game?" Katja asks, and you spend time trying to explain how the game works.'
 						act 'Continue to drink your coffee': gt 'katja_chat', 'coffee_hole_hangout'
 					end
 				end
@@ -701,11 +701,11 @@ if $ARGS[0] = 'coffee_hole_katja_nush_sveta':
 					'Anushka never glances back at the guy after his response as she walks to the counter. "You can stop staring at my ass now," she says and he blushes slightly while quickly looking anywhere but at her ass. "You pay me to look hot and flirt with the customers," she tells Joanna.'
 					'Joanna shakes her head. "No, I pay you to work the counter, wait on customers and keep them happy."'
 					'Anushka walks behind the counter. "Yeah, that''s what I said," she replies as she disappears in back. Joanna just looks up at the sky and visibly sighs, as if asking for help from a higher power to deal with Anushka.'
-					act 'Go back to talking with Katja': gt 'katja_chat', 'coffee_hole_hangout'								
+					act 'Go back to talking with Katja': gt 'katja_chat', 'coffee_hole_hangout'
 				end
 			else
 				act 'Convince Katja (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end		
+			end
 		else
 			'It''s clear she can''t be convinced.'
 		end
@@ -743,7 +743,7 @@ if $ARGS[0] = 'coffee_hole_hangout':
 			'"I need to go study. '+iif($university['enrolled_in'] = 'teaching_studies' or katjaQW['QWstage']> 0, 'Wanna join me?', 'See you later!')+'" she says as she packs her things and gets ready to leave.'
 			act 'Say goodbye and leave': gt 'city_coffee_hole', 'inner'
 			if $university['enrolled_in'] = 'teaching_studies' or katjaQW['QWstage']> 0:
-				act 'Go to the library with Katja': minut += 15 & gt 'katja_uni', 'library2' 
+				act 'Go to the library with Katja': minut += 15 & gt 'katja_uni', 'library2'
 			end
 			if katjaQW['QWstage'] >= 2:
 				act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
@@ -752,7 +752,7 @@ if $ARGS[0] = 'coffee_hole_hangout':
 			'"I''m done here. I want to go to the city mall to look at clothes," Katja says as she packs her things and gets ready to leave.'
 			act 'Say goodbye and Leave': gt 'city_coffee_hole', 'inner'
 			if katjaQW['QWstage']> 0:
-				act 'Go with Katja to the city mall': minut += 15 & gt 'katja_city', 'metro' 
+				act 'Go with Katja to the city mall': minut += 15 & gt 'katja_city', 'metro'
 			end
 			if katjaQW['QWstage'] >= 2:
 				act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
@@ -807,13 +807,13 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
 							else
 								'You call him, and he quickly agrees to have you over.'
-								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'	
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
 							end
 						end
 					else
 						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2'
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				elseif katjaQW['horny'] > 65:
 					'"No, I really should be studying," Katja says, but still looks somewhat aroused.'
@@ -836,13 +836,13 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
 							else
 								'You call Lazar, and he quickly agrees to have you over.'
-								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'	
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
 							end
 						end
 					else
 						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2'
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				elseif katjaQW['horny'] > 50:
 					'"No, I should be studying," Katja says, but something in her voice makes you think that she can be convinced.'
@@ -865,18 +865,18 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
 							else
 								'You call Lazar, and he quickly agrees to have you over.'
-								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'	
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
 							end
 						end
 					else
 						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
-					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2'
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				else
 					KatjaQW['dom'] += 1
 					'"No, I need to study!" she says in a voice that makes it clear that you won''t convince her otherwise.'
-					act 'Go to the library with Katja': minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Go to the library with Katja': minut += 15 & gt 'katja_uni', 'library2'
 					act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
 				end
 			end
@@ -910,9 +910,9 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 			else
 				act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+			act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2'
 			act 'Say goodbye and get up': KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
-		end	
+		end
 		act 'Let''s go to your room':
 			*clr & cla
 			gs 'stat'
@@ -942,8 +942,8 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 			else
 				act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
-			act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
-			act 'Say goodbye and get up': KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'			
+			act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2'
+			act 'Say goodbye and get up': KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 		end
 	elseif locat['katja'] ! 30:
 		'"Come on, Katja! Let''s do something else," you plead.'
@@ -979,9 +979,9 @@ if $ARGS[0] = 'coffee_hole_have_fun':
 						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 					end
 					if  locat['katja'] = 44:
-						act 'Go with Katja to the city mall': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_city', 'metro' 
+						act 'Go with Katja to the city mall': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_city', 'metro'
 					elseif   locat['katja'] = 31:
-					
+
 					end
 					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
 				elseif katjaQW['horny'] > 50:
@@ -1143,10 +1143,10 @@ if $ARGS[0] = 'nightclub_sex_follow_up':
 	if katjaQW['simultanous_girls'] = 0:
 		katjaQW['simultanous_girls'] = 1
 		'You give her a moment before you ask her, "Was this the first time you were with a girl?"'
-		'Katja answers with a shaking voice, "Yes... But '+iif(katjaQW['first_time_in_nightclub'] = 2, 'definitely', 'probably')+' not the last time."' 
+		'Katja answers with a shaking voice, "Yes... But '+iif(katjaQW['first_time_in_nightclub'] = 2, 'definitely', 'probably')+' not the last time."'
 	else
 		'You give her a moment before you ask her, "Do you often have sex with girls?"'
-		'Katja answers with a shaking voice, "'+iif(katjaQW['simultanous_girls'] > 1, 'It happens not so rarely.', 'I''ve had sex with a few.')+' I like having sex with girls." Her face goes red again.' 
+		'Katja answers with a shaking voice, "'+iif(katjaQW['simultanous_girls'] > 1, 'It happens not so rarely.', 'I''ve had sex with a few.')+' I like having sex with girls." Her face goes red again.'
 	end
 	if katjaQW['knows_dorm_room_number'] = 0:
 		katjaQW['knows_dorm_room_number'] = 1

+ 1 - 1
locations/kuhrPar.qsrc

@@ -89,7 +89,7 @@ if $home['current'] = 'parents_home':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/breakfasthome.jpg"></center>'
 				'As you sit down and join your family for breakfast, your stepfather enages you in conversation. "How are you doing in school <<$pcs_nickname>>?"'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and $home['current'] = 'parents_home' and SchoolBlock = 0:
+				if kanikuli = 0 and $start_loc = 'sg' and $home['current'] = 'parents_home' and SchoolBlock = 0:
 					if class['school_grade_average'] >= 80:
 						'You smile at him. "Really great. We were just learning something interesting the other day." You go on to talk about some of the stuff you have learned recently in school. He just nods, while your mother gives you a proud smile and Kolka rolls his eyes.'
 						'The rest of breakfast is taken up with some small talk about what everyone has been up to of late. You thoroughly enjoy your breakfast with your family.'

+ 3 - 3
locations/mainQW.qsrc

@@ -40,7 +40,7 @@ act 'Investigate':
 				gs 'stat'
 				minut += 30
 !!				killobj
-!! here was an exchange of the objects, but I have no clue why. It was removed at some time rachels 11 2020 
+!! here was an exchange of the objects, but I have no clue why. It was removed at some time rachels 11 2020
 
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/lab/event/main1.jpg"></center>'
 				'You undress and lie down on the couch, Tatiana begins to examine you. She dabs you with charms and uses a variety strange looking devices, after half an hour of examination she sighs and tells you to get dressed.'
@@ -63,9 +63,9 @@ act 'Investigate':
 
 				act 'Leave':
 					minut += 15
-					if mid($start_type,1,4) = 'city':
+					if $start_loc = 'city':
 						gt 'city_residential'
-					elseif mid($start_type,1,3) = 'uni':
+					elseif $start_loc = 'uni':
 						gt 'city_island'
 					else
 						gt 'pav_residential'

+ 3 - 3
locations/miroslava.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 	! npc_QW['A60'] = 11 Guys fuck Mira after she pissed at party
 	! npc_QW['A60'] = 12 PC tells her about it
 	! npc_QW['A60'] += Mira pose as a prostitute
-	
+
 	! Mira_no > 0 Mira hiding in her house after 3rd wish. Reduces 1 per day, plus 1 more per day if you talk to her
 
 	gs 'miroslava', 'miraclothes'
@@ -486,7 +486,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 			end
 		end
 
-		if npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1) and mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
+		if npc_rel['A60'] >= 15 and MiraLoc ! 3 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1) and $start_loc = 'sg' and grandmaQW['block'] = 0:
 			if mira_guest = 0:
 				act 'Invite to your grandparent''s':
 					menu_off = 1
@@ -566,7 +566,7 @@ if $ARGS[0] = 'Start' or $ARGS[0] = '':
 		end
 
 		if npc_rel['A60'] >= 15 and Mira_no = 0 and (npc_QW['A63'] < 11 or npc_QW['A60'] >= 11 or mirasex > 1):
-			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3 and mid($start_type,1,2) = 'sg' and grandmaQW['block'] = 0:
+			if mira_guest = 0 and mira_temp >= 1 and mira_temp <= 2 and mira_go_blok = 0 and MiraLoc ! 3 and $start_loc = 'sg' and grandmaQW['block'] = 0:
 				menu_off = 1
 				*clr & cla
 				minut += 1

+ 45 - 45
locations/model_mari.qsrc

@@ -106,7 +106,7 @@ end
 
 
 if $ARGS[0] = 'mari_1.2':
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		act'"You''re from Gadukino?"':
 			cla
 			*clr
@@ -364,7 +364,7 @@ if $ARGS[0] = 'mari_chat':
 	gs'model_mari','mari_book_chat'
 	gs'model_mari','mari_food_chat'
 	gs'model_mari','mari_fitness_chat'
-	
+
 	act'Talk about modelling':gt'model_mari','mari_modelling_chat'
 	gs'model_mari','mari_sex_talk'
 
@@ -435,7 +435,7 @@ if $ARGS[0] = 'mari_family_chat':
 	'"Any siblings Mari?"'
 	*nl
 	'"No, none for me. I''m an only child. What about you?"'
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		if npc_rel['A34'] < 20:
 			'"Yeah, I''ve got two. My sister who''s about the same age as you are and my stupid little brother. He''s such a pain in the ass!"'
 			'Mari sits up a bit. "Really? What''s so bad about him?"'
@@ -508,7 +508,7 @@ if $ARGS[0] = 'mari_underwear_chat':
 			'"That''s fair," Mari smiles. "It''s not like there''s anything wrong with buying from G&M I guess."'
 			gs 'model_mari','mari_chat'
 		end
-		
+
 		act'I like them':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading15.jpg"></center>'
@@ -517,7 +517,7 @@ if $ARGS[0] = 'mari_underwear_chat':
 			gs 'model_mari','mari_chat'
 		end
 	end
-	
+
 	act'I buy from Pussy Kats':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading3.jpg"></center>'
@@ -530,7 +530,7 @@ if $ARGS[0] = 'mari_underwear_chat':
 			'"Really? Maybe I should check it out after work," Mari smiles.'
 			gs 'model_mari','mari_chat'
 		end
-		
+
 		act'They''re cute':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading6.jpg"></center>'
@@ -539,7 +539,7 @@ if $ARGS[0] = 'mari_underwear_chat':
 			gs 'model_mari','mari_chat'
 		end
 	end
-	
+
 	act'I buy from Fashionista':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading2.jpg"></center>'
@@ -549,7 +549,7 @@ if $ARGS[0] = 'mari_underwear_chat':
 		'"Oh. I''m not really into lace. A bit uncomfortable for me. Maybe I''ll try something else. Thanks for the suggestion though!"'
 		gs 'model_mari','mari_chat'
 	end
-	
+
 	act'I mostly wear sports underwear':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading3.jpg"></center>'
@@ -564,7 +564,7 @@ if $ARGS[0] = 'mari_underwear_chat':
 			'"Well that sounds pretty cool. Maybe I''ll check it out after work," she says thoughtfully.'
 			gs 'model_mari','mari_chat'
 		end
-		
+
 		act'Because I exercise?':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading5.jpg"></center>'
@@ -573,7 +573,7 @@ if $ARGS[0] = 'mari_underwear_chat':
 			gs 'model_mari','mari_chat'
 		end
 	end
-	
+
 	if pcs_traits['commando_lvl'] = 3:
 		act'I don''t wear underwear':
 			cla & *clr
@@ -613,7 +613,7 @@ if $ARGS[0] = 'mari_model_ask':
 		'"Oh well, I suppose that''s a fair a reason as any," she says. "I like being able to afford nice things too."'
 		gs 'model_mari','mari_chat'
 	end
-	
+
 	act'To make money because I needed it':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading2.jpg"></center>'
@@ -713,19 +713,19 @@ if $ARGS[0] = 'mari_modelling_chat':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading2.jpg"></center>'
 	'"You want to talk about modelling? What about it?"'
-	
+
 	act'Talk about something else':cla & gs'model_mari','mari_chat'
 
 	gs'model_mari','mari_model_advice'
 	gs'model_mari','mari_origin'
 
 	if mari['name_chat'] = 0:gs 'model_mari','mari_nametalk'
-	
+
 	gs'model_mari','mari_parents'
 	gs'model_mari','mari_fakepassport_talk'
 	gs'model_mari','mari_first_nude'
 
-	
+
 end
 
 if $ARGS[0] = 'mari_model_advice':
@@ -810,7 +810,7 @@ if $ARGS[0] = 'mari_nametalk':
 				'"Yeah? I think so too," she smiles back at you. "Ever since I started this job, I think of myself more as ''Mari''. I introduce myself that way to everyone now. What about you?"'
 				gs 'model_mari','mari_nametalk2'
 			end
-			
+
 			act'You look like a Mariya':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading5.jpg"></center>'
@@ -830,7 +830,7 @@ if $ARGS[0] = 'mari_nametalk2':
 		'"Your name!" she says, laughing. "Is <<$model[''firstname'']>> your real name?"'
 		gs 'model_mari','mari_nametalk3'
 	end
-	
+
 	act'My name?':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/face.jpg"></center>'
@@ -876,7 +876,7 @@ if $ARGS[0] = 'mari_nametalk3':
 		'"I''d... rather not say," you say hesitantly.'
 		gs 'model_mari','mari_nametalk4'
 	end
-	
+
 	act'That''s a secret':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading4.jpg"></center>'
@@ -915,7 +915,7 @@ if $ARGS[0] = 'mari_nametalk5':
 		'"Yeah..." Mari smiles back at you.'
 		act'Keep chatting':gt 'model_mari','mari_modelling_chat'
 	end
-	
+
 	act'I''d like that':
 		$mari['used_firstname'] = $pcs_firstname
 		$mari['used_nickname'] = $pcs_nickname
@@ -932,7 +932,7 @@ end
 
 
 if $ARGS[0] = 'mari_parents':
-	if mari['parent_ask'] < 1 and mid($start_type,1,2) = 'sg':
+	if mari['parent_ask'] < 1 and $start_loc = 'sg':
 		act'Ask about her parents':
 			mari['parent_ask'] = 1
 			cla & *clr
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'mari_fakepassport_talk':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading2.jpg"></center>'
 							'"I''m <<age>>. I didn''t work here when I was still underage, but I still needed the fake to buy booze and stuff," you grin.'
-							if mid($start_type,1,2) = 'sg':
+							if $start_loc = 'sg':
 								'"That''s fair enough I guess. Not everyone has a neighbor like Misha brewing moonshine vodka in his barn," she laughs.'
 							else
 								'"That''s fair enough I guess. I didn''t drink when I lived in the village, but if I ever wanted one, I had a neighbor who would brew moonshine in his barn," she laughs.'
@@ -1108,7 +1108,7 @@ if $ARGS[0] = 'mari_fakepassport_talk':
 					end
 				end
 			end
-			
+
 !!			act'Do you ever worry about the consequences?':
 		end
 	end
@@ -1140,7 +1140,7 @@ if $ARGS[0] = 'mari_first_nude2':
 			'"If you''re so curious, you haven''t looked through my portfolio at the front have you?"'
 			gs'model_mari', 'mari_first_nude3'
 		end
-		
+
 		act'Been thinking about it (experience)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading15.jpg"></center>'
@@ -1149,7 +1149,7 @@ if $ARGS[0] = 'mari_first_nude2':
 			'"You should do it!" Mari says. "I think you''re right. It was a great experience for me anyways. I had a lot of fun doing it. I''ve never really been embarrassed about my body so when they asked me if I wanted to pose nude I just figured why not? It was a little embarrassing to shave everything, uhm, down there... but even that wasn''t too bad. I just remember laughing a lot and feeling strangely energized. And since I did my debut early on in my career, the majority of my portfolio is filled with nudes now."'
 			gs'model_mari', 'mari_first_nude2.shave'
 		end
-		
+
 		act'Been thinking about it (career)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading2.jpg"></center>'
@@ -1157,7 +1157,7 @@ if $ARGS[0] = 'mari_first_nude2':
 			'"That''s fair," Mari nods. "It was good for mine. Let me get a jump on nude shoots early on so now my portfolio is full of them. It was good exposure and got me a lot more jobs. But more than that, it was just a great experience for me. I had a lot of fun doing it. I''ve never really been embarrassed about my body so when they asked me if I wanted to pose nude I just figured why not? It was a little embarrassing to shave everything, uhm, down there... but even that wasn''t too bad. I just remember laughing a lot and feeling strangely energized. Maybe my nerves just make me laugh," she smiles shyly.'
 			gs'model_mari', 'mari_first_nude2.shave'
 		end
-		
+
 		act'Been thinking about it (money)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading15.jpg"></center>'
@@ -1165,7 +1165,7 @@ if $ARGS[0] = 'mari_first_nude2':
 			'"That''s fair," Mari nods. "It gave me enough money for the first deposit to move into my own place. But more than that, it was just a great experience for me. I had a lot of fun doing it. I''ve never really been embarrassed about my body so when they asked me if I wanted to pose nude I just figured why not? It was a little embarrassing to shave everything, uhm, down there... but even that wasn''t too bad. I just remember laughing a lot and feeling strangely energized. Maybe my nerves just make me laugh," she smiles shyly.'
 			gs'model_mari', 'mari_first_nude2.shave'
 		end
-		
+
 	else
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading4.jpg"></center>'
 		'"But sorry, you wanted to talk about my debut, not yours," she says looking mildly chagrined.'
@@ -1191,7 +1191,7 @@ if $ARGS[0] = 'mari_first_nude3':
 		'"Well, that''s probably for the best," Mari replies, a faint blush coloring her cheeks. "You''d probably tease me for looking too cheerful. Honestly? It was a great experience for me. I had a lot of fun doing it. I''ve never really been embarrassed about my body so when they asked me if I wanted to pose nude I just figured why not? It was a little embarrassing to shave everything, uhm, down there... but even that wasn''t too bad. It mostly felt... breezy? Like being more naked than naked if that makes any sense. It''s a good thing I like being naked!" she laughs. "But since I did my debut early on in my career, the majority of my portfolio is filled with nudes now."'
 		gs'model_mari', 'mari_first_nude4'
 	end
-	
+
 	act'Yes':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading5.jpg"></center>'
@@ -1227,10 +1227,10 @@ if $ARGS[0] = 'pc_nude_debut_talk':
 	'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading3.jpg"></center>'
 	'"What was your nude debut like Mari?" you ask and she perks up.'
 	'"Oh yeah! I heard you did your first nude shoot! Congratulations! How was it?"'
-	
+
 	act'Tell the truth':
 		cla & *clr
-		
+
 		if $modelfoto['nude_after_reaction'] = 'mortified':
 			'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading11.jpg"></center>'
 			if $modelfoto['first_nude_during'] = 'sick':
@@ -1317,7 +1317,7 @@ if $ARGS[0] = 'pc_nude_debut_talk':
 				'"It... it really turned me on," you admit with a warm blush. "I have to admit, during the shoot I felt... hollow. Like I was giving something up inside me. But when I got to see the photos I just felt something <i>gush</i> inside me. I remember thinking, ''I''m so hot!'' I got over those bad feelings pretty quickly. Is it kind of weird that I got turned on by pictures of me?"'
 			end
 		end
-		
+
 		if $modelfoto['nude_after_reaction'] = 'mortified' or $modelfoto['nude_after_reaction'] = 'empty' or $modelfoto['nude_after_reaction'] = 'regret':
 			'Mari''s smile fades. "I''m so sorry <<$mari[''used_nickname'']>>. Well, now I feel guilty that my experience was so different..."'
 			'"Don''t be," you reassure her. "I would hate to find out that everyone''s first nude shoot was like mine."'
@@ -1334,7 +1334,7 @@ if $ARGS[0] = 'pc_nude_debut_talk':
 			act'Continue':gt 'model_mari','mari_first_nude2'
 		end
 	end
-	
+
 	if $modelfoto['nude_after_reaction'] = 'mortified' or $modelfoto['nude_after_reaction'] = 'empty' or $modelfoto['nude_after_reaction'] = 'regret':
 		act'It was good (lie)':
 			cla & *nl
@@ -1344,9 +1344,9 @@ if $ARGS[0] = 'pc_nude_debut_talk':
 		end
 	else
 !!		act'Play it off':
-		
+
 !!		end
-		
+
 		if modelfoto['nude_shave_yes'] = 1 or modelfoto['nude_shave_no'] = 1:
 			act'Annoyed you had to shave':
 				cla & *clr
@@ -1362,7 +1362,7 @@ end
 if $ARGS[0] = 'weekend_plans':
 	if week = 5:
 		act'Ask about her weekend plans':
-			
+
 			if mari['weekend_gone'] < daystart and mari['weekend_stay'] < daystart:
 				if rand(1,2) = 1:
 					mari['weekend_gone'] = daystart + 2
@@ -1371,7 +1371,7 @@ if $ARGS[0] = 'weekend_plans':
 				end
 			end
 			cla & *clr
-			
+
 			if mari['weekend_gone'] > daystart:
 				if mari['weekend_ask'] = daystart:
 					'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading4.jpg"></center>'
@@ -1466,7 +1466,7 @@ if $ARGS[0] = 'mari_sex_talk':
 										end
 									end
 								end
-								
+
 								act'"Are you bi?"':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading18.jpg"></center>'
@@ -1493,15 +1493,15 @@ if $ARGS[0] = 'mari_sex_talk':
 													gs 'model_mari','mari_chat'
 												end
 											end
-											
+
 											!!{act'Yes':
 												cla & *clr
 												'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading19.jpg"></center>'
 												'"I really think you might be Mari," you admit. "The way you act, how you''re always hugging me and other girls, honestly the way you look at us sometimes... It might be more affectionate than you realize."'
 												'"Oh.'
-											
+
 											end}
-											
+
 											act'Maybe':
 												cla & *clr
 												'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/reading19.jpg"></center>'
@@ -1509,17 +1509,17 @@ if $ARGS[0] = 'mari_sex_talk':
 												'"I guess this is something I''ll have to think about..."'
 												gs 'model_mari','mari_chat'
 											end
-											
+
 											!!act'I don''t know':
-											
-											
+
+
 											!!end
-											
+
 										!!	act'We could find out (try to kiss her)':
-											
-											
+
+
 										!!	end
-											
+
 										end
 									end
 								end

+ 65 - 65
locations/nichApartment.qsrc

@@ -27,23 +27,23 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 	*clr & cla
 	$location_type = 'private'
 	killvar '$locclass'
-		
+
 	gs 'stat'
 	'<center><b>Nicholas'' Apartment</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/nichApartment/hallway.jpg"></center>'
-		
+
 	'You are standing in a luxurious and spacious city center home.'
-	
+
 	$nickFamDesc = 'It belongs to <a href="exec: gt ''nichNicholas'', ''desc''">Nicholas</a>, who is also the head of home.'
 	if nichGalaDisabled = 0: $nickFamDesc += ' He lives here with his wife <a href="exec: gt ''nichGala'', ''desc''">Gala</a>.'
 	$nickFamDesc += ' <a href="exec: gt ''nichTanya'', ''desc''">Tanya</a> is the daughter of Gala and step-daughter of Nicholas. She also lives here.'
 	$nickFamDesc
 	killvar '$nickFamDesc'
-	
+
 	if nichWork = 2:
 		'You work here as a live-in maid.'
-		
-		
+
+
 		if nichNote = 1:
 			*nl
 			'<font color = red><b>You see a note hanging at the door to your room:</b></font>'
@@ -79,62 +79,62 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		'You used to work here.'
 	end
 	'The corridor''s floor and walls are a tasteful mix of marble and wood. Besides several paintings and small statues for decoration, the only thing of note in it is are a coat and shoe rack for guests.'
-	
+
 	$nichGalaAct = func('nichUtil','npcActivity','gala')
 	$nichNichAct = func('nichUtil','npcActivity','nicholas')
 	$nichTanyAct = func('nichUtil','npcActivity','tanya')
-	if $nichNichAct = 'leaveWork': 
+	if $nichNichAct = 'leaveWork':
 		'<a href="exec: gt ''nichNicholas'', ''start''">Nicholas</a> is wearing an expensive suit and is about to leave for work.'
-	elseif $nichNichAct = 'returnWork':  
+	elseif $nichNichAct = 'returnWork':
 		'Nicholas is wearing one of his expensive suits. Apparently he just returned from work.'
-	elseif $nichNichAct = 'leaveShopping':  
+	elseif $nichNichAct = 'leaveShopping':
 		'Nicholas is about to leave the apartment. It looks as if he wants to go shopping.'
-	elseif $nichNichAct = 'returnShopping':  
+	elseif $nichNichAct = 'returnShopping':
 		'Nicholas just returned from shopping. Apparently he bought some things from expensive shops.'
-	elseif $nichNichAct = 'leaveClub':  
+	elseif $nichNichAct = 'leaveClub':
 		'Nicholas is wearing one of his finest black tie suits. Apperently he is about to leave for his club.'
-		if $nichGalaAct = 'leaveClub': 
+		if $nichGalaAct = 'leaveClub':
 			'Gala accompanies him. She is wearing her silver jewelry and an expensive looking dress which is a perfect combination of classy and sexy.'
 		end
-	elseif $nichNichAct = 'returnClub':  
-		if $nichGalaAct = 'returnClub': 
+	elseif $nichNichAct = 'returnClub':
+		if $nichGalaAct = 'returnClub':
 			'Nicholas and Gala just returned from their club.'
 		end
 		'Nicholas just returned from his club.'
 	end
-	
-	if $nichGalaAct = 'leaveSpa': 
+
+	if $nichGalaAct = 'leaveSpa':
 		'Gala is about to leave the apartment. As far as you know she is going to her spa.'
-	elseif $nichGalaAct = 'returnSpa':  
+	elseif $nichGalaAct = 'returnSpa':
 		'Gala just entered the apartment. She seems to be very releaxed. Apparently she was at her spa.'
-	elseif $nichGalaAct = 'leaveFriend':  
+	elseif $nichGalaAct = 'leaveFriend':
 		'Gala is about to leave the apartment. She is wearing one of her favorite short dresses and apparently spent much effort applying her make-up. As far as you know she wants to visit a friend of hers.'
-	elseif $nichGalaAct = 'returnFriend':  
+	elseif $nichGalaAct = 'returnFriend':
 		'Gala just entered the apartment. As far as you know she visited a friend.'
 	end
-	
-	if $nichTanyAct = 'leaveUni': 
+
+	if $nichTanyAct = 'leaveUni':
 		'Tanya is about to leave the apartment. It looks as if she is about to attend her classes at university.'
-	elseif $nichTanyAct = 'returnUni':  
+	elseif $nichTanyAct = 'returnUni':
 		'Tanya just entered the apartment. Apparently she returned from university.'
-	elseif $nichTanyAct = 'leaveBallet':  
+	elseif $nichTanyAct = 'leaveBallet':
 		'Tanya is about to leave the apartment. Apperently she is going to attend to her ballet lessons.'
-	elseif $nichTanyAct = 'returnBallet':  
+	elseif $nichTanyAct = 'returnBallet':
 		'Tanya just entered the apartment. As far as you know she was at her ballet lessons.'
-	elseif $nichTanyAct = 'leaveFriend': 
+	elseif $nichTanyAct = 'leaveFriend':
 		'Tanya is about to leave the apartment. As far as you know she is going to visit a friend.'
-	elseif $nichTanyAct = 'returnFriend':  
+	elseif $nichTanyAct = 'returnFriend':
 		'Tanya just entered the apartment. As far as you know she visited a friend.'
-	elseif $nichTanyAct = 'leaveShopping':  
+	elseif $nichTanyAct = 'leaveShopping':
 		'Tanya is about to leave the apartment. From the way she is dresses you assume that she is heading for a shopping trip.'
-	elseif $nichTanyAct = 'returnShopping':  
+	elseif $nichTanyAct = 'returnShopping':
 		'Tanya just entered the apartment. She carries some plastic bags with her, indicating that she bought some new clothes and shoes.'
-	elseif $nichTanyAct = 'leaveClub':  
+	elseif $nichTanyAct = 'leaveClub':
 		'Tanya is about to leave to a dance club.'
-	elseif $nichTanyAct = 'returnClub':  
+	elseif $nichTanyAct = 'returnClub':
 		'Tanya just entered the apartment. She wears the clothes she usually wears to her dance club. She appears to be a little bit exhausted.'
 	end
-	
+
 	killvar '$nichNichAct'
 	killvar '$nichGalaAct'
 
@@ -147,7 +147,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 			gt $CURLOC
 		end
 	end
-	
+
 	if nichWork = 2:
 		act '<b>Go to your bedroom</b>':
 			minut += 1
@@ -159,7 +159,7 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 			gt 'nichBedroomServant'
 		end
 	end
-	
+
 	act 'Go to the living room':
 		minut += 1
 		gt 'nichLivingroom'
@@ -170,49 +170,49 @@ if $ARGS[0] = '' or $ARGS[0] = 'start' or $ARGS[0] = 'return':
 		gt 'nichBedroomMaster'
 	end
 
-	
+
 
 	act 'Go to Tanya''s room':
 		minut += 1
 		gt 'nichBedroomTanja'
 	end
-	
+
 	act 'Go to the study':
 		minut += 1
 		gt 'nichStudy'
 	end
-	
+
 	act 'Go to the guest cloakroom':
 		minut += 1
 		gt 'nichBathGuest'
 	end
 
 	if nichWork = 2:
-	
+
 		gs 'nichChore','inspect','hallway'
-		
+
 		if nichWorkState > 0:
 			act 'Clean apartment':
 				gt 'nichChore', 'cleanApartment', 'start'
 			end
 		end
 	end
-	
+
 	if nichDebug = 1:
 		act 'Debug Menu':
 			gt 'nichUtil', 'debug'
 		end
-	end	
+	end
 end
 
 if $ARGS[0] = 'jobInterview':
 	*clr & cla
 	$location_type = 'event'
 	menu_off = 1
-	
+
 	'The adress you have been given leads you to a very expensive looking apartment building. A porter stands at the door, inspecting you while you come closer.'
 	'"Hello, I am here to apply for the job as live-in maid."'
-	
+
 	if $clothingworntype ! 'gm_maid':
 		'"I am afraid I am not allowed to let you pass dressed like this, Miss. Master Nicholas made it very clear that every applicant for this position has to be dressed in an appropriate outfit. Meaning you have to wear a maid uniform for the job interview. You can get one at the mall nearby."'
 		act 'Turn around': gt 'city_center'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'jobInterview':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/city/tanya/01.jpg"></center>'
 			'Finally the elevator stops and its doors open.'
-			
+
 			if nichTanya['Known'] = 0:
 				'In front of you stands a cute girl smiling at you.'
 				'"Hello. My name is Tanya. You are here for the maid-job I guess? Just follow me to the living room. My parents are waiting for you."'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'jobInterview':
 				'In front of you stands a cute girl smiling at you. It is Tanya!'
 				'"<<$pcs_nickname>>? You are the girl applying as a maid? Why didn''t you tell me that you are interested in a maid-job? Anyways, follow me. My parents want to meet you."'
 			end
-			
+
 			act 'Follow her': gt 'nichApartment', 'hiring'
 		end
 	end
@@ -245,23 +245,23 @@ end
 if $ARGS[0] = 'hiring':
 	$location_type = 'event'
 	menu_off = 1
-	
+
 	if nichHotelReferral = 2:
 		nichHireMode = 1
-	else	
+	else
 		nichHireMode = 2
 	end
-	
+
 	'<center><img <<$set_imgh>> src="images/characters/city/nicholas/01.jpg"></center>'
 	'Tanya leads you into the living room. Nicholas, her step-father, and her mother Gala are already sitting there.'
-	
-	
+
+
 	if nichHireMode = 1:
 		'"This is <<$pcs_nickname>>." Tanya says before sitting down next to her mother. You have the feeling that you are expected to keep standing.'
 	elseif nichHireMode = 2:
 		'"This is <<$pcs_nickname>>, the girl I told you about." Tanya says before sitting down next to her mother. You have the feeling that you are expected to keep standing.'
 	end
-	
+
 	if FUNC('body_din','pregnancyVisibility',0,'nude') = 1:
 		'Nicholas only takes a short look at you.'
 		'"I am sorry, but I can''t have a pregnant woman be my maid. You might apply again once you have given birth. If the position is still open then."'
@@ -272,7 +272,7 @@ if $ARGS[0] = 'hiring':
 		act 'Leave': gt 'city_center'
 		exit
 	end
-	
+
 	if CloInhibit > 20:
 		nichGalaOpinion = 1
 		if nichHireMode = 1:
@@ -329,17 +329,17 @@ if $ARGS[0] = 'hiring':
 		'"<<$pcs_nickname>>, I expect from my maids what I expect from all of my employees, and what they can expect of me: An immaculate appearance that commands respect, for you, for me, for my company, for my family. If you want to work for us you will start taking care of your hair."'
 	end
 	if nichImperfections = 0:
-		'Unable to find anything to criticize, he gives you an approving nod.' 
+		'Unable to find anything to criticize, he gives you an approving nod.'
 		'"The uniform suits you, <<$pcs_nickname>>, and it seems you know how to take care of your appearance. Good."'
 	end
 	killvar 'nichImperfections'
-	
+
 	if nichHireMode = 1:
 		'He sits back down and takes a look at your referral. Then he looks at the two women sitting next to him. Both of them shrug.'
 	elseif nichHireMode = 2:
 		'He sits back down. "Tanya told me that you will do a good job as our maid. And I trust her judgment." He takes a look at the two women sitting next to him. Tanya beams back while Gala shrugs.'
 	end
-	
+
 	'"Well then. In the name of my family I would like to offer you the job as our live-in maid. There are a few rules you should be aware of:'
 	*nl
 	'1. You have to look presentable at all times. During work you will wear your uniform.'
@@ -404,17 +404,17 @@ if $ARGS[0] = 'hiring':
 	act 'No':
 		cla
 		'"I... Uh, I don''t know if this is right for me", you stutter.'
-		'Nicholas seems surprised and annoyed - he most likely isn''t used to people just telling him they changed their mind at the very last second - but he maintains a friendly face and simply states: "That is unfortunate, but I''m sure you have your reasons."' 
+		'Nicholas seems surprised and annoyed - he most likely isn''t used to people just telling him they changed their mind at the very last second - but he maintains a friendly face and simply states: "That is unfortunate, but I''m sure you have your reasons."'
 		if nichHireMode = 2:
-			'Tanya, however, looks livid. She doesn''t say a word, her lips so tightly pressed together she probably wouldn''t be able to say anything without yelling, but her silence says more than her screams possibly could: You dealt severe damage to your relationship with her by making her look stupid like this.' 
+			'Tanya, however, looks livid. She doesn''t say a word, her lips so tightly pressed together she probably wouldn''t be able to say anything without yelling, but her silence says more than her screams possibly could: You dealt severe damage to your relationship with her by making her look stupid like this.'
 			'As you excuse yourself, turn and quietly leave the apartment, you realize that you will have to put some effort into restoring Tanya''s friendship with you... if you can save it at all.'
-			
+
 			npc_rel['A218'] = 1
 			nichWork = 0
 			nichJobRefused = 1
 			nichJobRefusedTReact = 1
 		end
-		
+
 		act 'Leave now before you can do anymore damage':gt 'city_center'
 	end
 end
@@ -423,7 +423,7 @@ if $ARGS[0] = 'visitTanya':
 	!! Visiting Tanya is only possible if PC is not employed by Nicholas. If she is she can find Tanya by going to her room.
 	$location_type = 'event'
 	menu_off = 1
-	
+
 	if nichWork = 1:
 		gt 'nichApartment', 'agreed_to_job'
 	elseif nichTanya['FuckCounter'] > rand(3,5) and nichJobRefused < 1 and nichWork = 0 and FUNC('body_din','pregnancyVisibility',0,'nude') = 0:
@@ -488,7 +488,7 @@ if $ARGS[0] = 'job_offer':
 	!!TODO: check whether PC has worked as maid in hotel. If so she will mention or think it.
 	'"Believe me, if I ask him <i>nicely</i>, he will hire you", Tanya smiles lasciviously.'
 
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0:
 		act 'Refuse (still at school)':
 			cla
 			nichJobRefused = 1
@@ -524,17 +524,17 @@ if $ARGS[0] = 'job_offer':
 			nichJobRefused = 1
 			act 'Leave the apartment':gt 'city_center'
 		end
-		
+
 		act 'Agree':
 			xgt 'nichTanya','hire'
 		end
-		
+
 		act 'Maybe later':
 			cla
 			nichJobRefused = 2
 			'"Of course I''d love to be able to spend more time here with you but I have other commitments and I can''t just drop them so how about if circumstances change I get back to you? For now let''s leave things as they are and just enjoy our times together."'
 			'"So maybe in the future? Talk to me when you can start working here. We seem to get through maids very quickly for some reason."'
-			
+
 			'Without saying another word she takes your hand and leads you to her room.'
 			act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
 		end
@@ -557,7 +557,7 @@ if $ARGS[0] = 'casual_visit':
 	else
 		'Tanya opens the door and smiles warmly at you. "Hello <<$pcs_nickname>>! After all these weeks of not hearing anything from you I was beginning to wonder if you would show up again. I''m very happy you did."'
 	end
-	
+
 	'Without saying another word she takes your hand and leads you to her room.'
 	act 'Have sex with Tanya': gt 'nichTanya', 'sexL'
 	act 'Chat with Tanya': gt 'nichTanya', 'chat'

+ 4 - 4
locations/obj_din.qsrc

@@ -255,7 +255,7 @@ if $ARGS[0] = 'description':
 	'Your name is <<$pcs_firstname>> <<$pcs_lastname>>.'
 
 	!!!0.2.6 extension
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		'Your friends and family call you <<$pcs_nickname>>.'
 	else
 		'Your friends call you <<$pcs_nickname>>.'
@@ -480,7 +480,7 @@ if $ARGS[0] = 'skills':
 	*nl
 	'<b>Other Skills</b>'
 	*nl
-	if SchoolAtestat = 0 and mid($start_type,1,2) = 'sg':
+	if SchoolAtestat = 0 and $start_loc = 'sg':
 		if schoolprogul > 0: 'School absenteeism - <<schoolprogul>> days'
 	end
 	'</td><td width="25%" cellspacing="0" cellpadding="10" valign="top">'
@@ -541,7 +541,7 @@ if $ARGS[0] = 'stats':
 	if opPRE = 0: 'It has been <<daystart>> days since the game started.'
 	*nl
 
-	if SchoolAtestat = 0 and mid($start_type,1,2) = 'sg':
+	if SchoolAtestat = 0 and $start_loc = 'sg':
 		gs 'grades', 'assing_grade_description', 'school'
 
 		gs 'grades', 'grade above', 'school', 90
@@ -1051,7 +1051,7 @@ if $ARGS[0] = 'reputation':
 		'<center><a href="exec:Enable_family_Reputation = 0 & gs ''obj_din'', ''reputation''">Hide details</a></center>'
 		if rinslut > 0 or kavslut > 0:'In the residential area of ​​you are known as a whore that sleeps with Caucasians.'
 		if opusk > 0 or gnewQW >= 5: 'In the residential area it is well known by all the guys that you are a whore.'
-		if mid($start_type,1,2) = 'sg':
+		if $start_loc = 'sg':
 			*nl
 			if motherKnowWhore > 0:
 				'Your mother knows that you are sexually active and considers you a whore.'

+ 26 - 26
locations/pav_aptcourtev.qsrc

@@ -122,14 +122,14 @@ if $ARGS[0] = 'events1':
 
 	:reroll_jump1
 
-	if rolanmeet = 0 or mid($start_type,1,2) ! 'sg':
+	if rolanmeet = 0 or $start_loc ! 'sg':
 		events = rand(0,17)
 	else
 		events = rand(0,22)
 	end
 
 	if anushkaQW['first_visit'] = 0 and npc_rel['A144'] > 50 and rand(0,1) = 1 and anushka_met ! daystart:
-		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump1'
+		if $start_loc ! 'sg': jump 'reroll_jump1'
 		if week < 6 and hour < 8: jump 'reroll_jump1'
 		*clr & cla
 		anushka_met = daystart
@@ -155,7 +155,7 @@ if $ARGS[0] = 'events1':
 		'A boy and girl are sitting on one of the benches making out passionately, seemingly unaware or not caring that anyone is watching them. You think you recognize the boy as part of the group that smoke in the stairwell.'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 2:
-		if mid($start_type,1,2) ! 'sg': jump 'reroll_jump1'
+		if $start_loc ! 'sg': jump 'reroll_jump1'
 		*clr & cla
 		minut += 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/evggkiss' + rand(1,3) + '.jpg"></center>'
@@ -194,7 +194,7 @@ if $ARGS[0] = 'events1':
 	elseif events = 7:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3girls.jpg"></center>'
-		'You see some guys checking out three girls, who seem well aware of their attention. One of the boys says something to his friends and they seem to egg him on, but before he can do what ever is he had planned, the girl on the right walks around her friend in the center, firmly grips her hips and starts to pretend fuck her from behind, which causes her friends to laugh and the boys to hoot and holler.' 
+		'You see some guys checking out three girls, who seem well aware of their attention. One of the boys says something to his friends and they seem to egg him on, but before he can do what ever is he had planned, the girl on the right walks around her friend in the center, firmly grips her hips and starts to pretend fuck her from behind, which causes her friends to laugh and the boys to hoot and holler.'
 		'The girl on the left grabs the head of her friend in the center, turns towards her and pulls her head down to her crotch before pretending to fuck her mouth.'
 		'The middle girl seems to get into it and pretends to suck a dick while her other friend pounds against her ass. They keep this up until the boys start to approach them, at which point they flip the boys off and run away, leaving the boys frustrated and hollering some unpleasant things after them.'
 		act 'Move away':gt 'pav_complex', 'start'
@@ -205,7 +205,7 @@ if $ARGS[0] = 'events1':
 		'You notice three girls standing at the alley near the garages. Every time a car drives down the alley, they turn around and moon it. After several minutes, they grow bored and walk away down the alley.'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 9:
-		if mid($start_type,1,2) ! 'sg' or (week < 6 and hour < 14) or (week = 3 and hour >= 16): jump 'reroll_jump1'
+		if $start_loc ! 'sg' or (week < 6 and hour < 14) or (week = 3 and hour >= 16): jump 'reroll_jump1'
 		*clr & cla
 		gs 'exp_gain', 'prcptn', rand(1,2)
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/eatu.jpg"></center>'
@@ -246,9 +246,9 @@ if $ARGS[0] = 'events1':
 		minut += 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbj' + rand(1,2) + '.jpg"></center>'
 		text_rand = rand(0,2)
-		if text_rand = 1 and mid($start_type,1,2) = 'sg' and (week > 5 or hour >= 14):
+		if text_rand = 1 and $start_loc = 'sg' and (week > 5 or hour >= 14):
 			'You spot Lavrenti leaning against a wall near the storage buildings and are surprised to see Lena squatting down in front of him as she sucks his dick, seemingly enjoying it as much as Lavrenti. After a few minutes, you hear him moan, his cock never leaving her mouth as she continues to milk him for another minute before standing up. They walk away together as you wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him.'
-		elseif text_rand = 2 and mid($start_type,1,2) = 'sg' and (locat['Anya'] = 9 or locat['Anya'] = 13 or locat['Anya'] = 14 or locat['Anya'] = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
+		elseif text_rand = 2 and $start_loc = 'sg' and (locat['Anya'] = 9 or locat['Anya'] = 13 or locat['Anya'] = 14 or locat['Anya'] = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
 			'You spot a guy you think you recognize leaning against a wall near the storage buildings, but it''s hard to tell as his face is turned to the side and tilted down. There''s a girl kneeling in front of him, giving him an enthusiastic blowjob. You move to get a better view and realize it is Roma, your sister''s boyfriend and... Oh god! It''s your sister! She''s sucking him for all she''s worth, taking his dick all the way down her throat. Part of you knows you shouldn''t watch, but another can''t look away. Where did your sister learn these skills? Can she teach you?'
 			'You''re pulled out of your thoughts when you hear Roma moan, his hand gripping the back of Anya''s head as he cums hard in her mouth. Anya doesn''t resist and continues to suck, even after Roma removes his hand from her head. She sucks his cock clean before standing up. You instinctively duck, hoping you''re not noticed. They briefly kiss before walking away hand in hand.'
 		else
@@ -260,7 +260,7 @@ if $ARGS[0] = 'events1':
 		gs 'stat'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 15:
-		if mid($start_type,1,2) ! 'sg' or (week < 5 and hour < 14): jump 'reroll_jump1'
+		if $start_loc ! 'sg' or (week < 5 and hour < 14): jump 'reroll_jump1'
 		*clr & cla
 		gs 'exp_gain', 'prcptn', rand(1,2)
 		minut += 3
@@ -277,7 +277,7 @@ if $ARGS[0] = 'events1':
 		gs 'stat'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif events = 16:
-		if mid($start_type,1,2) ! 'sg' or (week = 3 and hour >= 16) or (week < 5 and hour < 14): jump 'reroll_jump1'
+		if $start_loc ! 'sg' or (week = 3 and hour >= 16) or (week < 5 and hour < 14): jump 'reroll_jump1'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/nushbench.jpg"></center>'
 		'As you walk through the courtyard, you see Anushka sitting on one of the benches. She hasn''t noticed you yet.'
@@ -340,7 +340,7 @@ if $ARGS[0] = 'events1':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'
 					'You take the cigarette and one of the boys lights it for you. You take a long slow draw off it. "Thanks. I needed that."'
-					'They smile in return. "Sure, no problem."' 
+					'They smile in return. "Sure, no problem."'
 					'The three of you talk about some of the neighbors you both know and things you''ve seen around the complex while you smoke. Once you finish your cigarette, you thank them again before moving on.'
 					act 'Move away':gt 'pav_complex', 'start'
 				end
@@ -402,9 +402,9 @@ if $ARGS[0] = 'events2':
 		minut += 3
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/evbjn.jpg"></center>'
 		text_rand = rand(0,2)
-		if text_rand = 1 and mid($start_type,1,2) = 'sg' and ((week > 5 and hour < 4) or hour < 7):
+		if text_rand = 1 and $start_loc = 'sg' and ((week > 5 and hour < 4) or hour < 7):
 			'You spot Lavrenti leaning against a wall near the storage buildings and are surprised to see Lena squatting down in front of him as she sucks his dick, seemingly enjoying it as much as Lavrenti. After a few minutes, you hear him moan, his cock never leaving her mouth as she continues to milk him for another minute before standing up. They walk away together as you wonder if Vitek is aware of what his sister is getting up to, though you definitely aren''t going to ask him.'
-		elseif text_rand = 2 and mid($start_type,1,2) = 'sg' and (locat['Anya'] = 9 or locat['Anya'] = 13 or locat['Anya'] = 14 or locat['Anya'] = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
+		elseif text_rand = 2 and $start_loc = 'sg' and (locat['Anya'] = 9 or locat['Anya'] = 13 or locat['Anya'] = 14 or locat['Anya'] = 24) and (sisterQW['AnyaRomaQW'] = 0 or sisterQW['partytalk'] > 0):
 			'You spot a guy you think you recognize leaning against a wall near the storage buildings, but it''s hard to tell as his face is turned to the side and tilted down. There''s a girl kneeling in front of him, giving him an enthusiastic blowjob. You move to get a better view and realize it is Roma, your sister''s boyfriend and... Oh god! It''s your sister! She''s sucking him for all she''s worth, taking his dick all the way down her throat. Part of you knows you shouldn''t watch, but another can''t look away. Where did your sister learn these skills? Can she teach you?'
 			'You''re pulled out of your thoughts when you hear Roma moan, his hand gripping the back of Anya''s head as he cums hard in her mouth. Anya doesn''t resist and continues to suck, even after Roma removes his hand from her head. She sucks his cock clean before standing up. You instinctively duck, hoping you''re not noticed. They briefly kiss before walking away hand in hand.'
 		else
@@ -416,7 +416,7 @@ if $ARGS[0] = 'events2':
 		gs 'stat'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif nightevents = 5:
-		if mid($start_type,1,2) ! 'sg' or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
+		if $start_loc ! 'sg' or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
 		*clr & cla
 		gs 'exp_gain', 'prcptn', rand(1,2)
 		minut += 3
@@ -444,7 +444,7 @@ if $ARGS[0] = 'events2':
 		'You notice a group of gopnik boys and a girl who is stripped down to her panties. They are manhandling her quite a bit, but she seems to be okay with it, or at least is not putting up a fight or trying to get away. One of the guys pulls her into his lap as she notices you looking; she stares at you with a resigned look on her face before turning her attention back to the boys. Not wishing to get the guys'' attention, you move on.'
 		act 'Move away':gt 'pav_complex', 'start'
 	elseif nightevents = 8:
-		if mid($start_type,1,2) ! 'sg' or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
+		if $start_loc ! 'sg' or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
 		*clr & cla
 		if month >= 11 or month <= 3:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/3stoogesw.jpg"></center>'
@@ -494,7 +494,7 @@ if $ARGS[0] = 'events2':
 				else
 					'Vasily smiles at you and scoots over, giving you a spot to sit between him and Dan. "What you up to?" he asks in a teasing tone as you sit down.'
 					'Dan glances over at you with a sneer. "Looking to slum it a little, princess? Got tired of all the limp dicks you normally hang out with and want to know what a real cock feels like?"'
-					'Vitek grins. "Is that it? You looking for some real cock?"' 
+					'Vitek grins. "Is that it? You looking for some real cock?"'
 					'Maybe hanging out with them isn''t the best idea...'
 					act 'Make excuse and leave':
 						minut += 1
@@ -520,7 +520,7 @@ if $ARGS[0] = 'events2':
 			end
 		end
 	elseif nightevents = 9:
-		if mid($start_type,1,2) ! 'sg' or (week = 3 and hour <= 23) or (week = 5 and hour >= 20) or (week = 6 and hour >= 20) or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
+		if $start_loc ! 'sg' or (week = 3 and hour <= 23) or (week = 5 and hour >= 20) or (week = 6 and hour >= 20) or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/gopgirls.jpg"></center>'
 		'Lena, Lera, Alyona and Anushka are hanging out on one of the benches, drinking beers and smoking cigarettes and weed while laughing and messing around.'
@@ -579,7 +579,7 @@ if $ARGS[0] = 'events2':
 			end
 		end
 	elseif nightevents = 10:
-		if mid($start_type,1,2) ! 'sg' or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
+		if $start_loc ! 'sg' or (week < 6 and hour > 3) or hour > 6: jump 'reroll_jump2'
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/lelepa.jpg"></center>'
 		'Lena, Lera, and Pauline are hanging out on one of the benches, drinking beers and smoking cigarettes while laughing and messing around.'
@@ -590,7 +590,7 @@ if $ARGS[0] = 'events2':
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/lelepa.jpg"></center>'
 			'You walk over to them. "Hey guys, mind if I join you?"'
 			if grupTipe = 5:
-				'They all give you a look of disgust.' 
+				'They all give you a look of disgust.'
 				'"Get lost loser!" Pauline shouts in a tone that makes you think she''s ready to kick your ass.'
 				act 'Move away':gt 'pav_complex', 'start'
 			elseif grupTipe = 4:
@@ -683,7 +683,7 @@ if $ARGS[0] = 'events2':
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/boysmoke2.jpg"></center>'
 					'You take the cigarette and one of the boys lights it for you. You take a long slow draw off it. "Thanks. I needed that."'
-					'They smile in return. "Sure, no problem."' 
+					'They smile in return. "Sure, no problem."'
 					'The three of you talk about some of the neighbors you both know and things you''ve seen around the complex while you smoke. Once you finish your cigarette, you thank them again before moving on.'
 					act 'Move away':gt 'pav_complex', 'start'
 				end
@@ -799,7 +799,7 @@ if $ARGS[0] = 'male_gopnik_beer':
 					gs 'drugs', 'alcohol', 'beer'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
-					'You''re feeling pretty drunk and the guys seem to be amused at the sight of you. They exchange a few words that you can''t quite make out before Vasily speaks up. "Hey <<$pcs_nickname>>, you really know how to drink."' 
+					'You''re feeling pretty drunk and the guys seem to be amused at the sight of you. They exchange a few words that you can''t quite make out before Vasily speaks up. "Hey <<$pcs_nickname>>, you really know how to drink."'
 					'You nod at the compliment. "Yeah.... I do okay...." you slur in reply.'
 					*nl
 					'This seems to amuse them even more. "Yeah, I bet you could down a beer faster than Vitek, couldn''t you?" You give him a look, but feel like you could out drink anyone right now, so you drunkenly nod.'
@@ -963,7 +963,7 @@ if $ARGS[0] = 'female_gopnik_beer_1':
 				gs 'drugs', 'alcohol', 'beer'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/beer' + rand(1,2) + '.jpg"></center>'
-				'You''re feeling pretty drunk, and the girls seem to be amused by the sight of you. They exchange a few words that you can''t quite make out before Lena speaks up. "Hey <<$pcs_nickname>>, you really know how to drink."' 
+				'You''re feeling pretty drunk, and the girls seem to be amused by the sight of you. They exchange a few words that you can''t quite make out before Lena speaks up. "Hey <<$pcs_nickname>>, you really know how to drink."'
 				'You nod at the compliment. "Yeah.... I do okay..." you slur in reply.'
 				*nl
 				'This seems to amuse them even more. "Yeah, I bet you could down a beer faster than Alyona, couldn''t you?" You give her a look, but feel like you could out drink anyone right now, so you drunkenly nod.'
@@ -1204,7 +1204,7 @@ if $ARGS[0] = 'female_gopnik_beer_2':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/passedout.jpg"></center>'
 							'You lose count of the number of beers you drink and everything becomes fuzzy before going black.'
-							'You don''t know how long you were passed out, but you feel sick to your stomach and your head is starting to hurt as you find yourself laying face down on the ground. As you slowly get up, you notice you''re completely naked other than your shoes and your purse laying a few feet away.' 
+							'You don''t know how long you were passed out, but you feel sick to your stomach and your head is starting to hurt as you find yourself laying face down on the ground. As you slowly get up, you notice you''re completely naked other than your shoes and your purse laying a few feet away.'
 							'Panicking, you look around but don''t see anyone, just all the empty bottles by the bench where the girls once were.'
 							act 'Go home':gt 'pav_aptcourtev', 'homenaked'
 						end
@@ -1625,7 +1625,7 @@ if $ARGS[0] = 'two_boys':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/nanal1.jpg"></center>'
 					'You sit down on the cushion. "Guys, can''t I just suck you off? I''m still a virgin."'
-					'They both scoff at that. "Bullshit!" one of thr+em staes and you give him a serious look and nod.' 
+					'They both scoff at that. "Bullshit!" one of thr+em staes and you give him a serious look and nod.'
 					'They pause for a second and the other one says "Well good thing you go more holes then. Lay down on your side." He grins as you do it before adding "Don''t worry, we won''t pop your cherry."'
 					*nl
 					'One of them walks over, pushes you over so you''re laying on your side, and sticks his dick back in your mouth, making you unable to see what the other one is doing, but you feel him moving in behind you. A moment later, you feel slick fingers lubing up your asshole before you feel the head of his cock against it.'
@@ -1644,7 +1644,7 @@ if $ARGS[0] = 'two_boys':
 						act 'Back on your knees':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ncum.jpg"></center>'
-							'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them says "Get on your knees and open your mouth, whore." You do as you''re told and they both start jerking their dicks in front of your face. Both of them start cumming at almost the same time, some of it going in your mouth and on your tongue, while the rest splatters your face.' 
+							'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them says "Get on your knees and open your mouth, whore." You do as you''re told and they both start jerking their dicks in front of your face. Both of them start cumming at almost the same time, some of it going in your mouth and on your tongue, while the rest splatters your face.'
 							'Once they finish cumming on you, they grab you by the arms and pull you to your feet, drag you over to the door and shove you out into the hall naked with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
 							gs 'arousal', 'foreplay', 2, 'sub', 'group', 'humiliation'
 							if pavapt_boyrand = 1:
@@ -1702,7 +1702,7 @@ if $ARGS[0] = 'two_boys':
 									act 'Back on your knees':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/events/sex/apartment/ncum.jpg"></center>'
-										'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them says "Get on your knees and open your mouth, whore." You do as you''re told and they both start jerking their dicks in front of your face. Both of them start cumming at almost the same time, some of it going in your mouth and on your tongue, while the rest splatters your face.' 
+										'Several minutes go by until they both starting grunting, obviously getting close to cumming. They pull out of you as one of them says "Get on your knees and open your mouth, whore." You do as you''re told and they both start jerking their dicks in front of your face. Both of them start cumming at almost the same time, some of it going in your mouth and on your tongue, while the rest splatters your face.'
 										'Once they finish cumming on you, they grab you by the arms and pull you to your feet, drag you over to the door and shove you out into the hall naked with your face covered in their cum. "Get lost whore!" With that, they close the door in your face.'
 										gs 'arousal', 'foreplay', 2, 'sub', 'group', 'humiliation'
 										if pavapt_boyrand = 1:
@@ -1743,7 +1743,7 @@ if $ARGS[0] = 'misha':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/naked/aptstairsnaked.jpg"></center>'
 	'Once inside you sigh in relief. Taking a look around, you glance up the stairs and slowly start creeping up them, hoping no one suddenly comes out of their apartment or comes down the stairs. You almost make it to your door when you hear a door behind you open, followed by a cough. You turn around and see Uncle Misha watching you with a raised eyebrow. "Should I ask why you''re sneaking around naked, <<$pcs_nickname>>?"'
 	'You blush as he stares at your naked body, having been caught by someone you know. "Some girls at school stole my clothes," you explain to him, and he snorts a laugh and shakes his head.'
-	'"Well, you best get inside then," he tells you and you unlock the door as quickly as you can. As you head inside, you think you hear him say "Where were girls like that when I was in school?"' 
+	'"Well, you best get inside then," he tells you and you unlock the door as quickly as you can. As you head inside, you think you hear him say "Where were girls like that when I was in school?"'
 	'You rush down the hall to your bedroom.'
 	gs 'stat'
 	act 'Go to your bedroom':

+ 10 - 10
locations/pav_clinic.qsrc

@@ -144,7 +144,7 @@ if $ARGS[0] = '':
 				menu_off = 1
 				minut += 15
 				gs 'stat'
-			
+
 				if pcs_brace = 1:
 					pcs_brace = 0
 					pcs_teeth -= 1
@@ -230,7 +230,7 @@ if $ARGS[0] = '':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/optometrist.jpg"></center>'
 				'The optometrist takes you through a series of tests to measure the condition of your eyes.'
-				'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave.' 
+				'He looks at you as if he has bad news for you. "Well, you probably already expected this, but your vision has deteriorated significantly. You''re going to need glasses to be able to read. The prescription I''m writing for you is for a simple set of rimmed glasses which you can pick up at the front desk before you leave.'
 				'He hands you a piece of paper. "Of course you can get a different pair elsewhere if you want better looking ones, the details for which ones you need are on your prescription. You can also get laser vision correction if you really don''t want to use glasses, but I''m going to be honest with you: that''s a very expensive procedure."'
 				pcs_nerd += 1
 				glassqw = 2
@@ -593,7 +593,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if narkoman = 1 and mid($start_type,1,2) = 'sg':
+		if narkoman = 1 and $start_loc = 'sg':
 			act 'Seek help for your weakness and pain':
 				*clr & cla
 				menu_off = 1
@@ -680,7 +680,7 @@ if $ARGS[0] = '':
 				end
 			end
 		end
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0 and func('homes_properties', 'has_access', 'parents_home'): act 'Go to the gynaecologist for a referral': gt 'pav_clinic', 'referral'
+		if $start_loc = 'sg' and SchoolAtestat = 0 and Gspravka < 3 and motherKnowSpravka = 0 and func('homes_properties', 'has_access', 'parents_home'): act 'Go to the gynaecologist for a referral': gt 'pav_clinic', 'referral'
 	else
 		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
 	end
@@ -1054,10 +1054,10 @@ if $ARGS[0] = 'spravka_arrange':
 		minut += 5
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/gyno/sex/gpoli_6.jpg"></center>'
-		'You take another deep breath and slowly put your hands on his groin. To your surprise you feel that his cock is already fully erect. You massage it through his pants before dropping to your knees as he pulls his erection free from his pants.' 
-		'You guide his stiff cock to your mouth with your hand and lick the tip teasingly before you slowly envelop his cock with your mouth and start sucking the head.' 
+		'You take another deep breath and slowly put your hands on his groin. To your surprise you feel that his cock is already fully erect. You massage it through his pants before dropping to your knees as he pulls his erection free from his pants.'
+		'You guide his stiff cock to your mouth with your hand and lick the tip teasingly before you slowly envelop his cock with your mouth and start sucking the head.'
 		'After a minute or two, you feel his hand at the back of your head. You want to raise your head and ask him what he wants, but he forces you to stay where you are and slowly pushes his hips forward, making you take more and more of his rod inside your mouth.'
-		
+
 		act 'Give him a blowjob':
 			if venera > 0: gt 'pav_clinic', 'gynoblow', 'referral_blow'
 			*clr & cla
@@ -1096,7 +1096,7 @@ if $ARGS[0] = 'spravka_arrange':
 					$orgasm_or = 'yes'
 					gs 'arousal', 'vaginal', 5, 'sub'
 					gs 'stat'
-					
+
 					act 'Sex on the table':
 						*clr & cla
 						gs 'stat'
@@ -1386,7 +1386,7 @@ if $ARGS[0] = 'spravka_arrange_pale':
 					$orgasm_or = 'yes'
 					gs 'arousal', 'vaginal', 5, 'sub'
 					gs 'stat'
-					
+
 					act 'Sex on the table':
 						*clr & cla
 						gs 'stat'
@@ -1459,7 +1459,7 @@ if $ARGS[0] = 'spravka_arrange_pale':
 											'"Thank you doctor," you quietly mumble as you straighten your clothes.'
 											gs 'arousal', 'end'
 											gs 'stat'
-											
+
 											act 'Leave':gt 'pav_clinic'
 										end
 									end

+ 4 - 4
locations/pav_commercial.qsrc

@@ -61,7 +61,7 @@ gs'street_event','pav_commercial', 'extras'
 if ((month = 9 and day > 16) or month >= 10) and (AlbinaQW['StarletsShutDown'] = 0 or AlbinaQW['Chernov'] = 0): 'You can see election posters on the walls all over town. They say: "Vote for Boris Barlovsky!" Wait a minute... isn''t that Albina''s father?'
 if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['Chernov'] = 0 and ((month = 11 and day > 18) or month = 12) and hour >= 14:gt 'albina_election_events', 'start'
 
-if mid($start_type,1,2) = 'sg' and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and func('homes_properties', 'has_access', 'parents_home'):
+if $start_loc = 'sg' and hour < 4 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and func('homes_properties', 'has_access', 'parents_home'):
 	motherWorry = 1
 end
 
@@ -111,7 +111,7 @@ if hour >= 8 and hour <= 20:
 else
 	$desc_txt3 = '<a href="exec:msg ''Pyaterochka, which is closed right now. It will reopen again at 8:00''">Pyaterochka</a>, a popular discount supermarket chain'
 end
-'<br>Of course, right after you visit the bank, you can spend your money at <<$desc_txt3>>.' 
+'<br>Of course, right after you visit the bank, you can spend your money at <<$desc_txt3>>.'
 
 if hour >= 8 and hour <= 17:
 	$desc_txt1 = '<a href="exec: minut += 3 & gt ''barbershop'', ''start''">A Cut Above</a>, the only barber shop in the area, <a href="exec: minut += 3 & gt ''shop_coco_carmen'', ''start''">Coco Carmen</a> the trendy clothes shop and <a href="exec: minut += 3 & gt ''shop_allure'', ''start''">Allure</a> the swimwear chain'
@@ -138,7 +138,7 @@ end
 
 if workPTU > 2:act '<b>Go to the hostel</b>':gt 'etoexhib', 'pos40'
 
- if  hour >= 6 and hour < 19 and hypnoSchedule = 1 and therapistday ! daystart: 
+ if  hour >= 6 and hour < 19 and hypnoSchedule = 1 and therapistday ! daystart:
     act '<b>Go see your therapist  (1:00)</b>': minut += 5 & gt 'therapist'
     *nl
 end
@@ -177,7 +177,7 @@ elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23
 	act 'Go to the jeep': gt 'belgang', 'workofdebt'
 end
 
-!-- Random prostitution solicitation check ------------------------ 
+!-- Random prostitution solicitation check ------------------------
 if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
 
 

+ 20 - 20
locations/pav_complex.qsrc

@@ -53,22 +53,22 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if mid($start_type,1,2) = 'sg' and hour < 5 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and func('homes_properties', 'has_access', 'parents_home') and locat['Fam_inGad'] = 0: motherWorry = 1
+	if $start_loc = 'sg' and hour < 5 and motherWorry = 0 and SchoolAtestat = 0 and age < 18 and func('homes_properties', 'has_access', 'parents_home') and locat['Fam_inGad'] = 0: motherWorry = 1
 
 	if ((minut + 60*(hour+daystart*24) - pavcomplexevent_time) > 60) or ((daystart+1)*1440 < pavcomplexevent_time):
-		if hour >= 8 and hour <= 20 and rand (0,2) = 0: 
+		if hour >= 8 and hour <= 20 and rand (0,2) = 0:
 			pavcomplexevent_time = minut + 60*(hour+daystart*24)
 			gt 'pav_aptcourtev', 'events1'
 		elseif (hour < 8 or hour > 20) and rand (0,3) = 0:
 			pavcomplexevent_time = minut + 60*(hour+daystart*24)
 			gt 'pav_aptcourtev', 'events2'
 		end
-	end	
+	end
+
+	if week <= 5 and cheerleaders_on = 0 and hour >= 14 and hour <= 18 and $start_loc = 'sg' and (LariskaQW['story'] = 0 or LariskaQW['story'] = 1) and npc_rel['A13'] > 40 and lariska_ball ! daystart: 'Walking along the apartment complex, you hear a bouncing sound. Turning the corner, you see <a href="exec:gt ''lariska_storyline'', ''story_intro''">Lariska</a> hitting a volleyball against a wall.'
 
-	if week <= 5 and cheerleaders_on = 0 and hour >= 14 and hour <= 18 and mid($start_type,1,2) = 'sg' and (LariskaQW['story'] = 0 or LariskaQW['story'] = 1) and npc_rel['A13'] > 40 and lariska_ball ! daystart: 'Walking along the apartment complex, you hear a bouncing sound. Turning the corner, you see <a href="exec:gt ''lariska_storyline'', ''story_intro''">Lariska</a> hitting a volleyball against a wall.'
-	
 	if car > 0 and cardrive = 20: 'Your <a href="exec:gs ''carF'', ''start''"><<$car>></a> is parked in the street.'
-	
+
 	if rexCar = 1 and rexCarDay = daystart and hour >= 21 and hour < 23 and rexSisTalk = 3:
 		'<br>Rex is in his car, waiting for you at the parking lot near the apartment building where your parents live.'
 		act 'Join Rex in his car':gt 'rex_events','avto'
@@ -85,7 +85,7 @@ if $ARGS[0] = 'start':
 	'Behind the apartments is a row of <a href="exec:minut += 3 & gt ''pav_complex'', ''garages''">garages</a> and storage space for tenants.'
 
 	if pavComplex_met_dealer >= 3 and hour > 20: '<br>You can see the <a href="exec:minut += 3 & gt ''pav_aptcourtev'', ''dealer''">boy</a> who sells weed in the courtyard.'
-	
+
 	if Enable_tablemap = 0:
 		if npc_rel['A112'] >=70 or (week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (hour >= 0 and hour < 2):'<a href="exec:minut += 15 & gt ''vasilyhome'', ''home''">The Shulgin family</a> live in the apartment above your parents.'
 		if ArtemBeInHome > 0 and artemQW['artemblok'] = 0:'<a href="exec:minut += 15 & gt ''artemhome'', ''home''">Artem Chebotarev</a>, one of your classmates, lives in the same apartment building as your parents, on the first floor.'
@@ -131,11 +131,11 @@ if $ARGS[0] = 'start':
 	end
 
 	if seenAD = 1 and pavSharedAptEnabled = 0: '<br>Some guys in one of the <a href="exec:minut += 5 & gt ''pav_shared_apt'',''doorNo30''">apartments</a> are looking for a roommate.'
-	
+
 	if rolanmeet = 8 and rolanblockhome ! 1: '<br>Mr. Matveev''s is living in an <a href="exec:minut += 5 & gt ''rolanapt'',''home''">apartment</a> in the Five Eight Estate.'
-	
-!!	if mid($start_type,1,2) = 'sg': '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & gt ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
-	
+
+!!	if $start_loc = 'sg': '<br>Nearby, in another block of apartments, there''s an <a href="exec:minut += 3 & gt ''pavComplexOld'',''etaj_1''">old apartment building</a> that looks quite rundown and possibly abandoned.'
+
 	if func('homes_properties', 'has_access', 'parents_home'): act '<b>Go Home</b> (Parents'' Apartment)': minut += 4 & pavhome_enter = 1 & gt 'korrPar'
 	if pavSharedAptEnabled = 1: act '<b>Go Home</b> (Shared Apartment)': minut += 5 & gt 'pav_shared_apt', 'start'
 	act 'Walk to the Residential area (0:02)':minut += 2 & gt 'pav_residential'
@@ -144,16 +144,16 @@ if $ARGS[0] = 'start':
 	act 'Walk to the Market (0:15)':minut += 15 & gt 'pav_market'
 	act 'Walk to the train station (0:15)':minut += 15 & gt 'pav_train_hall'
 	act 'Walk to Pushkin (0:30)':minut += 30 & nroad = 19 & gt 'pushkin'
-	if mid($start_type,1,2) = 'sg' and func('homes_properties', 'has_access', 'parents_home'): 
+	if $start_loc = 'sg' and func('homes_properties', 'has_access', 'parents_home'):
 		act 'Go to your apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
-	elseif mid($start_type,1,2) = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):
+	elseif $start_loc = 'sg' and (func('homes_properties', 'has_access', 'parents_home') = 0 or pavSharedAptEnabled = 1):
 		act 'Go to your parent''s apartment building':minut += 1 & gt 'pod_ezd', 'etaj_1'
 	end
-!!	if mid($start_type,1,2) = 'sg': act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'
+!!	if $start_loc = 'sg': act 'Go to the old apartment building':minut += 1 & gt 'pavComplexOld', 'etaj_1'
 	act 'Sit on a bench':gt 'pav_aptcourtev', 'bench'
 	gs 'camera', 'check_location'
 
-	!-- Random prostitution solicitation check ------------------------ 
+	!-- Random prostitution solicitation check ------------------------
 	if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
 
 end
@@ -167,7 +167,7 @@ if $ARGS[0] = 'garages':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/garages.jpg"></center>'
 	'Along the back street is a row of garages available for the residents of the apartments to rent. The weather in Pavlovsk can be brutal, especially in the winter, so people who own a car often have a garage to put it away safely. Between the garages and the courtyard is a series of smaller storage buildings that can be rented, as well as the complex''s maintenance and laundry buildings. The layout of the buildings leaves a maze of walkways between them, which are a popular place for kids to play or for teenagers to hang out.'
 	*nl
-	if mid($start_type,1,2) = 'sg':'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
+	if $start_loc = 'sg':'Your <a href="exec:minut += 5 & gt ''gargazel''">stepfather''s garage</a> is around here somewhere.'
 	if gopnikbandQW['practice_invite'] = 1:'The converted <a href="exec:minut += 5 & gt ''praiders_garage'', ''band_garage''">band garage</a> the band uses to practice in is around here.'
 	if gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour = 20: act '<b>Meet Lena and Lera</b>': gt 'gopnik_initiation','initiation'
 	if ((week < 6 and hour => 18 and hour < 22) or (week >= 6 and hour >= 15 and hour < 22)) and ed_event_day ! daystart:
@@ -272,7 +272,7 @@ if $ARGS[0] = 'garages':
 								end
 							else
 								act 'Talk to Valentin (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-							end	
+							end
 							act 'Strip down to your panties':
 								cla & *clr
 								minut += 3
@@ -382,7 +382,7 @@ if $ARGS[0] = 'garages':
 									cla & *clr
 									minut += 15
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/garage/ed/ed6.jpg"></center>'
-									edchat = rand(1,13)	
+									edchat = rand(1,13)
 									if edchat = 1:
 										'"Your daughter is lots of fun, has anyone ever told you that?" you gloat a little.'
 										'"So what''s my daughter up to these days?" Eduard causally asks while working on his bike.'
@@ -450,7 +450,7 @@ if $ARGS[0] = 'garages':
 										end
 									elseif edchat = 12:
 										'"So I was just harassed by the local police..." you complain to Eduard.'
-										'"Ah yes, our finest." he says and spits on the ground out of spite. "They''re always harassing people, looking for a bribe. I''ve always hated this city''s police force. Even when I was young, they were out to get me."' 
+										'"Ah yes, our finest." he says and spits on the ground out of spite. "They''re always harassing people, looking for a bribe. I''ve always hated this city''s police force. Even when I was young, they were out to get me."'
 									elseif edchat = 13:
 										'"Tell me <<$pcs_nickname>>, is that place over by the old factory still there?" Eduard curiously asks.'
 										'You ponder for a while. "I don''t really know which one you mean, but no one really hangs out over there anymore. The only ones that remain are the drug dealers..."'
@@ -492,7 +492,7 @@ if $ARGS[0] = 'garages':
 	if $CURACTS = '':
 		gs 'stat'
 		act 'Go back to the courtyard':minut += 2 & gt 'pav_complex', 'start'
-		if mid($start_type,1,2) = 'sg': act 'Go to your stepfather''s garage': minut += 5 & gt 'gargazel'
+		if $start_loc = 'sg': act 'Go to your stepfather''s garage': minut += 5 & gt 'gargazel'
 	end
 
 end

+ 1 - 1
locations/pav_complexb3.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'etaj_1':
 	act 'Leave the building': minut += 1 & gt 'pav_complex', 'start'
 	act 'Go up to the second floor': minut +=1 &  gt 'pav_complexb3','etaj_2'
 	act 'Take the elevator': gt 'pav_complexb3','lift','etaj_1'
-!!	if rolanblockhome ! 1 and mid($start_type,1,2) = 'sg':
+!!	if rolanblockhome ! 1 and $start_loc = 'sg':
 !!		act 'Apartment 1: Mr. Matveev''s': gt 'rolanapt','home'
 !!	end
 end

+ 56 - 56
locations/pav_disco.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = '':
 !! check against clothing and makeup impacting social groups only once per day
 	if social_check['disco'] ! daystart and hour > 6:
 		social_check['disco'] = daystart
-		if PCloskirt = 0: 
+		if PCloskirt = 0:
 			grupvalue[1] -= 1
 			if PCloquality > 4:grupvalue[1] += 1
 		end
@@ -46,13 +46,13 @@ if $ARGS[0] = '':
 			grupvalue[1] -= 5
 			grupvalue[2] -= 5
 			grupvalue[4] -= 1
-		elseif pcs_makeup = 1: 
+		elseif pcs_makeup = 1:
 			grupvalue[1] -= 5
 			grupvalue[2] -= 3
 			grupvalue[4] -= 1
-		elseif pcs_makeup = 2: 
+		elseif pcs_makeup = 2:
 			grupvalue[4] -= 1
-		elseif pcs_makeup = 3: 
+		elseif pcs_makeup = 3:
 			grupvalue[1] += 1
 		elseif pcs_makeup = 4:
 			grupvalue[2] -= 1
@@ -76,11 +76,11 @@ if $ARGS[0] = '':
 
 		act 'Go to the toilets': gt 'gdktoilet', 'start'
 
-		if mid($start_type,1,2) = 'sg' and yearstart <= 1: 'You see a few of your <a href="exec: gt ''pav_disco_classmates'', ''classmates''">classmates</a>. Some of them dancing, while others stick to their own groups and talk.'
+		if $start_loc = 'sg' and yearstart <= 1: 'You see a few of your <a href="exec: gt ''pav_disco_classmates'', ''classmates''">classmates</a>. Some of them dancing, while others stick to their own groups and talk.'
 
 		if dimaRevenge = 7 and dimaRevChoice = 4 and dimadisco = 0: gt 'dimaRevenge', 5, 'disco'
 
-		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0 and month > 9 and npc_grupTipe['A25'] ! 5 and mid($start_type,1,2) = 'sg' and BeInSchool > 0 and hour < 22:
+		if rand(1,3) = 2 and soniaPS < 1 and soniadisco_day ! daystart and SchoolAtestat = 0 and month > 9 and npc_grupTipe['A25'] ! 5 and $start_loc = 'sg' and BeInSchool > 0 and hour < 22:
 			'You notice Sonia talking to Vitek about something.'
 			act 'Watch Sonia': soniadisco_day = daystart & gt 'soniadisco', 'start'
 		end
@@ -199,13 +199,13 @@ if $ARGS[0] = '':
 						grupvalue[4] += 1
 						'You''re having a lot of fun out on the dance floor. Most people would have a hard time telling you were drunk as you expertly move your body in a seductive manner to the beat of the music.'
 					end
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
+					if $start_loc = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1:
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
-						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1: 
+					elseif $start_loc = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
+						gt 'pav_disco', 'sonia_too_drunk'
+					elseif $start_loc = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,10) = 1:
+					elseif $start_loc = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,10) = 1:
 						gt 'pav_disco', 'albina_too_drunk'
 					end
 				elseif alko < 10:
@@ -235,13 +235,13 @@ if $ARGS[0] = '':
 							grupvalue[4] += 2
 							'You''re very drunk and forget that you don''t have any panties on. Most people would have a hard time knowing you were very drunk as you expertly move your body around in a seductive manner, but you are too drunk to notice your skirt riding up, exposing your pussy to the observant people on the dance floor with you.'
 						end
-						if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
+						if $start_loc = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1:
 							gt 'pav_disco', 'katja_too_drunk'
-						elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
-							gt 'pav_disco', 'sonia_too_drunk' 
-						elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+						elseif $start_loc = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
+							gt 'pav_disco', 'sonia_too_drunk'
+						elseif $start_loc = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'anushka_too_drunk'
-						elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,7) = 1:
+						elseif $start_loc = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,7) = 1:
 							gt 'pav_disco', 'albina_too_drunk'
 						end
 					else
@@ -266,13 +266,13 @@ if $ARGS[0] = '':
 							grupvalue[2] -= 1
 							'You''re very drunk, but are having a lot of fun out on the dance floor anyway. Most people would have a hard time knowing you were drunk as you expertly move your body around in a seductive manner to the beat of the music.'
 						end
-						if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
+						if $start_loc = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1:
 							gt 'pav_disco', 'katja_too_drunk'
-						elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
-							gt 'pav_disco', 'sonia_too_drunk' 
-						elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+						elseif $start_loc = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
+							gt 'pav_disco', 'sonia_too_drunk'
+						elseif $start_loc = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1:
 							gt 'pav_disco', 'anushka_too_drunk'
-						elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,7) = 1:
+						elseif $start_loc = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,7) = 1:
 							gt 'pav_disco', 'albina_too_drunk'
 						end
 					end
@@ -282,13 +282,13 @@ if $ARGS[0] = '':
 					grupvalue[4] -= 1
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wasted_dance.jpg"></center>'
 					'You''re far too drunk and are barely able to stay on your feet. You''re mostly just drunkenly bumping into other people as you try and dance.'
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,3) = 1: 
+					if $start_loc = 'sg' and katjaQW['QWstage']  > 1 and rand(1,3) = 1:
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,5) = 1:
-						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,5) = 1: 
+					elseif $start_loc = 'sg' and npc_rel['A25'] >= 50 and rand(1,5) = 1:
+						gt 'pav_disco', 'sonia_too_drunk'
+					elseif $start_loc = 'sg' and npc_rel['A144'] >= 50 and rand(1,5) = 1:
 						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,5) = 1:
+					elseif $start_loc = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,5) = 1:
 						gt 'pav_disco', 'albina_too_drunk'
 					end
 				end
@@ -333,25 +333,25 @@ if $ARGS[0] = '':
 				elseif alko < 4:
 					'You''re tipsy and stand against the wall while watching the others dance.'
 				elseif alko < 6:
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1: 
+					if $start_loc = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1:
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
-						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1: 
+					elseif $start_loc = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
+						gt 'pav_disco', 'sonia_too_drunk'
+					elseif $start_loc = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1:
 						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,10) = 1:
+					elseif $start_loc = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,10) = 1:
 						gt 'pav_disco', 'albina_too_drunk'
 					else
 						'You''re pretty drunk and stand against the wall for support as you watch the others dance.'
-					end	
+					end
 				else
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1: 
+					if $start_loc = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1:
 						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
-						gt 'pav_disco', 'sonia_too_drunk' 
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1: 
+					elseif $start_loc = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
+						gt 'pav_disco', 'sonia_too_drunk'
+					elseif $start_loc = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1:
 						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,7) = 1:
+					elseif $start_loc = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,7) = 1:
 						gt 'pav_disco', 'albina_too_drunk'
 					else
 						'You''re too drunk to dance and lean against the wall for support to stop yourself from falling.'
@@ -385,7 +385,7 @@ if $ARGS[0] = '':
 			gs 'stat'
 			act 'Continue': gt 'pav_disco'
 		end
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0: act 'Look for your classmates': gt 'pav_disco_classmates', 'classmates'
+		if $start_loc = 'sg' and SchoolAtestat = 0: act 'Look for your classmates': gt 'pav_disco_classmates', 'classmates'
 	elseif hour < 20:
 		'<center><b><font color="maroon">Disco</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/closing.jpg"></center>'
@@ -405,7 +405,7 @@ if $ARGS[0] = 'kotov_love':
 		fightboyrand = rand(0, 10)
 
 		if fightboyrand <= 5:
-			'The frightened man begins to speak. "Come on, I didn''t know. I''m leaving."' 
+			'The frightened man begins to speak. "Come on, I didn''t know. I''m leaving."'
 			'Vitek pushes the guy. "Get out of here and don''t come back."'
 		elseif fightboyrand > 5 and fightboyrand < 10:
 			'The guy shoves Vitek back. "Get your hands off me asshole!" Vitek suddenly kicks the guy with a fast and powerful blow.'
@@ -417,7 +417,7 @@ if $ARGS[0] = 'kotov_love':
 	elseif DPgrup = 2:
 		'The guy has a smug look on his face as he calls over his friends, who all come over to crowd around Vitek. "Real tough guy huh?" Vitek''s friends come over to back him up. After a bit of tough talk and shoving, the two groups break apart peacefully, going their own ways.'
 	elseif DPgrup = 3:
-		'The guy throws up his hands. "Sorry man, I didn''t know she was with you."' 
+		'The guy throws up his hands. "Sorry man, I didn''t know she was with you."'
 		'Vitek pushes the guy. "Go back to the city and stay there."'
 	end
 	act 'Go to Vitek':
@@ -555,20 +555,20 @@ if $ARGS[0] = 'dance_vrp':
 			$boydesc = $npc_nickname[$npclastcalled]
 			if rand(1,2) = 1:
 				if DPtipe = 1:
-					'"My name is <<$boydesc>>. What''s yours?" the guy asks.' 
+					'"My name is <<$boydesc>>. What''s yours?" the guy asks.'
 					'"<<$pcs_firstname>>, but people call me <<$pcs_nickname>>." you reply. Once the song ends, the guy asks you to sit with him and chat.'
 				elseif DPtipe = 2:
-					'"My name is <<$boydesc>>. What''s yours?" the guy asks.' 
+					'"My name is <<$boydesc>>. What''s yours?" the guy asks.'
 					'"<<$pcs_firstname>>, but people call me <<$pcs_nickname>>." you reply. The drunk guy humped you throughout the dance and now his face is flushed with excitement. He asks you to leave with him to get some fresh air and talk outside.'
 				end
 
 				act 'Go with the guy': gt 'pav_disco_sex', 'outside', 'nice'
 			else
 				if DPtipe = 1:
-					'"My name is <<$boydesc>>. What''s yours?" the guy asks.' 
+					'"My name is <<$boydesc>>. What''s yours?" the guy asks.'
 					'"<<$pcs_firstname>>, but people call me <<$pcs_nickname>>." you reply. Once the song ends, the guy asks if you want to go outside with him.'
 				elseif DPtipe = 2:
-					'"My name is <<$boydesc>>. What''s yours?" the guy asks.' 
+					'"My name is <<$boydesc>>. What''s yours?" the guy asks.'
 					'"<<$pcs_firstname>>, but people call me <<$pcs_nickname>>." you reply. The drunk guy humped you throughout the dance and now his face is flushed with excitement. He asks you to leave with him and to get some fresh air and talk outside.'
 				end
 				act 'Go with the guy': gt'pav_disco','hookup_nice'
@@ -608,7 +608,7 @@ if $ARGS[0] = 'dance_vrp':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 					$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
 					$boydesc = $npc_nickname[$npclastcalled]
-					'You go outside with the man. As you walk, he put his arm around your waist. "My name is <<$boydesc>>. What''s yours?" he asks.' 
+					'You go outside with the man. As you walk, he put his arm around your waist. "My name is <<$boydesc>>. What''s yours?" he asks.'
 					'"<<$pcs_firstname>>, but people call me <<$pcs_nickname>>." you answer and the man continues. "That''s a nice name. I''m in town on a business trip and I''m staying at a nearby hotel. There''s virtually nothing to do in this town, so why don''t you come back to my hotel with me? We can drink some whiskey and chat."'
 					if alko < 6 or pcs_horny <= 75 or fame['pav_slut'] <= 50:
 						gs 'willpower', 'drink', 'resist'
@@ -629,7 +629,7 @@ if $ARGS[0] = 'dance_vrp':
 			elseif DPtipe = 2:
 				$npc_usedname[$npclastcalled] = $npc_nickname[$npclastcalled]
 				$boydesc = $npc_nickname[$npclastcalled]
-				'The drunk man molests you for the entire dance and when the dance finally ends, he whispers in your ear. "My name is <<$boydesc>>. What''s yours?"' 
+				'The drunk man molests you for the entire dance and when the dance finally ends, he whispers in your ear. "My name is <<$boydesc>>. What''s yours?"'
 				'"<<$pcs_firstname>>, but people call me <<$pcs_nickname>>." you answer, feeling somewhat disgusted.'
 				'"<<$pcs_nickname>>, I''m not a local. I''m staying in a nearby hotel, so let''s take a taxi and go to my room." he drunkenly stutters.'
 				gs 'arousal', 'foreplay', 5
@@ -772,7 +772,7 @@ if $ARGS[0] = 'familiar2':
 		if bmTip[Tboynum] = 0:'After the Dance <<$boydesc>> offers to go out and drink beer.'
 		if bmTip[Tboynum] = 1:'After the Dance <<$boydesc>> offers to go hang out.'
 		if bmTip[Tboynum] = 2:'After the Dance <<$boydesc>> offers to go to his hotel.'
-		
+
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
 			act 'Refuse (<<will_cost>> Willpower)':
@@ -785,7 +785,7 @@ if $ARGS[0] = 'familiar2':
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		
+
 		act 'Agree':
 			*clr & cla
 			boynumBlock = 1
@@ -831,7 +831,7 @@ if $ARGS[0] = 'anushka_too_drunk':
 	'Anushka approaches and pokes you, which causes you to jerk away. This causes you to stumble and nearly fall, but Anushka catches you by the arm to help steady you. "Someone''s partied pretty hard tonight, haven''t they? Maybe a little too hard. Let''s get you home before someone tries to take advantage of you."'
 	act 'Go with Anushka': gt 'pav_disco_gopniks', 'anushka_walkhome'
 end
-	
+
 if $ARGS[0] = 'albina_too_drunk':
 	*clr & cla
 	menu_off = 1
@@ -859,7 +859,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		act 'Leave':gt $loc, $loc_arg
 		act 'Return to the dance':gt 'pav_disco'
 	end
-	
+
 	act 'Fuck off':
 		cla & *clr
 		'<center><img src="images/pc/reactions/fuckoff3.jpg"></center>'
@@ -870,7 +870,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		act 'Leave':gt $loc, $loc_arg
 		act 'Return to the dance':gt 'pav_disco'
 	end
-	
+
 	act 'That sounds nice':
 		cla & *clr
 		'<center><img src="images/locations/pavlovsk/community/disco/outside_kiss.jpg"></center>'
@@ -881,7 +881,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		gs 'stat'
 		act 'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 	end
-	
+
 	act 'That sounds great':
 		cla & *clr
 		'<center><img src="images/locations/pavlovsk/community/disco/outside_kiss.jpg"></center>'
@@ -890,7 +890,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		gs 'arousal', 'kiss', 5
 		gs 'arousal', 'end'
 		gs 'stat'
-		
+
 		act 'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 	end
 end
@@ -908,7 +908,7 @@ if $ARGS[0] = 'hookup_nice':
 		act 'Leave':gt $loc, $loc_arg
 		act 'Return to the dance':gt 'pav_disco'
 	end
-	
+
 	act 'No thanks':
 		cla & *clr
 		'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
@@ -918,7 +918,7 @@ if $ARGS[0] = 'hookup_nice':
 		act 'Leave':gt $loc, $loc_arg
 		act 'Return to the dance':gt 'pav_disco'
 	end
-	
+
 	act 'Hook up with him':
 		cla & *clr
 		gs 'fame', 'pav', 'sex', 1
@@ -929,7 +929,7 @@ if $ARGS[0] = 'hookup_nice':
 		gs 'stat'
 		act 'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 	end
-	
+
 	act 'Want to fuck?':
 		cla & *clr
 		gs 'fame', 'pav', 'sex', 1

+ 17 - 17
locations/pav_hotel.qsrc

@@ -20,14 +20,14 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 		'When you want to enter the hotel you notice the doors are closed.'
 		'You try knocking on the door but nobody comes to open them.'
 		act 'Go back to the High Street':
-			minut += 3 
+			minut += 3
 			killvar 'home_name'
 			gt'pav_market'
-		end 
-		
+		end
+
 		if hotresepQW = 3:
 			'The receptionist and the manager are probably at it again.'
-			act 'Wait until they are finished': 
+			act 'Wait until they are finished':
 				hotresepQW_day = daystart
 				minut += rand(1, 60-minut)
 				gt 'pav_hotel'
@@ -46,9 +46,9 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 			*clr & cla
 			gs 'exp_gain', 'observ', 3
 			gs 'stat'
-			if $prevloc = 'HotelRoom': 
+			if $prevloc = 'HotelRoom':
 				'You creep down to the lobby, and then around the corner, carefully, you sneak a glimpse.'
-			else 
+			else
 				'You find the door closed, and you realise that the receptionist and the manager are probably fooling around again. You carefully open the door with your key, and enter as quietly as you can.'
 				'Moving to the corner carefully, you sneak a glimpse.'
 			end
@@ -227,7 +227,7 @@ if $ARGS[0] = 'Pavlin' :
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/pavlin/pavlin.jpg"></center>'
 	'Varsonofy Krestovoz is a small time gangster who makes his money by whoring out vulnerable women in Pavlovsk. Few people know his name as he is usually called <<$npc_nickname[''A217'']>> (the Peacock).'
 	if npc_rel['A217'] = -1:'<<$npc_nickname[''A217'']>> killed your unborn baby, you truly hate him. You should go find some help if you don''t want these negative feelings to completely take over your personality.'
-	if npc_rel['A217']<20 and npc_rel['A217'] => 0:'You and <<$npc_nickname[''A217'']>> have a dysfunctional relation. You work for him but you are just one of many girls.'
+	if npc_rel['A217']<20 and npc_rel['A217'] >= 0:'You and <<$npc_nickname[''A217'']>> have a dysfunctional relation. You work for him but you are just one of many girls.'
 	if npc_rel['A217']>=20 and npc_rel['A217']<40:'You understand <<$npc_nickname[''A217'']>> a little better. You know he has an extreme violent side but you have figured out some strategies to avoid these outbursts.'
 	if npc_rel['A217']>=40 and npc_rel['A217']<60:'You and <<$npc_nickname[''A217'']>> have a normal relationship.'
 	if npc_rel['A217']>=60 and npc_rel['A217']<80:'You and <<$npc_nickname[''A217'']>> have a good relationship.'
@@ -369,12 +369,12 @@ if $ARGS[0] = 'Pavlin' :
 			act 'Move away':gt'pav_hotel','skip_resepevent'
 		end
 	end
-	if npc_rel['A217'] > 19 and proshotelday ! daystart and mid($start_type,1,2) = 'sg' and TwinQW < 0:
+	if npc_rel['A217'] > 19 and proshotelday ! daystart and $start_loc = 'sg' and TwinQW < 0:
 		!!! TwinQW: 0 quest not started; > 0: quest started; < 5: talking with sis; 5: sis agreed; 6: finished
 		!!! changing 'TwinQW < 0' in the above if statement to 'TwinQW < 1' reenables the quest line
 		!!! Kevin Smarts:
 		!!! The twin event is meant to be disabled as it does not fit  Anya''s personality. It is waiting to be redone with a more suitable "twin".
-		if tmp_TwinQW_AskedToday < daystart: 
+		if tmp_TwinQW_AskedToday < daystart:
 			act 'Fake Twins Request':
 				*clr & cla
 				tmp_TwinQW_AskedToday = daystart
@@ -501,7 +501,7 @@ if $ARGS[0] = 'Twins':
 		gs 'stat'
 		act 'Continue':
 			*clr & cla
-			
+
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sex/twins3.jpg"></center>'
 			'Just as your sister looks to be on the verge of cumming, <<$boydesc>> pulls her off of the couch and pushes her onto her knees. Her mouth still open in shock, the client pushes his dick between her lips. You hear Anya whimper as the throbbing member slides along her tongue, obviously frustrated by being so close, and yet so far, from orgasm.'
 			'The inconsiderate man turns his head your way. "You! Get over here and start licking my balls while I use your sister''s dirty mouth!"'
@@ -519,7 +519,7 @@ if $ARGS[0] = 'Twins':
 
 			gs 'arousal','bj',5,'prostitution'
 			gs 'stat'
-			
+
 			act 'Continue':
 				*clr & cla
 				gs 'stat'
@@ -548,7 +548,7 @@ if $ARGS[0] = 'Twins':
 					'The man finally pulls his still-hard member out of your cunt and steps back. "Ok girls, one last request. I am going to fuck one of you up the ass, but you can decide which one gets it."'
 					gs 'arousal','vaginal',10,'prostitution'
 					gs 'stat'
-					if klismaday ! daystart: 
+					if klismaday ! daystart:
 						'You lean in close and whisper to Anya that you hadn''t cleaned yourself down there today.'
 						'"Don''t worry <<$pcs_nickname>>, I love it up the ass!" She whispers back, her eyes wide with arousal and desire.'
 						act 'Anya takes it':
@@ -795,7 +795,7 @@ if $ARGS[0] = 'clown':
 				'He puts the ''cock'' aside and says "But seriously, get ready for my massive, huge, humongous gigantic dick."'
 				gs 'arousal', 'cuni', 15, 'prostitution'
 				gs 'stat'
-				
+
 				act 'Continue':
 					*clr & cla
 					'<center><video autoplay loop src="images/characters/pavlovsk/pavlin/clown8.mp4"></video></center>'
@@ -813,7 +813,7 @@ if $ARGS[0] = 'clown':
 					'"Because you could easily fit another pair of tits in there."'
 					'Again you groan at the stupid joke and can''t hide the fact that you are tired of these 2 clowns.'
 					'"Ok girl, now we will give you one last present before we go, just sit up on the bed and look at me."'
-					gs 'arousal', 'vaginal', 15, 'prostitution'					
+					gs 'arousal', 'vaginal', 15, 'prostitution'
 					gs 'cum_call','breasts', $npclastgenerated, 1
 					gs 'npcgeneratec', 0, 'Clown Popav', rand(18,45)
 					gs 'cum_call','breasts', $npclastgenerated, 1
@@ -1000,7 +1000,7 @@ if $ARGS[0] = 'PregBDSM' :
 				end
 				act 'No, I can''t do this, let me go':
 					*clr & cla
-					!!Removal of 1 on counter for prostitution as you didn''t get paid 
+					!!Removal of 1 on counter for prostitution as you didn''t get paid
 					slutty -= 1
 					gs 'arousal', 'end'
 					gs 'pain', 9, 'head', 'hit'
@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'PregBDSM' :
 					'"After everything I''ve done for you, this is how you repay me?!?"'
 					'You stumble back and look at <<$npc_nickname[''A217'']>> with watery eyes. You see his clenched hand rise again, so you cover your head for protection and close your eyes, bracing for impact.'
 					*nl
-					'All the breath leaves your body as <<$npc_nickname[''A217'']>> buries his fist into your pregnant belly. Your knees turn to jelly as you fall to the ground, now laying on your side. You feel a sickly, twisting pain in your stomach and everything inside you feels wrong.' 
+					'All the breath leaves your body as <<$npc_nickname[''A217'']>> buries his fist into your pregnant belly. Your knees turn to jelly as you fall to the ground, now laying on your side. You feel a sickly, twisting pain in your stomach and everything inside you feels wrong.'
 					'"<<$pitfs>>No! He has to stop! My baby...<<$pitfe>>" Your motherly instict cries out to you.'
 					'The tip of the horrible bastard''s steel toe boot slams into your swollen belly again and again. You try to cover your womb with your arms as the kicking assault continues, but the boot still manages to make it through your desperate defense.'
 					*nl
@@ -1058,7 +1058,7 @@ if $ARGS[0] = 'PregBDSM' :
 									abortionbirthdate = daystart
 									unintendedabort = 1
 									knowpregloss = 2
-									if broodcurse > 0: over = 13 & gt'gameover'									
+									if broodcurse > 0: over = 13 & gt'gameover'
 									gs 'stat'
 									act 'Wait for the doctor':
 										*clr & cla

+ 12 - 12
locations/pav_lake.qsrc

@@ -56,14 +56,14 @@ if $ARGS[0] = '':
 		if pcs_icesktng>0: 'Your ice skating skill is <<pcs_icesktng>>.'
 	end
 
-	if mid($start_type,1,2) = 'sg' and (month <= 2 or month = 12):
+	if $start_loc = 'sg' and (month <= 2 or month = 12):
 		if week >= 6 and hour >= 8 and hour <= 11:
 			'Looking out over the frozen lake, you see a figure in the distance figure skating and doing all types of crazy moves. Stepping onto the ice and skating out, you notice that it''s <a href="exec:gt ''gschool_socialchg1'', ''tVeronika''">Veronika</a>.'
 		end
 	end
 
 	if konki_cloth = 1 or pcs_ski_worn = 0:
-		if mid($start_type,1,2) = 'sg' and temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour >= 12 and hour <= 14 and ((kanikuli = 0 and week = 7) or (kanikuli > 0 and week mod 2 = 0)):
+		if $start_loc = 'sg' and temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour >= 12 and hour <= 14 and ((kanikuli = 0 and week = 7) or (kanikuli > 0 and week mod 2 = 0)):
 			if $clothingworntype = 'nude':
 				'As you walk down to the beach area of the lake, you see the jocks and cool kids hanging out and hope none of them have seen you naked. You should put on a swimsuit before approaching them if you want to hang out, or just avoid them and do your own thing today.'
 			else
@@ -72,7 +72,7 @@ if $ARGS[0] = '':
 			end
 		end
 
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and week <= 5 and hour >= 15 and hour <= 20 and christinaQW['subpath'] = 1 and socialchg['tChristina_day'] ! daystart:
+		if $start_loc = 'sg' and SchoolAtestat = 0 and ((month >= 3 and month <= 5) or (month >= 9 and month <= 11)) and week <= 5 and hour >= 15 and hour <= 20 and christinaQW['subpath'] = 1 and socialchg['tChristina_day'] ! daystart:
 			'<a href="exec:gt ''Zvereva_sub_1'', ''chris_sub''">Christina</a> is standing by the beach looking out over the lake as Lina stands next to her, breathing heavily.'
 		end
 
@@ -167,14 +167,14 @@ if $ARGS[0] = '':
 			'You walk along the beach, enjoying the feeling of the sun on your body.'
 			act 'Continue':gt 'pav_lake'
 		end
-		
+
 		if PCloswimwear = 1 or $clothingworntype = 'nude':
 			if pcs_stam >= (10 * (10 - sport_clothes_exercise_bonus)) / 2:
 				act 'Go for a swim in the lake':
 					gt 'pav_lake', 'swimming'
 				end
 			end
-			
+
 			if sunWeather = 1:
 				act 'Sunbathe': gt 'pav_lake', 'sunbathe'
 			end
@@ -512,7 +512,7 @@ if $ARGS[0] = 'ski':
 	act 'Finish skiing':  gt 'pav_lake'
 end
 
-if $ARGS[0] = 'car_sex': 
+if $ARGS[0] = 'car_sex':
 	*clr & cla
 	danilovich_outfits[1] = 1
 	danilovich_outfits_s[1] = 0
@@ -535,7 +535,7 @@ if $ARGS[0] = 'nude_home':
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/homenude.jpg"></center>'
 	'You cover yourself up as best as you can and dash into the woods, using them as cover to get as close as you can to your apartment. Luckily, no one spots you, but now you''re at the edge of the woods and have the difficult task of actually making it to the building without being seen.'
-	
+
 	gs 'willpower', 'exhib', 'self'
 	if will_cost <= pcs_willpwr:
 		act 'Run for it (<<will_cost>> Willpower)':
@@ -557,7 +557,7 @@ if $ARGS[0] = 'nude_home':
 	else
 		act 'Run for it (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	
+
 	act 'Sneak home':
 		*clr & cla
 		minut += 20
@@ -625,7 +625,7 @@ if $ARGS[0] = 'skating':
 	end
 
 	gs'stat'
-	
+
 	if hour <= 17:
 		act 'Leave the rink': gt'pav_lake'
 		act 'Skate some more': gt 'pav_lake', 'skating'
@@ -663,9 +663,9 @@ if $ARGS[0] = 'beach_hangout':
 	*clr & cla
 	minut += 5
 	!!Cool kids approve of high quality bikini or outfit and disapprove of low quality
-	if PCloQuality >= 4: 	
+	if PCloQuality >= 4:
 		grupvalue[1] += 1
-	elseif PCloQuality  < 3: 	
+	elseif PCloQuality  < 3:
 		grupvalue[1] -= 1
 	end
 	!!Cool kids and jocks approve of somewhat revealing clothes or a little skimpy bikini and disapprove of conservative clothes or bikinis and very revealing clothes or very skimpy bikini
@@ -688,7 +688,7 @@ if $ARGS[0] = 'beach_hangout':
 	if grupTipe = 1 or grupTipe = 2:
 		'You smile at your friends and take a seat with them before joining in on the variety of conversations going on. Some are tanning, others sit around talking, and some horse around. You can use this opportunity to get to know one of them better if you want.'
 	else
-		'You smile and take a seat with them, but get mixed responses. The ones you know better seem somewhat friendly, but the others range from indifference to annoyance. Many choose just to ignore you.' 
+		'You smile and take a seat with them, but get mixed responses. The ones you know better seem somewhat friendly, but the others range from indifference to annoyance. Many choose just to ignore you.'
 		'Some are tanning, others sit around talking, and some horse around. You spend some time trying to get involved in the conversations going on, but meet limited success. You can use this opportunity to get to know one of them better if you want.'
 	end
 	act 'Leave': gt'pav_lake'

+ 14 - 14
locations/pav_lake_nude.qsrc

@@ -46,7 +46,7 @@ elseif month < 3 or month = 12:
 	*nl
 end
 
-if mid($start_type,1,2) = 'sg' and month >= 3 and month <= 8 and week >= 6 and hour >= 8 and hour <= 10 and ivanfedorseennaked ! daystart and rand(0,3) = 0 and fedorKozlovQW >= 0:
+if $start_loc = 'sg' and month >= 3 and month <= 8 and week >= 6 and hour >= 8 and hour <= 10 and ivanfedorseennaked ! daystart and rand(0,3) = 0 and fedorKozlovQW >= 0:
 	if $clothingworntype = 'nude':
 		gs 'arousal', 'flash', -5, 'exhibitionism'
 		gs 'fame', 'pav', 'sex', 3
@@ -68,7 +68,7 @@ if month >= 5 and month <= 9:
 		'You should buy some swimwear if you intend on spending time at the beach'
 		*nl
 	end
-		
+
 	if $clothingworntype ! 'nude' and (pcs_inhib > 30 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
@@ -131,7 +131,7 @@ end
 
 act 'Go to the sauna': gt 'pav_lake_nude', 'sauna'
 
-if temper >= 15 and month >= 5 and month <= 9:	
+if temper >= 15 and month >= 5 and month <= 9:
 	act 'Take a walk along the beach':
 		*clr & cla
 		menu_off = 1
@@ -156,7 +156,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 		'You walk along the beach, enjoying the feeling of the sun on your body.'
 		act 'Continue':gt'pav_lake_nude'
 	end
-	
+
 	if hour >= 6 and hour <= 20 and (PCloswimwear = 1 or $clothingworntype = 'nude'):
 		if pcs_stam >= (20 * (10 - sport_clothes_exercise_bonus)) / 2:
 			act 'Go swimming':
@@ -193,7 +193,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			end
 		end
 	end
-	
+
 	if sunWeather = 1 and hour >= 6 and hour <= 20  and (PCloswimwear = 1 or $clothingworntype = 'nude'):
 		act 'Go sunbathing':
 			menu_off = 1
@@ -233,7 +233,7 @@ if temper >= 15 and month >= 5 and month <= 9:
 			end
 		end
 	end
-	
+
 	if voyeurism_start = 0:
 		act 'Look around the beach':
 			*clr & cla
@@ -324,13 +324,13 @@ if $ARGS[0] = 'sauna':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/sauna.jpg"></center>'
 	'You walk up the small trail from the beach to the sauna. They say it was built for the tourists, but you wonder why they put it on a secluded beach where tourists can''t possibly find it. Either way, you and many others are glad they built it. It''s well built inside and out with three sections - the mens section, the womens section and a co-ed section. You need swimwear to use the sauna, but some people use it naked.'
-	
+
 	if $clothingworntype ! 'nude' or sauna_stripped = 0:
 		act 'Go back to the beach': gt 'pav_lake_nude'
 	else
 		gs 'willpower', 'exhib', 'self'
 		if will_cost <= pcs_willpwr:
-			act 'Go to the beach (<<will_cost>> Willpower)': 
+			act 'Go to the beach (<<will_cost>> Willpower)':
 				gs 'willpower', 'pay', 'self'
 				gt 'pav_lake_nude'
 			end
@@ -338,14 +338,14 @@ if $ARGS[0] = 'sauna':
 			act 'Go to the beach (<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 func('changingroom','count_swim_item') > 0:
 		act 'Use changing room':gt 'changingroom', 'view_swim_list'
 	else
 		*nl
 		'You should buy some swimwear if you intend on spending time at the beach.'
 	end
-		
+
 	if $clothingworntype ! 'nude' and (pcs_inhib > 25 or (exhibitionist_lvl > 1 and pcs_horny >= 60)):
 		act 'Take your clothes off':
 			*clr & cla
@@ -377,7 +377,7 @@ if $ARGS[0] = 'sauna':
 			act 'Continue': gt 'pav_lake_nude', 'sauna'
 		end
 	end
-	
+
 	if $clothingworntype = 'nude' or PCloswimwear = 1:
 		act 'Go to the womens section':
 			*clr & cla
@@ -419,7 +419,7 @@ if $ARGS[0] = 'sauna':
 				end
 				gs 'stat'
 				'You spend 30 minutes relaxing in the sauna.'
-				
+
 				act 'Leave': gt 'pav_lake_nude', 'sauna'
 				if month = 12 or month < 3: gs 'pav_lake_nude', 'ice_plunge'
 			end
@@ -452,7 +452,7 @@ if $ARGS[0] = 'sauna':
 						if pcs_inhib < 60: inhib_exp += rand(1,2)
 					end
 					'You spend 30 minutes relaxing in the sauna.'
-					
+
 					act 'Leave': gt 'pav_lake_nude', 'sauna'
 					if month = 12 or month < 3: gs 'pav_lake_nude', 'ice_plunge'
 				end
@@ -464,7 +464,7 @@ if $ARGS[0] = 'sauna':
 			*clr & cla
 			menu_off = 1
 			minut += 2
-			gs 'stat'			
+			gs 'stat'
 			if hour < 8 or hour > 22:
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/secluded_beach/sauna/saunaempty.jpg"></center>'
 				'It appears to be empty at the moment.'

+ 3 - 3
locations/pav_library.qsrc

@@ -17,11 +17,11 @@ gs 'themes', 'indoors'
 if lernHome > 0:
 'You could do your homework with the help of one of the computers.'
 end
-if 	mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+if 	$start_loc = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
 	'The nerds are sitting at a table studying together.'
 end
 
-if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week > 5 and hour >= 12 and hour < 14:
+if $start_loc = 'sg' and kanikuli = 0 and week > 5 and hour >= 12 and hour < 14:
 	if nataliaQW['library_day_check'] ! daystart:
 		nataliaQW['library_day_check'] = daystart
 		if  rand(0,3) = 0: nataliaQW['library_day'] = daystart
@@ -158,7 +158,7 @@ if hour >= 8 and hour < 18:
 	elseif lernHome > 0 and will_cost > pcs_willpwr:
 		act 'Do your homework (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	if mid($start_type,1,2) = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
+	if $start_loc = 'sg' and kanikuli = 0 and week < 6 and nerdstudynight['day'] ! daystart and hour > 14:
 		act 'Join the nerd''s study group': gt 'pav_library_nerdstudy', 'nerd_study_night'
 	end
 else

+ 17 - 17
locations/pav_market.qsrc

@@ -34,13 +34,13 @@ else
 	end
 end
 *nl
-'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif(mid($start_type,1,2) = 'sg',' where your mother works','') + '. Next to the train station you can see the <a href="exec:minut += 5 & gt ''pav_station'', ''station_outside''">Pavlovsk police station</a> where you can find Pavlovsk''s finest.'
+'Pavlovsk''s modest train station, is near the Pavlovsk market Square. You can enter the central hall of the <a href="exec:minut += 3 & gt ''pav_train_hall''">train station</a>. Down the street from the train station is the <a href="exec:minut += 5 & gt ''gkafe''">Borislav''s cafe</a>' + iif($start_loc = 'sg',' where your mother works','') + '. Next to the train station you can see the <a href="exec:minut += 5 & gt ''pav_station'', ''station_outside''">Pavlovsk police station</a> where you can find Pavlovsk''s finest.'
 *nl
 'The other side of the train station is a large square, where you can find a <a href="exec:minut += 1 & gt ''pav_train_market'', ''start''">market</a> on most days.'
 *nl
 'A rather run-down <a href="exec:minut += 1 & gt ''pav_hotel''">hotel</a> is just across the square, where travelers can spend the night. The manager is always looking for maids among the local young girls. Because of it''s frequent use by the local prostitutes, most people prefer to stay at the middle-class hotel by the main road.'
 if prostitute['blocked'] = 0 and prostitute['gas_station'] = 1:
-	*nl 
+	*nl
 	if money >= 75:
 		'Next to the train station you can find the bus terminal. Here you can catch the bus that will take you to <a href="exec:minut += 87 & money -= 75 & gt ''gas_station_gp_117'', ''outside''">the gas station on the M11</a>.'
 	else
@@ -112,10 +112,10 @@ if kidaloa = 0:
 			end
 
 			'Even though you definitely wouldn''t mind a new laptop, you simply don''t have time to talk to them right now. You politely decline and walk away before they can protest. A few minutes later you see the two of them hastily running across the square, while some poor guy opens the fancily packed box only to find a brick in it. By the time he realizes he got scammed, they are long gone. Looks like you dodged a bullet there!'
-			
+
 			act 'Return to the station' :minut += 15 & gt $curloc
-		end	
-		
+		end
+
 		act 'Wow, this must be your lucky day!':
 			*clr & cla
 			gs 'stat'
@@ -159,7 +159,7 @@ if kidaloa = 0:
 				end
 
 				'You quickly give them the money and enthusiastically begin to pull at the bow. When you finally manage to tear the wrapping paper off and open the box, you only find a brick wrapped in newspaper. You look up trying to find the man and girl to get your money back, but they are nowhere to be found. You feel terrible for being scammed out of your money, and angrily stuff the box in a garbage can before you move on.'
-				
+
 				act 'Return to the train station':minut += 15 & gt $curloc
 			end
 			act 'Say you can''t afford it right now':
@@ -182,16 +182,16 @@ if kidaloa = 0:
 
 				'With some regret in your voice, you apologize to the man and girl and explain that you can''t afford to pay the VAT right now. They try to explain to you that this could very well be a one-time opportunity and that you are missing out on a free laptop, but you have to decline. You simply cannot afford to spend the money you have right now on a frivolous purchase like a laptop, even if it comes really cheap.'
 				'Sympathizing with you, they promise to look for you if they ever come back to Pavlovsk for another episode of the show.'
-				
+
 				act 'Thank them and leave': minut +=15 & gt $curloc
 			end
 		end
 		exit
 	end
 end
-	
+
 if kidalob = 0:
-	podrand = rand(0, 5)	
+	podrand = rand(0, 5)
 	if money >= 1000 and hour >= 8 and hour <= 20 and podrand = 5 and ($clothingworntype = 'moncheri_dress' or $clothingworntype = 'moncheri_gown' or $clothingworntype = 'fashionista') and monthKidalo ! month:
 		*clr & cla
 		menu_off = 1
@@ -225,7 +225,7 @@ if kidalob = 0:
 			end
 		else
 			act 'You''re not interested (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-		end	
+		end
 		act 'Agree to do the photo shoot':
 			*clr & cla
 			minut += 2
@@ -244,7 +244,7 @@ if kidalob = 0:
 				end
 			else
 				act 'Refuse and leave, you''re not taking off your clothes!(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end	
+			end
 			act 'Change into the sundress':
 				*clr & cla
 				!! ths will either add the sundress or simply set it to a certain damage level
@@ -259,11 +259,11 @@ if kidalob = 0:
 				gs 'clothing', 'wear', 'gm_dress', 52
 				KILLVAR '$lastwornclothingtype'
 				KILLVAR 'lastwornclothingnumber'
-				
+
 				gs 'stat'
 				!!need image
 				'You quickly get into the car and take off your dress, and put on the dress the man gave you. You give your <<$titsize>> breasts a squeeze through the fabric, adjusting the dress a bit so it fits well around them for the photo shoot.'
-				
+
 				act 'Pose for the camera':
 					*clr & cla
 					kidalob = 1
@@ -271,7 +271,7 @@ if kidalob = 0:
 					gs 'stat'
 					!!need image
 					'You get out of the car leaving your possessions in there, figuring it''s easier to just collect them when you change back to your regular clothes. You get out and walk to the tree the camera is aimed at. The guy who hasn''t said a word mans the camera, while the first guy instructs you how to stand in several poses. "Very nice, very nice... now turn your back to the camera!" The camera clicks several times. "Excellent. Now tilt your head backwards and close your eyes." You do as instructed, waiting for the now familiar click of the camera. It never comes.'
-					
+
 					act 'Ask what''s taking so long':
 						*clr & cla
 						money = 0
@@ -280,14 +280,14 @@ if kidalob = 0:
 						gs 'stat'
 						!!need image
 						'After a while you turn around and open your eyes, wanting to ask the guys what''s taking so long. You open your eyes right on time to see the car, with the guys in it, speed off and zip around a corner. Then you realize: all your stuff is still on the back seat of the car! Slowly realizing you have just been scammed out of your good dress and all of your money, you sit down on a tree stump and hold your head in your hands for a minute or two, pondering how you could''ve been so stupid as to believe them.'
-						
+
 						act 'Return to the train station':gt $curloc
 					end
 				end
 			end
 		end
 	exit
-		
+
 	end
 end
 
@@ -309,7 +309,7 @@ act 'Walk to Pushkin (0:20)':minut += 20 & nroad = 19 & gt 'pushkin'
 
 gs 'camera', 'check_location'
 
-!-- Random prostitution solicitation check ------------------------ 
+!-- Random prostitution solicitation check ------------------------
 if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
 
 --- pav_market ---------------------------------

+ 10 - 10
locations/pav_park.qsrc

@@ -55,7 +55,7 @@ if $ARGS[0] = 'start':
 			if hour >= 0 and hour <= 7:PLAY 'sound/street_night.mp3',30
 		end
 	end
-	
+
 	gs'pav_park', 'pav_park_image'
 
 	if month = 3 or month = 4 or month = 5:
@@ -193,9 +193,9 @@ if $ARGS[0] = 'start':
 		act 'Go and see Rex':gt 'rex_events', 'skver'
 	end
 
-	if week >= 6 and hour >= 8 and hour <= 9 and mid($start_type,1,2) = 'sg' and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
+	if week >= 6 and hour >= 8 and hour <= 9 and $start_loc = 'sg' and socialchg['tVanya_day'] ! daystart: '<a href="exec:gt ''gschool_socialchg1'',''tVanya''">Vanya</a> is out on a light jog and is slowly approaching you.'
 
-	if mid($start_type,1,2) = 'sg' and locat['Christina'] = 9 and socialchg['tChris_Lina_jog'] ! daystart: 'You spot <a href="exec:gt ''Zvereva_events'',''Chris_Lina_park''">Christina</a> and Lina jogging around the park.'
+	if $start_loc = 'sg' and locat['Christina'] = 9 and socialchg['tChris_Lina_jog'] ! daystart: 'You spot <a href="exec:gt ''Zvereva_events'',''Chris_Lina_park''">Christina</a> and Lina jogging around the park.'
 
 	gs 'treeCircEntry', 'PavlovskPark'
 	act 'Go for a walk (0:15)':
@@ -204,7 +204,7 @@ if $ARGS[0] = 'start':
 		menu_off = 1
 		if pcs_exhib = 100 and exhibitionQW = 0: gt 'kseniyaQW', 'event1', 1
 
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 11:
+		if $start_loc = 'sg' and SchoolAtestat = 0 and mey_vika['mey_vika_qw'] > 0 and mey_vika['mey_vika_qw'] < 27 and mey_vika['qw_day'] ! daystart and locat['Vicky'] = 11:
 			gs 'mey_vika_events', 'park_meet'
 			gs 'stat'
 		else
@@ -312,7 +312,7 @@ if $ARGS[0] = 'start':
 
 	if joint > 0 and jointhigh = 0: act 'Smoke a joint': gs 'drugs', 'joint' & gt $loc, $loc_arg
 
-	!-- Random prostitution solicitation check ------------------------ 
+	!-- Random prostitution solicitation check ------------------------
 	if prostitute['blocked'] = 0 : gs 'prostitution_functions', 'check_solicitation_event'
 
 	gs 'camera', 'check_location'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'alb_father_meeting_2':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/meeting/meeting2.jpg"></center>'
 	'"Don''t believe the ridiculous accusations thrown against me! They''re fake news!" He slams the podium as he passionately speaks.'
-	'The crowd keeps calm, except for his most die-hard supporters, who yell profanities and accusations against the current administration as Albina''s father continues.' 
+	'The crowd keeps calm, except for his most die-hard supporters, who yell profanities and accusations against the current administration as Albina''s father continues.'
 	'"My opponents are desperate, desperate because I''m about to unravel their web of lies, corruption and bribes that let them laugh at you from up in their ivory towers while you fight for scraps down in the dirt!" He slams the podium again.'
 
 	act 'Go on with your day': gt 'pav_park', 'start'
@@ -458,7 +458,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 
 	'You''re feeling tired and decide to try and get some sleep on the park bench.'
 	if alko >= 7 and hotcat >= 6:
-		gt 'placer_sex','sleeping_park_alco_rape'	
+		gt 'placer_sex','sleeping_park_alco_rape'
 	end
 	act 'Wake up':
 		cla & *clr
@@ -481,7 +481,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 end
 
 if $ARGS[0] = 'sitting_park_bench':
-	
+
 	waiting = input ("How long would you like to rest?<br>(Default 15 minutes, maximum 120 minutes)")
 
 	if waiting = '':
@@ -507,10 +507,10 @@ if (hour >= 20 or hour < 6) and (pcs_sleep <= 30 or cheatNoSleep ! 0):
 		!nowhere to live in town
 		if money >= 500 or karta+bankDebtLimit >= 500:
 			'It''s pretty dark now. Maybe you could get a room in the hotel?'
-		else	
+		else
 			'It''s pretty dark now and you have nowhere to stay nearby. Maybe you should try to sleep on a bench?'
 		end
-		if mid($start_type,1,2) = 'sg': 'You could also try your luck at Uncle Shulgin''s apartment?'
+		if $start_loc = 'sg': 'You could also try your luck at Uncle Shulgin''s apartment?'
 	elseif pavlovsk_home = 1 and (hour >= 22 or hour < 6):
 		'It''s pretty dark outside and you feel tired. Maybe you should head home?'
 	elseif hotelRoom['pav_hotel'] > 0:

+ 14 - 14
locations/pav_residential.qsrc

@@ -42,7 +42,7 @@ else
 	if daystage = 2 or daystage = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavres.jpg"></center>'
 	else
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn_'+ rand(1,2) +'.jpg"></center>' 
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/pavresn_'+ rand(1,2) +'.jpg"></center>'
 	end
 end
 
@@ -71,7 +71,7 @@ elseif rape > rape_count:
 	end
 end
 
-!! TODO: Commented out and replaced by the wlife mechanics - see end of the file under !-- Prostitution ---- 
+!! TODO: Commented out and replaced by the wlife mechanics - see end of the file under !-- Prostitution ----
 !!if fame['pav_slut'] >= 250 and rand(1, 10) = 10 and pav_residential_prost_day ! daystart:
 !!	pav_residential_prost_day = daystart
 !!	'A man approaches you, and asks if you want to earn some easy money. He''s offers you 200 <b>₽</b> for a quickie in the bushes.'
@@ -111,11 +111,11 @@ if fedorKozlovQW >= 20 and FedorKozHome = 1 or fedorKozlovQW = -15 and FedorKozH
 
 if hour >= 8 and hour <= 22:'<br>At the end of the street, there''s a small <a href="exec:$loc = ''pav_residential'' & gt ''kiosk'', ''start''">kiosk</a> selling a variety of items such as cigarettes, magazines, snacks, drinks and even themes for your phone.'
 
-if mid($start_type,1,2) = 'sg':
+if $start_loc = 'sg':
 	$schoolname = 'the <a href="exec: minut += 2 & gt ''gschool_grounds'', ''main''">local school</a>.'
 else
 	$schoolname = 'your old school.'
-end	
+end
 
 '<br>In the center of Pavlovsk is the town square, which features the <a href="exec: minut += 2 & gt ''pav_commcenter''">community center</a>, a popular hotspot for the local teenagers to hang out after a long day at <<$schoolname>></b> Connected to the town center is the old palace grounds, which have been turned into a large <a href="exec:minut += 5 & gt ''pav_park'', ''start''">public park</a>. With the <a href="exec: minut += 5 & gt ''pav_lake''">lake</a> nearby, the area can get quite busy, especially during the summer and winter when people can swim or skate at the lake.'
 
@@ -142,7 +142,7 @@ else
 end
 !!end of code changes.
 
-if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9: 
+if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7 and hour < 9:
 	act '<b>Go to school</b>': minut += 2 & gt 'gschool_grounds', 'main'
 end
 
@@ -197,7 +197,7 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 end
 
 !!Uncle Misha is npcstatic number 54
-if mid($start_type,1,2) = 'sg' and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
+if $start_loc = 'sg' and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
 	menu_off = 1
 	*clr & cla
 	npcdaycheck[54] = daystart
@@ -214,7 +214,7 @@ if mid($start_type,1,2) = 'sg' and (hour >= 8 or hour < 23) and cumloc[11] = 1 a
 	exit
 end
 
-if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,2) = 'sg' and $start_type[1] ! 'nomagic':
+if pcs_magik >= 1 and mainQW = 0 and $start_loc = 'sg' and $start_type[1] ! 'nomagic':
 	menu_off = 1
 	*clr & cla
 	mainQW = 1
@@ -227,7 +227,7 @@ if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,2) = 'sg' and $start_type
 	exit
 end
 
-if mid($start_type,1,2) = 'sg' and AndRev = 1 and (hour >=22 or hour <=2) and rand(1,100) >= 90 and AndRevstart ! daystart:
+if $start_loc = 'sg' and AndRev = 1 and (hour >=22 or hour <=2) and rand(1,100) >= 90 and AndRevstart ! daystart:
 	menu_off = 1
 	*clr & cla
 	gs 'stat'
@@ -249,25 +249,25 @@ if npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and
 	daybelisex = daystart
 	minut += 1
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'As you walk through Pavlovsk, Vadim Belys Mitsubishi Pajero stops near you.'
 
-	act 'Go to the jeep': gt 'belgang', 'payday' 	
+	act 'Go to the jeep': gt 'belgang', 'payday'
 elseif npc_QW['A113'] = 1 and daybelisex ! daystart and hour >= 9 and hour <= 23 and week ! 7 and belgangPayWeek >= 300 and belgangProstitute = 1 and rand (0,2) = 0:
 	menu_off = 1
 	cla & *clr
 	daybelisex = daystart
 	minut += 1
 	gs 'stat'
-	
+
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/vadim/belyjeep.jpg"></center>'
 	'You see the by now familiar old Mitsubishi Pajero driving through the streets with Vadim Bely and his gang inside. Your heart skips a beat as you notice one of them pointing at you and they pull over.'
-		
-	act 'Go to the jeep': gt 'belgang', 'workofdebt' 	
+
+	act 'Go to the jeep': gt 'belgang', 'workofdebt'
 end
 
-!-- Random prostitution solicitation check ------------------------ 
+!-- Random prostitution solicitation check ------------------------
 if prostitute['blocked'] = 0: gs 'prostitution_functions', 'check_solicitation_event'
 
 gs 'booty_call', 'home_links'

+ 2 - 2
locations/pav_train_hall.qsrc

@@ -22,7 +22,7 @@ if $ARGS[0] = '':
 	*nl
 	'The long-distance trains are at the station platforms between 11:00-11:30 and 18:00-18:30.'
 	*nl
-	
+
 	*nl
 	if rand(0,2) = 0 and week < 5 and hour >= 8 and hour < 18:
 !!a 1 in 3 chances at those times he is here
@@ -43,7 +43,7 @@ if $ARGS[0] = '':
 			end
 		end
 	end
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0:
 		if (sunWeather = 0 or temper <= 0) and hour >= 18 and hour < 20 and week < 6:'You see your classmates <a href="exec:minut += 3 & $prevloc = $loc & gt ''gopskver''">Vitek, Dan and Vasily</a> hanging around here.'
 	end
 	*nl

+ 4 - 4
locations/placer_sex.qsrc

@@ -1420,9 +1420,9 @@ end
 
 if $args[0] = 'sleep':
 	if disable_autosave = 0:
-		if mid($start_type,1,4) = 'city':
+		if $start_loc = 'city':
 			savegame 'autosave_city.sav'
-		elseif mid($start_type,1,3) = 'uni':
+		elseif $start_loc = 'uni':
 			savegame 'autosave_uni.sav'
 		else
 			savegame 'autosave_sg.sav'
@@ -1898,7 +1898,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/sleeping_park2.jpg"></center>'
 			'You wake up with a smile, stretching your arms and legs.'
 		end
-		
+
 		if rand(1,10) <= 6 and money ! 0: *nl & 'You now realize someone stole your money while you were sleeping!' & money = 0
 		temp = rand(1,10)
 		if temp <= 8:
@@ -1941,7 +1941,7 @@ if $ARGS[0] = 'sleeping_park_bench':
 			end
 			gs 'stat'
 		end
-		
+
 		act 'Continue': gt $loc, $loc_arg
 	end
 end

+ 3 - 3
locations/saveupdater.qsrc

@@ -355,7 +355,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 
 		krystal['saveupdate'] = 1
 	end
-	
+
 	if $model['firstname'] = '':
 		$model['firstname'] = $pcs_firstname
 		$model['nickname'] = $pcs_nickname
@@ -1643,13 +1643,13 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 	end
 	if i <= ARRSIZE('sport_bras'):jump 'loopsportbras'
 	killvar 'sport_bras'
-	
+
 	if metmira = 1: npc_known['A60'] = 1 & killvar 'metmira'
 end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080903:
 	if $wardrobeDefaultPagePref = 'savedOutfits':$wardrobeDefaultPagePref = 'default1'
-	if mid($start_type,1,4) = 'city' or $start_type = 'uni':
+	if $start_loc = 'city' or $start_type = 'uni':
 		gs 'homes_properties', 'give_access', 'parents_home'
 		SchoolAtestat = 1
 	end

+ 59 - 59
locations/sex_ev_after.qsrc

@@ -75,7 +75,7 @@ if $ARGS[0] = 'stop_here':
 				end
 				gs'sex_ev_after', 'stop_here2'
 			end
-			
+
 			act'I''m shattered':
 				cla & *clr
 				gs 'sex_ev_sex', 'inserted_img'
@@ -88,14 +88,14 @@ if $ARGS[0] = 'stop_here':
 				end
 				gs'sex_ev_after', 'stop_here2'
 			end
-			
+
 			act'Need to get going':
 				cla & *clr
 				gs 'sex_ev_sex', 'inserted_img'
 				'"You mind if we stop here?" you ask. "I need to get going soon."'
 				gs'sex_ev_after', 'stop_here2'
 			end
-			
+
 			gs'sex_ev_pillow_talk2', 'wakeup_sex_late_for_school'
 		end
 !!		gs'sex_ev_after', 'stop_here2'
@@ -123,17 +123,17 @@ if $ARGS[0] = 'stop_here2':
 			if $sex_ev['position'] = 'miss' or $sex_ev['position'] = 'doggy' or $sex_ev['position'] = 'cowgirl':
 				'"Can I just come real quick?" <<$npc_firstname[$boy]>> asks. "I''m really close."'
 			else
-				
+
 			end}
 		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'sex_ev_after', 'ask_continue_options'
 		elseif npc_caretaker[$boy] = 1:
-			
+
 			gs'sex_ev_after', 'ask_continue_options'
-			
+
 		end
-		
+
 	else
 		gs'sex_ev_after', 'finish_sex'
 	end
@@ -176,7 +176,7 @@ if $ARGS[0] = 'ask_continue_options':
 			end
 		end
 	end
-	
+
 	gs'sex_ev_after', 'well_continue'
 
 	act'I don''t have time':
@@ -199,8 +199,8 @@ if $ARGS[0] = 'ask_continue_options':
 		gs'sex_ev_after', 'after_sex1'
 		gs'sex_ev_after', 'well_continue'
 	end
-	
-	if mid($start_type,1,2) = 'sg' and (hour >= 22 or hour < 3) and $sex_ev['loc'] ! 'pc_home':
+
+	if $start_loc = 'sg' and (hour >= 22 or hour < 3) and $sex_ev['loc'] ! 'pc_home':
 		act'Mom will kill me':
 			cla & *nl
 			sex_ev['mom_kill'] += 1
@@ -214,7 +214,7 @@ if $ARGS[0] = 'ask_continue_options':
 			else
 				'"I wish I could, but I need to get home <<$npc_firstname[$boy]>>," you shake your head. "My mom will kill me if I''m not back before midnight."'
 			end
-			
+
 			if npc_caretaker[$boy] = 1:
 				'"Well, I guess there''s always next time," he says softly.'
 				gs'sex_ev_after', 'after_sex1'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'ask_continue_options':
 						'"Tell me about it," you roll your eyes. "At least you don''t have to live with her."'
 						gs'sex_ev_after', 'after_sex1'
 					end
-					
+
 					act'Don''t talk about my mom like that':
 						cla & *nl
 						'"Hey!" you growl. "Don''t talk about my mom like that!"'
@@ -243,7 +243,7 @@ if $ARGS[0] = 'ask_continue_options':
 			end
 		end
 	end
-	
+
 	if sex_ev['fuck_count'] > 3:
 		act'Sore pussy':
 			cla & *nl
@@ -282,7 +282,7 @@ if $ARGS[0] = 'well_continue':
 				sex_ev['keep_going_continue'] += 1
 				gs'sex_ev_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.'
@@ -330,7 +330,7 @@ if $ARGS[0] = 'tap_out':
 				else
 					'"I can''t keep this up..." you pant, wincing at the pain of <<$npc_firstname[$boy]>>''s large cock stretching your pussy past its limits. "You''re too big for me... I just... I can''t keep going..."'
 				end
-				
+
 				if npc_selfish[$boy] = 1 or npc_abusive[$boy] = 1:
 					'"Come on, don''t be like that," <<$npc_firstname[$boy]>> moans. "You just need to get used to it. Don''t pussy out now."'
 					act'I can''t':
@@ -340,7 +340,7 @@ if $ARGS[0] = 'tap_out':
 						'"Ugh," <<$npc_firstname[$boy]>> says rolling his eyes. "Way to be a little bitch about it. Never going to learn to enjoy my big cock unless you practice."'
 						gs'sex_ev_after', 'after_sex1'
 					end
-					
+
 					act'Force yourself to keep going':
 						cla & *nl
 						sex_ev['tap_out'] = 2
@@ -358,7 +358,7 @@ if $ARGS[0] = 'tap_out':
 							gs'sex_ev_sex', 'keep_fucking_act'
 						end
 					end
-					
+
 					act'Ask for a break':
 						cla & *nl
 						'"Can''t we just do something else?" you beg. "Just for a little bit? Give my pussy a break?"'
@@ -374,7 +374,7 @@ if $ARGS[0] = 'tap_out':
 							'"Thanks," you say, smiling gratefully at him. "Yeah... maybe another time..."'
 							gs'sex_ev_after', 'after_sex1'
 						end
-						
+
 						act'Don''t be sorry':
 							cla & *nl
 							'"Don''t be sorry," you say, shaking your head. "It''s not your fault you''ve got such a big dick. Maybe it''s my fault for having too small a pussy."'
@@ -387,14 +387,14 @@ if $ARGS[0] = 'tap_out':
 						'He laughs aloud, not seeming to care much that your pussy is sore beyond belief.'
 						act'Finish sex':gs'sex_ev_after', 'after_sex1'
 					end
-					
+
 					act'Blow him for a little bit':
 						cla & *nl
 						'"I just need a little break," you smile gratefully. "Maybe I can blow you for a little bit and then come back to it?"'
 						'"That sounds great," <<$npc_firstname[$boy]>> smiles back.'
 						act'Blow him':gt 'sex_ev_foreplay', 'bj_sub1'
 					end
-					
+
 					act'We can do other stuff':
 						cla & *nl
 						sex_ev['no_sex'] = 1
@@ -445,7 +445,7 @@ if $ARGS[0] = 'fucked_out':
 			gs'sex_ev_after', 'after_sex2'
 		end
 	end
-	
+
 	act'Sigh':
 		cla & *clr
 		$sex_ev['end_comment'] = 'You sigh in disappointment.'
@@ -458,7 +458,7 @@ if $ARGS[0] = 'fucked_out':
 			gs'sex_ev_after', 'after_sex2'
 		end
 	end
-	
+
 	act'Laugh':
 		cla & *clr
 		if sex_ev['fuck_count'] > 0:
@@ -744,7 +744,7 @@ if $ARGS[0] = 'finish_sex':
 		gs'sex_ev_after', 'no_cum_end'
 !!	elseif sex_ev['force_harden'] = 2:
 !!		sex_ev['force_harden'] = 3
-		
+
 !!		gs'sex_ev_after', 'after_sex1'
 	elseif sex_ev['cum_count'] < npc_sexdrive[$boy] + sex_ev['extra_cum'] / 2:
 		'"I could go a few more times, but I guess this is good enough for now," <<$npc_firstname[$boy]>> says.'
@@ -803,7 +803,7 @@ if $ARGS[0] = 'no_cum_end':
 					'"Because I want to," you scowl at him. "I have to explain what I want to do with <i>my</i> body?"'
 					gs'sex_ev_after', 'after_sex1'
 				end
-				if mid($start_type,1,2) = 'sg':
+				if $start_loc = 'sg':
 					act'Ask my mom':
 						cla & *nl
 						'"I don''t know," you say, rolling your eyes in exasperation. "Ask my mom why it''s so important."'
@@ -841,7 +841,7 @@ if $ARGS[0] = 'no_cum_end':
 			'"Let''s just not make a habit of it, all right?" you laugh back.'
 			gs'sex_ev_after', 'after_sex1'
 		end
-		
+
 		if sex_ev['virgin'] = 1:
 			act'Loss of virginity is enough':
 				cla & *nl
@@ -912,7 +912,7 @@ if $ARGS[0] = 'black_out':
 		'You collapse to the bed as soon as you gulp, no strength left for you to stay upright. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is the salty taste of <<$npc_firstname[$boy]>>''s cum on your lips, and then...'
 	elseif $sex_ev['last_cum'] = 'spit':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/party_girls_party_gost_22.jpg"></center>'
-		'You collapse to the bed, <<$npc_firstname[$boy]>>''s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...'		
+		'You collapse to the bed, <<$npc_firstname[$boy]>>''s cum still dribbling down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid running down your cheek, and then...'
 	elseif $sex_ev['last_cum'] = 'face_mouth':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/sleep4.jpg"></center>'
 		'You collapse to the bed, <<$npc_firstname[$boy]>>''s cum hot on your face, still running down your chin. Your vision blurs and you struggle to keep your eyes open. The last thing you remember is a trickle of liquid dribbling from your lips, and then...'
@@ -966,14 +966,14 @@ end
 
 if $ARGS[0] = 'black_out_wake_options':
 	act'Find your clothes':gt'sex_ev_after', 'black_out_wake2'
-	
+
 	act'Shower?':
 		cla & *clr
 		$sex_ev['bed_room']
 		'"Ugh..." you moan, holding your hand to your head. "Can I borrow your shower first? I''m kind of-"'
 		'"No, no time," <<$npc_firstname[$boy]>> says, shaking his head. "If you wanted that, then you shouldn''t have fallen asleep on me."'
 		act'Get out of bed':gt'sex_ev_after', 'black_out_wake2'
-		
+
 		act'Get out of bed (grumble)':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/leave_bed1.mp4"></video></center>'
@@ -996,7 +996,7 @@ if $ARGS[0] = 'black_out_wake_options':
 			end
 		end
 	end
-	
+
 	if pc_know_npc_has_girlfriend[$boy] ! 1 and sex_ev['girlfriend_discover'] ! 1:
 		act'Girlfriend?':
 			sex_ev['girlfriend_discover'] = 1
@@ -1044,13 +1044,13 @@ if $ARGS[0] = 'cum_clean':
 		act'Clean up':
 			cla
 			act'Never mind': cla & gs 'sex_ev_sex', 'sex_end'
-			
+
 			act'Ask him if he has any wipes':
 				sex_ev['cock_inserted'] = 0
 				gs 'cum_cleanup', 'cleanloc'
 				gs'stat'
 				cla & *clr
-				
+
 				if cum_loc['face'] > 0:
 					gs'sex_ev_reactions', 'facial_smile_img'
 					'"Got anything for this?" you ask, smiling wryly as you point to the sticky strands of cum covering your face.'
@@ -1077,7 +1077,7 @@ if $ARGS[0] = 'cum_clean':
 					gs'sex_ev_sex', 'sex_end'
 				end
 			end
-			
+
 			if salfetka > 0:
 				act'Use your wipes':
 					gs'sex_ev_after', 'wipe_menu'
@@ -1294,9 +1294,9 @@ if $ARGS[0] = 'after_sex2':
 			gs'sex_ev_after', 'relax_together'
 		end
 	end
-	
+
 	act'Use his bathroom':gt'sex_ev_after', 'boy_bathroom'
-		
+
 	if sex_ev['cigarette'] = 0 and (siga > 0 or npc_smoker[$boy] > 0) and sex_ev['npc_late'] ! 1:
 		act'Smoke a cigarette':cla & gs'sex_ev_after', 'smoke_ciga1'
 	end
@@ -1328,19 +1328,19 @@ if $ARGS[0] = 'after_sex_dressed':
 			end
 		end
 	else
-	
+
 	end
 	act'Use the bathroom':gt'sex_ev_after', 'boy_bathroom'
-	
+
 	gs'sex_ev_leave', 'breakup_start'
 !!{
-	
+
 
 		act'This is getting too complicated':
 
 
 		end
-		
+
 	end
 	}
 end
@@ -1363,7 +1363,7 @@ if $ARGS[0] = 'boy_bathroom':
 		$locM_arg = 'boy_bathroom'
 		gt 'mirror', 'start'
 	end
-	
+
 	if (pcs_breath ! 1 or cumloc[12] = 1) and (travel_brush = 1 or overnight_bag[$boy] = 1 or $sex_ev['loc'] = 'pc_home'):
 		menu_off = 1
 		*clr & cla
@@ -1419,7 +1419,7 @@ if $ARGS[0] = 'boy_bathroom':
 			act'Continue':gs'sex_ev_after', 'boy_bathroom'
 		end
 	end
-	
+
 	if cum_loc['vagina'] > 0:
 		act'Let the cum drain from your pussy (0:15)':
 			cumspclnt = 3
@@ -1435,7 +1435,7 @@ if $ARGS[0] = 'boy_bathroom':
 				'After about fifteen minutes, you figure you''re safe and grab some toilet paper to wipe the last strands from your labia.'
 				act'Continue':gs'sex_ev_after', 'boy_bathroom'
 			end
-			
+
 			if siga > 0:
 				act'Smoke to pass the time':
 					gs 'drugs', 'smoke'
@@ -1458,13 +1458,13 @@ if $ARGS[0] = 'relax_together':
 	cla
 	sex_ev['relax_after'] = 1
 	act'Stop relaxing':cla & gs'sex_ev_after', 'after_sex2'
-	
+
 	act'Pillow talk':gt'sex_ev_pillow_talk', 'start'
-	
+
 	if sex_ev['after_kiss'] = 0:
 		act'Kiss <<$npc_firstname[$boy]>>':gt 'sex_ev_after', 'kiss'
 	end
-	
+
 	if sex_ev['sleep_fuck'] > 0:
 !!		gs'sex_ev_pillow_talk', 'sleep_fucking_talk'
 	elseif pcs_sleep < 30 and sex_ev['get_up'] = 0 and sex_ev['angry_after'] = 0:
@@ -1594,7 +1594,7 @@ if $ARGS[0] = 'plan_b2':
 		gs 'medical_din', 'morning_after_pill_function'
 		gs'sex_ev_after', 'after_sex2'
 	end
-	
+
 	act'Take it sexily':
 		cla & *nl
 		'As <<$npc_firstname[$boy]>> watches you pull the pill from its packaging, you stick out your tongue at him, popping the pill onto it and swallowing with a wide grin.'
@@ -1675,7 +1675,7 @@ if $ARGS[0] = 'birth_control_pill_take2':
 		end
 		gs'sex_ev_after', 'after_sex2'
 	end
-	
+
 	act'Take it sexily':
 		cla & *clr
 		if sex_ev['get_up'] = 0:
@@ -1724,14 +1724,14 @@ if $ARGS[0] = 'smoke_ciga1':
 			gt'sex_ev_after', 'smoke_ciga2'
 		end
 	end
-	
+
 	act'Bum a cigarette':
 		sex_ev['bum_cigarette'] = 1
 		siga += 1
 		siga_bum = 1
 		gt'sex_ev_after', 'smoke_ciga_bum'
 	end
-	
+
 	act'Bum a cigarette and play with your phone':
 		sex_ev['bum_cigarette'] = 1
 		sex_ev['cigarette'] = 3
@@ -1754,7 +1754,7 @@ if $ARGS[0] = 'smoke_ciga2':
 	else
 		'You pull a cigarette from your purse and place it in your mouth, sparking it with your lighter while inhaling deeply.'
 	end
-	
+
 	act'Smoke':
 		gs 'drugs', 'smoke'
 		if sex_ev['phone'] = 2:gt'sex_ev_after', 'smoke_phone'
@@ -1806,13 +1806,13 @@ if $ARGS[0] = 'smoke_ciga_bum':
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/annoyed1.jpg"></center>'
 		'"Got any smokes?" you ask but <<$npc_firstname[$boy]>> just shakes his head.'
 		'"I don''t smoke. It''s bad for you y''know."'
-		
+
 		act'Damn':
 			cla & *nl
 			'"Damn," you sigh unhappily. "A cigarette is just what I need right now..."'
 			gs'sex_ev_after', 'relax_together'
 		end
-		
+
 		act'I should probably quit':
 			cla & *nl
 			'"I should probably quit too," you say ruefully. "It just feels so good to smoke one after sex..."'
@@ -1858,7 +1858,7 @@ if $ARGS[0] = 'spend_night_ask':
 				gs'sex_ev_after', 'spend_night'
 			end
 
-			if mid($start_type,1,2) = 'sg':
+			if $start_loc = 'sg':
 				act'I''m sick of my mom':
 					cla & *clr
 					$sex_ev['bed_room']
@@ -1866,9 +1866,9 @@ if $ARGS[0] = 'spend_night_ask':
 					gs'sex_ev_after', 'spend_night'
 				end
 			end
-			
+
 			if hour < 5:
-				if mid($start_type,1,2) = 'sg':
+				if $start_loc = 'sg':
 					act'Avoid my mom':
 						cla & *clr
 						$sex_ev['bed_room']
@@ -1877,7 +1877,7 @@ if $ARGS[0] = 'spend_night_ask':
 					end
 				end
 			end
-			
+
 			if hour >= 22 or hour < 5:
 				act'It''s late':
 					cla & *clr
@@ -1886,7 +1886,7 @@ if $ARGS[0] = 'spend_night_ask':
 					gs'sex_ev_after', 'spend_night'
 				end
 			end
-			
+
 			if pcs_lover - pcs_girlfriends > 0 and living_with_npc > 0:
 				act'I don''t want to see my boyfriend(annoyed)':
 					cla & *clr
@@ -2043,7 +2043,7 @@ if $ARGS[0] = 'sleep_function':
 			end
 		end
 	end}
-	
+
 	if rand(1,10) < npc_sexdrive[$boy] - (sex_ev['cum_count']/2) + npc_sleep_sex_okay[$boy] and (stat['think_virgin'] ! 1 or sex_ev['fuck_count'] > 0) and sex_ev['sleep_fuck'] = 0 and sex_ev['lover_left'] ! 1:
 		sex_ev['sleepover'] = 1
 		if rand(0,1) = 1:
@@ -2076,8 +2076,8 @@ if $ARGS[0] = 'sleep_function':
 			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
+		if $start_loc = 'sg' and func('homes_properties', 'has_access', 'parents_home'): sveta_punishment['no_come_home'] = 1
 		gt'sex_ev_morning', 'morning'
 	end
 end
---- sex_ev_after ---------------------------------
+--- sex_ev_after ---------------------------------

+ 95 - 95
locations/sex_ev_leave.qsrc

@@ -96,7 +96,7 @@ if $ARGS[0] = 'leaving_dialogue':
 		$sex_ev['leave_dialogue'] = 'See ya'
 		gs'sex_ev_leave', 'leaving_action'
 	end
-	
+
 	act'"Toodles"':
 		$sex_ev['leave_dialogue'] = 'Toodles'
 		gs'sex_ev_leave', 'leaving_action'
@@ -106,7 +106,7 @@ if $ARGS[0] = 'leaving_dialogue':
 			$sex_ev['leave_dialogue'] = 'Text me'
 			gs'sex_ev_leave', 'leaving_action'
 		end
-		
+
 		if npc_booty_call_date[$boy] = daystart and sex_ev['sleepover'] = 1:
 			act'"See you soon"':
 				$sex_ev['leave_dialogue'] = 'See you soon'
@@ -132,7 +132,7 @@ if $ARGS[0] = 'leaving_action':
 		$sex_ev['leave_action'] = ' nonchalantly and head out the door without a second glance'
 		gs'sex_ev_leave', 'leaving_end'
 	end
-	
+
 	act'Wave goodbye':
 		$sex_ev['leave_action'] = ', waggling your fingers at him and head out the door'
 		gs'sex_ev_leave', 'leaving_end'
@@ -142,12 +142,12 @@ if $ARGS[0] = 'leaving_action':
 		$sex_ev['leave_action'] = ' with a wink as you close the door behind you'
 		gs'sex_ev_leave', 'leaving_end'
 	end
-	
+
 	act'Blow him a kiss':
 		$sex_ev['leave_action'] = ', blowing him a kiss just before the door closes behind you'
 		gs'sex_ev_leave', 'leaving_end'
 	end
-	
+
 	act'Shake your ass':
 		$sex_ev['leave_action'] = ', giving him a teasing shake of your ass just before you close the door behind you'
 		gs'sex_ev_leave', 'leaving_end'
@@ -191,7 +191,7 @@ if $ARGS[0] = 'npc_leaving_action':
 			$sex_ev['leave_action2'] = 'He flashes you a quick smile and then gathers the rest of his stuff to leave, closing the door behind him.'
 			gs'sex_ev_leave', 'npc_leaving_dialogue'
 		end
-		
+
 		act'Stay in bed (covers off)':
 			$sex_ev_exit['loc'] = 'bedroom'
 			$sex_ev['leave_action'] = 'You stay sat on the bed, casually laying nude atop the sheets as you watch <<$npc_firstname[$boy]>> get dressed. He throws more than a few admiring glances your way as he does and when he finishes you say,'
@@ -199,7 +199,7 @@ if $ARGS[0] = 'npc_leaving_action':
 			gs'sex_ev_leave', 'npc_leaving_dialogue'
 		end
 	end
-	
+
 	act'Kiss goodbye':
 		$sex_ev_exit['loc'] = 'bedroom'
 		$sex_ev['leave_action'] = 'You sit on the bed, waiting patiently for <<$npc_firstname[$boy]>> to get dressed. Once he''s finished you move over to him and give him a gentle kiss on the lips, saying,'
@@ -218,7 +218,7 @@ if $ARGS[0] = 'npc_leaving_action':
 		end
 		gs'sex_ev_leave', 'npc_leaving_dialogue'
 	end
-	
+
 	act'Kiss <<$npc_firstname[$boy]>> at the door':
 		$sex_ev_exit['loc'] = 'hallway'
 		if $clothingworntype = 'nude':
@@ -243,7 +243,7 @@ if $ARGS[0] = 'npc_leaving_dialogue':
 		else
 			$sex_ev['leave_dialogue'] = '"Thanks for coming over. It was fun."'
 		end
-		
+
 		gs'sex_ev_leave', 'npc_leaving_end'
 	end
 
@@ -251,13 +251,13 @@ if $ARGS[0] = 'npc_leaving_dialogue':
 		$sex_ev['leave_dialogue'] = '"See ya."'
 		gs'sex_ev_leave', 'npc_leaving_end'
 	end
-	
+
 	if $npc_rel_type[$boy] ! '':
 		act'"Text me"':
 			$sex_ev['leave_dialogue'] = '"Text me."'
 			gs'sex_ev_leave', 'npc_leaving_end'
 		end
-		
+
 		if npc_booty_call_date[$boy] = daystart and sex_ev['sleepover'] = 1:
 			act'"See you soon"':
 				$sex_ev['leave_dialogue'] = '"See you soon."'
@@ -315,19 +315,19 @@ if $ARGS[0] = 'hurry_leave':
 		$sex_ev['leave_dialogue'] = ' without even saying goodbye'
 		gs'sex_ev_leave', 'hurry_leave2'
 	end
-	
+
 	act'"See you later!"':
 		cla & *nl
 		$sex_ev['leave_dialogue'] = ', calling, "See you later!" just before it slams behind you.'
 		gs'sex_ev_leave', 'hurry_leave2'
 	end
-	
+
 	act'"Text me!"':
 		cla & *nl
 		$sex_ev['leave_dialogue'] = ', calling, "Text me!" just before it slams behind you.'
 		gs'sex_ev_leave', 'hurry_leave2'
 	end
-	
+
 	if $sex_ev['type'] = 'hookup':
 		act'Leave your number (fuckbuddy)':
 			sex_ev['fuckbuddy_invite'] = 1
@@ -339,7 +339,7 @@ if $ARGS[0] = 'hurry_leave':
 			end
 			gs'sex_ev_leave', 'hurry_leave2'
 		end
-		
+
 		act'Leave your number (date)':
 			cla & *nl
 			sex_ev['date_invite'] = 1
@@ -347,7 +347,7 @@ if $ARGS[0] = 'hurry_leave':
 			gs'sex_ev_leave', 'hurry_leave2'
 		end
 	end
-	
+
 	if npc_booty_call_date[$boy] = daystart and sex_ev['sleepover'] = 1 and $npc_rel_type[$boy] ! 'husband':
 		act'"See you soon"':
 			$sex_ev['leave_dialogue'] = ', shouting, "See you soon!" just before it slams behind you.'
@@ -368,19 +368,19 @@ if $ARGS[0] = 'hurry_leave2':
 		$sex_ev['leave_action'] = 'You make sure all your clothes are in place with one last quick check and dash to the door'
 		gs'sex_ev_leave', 'hurry_leave_finish'
 	end
-	
+
 	act'Peck on the cheek':
 		cla & *nl
 		$sex_ev['leave_action'] = 'You make sure all your clothes are in place with one last quick check and dash over to <<$npc_firstname[$boy]>> to give him a quick kiss on the cheek'
 		gs'sex_ev_leave', 'hurry_leave_finish'
 	end
-	
+
 	act'Peck on the lips':
 		cla & *nl
 		$sex_ev['leave_action'] = 'You make sure all your clothes are in place with one last quick check and dash over to <<$npc_firstname[$boy]>> to give him a quick kiss on the lips'
 		act'Leave':gs'sex_ev_leave', 'hurry_leave_finish'
 	end
-	
+
 	act'Passionate kiss':
 		cla & *nl
 		$sex_ev['leave_action'] = 'You make sure all your clothes are in place with one last quick check and dash over to <<$npc_firstname[$boy]>> to kiss him. Despite your rush, you savour this moment, breathing in the taste of <<$npc_firstname[$boy]>>''s lips even as you force your tongue into his mouth to dance with his. A full five seconds go by until you break the kiss'
@@ -424,7 +424,7 @@ if $ARGS[0] = 'breakup_start':
 				end
 !!				gs'sex_ev_leave', 'found_someone_else_breakup'
 !!				gs'sex_ev_leave', 'cheating_on_you_breakup'
-				
+
 			else
 				'"Don''t text me to come over anymore."'
 				'"Why not?" he asks.'
@@ -483,7 +483,7 @@ if $ARGS[0] = 'unsatisfied_breakup':
 				gs'sex_ev_leave', 'isnt_going_to_work'
 			end
 		end
-		
+
 !!		act'You''re boring':
 	end
 end
@@ -505,7 +505,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'And with that, you head out the door.'
 					gs'sex_ev_leave', 'break_up'
 				end
-				
+
 				act'Well...':
 					cla & *nl
 					'You pause, biting your lip in consideration.'
@@ -516,7 +516,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 						'"Thatta girl," <<$npc_firstname[$boy]>> grins from bed.'
 						gs'sex_ev_after', 'cheating_end'
 					end
-					
+
 					act'Set some rules':
 						cla & *nl
 						'"Okay..." you say. "But there have to be rules!"'
@@ -532,7 +532,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 					'And with that, you head out the door.'
 					gs'sex_ev_leave', 'break_up'
 				end
-				
+
 				act'No I won''t':
 					cla & *clr
 					'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
@@ -543,7 +543,7 @@ if $ARGS[0] = 'no_more_cheating_breakup':
 				end
 			end
 		end
-		
+
 		if pcs_lover - pcs_girlfriends > 0:
 			act'I can''t keep cheating on my boyfriend':
 				cla & *clr
@@ -621,7 +621,7 @@ if $ARGS[0] = 'sneak_out1':
 			end
 			act'Leave':gt'sex_ev_leave', 'exit'
 		end
-		
+
 		act'Leave your a note on your panties':
 			sex_ev['panty_note'] = 1
 			npc_panty_give[$boy] += 1
@@ -649,7 +649,7 @@ if $ARGS[0] = 'sneak_out_note1':
 		$sex_ev['note_desc1']
 		gs'sex_ev_leave', 'sneak_out_note2'
 	end
-	
+
 	act'I had a good time':
 		cla & *clr
 		$sex_ev['hall_way']
@@ -657,7 +657,7 @@ if $ARGS[0] = 'sneak_out_note1':
 		$sex_ev['note_desc1']
 		gs'sex_ev_leave', 'sneak_out_note2'
 	end
-	
+
 	if sex_ev['fuck_count'] > 0:
 		act'Thanks for the fuck':
 			cla & *clr
@@ -689,7 +689,7 @@ if $ARGS[0] = 'sneak_out_note2':
 			end
 			gs'sex_ev_leave', 'sneak_out_note3'
 		end
-		
+
 		act'Text me (date)':
 			sex_ev['date_invite'] = 1
 			$sex_ev['note_desc2'] = '<i>Text me if you want to go out on a date sometime.</i>'
@@ -701,7 +701,7 @@ if $ARGS[0] = 'sneak_out_note2':
 			gs'sex_ev_leave', 'sneak_out_note3'
 		end
 	end
-	
+
 	act'Till next time':
 		$sex_ev['note_desc2'] = '<i>Until next time.</i>'
 		gs'sex_ev_leave', 'sneak_out_note3'
@@ -719,7 +719,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'<<$sex_ev[''note_desc1'']>> <<$sex_ev[''note_desc2'']>> - <<$pcs_nickname>>'
 		gs'sex_ev_leave', 'sneak_out_note_end'
 	end
-	
+
 	act'A smiley face':
 		cla & *clr
 		$sex_ev['hall_way']
@@ -728,7 +728,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'You leave a little face, unable to keep yourself from smiling as you dot two little eyes over the mouth.'
 		gs'sex_ev_leave', 'sneak_out_note_end'
 	end
-	
+
 	act'A winky face':
 		cla & *clr
 		$sex_ev['hall_way']
@@ -737,7 +737,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'You leave a little face, unable to keep yourself from smiling as you dot little winky eyes over the mouth.'
 		gs'sex_ev_leave', 'sneak_out_note_end'
 	end
-	
+
 	act'A heart':
 		cla & *clr
 		$sex_ev['hall_way']
@@ -746,7 +746,7 @@ if $ARGS[0] = 'sneak_out_note3':
 		'You punctuate the note with a tiny little heart, feeling warmth in your chest as you do.'
 		gs'sex_ev_leave', 'sneak_out_note_end'
 	end
-	
+
 	if pcs_makeup > 2:
 		act'A kiss':
 			cla & *clr
@@ -770,7 +770,7 @@ if $ARGS[0] = 'sneak_out_note_end':
 	else
 		'Satisfied, you leave your note on the counter and quietly slip out the door, letting it click shut behind you.'
 	end
-	
+
 	if (rand(1,3) = 1 or npc_goal[$boy] = 3) and sex_ev['fuckbuddy_invite'] = 1:
 		act'Leave':msg 'Unfortunately, he never ends up texting you.' & gt'sex_ev_leave', 'exit'
 	elseif (rand(1,3) = 1 or npc_goal[$boy] = 1) and sex_ev['date_invite'] = 1:
@@ -805,7 +805,7 @@ if $ARGS[0] = 'dress':
 end
 
 if $ARGS[0] = 'dressing_image':
-	
+
 !!	elseif $sex_ev['dress_describe'] = 'pulling your panties up your legs and fastening your bra around your chest':
 !!		'<center><video autoplay loop src="images/pc/activities/misc/dress_underwear1.mp4"></video></center>'
 	if $sex_ev['dress_describe'] = 'fastening your bra around your chest':
@@ -834,9 +834,9 @@ end
 
 if $ARGS[0] = 'pc_or_npc_dressing':
 	if sex_ev['dressing_start'] ! 1:
-	
+
 	else
-	
+
 	end
 end
 
@@ -853,7 +853,7 @@ if $ARGS[0] = 'dressing1':
 	cla & *clr
 !!	gs'sex_ev_leave', 'dress'
 	gs'sex_ev_leave', 'dress_loop'
-	
+
 	if sex_ev['sleepover'] = 1 and npc_latesleeper[$boy] = 1 and sex_ev['boy_asleep'] ! 0:
 		if sex_ev['towel'] = 1:
 			sex_ev['towel'] = 0
@@ -861,7 +861,7 @@ if $ARGS[0] = 'dressing1':
 		else
 			'You quietly reach down for where you left your clothes and try to pick them up without waking <<$npc_firstname[$boy]>>.'
 		end
-		
+
 		gs'sex_ev_leave', 'dressing2'
 	else
 		gs'sex_ev_leave', 'dress_start_desc'
@@ -870,7 +870,7 @@ if $ARGS[0] = 'dressing1':
 			gs'sex_ev_leave', 'dressing2'
 		elseif sex_ev['cant_stay'] = 1:
 			!! there is an additional dress_loop here to make it possible to give panties here
-			gs'sex_ev_leave', 'dress_loop_code' 
+			gs'sex_ev_leave', 'dress_loop_code'
 			'"Guess I''ll go then," you sigh, <<$sex_ev[''dress_describe'']>>.'
 			gs'sex_ev_leave', 'dressing2'
 			gs 'sex_ev_leave', 'panty_gift'
@@ -905,7 +905,7 @@ if $ARGS[0] = 'dressing2':
 	sex_ev['leaving'] = 1
 	if sex_ev['sleepover'] = 1:
 		gs'sex_ev_morning', 'end_morning'
-	
+
 !!		gs'sex_ev_hookup_leave', 'end_morning'
 	else
 		gs'sex_ev_leave', 'dressing_finish'
@@ -954,7 +954,7 @@ if $ARGS[0] = 'leaving_soon':
 		gs'sex_ev_leave', 'dress_start_desc'
 		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 		if sex_ev['sleepover'] < 1:
-			
+
 			'"Yeah," you say, <<$sex_ev[''dress_describe'']>>.' + iif($sex_ev['loc'] = 'pc_home', ' "Get your clothes on so I can get out of here."', ' ')
 			gs 'sex_ev_leave', 'dressing2'
 			gs 'sex_ev_leave', 'panty_gift'
@@ -985,7 +985,7 @@ if $ARGS[0] = 'going_disco':
 				end
 				!! add spontaneous disco date
 				gs 'sex_ev_leave', 'dressing2'
-				
+
 				gs 'sex_ev_leave', 'panty_gift'
 			end
 		else
@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'going_disco':
 				end
 				!! add spontaneous club date
 				gs 'sex_ev_leave', 'dressing2'
-				
+
 				gs 'sex_ev_leave', 'panty_gift'
 			end
 		end
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'going_disco':
 end
 
 if $ARGS[0] = 'mom_late':
-	if mid($start_type,1,2) = 'sg' and hour >= 20 and $sex_ev['loc'] ! 'pc_home':
+	if $start_loc = 'sg' and hour >= 20 and $sex_ev['loc'] ! 'pc_home':
 		act'Mom will kill me':
 			sex_ev['mom_kill'] = 1
 			cla & *clr
@@ -1020,9 +1020,9 @@ if $ARGS[0] = 'mom_late':
 				'"Yeah," you say, <<$sex_ev[''dress_describe'']>>. "I''m already going to be in trouble as it is, but if I don''t come home at all tonight, my mom will kill me."'
 			else
 				'"Yeah," you say, <<$sex_ev[''dress_describe'']>>. "My mom will kill me if I don''t come home before curfew."'
-			end			
+			end
 			gs 'sex_ev_leave', 'dressing2'
-			
+
 			gs 'sex_ev_leave', 'panty_gift'
 		end
 	end
@@ -1061,21 +1061,21 @@ if $ARGS[0] = 'need_homework':
 					'"Thanks," you say, <<$sex_ev[''dress_describe'']>>. "It means a lot to me that you get it."'
 					gs 'sex_ev_leave', 'dressing2'
 				end
-				
+
 				act'Want to go to uni':
 					gs'sex_ev_leave', 'dress_loop'
 					gs'sex_ev_leave', 'dress_start_desc'
 					'"I really want to go to uni," you say, <<$sex_ev[''dress_describe'']>>. "So keeping up with my classes is really important."'
 					gs 'sex_ev_leave', 'dressing2'
 				end
-				
+
 				act'Damn straight':
 					gs'sex_ev_leave', 'dress_loop'
 					gs'sex_ev_leave', 'dress_start_desc'
 					'"Damn straight it is," you say, <<$sex_ev[''dress_describe'']>>. "Skipping schoolwork to fuck you could end up fucking me for life!"'
 					gs 'sex_ev_leave', 'dressing2'
 				end
-				
+
 				act'No hard feelings':
 					gs'sex_ev_leave', 'dress_loop'
 					gs'sex_ev_leave', 'dress_start_desc'
@@ -1101,7 +1101,7 @@ if $ARGS[0] = 'something_to_do':
 			gs 'sex_ev_leave', 'panty_gift'
 		else
 			'"Yeah," you say, <<$sex_ev[''dress_describe'']>>. "Have a few things I need to get done.'  + iif($sex_ev['loc'] = 'pc_home',' Sorry to kick you out so quickly."',' Thanks for letting me spend the night."')
-			
+
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
 				gs 'sex_ev_leave', 'sex_ev_invite_later'
 			else
@@ -1125,7 +1125,7 @@ if $ARGS[0] = 'see_a_friend':
 			gs 'sex_ev_leave', 'panty_gift'
 		else
 			'"Yeah," you say, <<$sex_ev[''dress_describe'']>>. "Need to see a friend later.' + iif($sex_ev['loc'] = 'pc_home','Sorry to kick you out so quickly."','Thanks for letting me spend the night."')
-			
+
 			if rand(1,3) = 3 and (npc_day_off[$boy] = week or (npc_day_off[$boy] = week + 1) or (week = 7 and npc_day_off[$boy] = 1)):
 				gs 'sex_ev_leave', 'sex_ev_invite_later'
 			else
@@ -1153,7 +1153,7 @@ if $ARGS[0] = 'another_fuckbuddy':
 end
 
 if $ARGS[0] = 'going_school':
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6: 
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 		act'School':
 			cla & *clr
 			gs'sex_ev_leave', 'dress_loop'
@@ -1198,7 +1198,7 @@ if $ARGS[0] = 'going_school':
 end
 
 if $ARGS[0] = 'school_night':
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7): 
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
 		act'It''s a school night':
 			cla & *clr
 			gs'sex_ev_leave', 'dress_loop'
@@ -1281,7 +1281,7 @@ if $ARGS[0] = 'panty_gift2':
 			end
 		end
 	end
-	
+
 	act'Something to remember the occasion':
 		cla & *clr
 		gs'sex_ev_leave', 'dress_loop'
@@ -1307,7 +1307,7 @@ if $ARGS[0] = 'panty_gift2':
 			end
 		end
 	end
-	
+
 	act'Consider it a trophy':
 		cla & *clr
 		gs'sex_ev_leave', 'dress_loop'
@@ -1329,7 +1329,7 @@ if $ARGS[0] = 'panty_gift2':
 			end
 		end
 	end
-	
+
 	if sex_ev['virgin'] = 1:
 		act'To remember my virginity':
 			cla & *clr
@@ -1353,7 +1353,7 @@ if $ARGS[0] = 'panty_gift2':
 			end
 		end
 	end
-	
+
 	if sex_ev['orgasm_count'] > 0:
 		act'For making me orgasm':
 			cla & *clr
@@ -1376,7 +1376,7 @@ if $ARGS[0] = 'panty_gift2':
 				end
 			end
 		end
-		
+
 		act'For making me orgasm (tradition)':
 			cla & *clr
 			gs'sex_ev_leave', 'dress_loop'
@@ -1402,7 +1402,7 @@ if $ARGS[0] = 'panty_gift2':
 				end
 			end
 		end
-		
+
 	end
 end
 
@@ -1412,13 +1412,13 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 		'"Just hide them," you say, <<$sex_ev[''dress_describe'']>>. "If you can hide a fucking a girl in your bed, surely you can hide a pair of panties."'
 		gs 'sex_ev_leave', 'dressing2'
 	end
-	
+
 	act'Say they''re hers':
 		cla & *nl
 		'"Tell her they''re hers," you shrug with a wry smirk, <<$sex_ev[''dress_describe'']>>. "Maybe she''ll think she bought them."'
 		gs 'sex_ev_leave', 'dressing2'
 	end
-	
+
 	act'Say they''re yours':
 		gs'sex_ev_leave', 'dress_loop_code'
 		cla & *nl
@@ -1434,7 +1434,7 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 				'You move to <<$sex_ev[''dress_describe'']>> but <<$npc_firstname[$boy]>> continues to glare at you out of the corner of your eye for a few moments longer before looking away.'
 				gs 'sex_ev_leave', 'dressing2'
 			end
-			
+
 			act'I was kidding (acerbic)':
 				cla & *clr
 				$sex_ev['bed_room']
@@ -1448,13 +1448,13 @@ if $ARGS[0] = 'panty_gift_girlfriend':
 			gs 'sex_ev_leave', 'dressing2'
 		end
 	end
-	
+
 	act'Give them to her':
 		cla & *nl
 		'"Gift them to her," you say mischievously, <<$sex_ev[''dress_describe'']>>. "Maybe she''ll put them on."'
 		gs 'sex_ev_leave', 'dressing2'
 	end
-	
+
 	act'Throw them away':
 		cla & *nl
 		'"Throw them away then," you shrug, <<$sex_ev[''dress_describe'']>>. "I don''t care. Do whatever you want with them.'
@@ -1576,11 +1576,11 @@ end
 if $ARGS[0] = 'dress_talk':
 	cla
 	gs'sex_ev_leave', 'dressing_finish'
-	
+
 	gs 'sex_ev_leave', 'dress_talk_pc'
-	
+
 	gs 'sex_ev_leave', 'panty_gift'
-	
+
 	if sex_ev['dress_end'] ! 1 and sex_ev['plans_later_talk'] = 0 and rand(0,1) = 1 and $sex_ev['type'] ! 'hookup':
 		gs 'sex_ev_leave', 'npc_sex_ev_invite'
 !!{
@@ -1611,13 +1611,13 @@ if $ARGS[0] = 'dress_talk_boy':
 						gs'sex_ev_after', 'npc_date_later_response'
 						'Your blush deepens in response.'
 					end
-					
+
 					act'Casual':
 						gs'sex_ev_after', 'dress_image'
 						'"I have a date with my boyfriend later,"'
 						gs'sex_ev_after', 'npc_date_later_response'
 					end
-					
+
 					act'Exhasperated':
 						gs'sex_ev_after', 'dress_image'
 						'"I have a date with my boyfriend later,"'
@@ -1677,12 +1677,12 @@ if $ARGS[0] = 'dress_talk_pc':
 
 
 	end
-	
+
 	gs'sex_ev_leave', 'had_a_good_time'
 	gs'sex_ev_leave', 'stay_over_thanks'
 	gs'sex_ev_leave', 'walk_funny'
 !!	gs'sex_ev_leave', 'leak_all_day'
-	
+
 end
 
 !!if $ARGS[0] = '':
@@ -1745,7 +1745,7 @@ end
 
 if $ARGS[0] = 'walk_funny':
 	if sex_ev['fuck_count'] > 5 and $sex_ev['walk_funny_talk'] = '' and pain['vaginal'] > 10:
-		if hour < 16: 
+		if hour < 16:
 			$sex_ev['walk_funny_day'] = 'day'
 		else
 			$sex_ev['walk_funny_day'] = 'day tomorrow'
@@ -1756,7 +1756,7 @@ if $ARGS[0] = 'walk_funny':
 				cla & *clr
 				$sex_ev['walk_funny_talk'] = 'embarrassed'
 				gs'sex_ev_leave', 'dress_loop'
-				
+
 				if $sex_ev['dress_describe'] = 'pulling your panties up':
 					'"I''m going to walk funny all <<$sex_ev[''walk_funny_day'']>> because of you," you say, blushing slightly as you pull your panties up over your sore pussy.'
 				elseif $sex_ev['dress_describe'] = 'tugging your pants over your hips' and $pantyworntype = 'none':
@@ -1766,7 +1766,7 @@ if $ARGS[0] = 'walk_funny':
 				end
 				gs'sex_ev_leave', 'walk_funny2'
 			end
-			
+
 			act'Annoyed':
 				cla & *clr
 				$sex_ev['walk_funny_talk'] = 'annoyed'
@@ -1780,7 +1780,7 @@ if $ARGS[0] = 'walk_funny':
 				end
 				gs'sex_ev_leave', 'walk_funny2'
 			end
-			
+
 			act'Sexy':
 				cla & *clr
 				$sex_ev['walk_funny_talk'] = 'sexy'
@@ -1845,7 +1845,7 @@ if $ARGS[0] = 'leak_all_day':
 				cla & *clr
 				$sex_ev['cum_leak_talk'] = 'embarrassed'
 				gs'sex_ev_leave', 'dress_loop'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
+				if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
 					!! if schoolday
 					if $sex_ev['dress_describe'] = 'pulling your panties up':
 						'"I can''t believe I have to go to class full of your cum," you say, blushing furiously as you pull your panties up over your dripping snatch. The aforementioned cum immediately seeps into the fabric, creating an uncomfortable damp spot. "I''m going to be sitting in it all day!"'
@@ -1882,12 +1882,12 @@ if $ARGS[0] = 'leak_all_day':
 				end
 				gs'sex_ev_leave', 'leak_all_day2'
 			end
-			
+
 			act'Annoyed':
 				cla & *clr
 				$sex_ev['cum_leak_talk'] = 'annoyed'
 				gs'sex_ev_leave', 'dress_loop'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
+				if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
 					!! if schoolday
 					if $sex_ev['dress_describe'] = 'pulling your panties up':
 						'"I can''t believe I have to go to class like this," you scowl, pulling your panties up over your hips and immediately feel a glob of <<$npc_firstname[$boy]>>''s cum seep out to form an uncomfortable damp spot on the fabric. "I''m going to be sitting in this all day!"'
@@ -1924,12 +1924,12 @@ if $ARGS[0] = 'leak_all_day':
 				end
 				gs'sex_ev_leave', 'leak_all_day2'
 			end
-			
+
 			act'Sexy':
 				cla & *clr
 				$sex_ev['cum_leak_talk'] = 'sexy'
 				gs'sex_ev_leave', 'dress_loop'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
+				if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and (week < 5 or week = 7):
 					!! if schoolday
 					if $sex_ev['dress_describe'] = 'pulling your panties up':
 						'"My pussy is so full of your cum," you say with a sultry smirk, pulling your panties up over your dripping snatch. It seeps into the fabric, forming a damp spot. "My panties are going to be soaked with it before class is over."'
@@ -1978,7 +1978,7 @@ if $ARGS[0] = 'leak_all_day2':
 			'"Sorry about that," <<$npc_firstname[$boy]>> replies with a guilty smile.'
 		end
 	else
-	
+
 	end
 end
 
@@ -2012,7 +2012,7 @@ end
 if $ARGS[0] = 'ruined_panties':
 	if cum_loc['vagina'] > 0 and sex_ev['ruin_my_panties'] = 0 and $lastwornpantytype ! 'none' and sex_ev['panty_wear'] ! 1:
 		act'':
-			
+
 		end
 	end
 end
@@ -2022,7 +2022,7 @@ if $ARGS[0] = 'npc_date_later_response':
 		if npc_fidelity[$boy] < 7:
 			'"You''re still with that stick in the mud?" <<$npc_firstname[$boy]>> scoffs.'
 		else
-		
+
 		end
 	else
 		npc_know_cheat[$boy] = 1
@@ -2031,7 +2031,7 @@ if $ARGS[0] = 'npc_date_later_response':
 		else
 			'"Oh." <<$npc_firstname[$boy]>> looks away uncomfortably.'
 		end
-		
+
 	end
 end
 
@@ -2102,7 +2102,7 @@ if $ARGS[0] = 'pc_sex_ev_invite':
 end
 
 if $ARGS[0] = 'pc_sex_ev_timeset':
-	act'How about...': 
+	act'How about...':
 		:invalid_timeset
 		npc_booty_call_time[$boy] = input ("When do you want to come over to <<$npc_firstname[$boy]>>''s? (Pick an hour 1 - 22.)")
 		if npc_booty_call_time[$boy] > 22:
@@ -2193,9 +2193,9 @@ if $ARGS[0] = 'npc_sex_ev_invite':
 					'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "Want to come by and do this again?"'
 				end
 			end
-			
+
 			gs 'sex_ev_leave', 'busy_later'
-			
+
 			act'What time?':
 				gs 'sex_ev_leave', 'dress_loop'
 				'"That depends," you say, <<$sex_ev[''dress_describe'']>>. "What time were you thinking?"'
@@ -2230,10 +2230,10 @@ if $ARGS[0] = 'sex_ev_invite_later':
 			else
 				'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''ll be my day off. Want to come by and do this again?"'
 			end
-		end	
-		
+		end
+
 		gs 'sex_ev_leave', 'busy_later'
-		
+
 		act'What time?':
 			cla & *nl
 			'"That depends," you say, <<$sex_ev[''dress_describe'']>>. "What time were you thinking?"'
@@ -2279,7 +2279,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		gs 'sex_ev_leave', 'dress_talk'
 		if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 	end
-	
+
 	act'I''ve got nothing better to do':
 		gs 'booty_call', 'set_booty_call_date'
 		gs 'sex_ev_leave', 'dress_loop'
@@ -2288,7 +2288,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		gs 'sex_ev_leave', 'dress_talk'
 		if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 	end
-	
+
 	act'I could fit it in':
 		gs 'booty_call', 'set_booty_call_date'
 		gs 'sex_ev_leave', 'dress_loop'
@@ -2301,7 +2301,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		gs 'sex_ev_leave', 'dress_talk'
 		if sex_ev['morning_after'] = 1: gs 'sex_ev_morning', 'end_morning'
 	end
-	
+
 	act'Another time?':
 		gs 'sex_ev_leave', 'dress_loop'
 		'"That''s no good for me," you shake your head while <<$sex_ev[''dress_describe'']>>. "I have something to do then. What about..."'

+ 102 - 102
locations/sex_ev_morning.qsrc

@@ -37,13 +37,13 @@ if $ARGS[0] = 'morning':
 				gs'sex_ev_morning', 'kiss_wake'
 		!!	end
 		end
-		
+
 		gs'sex_ev_morning', 'late_for_school'
-		
+
 !!		if sex_ev['pass_out'] = 1:
-			
+
 		gs'sex_ev_morning', 'after_sleepfuck_wake'
-		
+
 		if $boy ! one_of_svetas_lovers:
 			if pcs_lover - pcs_girlfriends > 0:
 				act'Your boyfriend':$sex_ev['cheat'] = 'boyfriend' & gt'sex_ev_morning', 'guilt1'
@@ -52,7 +52,7 @@ if $ARGS[0] = 'morning':
 				act'Your girlfriend': $sex_ev['cheat'] = 'girlfriend' & gt'sex_ev_morning', 'guilt1'
 			end
 		end
-		
+
 		if pilldaychk < daystart - 1 and birth_control['using_bc'] = 1: gs'sex_ev_morning', 'forgot_bc_pill'
 	end
 end
@@ -96,7 +96,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 	else
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/sleep4.jpg"></center>'
 	end
-	
+
 	'Your mind stirs and you slowly come to consciousness. The first thing you notice...'
 	*nl
 	if cum_loc['vagina'] > sex_ev['sleep_cum_vagina']:
@@ -127,7 +127,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 !!		else
 !!			'<i>Was <<$npc_firstname[$boy]>> wearing a condom when you went to sleep last night?</i>'
 		end
-		
+
 		act'Did you fuck me in my sleep?':
 			cla & *nl
 			'"... did you fuck me while I was sleeping last night?" you ask.'
@@ -136,7 +136,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 				'"Was just wondering," you reply.'
 				gs'sex_ev_morning', 'wakeup1'
 			end
-			
+
 			act'Explains the dream':
 				cla & *nl
 				'"Well that explains the weird dreams I was having," you say.'
@@ -150,21 +150,21 @@ if $ARGS[0] = 'sleep_fuck_wake':
 					'"No promises," <<$npc_firstname[$boy]>> smirks mischievously.'
 					gs'sex_ev_morning', 'wakeup1'
 				end
-				
+
 				act'Wake me up next time':
 					cla & *nl
 					npc_sleep_sex_okay[$boy] = 1
 					'"Wake me up next time," you say. "Maybe I want to get some too."'
 					gs'sex_ev_morning', 'wakeup1'
 				end
-				
+
 				act'That''s fine':
 					cla & *nl
 					npc_sleep_sex_okay[$boy] = 2
 					'"That''s fine," you say. "A guy''s gotta take care of his needs, doesn''t he?"'
 					gs'sex_ev_morning', 'wakeup1'
 				end
-				
+
 				act'Sleep orgasms are the best':
 					cla & *nl
 					npc_sleep_sex_okay[$boy] = 2
@@ -180,7 +180,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 						'"If I weren''t in a rush to get up, I''d rip your head off."'
 						gs'sex_ev_morning', 'wakeup1'
 					end
-					
+
 					act'Let it slide':
 						cla & *nl
 						'"No," you say. "But I can''t do much about it now."'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 				end
 			end
 		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.'
@@ -208,14 +208,14 @@ if $ARGS[0] = 'sleep_fuck_wake':
 					'"Just ask next time," you smirk.'
 					gs'sex_ev_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'sex_ev_morning', 'wakeup1'
 				end
-				
+
 				act'Sleep orgasms are the best':
 					cla & *nl
 					npc_sleep_sex_okay[$boy] = 2
@@ -230,7 +230,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 						'"No," you say, glaring daggers at him. "If I weren''t in a rush to get up, I''d rip your head off."'
 						gs'sex_ev_morning', 'wakeup1'
 					end
-					
+
 					act'Let it slide':
 						cla & *nl
 						'"No," you say irritably. "But I can''t do much about it now."'
@@ -242,7 +242,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 						'"Of course it is," you smile. "I said you could."'
 						gs'sex_ev_morning', 'wakeup1'
 					end
-					
+
 					act'Sleep orgasms are the best':
 						cla & *nl
 						npc_sleep_sex_okay[$boy] = 2
@@ -252,7 +252,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 				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."'
@@ -264,7 +264,7 @@ if $ARGS[0] = 'sleep_fuck_wake':
 end
 
 if $ARGS[0] = 'late_for_school':
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7:
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 7:
 		act'School!':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -277,7 +277,7 @@ if $ARGS[0] = 'late_for_school':
 				gs'sex_ev_morning', 'late_school_not_at_home'
 			else
 				act'Get up!':
-					
+
 					'"I need to go," you say, hurriedly hauling <<$npc_firstname[$boy]>> out of your bed. "And so do you."'
 					if npc_latesleeper[$boy] = 1:
 						minut += rand(2,3)
@@ -444,7 +444,7 @@ if $ARGS[0] = 'kiss_wake':
 						gs'sex_ev_morning', 'bj_wake'
 					end
 				end
-				
+
 				act'His fault':
 					cla & *nl
 					'"It''s your fault," you say. "You''re the one who plastered my face last night."'
@@ -458,7 +458,7 @@ if $ARGS[0] = 'kiss_wake':
 						gs'sex_ev_morning', 'bj_wake'
 					end
 				end
-				
+
 				act'Oops, forgot':
 					cla & *nl
 					'"Oops," you say. "Forgot I fell asleep last night with your cum on my face."'
@@ -501,7 +501,7 @@ if $ARGS[0] = 'bj_wake':
 			'"Too bad," you smirk, teasing his cock with your hand while you savour his taste. "Guess it''ll have to wait until later."'
 			gs'sex_ev_morning', 'wakeup1'
 		end
-		
+
 		act'I''ll be fast':
 			sex_ev['morning_fuck'] = 1
 			if sex_ev['cum_count'] >= npc_sexdrive[$boy] + sex_ev['extra_cum']: sex_ev['extra_cum'] += npc_sexdrive[$boy]
@@ -531,7 +531,7 @@ if $ARGS[0] = 'bj_wake':
 				'"Fuck yes," he groans and you get back to work.'
 				act'Continue':gt'sex_ev_foreplay', 'bj_dom2'
 			end
-			
+
 			act'Keep sucking':
 				cla & *nl
 				'"Mmmm," you hum around the cock in your mouth, sending shivers through his body that you can feel between your lips. You never stop sucking.'
@@ -546,7 +546,7 @@ if $ARGS[0] = 'bj_wake':
 				'"Fuck no," he groans and you get back to work.'
 				act'Continue':gt'sex_ev_foreplay', 'bj_dom2'
 			end
-			
+
 			act'Guess':
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/blowjob/play1.mp4"></video></center>'
@@ -599,7 +599,7 @@ if $ARGS[0] = 'wakeup1':
 		else
 			act'Say goodbye to <<$npc_firstname[$boy]>>':gt'sex_ev_morning', 'npc_leave'
 		end
-		
+
 		if $clothingworntype = 'nude':
 			act'Get dressed':
 				cla & *clr
@@ -611,7 +611,7 @@ if $ARGS[0] = 'wakeup1':
 			end
 		end
 
-		
+
 		if npc_earlyriser[$boy] = 1 and sex_ev['npc_morning_shower'] = 1 and sex_ev['morning_shower'] = 0:
 			if npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
 				act'Join <<$npc_firstname[$boy]>> in the shower':gt'sex_ev_shower', 'morning_shower_join1'
@@ -632,7 +632,7 @@ if $ARGS[0] = 'wakeup1':
 						'"Oh. Well have fun with that," he smiles.'
 						act'Continue':gt'sex_ev_after', 'boy_bathroom'
 					end
-					
+
 					act'Take a shower':
 						cla & *nl
 						'"I need a shower," you say over your shoulder.'
@@ -643,7 +643,7 @@ if $ARGS[0] = 'wakeup1':
 								'"I could use some alone time right now," you reply shaking your head and lock the door behind you.'
 								act'Continue':gt'sex_ev_after', 'boy_bathroom'
 							end
-							
+
 							act'Sure':
 								cla & *nl
 								'"I''d like that," you reply taking his hand as he gets up and drag him inside with you.'
@@ -659,7 +659,7 @@ if $ARGS[0] = 'wakeup1':
 							end
 						end
 					end
-					
+
 					if cum_loc > 0:
 						act'Clean up':
 							cla & *nl
@@ -673,31 +673,31 @@ if $ARGS[0] = 'wakeup1':
 				end
 			end
 		end
-		
+
 		if npc_latesleeper[$boy] ! 1 and sex_ev['breakfast_finished'] = 0 and sex_ev['npc_morning_shower'] ! 1:
 			gs'sex_ev_morning', 'want_breakfast'
 			gs'sex_ev_pillow_talk2', 'forgot_bc_talk1'
 		elseif npc_latesleeper[$boy] = 1 and sex_ev['breakfast_finished'] = 0 and $sex_ev['loc'] ! 'hotel_room':
 			act'Make breakfast':gt'sex_ev_morning', 'pc_make_breakfast'
 		end
-		
+
 		if sex_ev['creampie_count'] > 0 and morning_after_pill > 0 and sex_ev['ma_pill'] = 0 and birth_control['think_safe'] = 0:
 			act'Take a morning after pill':
 				sex_ev['ma_pill'] = 2
 				cla & *clr
 				$sex_ev['bed_room']
-				
+
 				if LudaQW['free_condoms'] = 1 and stat['morning_after_pill'] = 0:
 					'You reach down to your purse and pull out the morning after pill Luda gave you, popping it from the packaging and swallowing it dry.'
 				else
 					'You reach down to your purse and pull out the morning after pill you keep inside, popping it from the packaging and swallowing it dry.'
 				end
-				
+
 				gs 'medical_din', 'morning_after_pill_function'
 				gs'sex_ev_morning', 'wakeup1'
 			end
 		end
-		
+
 		if sex_ev['boy_asleep'] = 1 and sex_ev['breakfast_finished'] = 0:
 			act'Wake <<$npc_firstname[$boy]>> with a blowjob':
 				cla & *clr
@@ -865,9 +865,9 @@ if $ARGS[0] = 'dressing1':
 		'"You heading out?" <<$npc_firstname[$boy]>> asks.'
 		gs'sex_ev_leave', 'dress_loop'
 
-		
-		
-		
+
+
+
 	!!	act'Talk while you dress':
 	!!		gs'sex_ev_morning', 'dress_talk'
 	!!	end
@@ -893,11 +893,11 @@ if $ARGS[0] = 'sex_ev_invite_later':
 			'"You busy tomorrow?" <<$npc_firstname[$boy]>> asks as you''re <<$sex_ev[''dress_describe'']>>. "It''ll be my day off. Want to come by and do this again?"'
 		end
 	end
-	
+
 	gs 'sex_ev_leave', 'dress_loop'
-	
+
 	gs 'sex_ev_leave', 'busy_later'
-	
+
 	act'What time?':
 		cla & *nl
 		'"That depends," you say, <<$sex_ev[''dress_describe'']>>. "What time were you thinking?"'
@@ -926,7 +926,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
 		gs 'sex_ev_morning', 'end_morning'
 	end
-	
+
 	act'I''ve got nothing better to do':
 		gs 'booty_call', 'set_sex_ev_date'
 		cla & *nl
@@ -934,7 +934,7 @@ if $ARGS[0] = 'sex_ev_plan':
 		'"Great," <<$npc_firstname[$boy]>> grins back.'
 		gs 'sex_ev_morning', 'end_morning'
 	end
-	
+
 	act'I could fit it in':
 		gs 'booty_call', 'set_sex_ev_date'
 		cla & *nl
@@ -982,7 +982,7 @@ if $ARGS[0] = 'cumshot_wakeup1':
 		'"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'sex_ev_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>'
@@ -993,7 +993,7 @@ if $ARGS[0] = 'cumshot_wakeup1':
 			'"No it''s not," he grins back and pushes his cock towards your lips.'
 			gs'sex_ev_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.'
@@ -1001,7 +1001,7 @@ if $ARGS[0] = 'cumshot_wakeup1':
 			gs'sex_ev_morning', 'cumshot_wakeup_clean2'
 		end
 	end
-	
+
 	if npc_cumshot_wake[$boy] > 0:
 		act'Again?! (annoyed)':
 			cla & *clr
@@ -1021,7 +1021,7 @@ if $ARGS[0] = 'cumshot_wakeup_clean1':
 		'"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'sex_ev_morning', 'wakeup1'
 	end
-	
+
 	act'Acquiesce':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
@@ -1039,7 +1039,7 @@ if $ARGS[0] = 'cumshot_wakeup_clean2':
 		'"Nuh uh!" you giggle, turning your head away from his tip. "One face shot is all you get No double dipping."'
 		gs'sex_ev_morning', 'wakeup1'
 	end
-	
+
 	act'Acquiesce':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/sleep/cumshot_wake3.mp4"></video></center>'
@@ -1094,7 +1094,7 @@ if $ARGS[0] = 'forgot_bc_pill':
 			end
 			gs'sex_ev_morning', 'forgot_bc_pill2'
 		end
-		
+
 		act'Calm down':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
@@ -1126,7 +1126,7 @@ if $ARGS[0] = 'forgot_bc_pill':
 				end
 				gs'sex_ev_morning', 'forgot_bc_pill2'
 			end
-			
+
 			if stat['dangerous_day'] ! 1:
 				act'You''re not fertile right now':
 					cla & *nl
@@ -1172,13 +1172,13 @@ if $ARGS[0] = 'forgot_bc_pill2':
 					'"It''s nothing," you mumble, flashing a smile to pretend like everything is fine.'
 					gs'sex_ev_morning', 'wakeup1'
 				end
-				
+
 				act'Tell him':
 					cla & *nl
 					'"I forgot my birth control yesterday," you sigh. "I fucked up. I''m sorry."'
 					gs'sex_ev_talk', 'forgot_bc_talk'
 				end
-				
+
 				if morning_after_pill > 0:
 					act'Take your morning after pill':
 						gs 'medical_din', 'morning_after_pill_function'
@@ -1240,16 +1240,16 @@ if $ARGS[0] = 'guilt1':
 				elseif sex_ev['orgasm_count'] > 0:
 					'<i>How he made you come...</i>'
 				end
-			
+
 				if sex_ev['creampie_count'] > 3:
 					'<i>He filled you with his cum...</i>'
 				elseif sex_ev['creampie_count'] > 0:
 					'<i>And he came inside you...</i>'
 				end
 			end
-			
+
 			if $sex_ev['cum_choice'] = 'face': '<i>And he came on your face...</i>'
-			if $sex_ev['cum_choice'] = 'mouth': 
+			if $sex_ev['cum_choice'] = 'mouth':
 				'<i>And he came in your mouth...</i>'
 				if sex_ev['swallow'] = 1:'<i>You even swallowed...</i>'
 			end
@@ -1287,7 +1287,7 @@ if $ARGS[0] = 'guilt_excuses':
 		'All your excuses ring hollow in your ears.'
 		gs'sex_ev_morning', 'guilt2'
 	end
-	
+
 	act'It''s just sex':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
@@ -1296,7 +1296,7 @@ if $ARGS[0] = 'guilt_excuses':
 		'You''re not sure whether you believe yourself.'
 		gs'sex_ev_morning', 'guilt2'
 	end
-	
+
 	act'You''re a whore':
 		cla & *clr
 		'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock3.mp4"></video></center>'
@@ -1354,15 +1354,15 @@ if $ARGS[0] = 'guilt3':
 				'"It''s nothing," you mumble, trying to keep a straight face while you shove down your shameful feelings.'
 				gs'sex_ev_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 <<$sex_ev[''cheat'']>>':
-				
+
 				end
 			end}
 		else
@@ -1385,32 +1385,32 @@ if $ARGS[0] = 'boy_breakfast_offer':
 			'"Sorry, I don''t have time," you say. "I wish I could but I really need to get going."'
 			gs 'sex_ev_morning', 'wakeup1'
 		end
-		
+
 		act'Not hungry':
 			cla & *nl
 			'"I''ll pass," you say. "I''m not all that hungry right now."'
 			gs 'sex_ev_morning', 'wakeup1'
 		end
-		
+
 		act'Don''t eat breakfast':
 			cla & *nl
 			'"I''ll pass," you say. "I don''t really eat breakfast."'
 			gs 'sex_ev_morning', 'wakeup1'
 		end
-		
+
 		act'On a diet':
 			cla & *nl
 			'"I''m on a diet," you say ruefully. "Gotta keep the calories down."'
 			gs 'sex_ev_morning', 'wakeup1'
 		end
 	end
-	
+
 	act'Yes please (15 minutes)':
 		cla & *nl
 		'"That sounds nice," you smile.'
 		act'Continue':gt'sex_ev_morning', 'wait_for_breakfast1'
 	end
-	
+
 	act'Let me cook instead':
 		cla & *nl
 		if sex_ev['get_up'] = 0:
@@ -1420,7 +1420,7 @@ if $ARGS[0] = 'boy_breakfast_offer':
 		end
 		act'Make breakfast':gt'sex_ev_morning', 'pc_make_breakfast'
 	end
-	
+
 	if sex_ev['morning_fuck'] = 0:
 		act'Differnt kind of breakfast (sex)':
 			gs'arousal', 'bj', 1, 'no_orgasm_msg'
@@ -1502,7 +1502,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Okay, now food," you grin.'
 			gs'sex_ev_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Just coffee (no food)':
 			cla & *nl
 			'"Coffee," you say. "Give me coffee."'
@@ -1521,7 +1521,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Mmmm," you smile with a full mouth. "That''s good toast."'
 			gs'sex_ev_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Butter':
 			cla & *clr
 			gs'sex_ev_morning', 'breakfast_image'
@@ -1529,7 +1529,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Mmmm," you smile with a full mouth. "That''s good toast."'
 			gs'sex_ev_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Jam':
 			cla & *clr
 			gs'sex_ev_morning', 'breakfast_image'
@@ -1537,7 +1537,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 			'"Mmmm," you smile with a full mouth. "That''s good toast."'
 			gs'sex_ev_morning', 'eat_breakfast1'
 		end
-		
+
 		act'Sour cream':
 			cla & *clr
 			gs'sex_ev_morning', 'breakfast_image'
@@ -1563,7 +1563,7 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 				'You giggle at the dirty joke, struggling to fit the fork into your mouth as you take your first bite of egg. It''s perfectly fried, the edges crispy but the the yolk is runny and delicious.'
 				gs'sex_ev_morning', 'eat_breakfast1'
 			end
-			
+
 			act'Maybe later':
 				cla & *nl
 				sex_ev['sex_after_breakfast'] = 1
@@ -1586,13 +1586,13 @@ if $ARGS[0] = 'breakfast_in_bed_menu':
 				'You sigh deeply, rolling your eyes to the heavens as you ignore his vulgar euphemisms and bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.'
 				gs'sex_ev_morning', 'eat_breakfast1'
 			end
-			
+
 			act'Giggle':
 				cla & *nl
 				'You giggle at the dirty joke, struggling to fit the fork into your mouth as you bite into the sandwich. The bread is nice and soft, the cheese creamy, and the kolbasa salty and cheap but full of familiar comfort.'
 				gs'sex_ev_morning', 'eat_breakfast1'
 			end
-			
+
 			act'Maybe later':
 				cla & *nl
 				sex_ev['sex_after_breakfast'] = 1
@@ -1633,7 +1633,7 @@ if $ARGS[0] = 'want_breakfast':
 				end
 				act'Make breakfast':gt'sex_ev_morning', 'pc_make_breakfast'
 			end
-			
+
 			act'You want coffee':
 				cla
 				act'Got any coffee?':
@@ -1641,13 +1641,13 @@ if $ARGS[0] = 'want_breakfast':
 					'"Any chance I could get some coffee?" you ask <<$npc_firstname[$boy]>>.'
 					gs'sex_ev_morning', 'want_coffee_response'
 				end
-				
+
 				act'Would kill for some coffee':
 					cla & *nl
 					'"I would <i>kill</i> for a cup of coffee right now," you say, looking suggestively at <<$npc_firstname[$boy]>>.'
 					gs'sex_ev_morning', 'want_coffee_response'
 				end
-				
+
 				act'Would suck cock for some coffee':
 					cla & *nl
 					'"I would suck your cock for a cup of coffee right now," you say, smirking suggestively at <<$npc_firstname[$boy]>>.'
@@ -1689,7 +1689,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 	sex_ev['out_of_bed'] = 1
 !!	if sex_ev['cooking_time'] = 0:
 !!		act'Give up':
-!!		
+!!
 !!		end
 !!	else
 		act'Start cooking':gt 'sex_ev_morning', 'pc_make_breakfast_cooking'
@@ -1704,7 +1704,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'A little too basic. Maybe not.'
 				gs'sex_ev_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (2 minutes)':
 				sex_ev['cooking_time'] += 2
 				sex_ev['coffee_make'] = 1
@@ -1715,7 +1715,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if sex_ev['toast_make'] = 0:
 		act'Toast':
 			cla & *clr
@@ -1726,7 +1726,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'A little too basic. Maybe not.'
 				gs'sex_ev_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (2 minutes)':
 				sex_ev['cooking_time'] += 2
 				sex_ev['toast_make'] = 1
@@ -1737,7 +1737,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if sex_ev['eggs_make'] = 0:
 		act'Fried eggs':
 			cla & *clr
@@ -1748,7 +1748,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'Not really in the mood. Maybe skip the eggs.'
 				gs'sex_ev_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (5 minutes)':
 				sex_ev['cooking_time'] += 5
 				sex_ev['eggs_make'] = 1
@@ -1759,7 +1759,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if sex_ev['kolbasa_make'] = 0:
 		act'Kolbasa':
 			cla & *clr
@@ -1770,7 +1770,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'A little simple. A little boring.'
 				gs'sex_ev_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (10 minutes)':
 				sex_ev['cooking_time'] += 10
 				sex_ev['kolbasa_make'] = 1
@@ -1781,7 +1781,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 			end
 		end
 	end
-	
+
 	if sex_ev['pancakes_make'] = 0:
 		act'Pancakes':
 			cla & *clr
@@ -1792,7 +1792,7 @@ if $ARGS[0] = 'pc_make_breakfast_choices':
 				'Too much work. Better do something else.'
 				gs'sex_ev_morning', 'pc_make_breakfast_choices'
 			end
-			
+
 			act'Yes (15 minutes)':
 				sex_ev['cooking_time'] += 15
 				sex_ev['pancakes_make'] = 1
@@ -1875,7 +1875,7 @@ if $ARGS[0] = 'pc_make_breakfast_done':
 				'"Hey," you smile at him. "Just finished up. Help yourself."'
 			end
 			gs'sex_ev_morning', 'eat_breakfast1'
-			
+
 		end
 	end
 end
@@ -1897,7 +1897,7 @@ if $ARGS[0] = 'eat_breakfast1':
 	act'Eat a small portion':gs'sex_ev_morning', 'eat_breakfast2'
 	act'Eat a medium portion':gs'sex_ev_morning', 'eat_breakfast3'
 	act'Eat a lot':gs'sex_ev_morning', 'eat_breakfast4'
-		
+
 	if sex_ev['cooking_total'] > 1:
 		if sex_ev['coffee_make'] = 1:
 			act'Just drink coffee':gs'sex_ev_morning', 'eat_breakfast_coffee'
@@ -1930,14 +1930,14 @@ if $ARGS[0] = 'eat_breakfast2':
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'sex_ev_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Keep it light':
 		cla & *nl
 		'"I just like to keep my portions light," you smile. "But you go ahead. Don''t hold back on account of me."'
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'sex_ev_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Not into breakfast':
 		cla & *nl
 		if sex_ev['boy_make_breakfast'] = 1:
@@ -1949,7 +1949,7 @@ if $ARGS[0] = 'eat_breakfast2':
 		end
 		act'Clear your dishes':gt'sex_ev_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Dieting':
 		cla & *nl
 		'"I''m on a diet so I''m trying not to eat much," you reply. "But you go ahead. Don''t hold back on account of me."'
@@ -2021,28 +2021,28 @@ if $ARGS[0] = 'eat_breakfast_coffee':
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'sex_ev_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Not that hungry':
 		cla & *nl
 		'"I''m just not very hungry right now," you reply. "But you go ahead. Don''t hold back on account of me."'
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'sex_ev_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Not into breakfast':
 		cla & *nl
 		'"I''m not much into breakfast," you admit. "But this is for you more than me. Enjoy it."'
 		'He smiles, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'sex_ev_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Dieting':
 		cla & *nl
 		'"I''m on a diet," you reply. "Caffeine is an appetite suppressant. But you go ahead. Don''t hold back on account of me."'
 		'He nods, continuing to help himself as you casually chit chat over the food.'
 		act'Clear your dishes':gt'sex_ev_morning', 'breakfast_dishes'
 	end
-	
+
 	act'Can''t eat in the morning':
 		cla & *nl
 		'"My stomach can''t really handle food in the morning," you reply. "I mostly just stick to coffee. But you go ahead. Don''t hold back on account of me."'
@@ -2073,7 +2073,7 @@ if $ARGS[0] = 'breakfast_dishes':
 			if rand(1,10) < npc_sexdrive[$boy] and (npc_sexdrive[$boy] < (sex_ev['cum_count'] + sex_ev['extra_cum'])) and (stat['think_virgin'] ! 1 or sex_ev['fuck_count'] > 0) or sex_ev['sex_after_breakfast'] = 1:
 				'"I can think of something nicer," he says, stepping up behind you, hands caressing your hips and something hard poking you in the back.'
 				gs'sex_ev_morning', 'after_breakfast_sex'
-				
+
 			else
 				if sex_ev['cooking_total'] > 0:
 					'"Thanks for breakfast," he smiles back, piling up the rest.'
@@ -2108,14 +2108,14 @@ if $ARGS[0] = 'after_breakfast_sex':
 			'"Tsk! Down boy!" you chide, rolling your eyes and taking his hands to forcibly pull them off your body. "I don''t have time for this."'
 			gs'sex_ev_morning', 'wakeup1'
 		end
-		
+
 		act'Not in the mood':
 			cla & *nl
 			'"Tsk! Down boy!" you chide, rolling your eyes and taking his hands to forcibly pull them off your body. "I had fun earlier but I''m not in the mood right now."'
 			gs'sex_ev_morning', 'wakeup1'
 		end
 	end
-	
+
 	act'Giggle':
 		cla
 		gs'arousal', 'foreplay', 1, 'no_orgasm_msg'
@@ -2130,13 +2130,13 @@ if $ARGS[0] = 'after_breakfast_sex':
 			'"You''re gonna make me late," you giggle uncontrollably as <<$npc_firstname[$boy]>> gets friskier, dragging you back to bed to do what he wants to you.'
 			gs 'sex_ev_foreplay', 'bed_start'
 		end
-		
+
 		act'Let him do what he wants':
 			cla & *nl
 			'You giggle uncontrollably, giving <<$npc_firstname[$boy]>> the non-verbal go ahead and you let him drag you back to the bed to do what he wants to you.'
 			gs 'sex_ev_foreplay', 'bed_start'
 		end
-		
+
 		if sex_ev['wake_fuck'] = 1 or sex_ev['morning_fuck'] = 1:
 			act'Again?!':
 				cla & *nl
@@ -2146,9 +2146,9 @@ if $ARGS[0] = 'after_breakfast_sex':
 				gs 'sex_ev_foreplay', 'bed_start'
 			end
 		end
-		
+
 	end
-	
+
 	if sex_ev['cooking_total'] ! 1 or sex_ev['coffee_make'] ! 1:
 		act'Not after eating':
 			cla & *nl

+ 86 - 86
locations/sex_ev_pillow_talk2.qsrc

@@ -40,26 +40,26 @@ if $ARGS[0] = 'weather_talk':
 						'You smile softly at <<$npc_firstname[$boy]>> who grins back confidently, wrapping his arm around you.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Grin':
 						cla
 						'You grin at <<$npc_firstname[$boy]>> who grins back just as wide as he wraps his arm around you.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Demure':
 						cla
 						'You snuggle in closer to <<$npc_firstname[$boy]>> without further comment, letting the implication of your words speak for itself. You figure he got the message when he grins as he wraps his arm around you.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
 				end
-				
+
 				act'Sometimes':
 					cla & *nl
 					'"Sometimes yes, sometimes no. I think I''m just like anybody else," you shrug, snuggling closer into <<$npc_firstname[$boy]>>''s warmth.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I''m always cold':
 					cla & *nl
 					pc_gets_chilly[$boy] = 1
@@ -84,7 +84,7 @@ if $ARGS[0] = 'fav_body_part':
 	!!			else
 					'"Your breasts," he smiles, glancing down to admire them.'
 	!!			end
-				
+
 				act'Really?':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -126,7 +126,7 @@ if $ARGS[0] = 'fav_body_part':
 					end
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Boobs are great," he grins. "And your boobs are especially great because you let me fuck you."'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like them too':
 					cla & *nl
 					'"Me too," you grin. "I love my boobs!"'
@@ -147,7 +147,7 @@ if $ARGS[0] = 'fav_body_part':
 				else
 					'"I love your ass," he smiles, running his hand up your thigh to give your bottom a firm squeeze.'
 				end
-				
+
 				act'Really?':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -155,7 +155,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"No way." He shakes his head. "Ass is the sexiest thing about a girl, and it''s the sexiest thing about you."'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -163,14 +163,14 @@ if $ARGS[0] = 'fav_body_part':
 					'"There''s something irresistible about a good ass," he grins, grabbing another handful of yours.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like it too':
 					cla & *nl
 					'"Me too," you grin. "It''s my best <i>ass</i>et," you add with a wink.'
 					'"Damn right," he says, unable to resist giving it another grab.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Oh you''re one of those':
 					cla & *nl
 					'"Oh," you say. "You''re one of <i>those</i>."'
@@ -179,7 +179,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Damn right," he grins, unable to resist giving it another grab.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 			elseif $npc_fav_body_part[$boy] = 'pussy':
 				gs 'arousal', 'foreplay', 1, 'no_orgasm_msg'
 				gs 'stat'
@@ -197,7 +197,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Yeah..." he says, giving a predatory smile as he draws his hand away trailing strands of your juices. "Your pussy is the best."'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Glad you think so':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
@@ -208,7 +208,7 @@ if $ARGS[0] = 'fav_body_part':
 					end
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'I like it too':
 					cla & *nl
 					if sex_ev['fuck_count'] > 0 or npc_fuck_times[$boy] > 0:
@@ -219,7 +219,7 @@ if $ARGS[0] = 'fav_body_part':
 					'"Glad we''re in agreement," he grins back.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				if stat['think_virgin'] ! 1 or sex_ev['fuck_count'] > 0 or npc_fuck_times[$boy] > 0:
 					act'You just like fucking it':
 						cla & *nl
@@ -318,11 +318,11 @@ if $ARGS[0] = 'made_me_late1':
 				end
 				gs'sex_ev_pillow_talk2', 'made_me_late2'
 			end
-			
+
 			act'Not mad':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				
+
 			end
 		end
 	elseif schoolprogul > 0 and npc_fuck_times[$boy] > 0:
@@ -338,18 +338,18 @@ if $ARGS[0] = 'made_me_late1':
 				end
 				gs'sex_ev_pillow_talk2', 'made_me_late2'
 			end
-			
+
 			act'Not mad':
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				
+
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'made_me_late2':
-	
+
 end
 
 if $ARGS[0] = 'plans_later':
@@ -401,7 +401,7 @@ if $ARGS[0] = 'pc_plans_later':
 		'"Thinking about going to see a movie later."'
 		gs'sex_ev_pillow_talk2', 'small_talk'
 	end
-	
+
 	act'Go to the library':
 		cla
 		act'To study':
@@ -409,14 +409,14 @@ if $ARGS[0] = 'pc_plans_later':
 			'"I was planning on doing some studying at the library later."'
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
-		
+
 		act'To read':
 			cla & *nl
 			'"Wanted to go to the library, see if I can find any new books to borrow."'
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if lernHome > 0:
 		act'Do my homework':
 			sex_ev['homework_after'] = 1
@@ -425,7 +425,7 @@ if $ARGS[0] = 'pc_plans_later':
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1) or gsAboDance > 0 or (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] ! 0):
 		act'Dance practice':
 			cla & *nl
@@ -445,7 +445,7 @@ if $ARGS[0] = 'pc_plans_later':
 				'"Thinking about going to the disco later," you reply.'
 				gs'sex_ev_pillow_talk2', 'disco_club_dancing'
 			end
-			
+
 			act'Go clubbing':
 				cla & *nl
 				sex_ev['club_after'] = 1
@@ -500,7 +500,7 @@ if $ARGS[0] = 'club_wasted':
 			'"Thinking about going clubbing later," you reply. "I kinda want to get wasted tonight."'
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
-		
+
 	end
 end
 
@@ -534,7 +534,7 @@ if $ARGS[0] = 'day_events':
 				'"Oh. I see..." you murmur uncomfortably. You leave it at that, unsure of what else to say.'
 				gs'sex_ev_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'How was it?':
 				cla & *nl
 				'"Oh, that''s cool," you reply pleasantly. "How was it? Your date?"'
@@ -568,16 +568,16 @@ if $ARGS[0] = 'pc_day_events':
 		'"I didn''t do much. Just you," you smirk back.'
 		gs'sex_ev_pillow_talk2', 'small_talk'
 	end
-	
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 		act'School':
 			cla & *nl
 			'"I spent most of the day in class," you shrug. "It''s school. It''s whatever."'
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and lernHome = 0 and kanikuli = 0:
+
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and lernHome = 0 and kanikuli = 0:
 		act'Homework':
 			cla & *nl
 			'"Just did my homework," you shrug. "Got the boring stuff out of the way so I could enjoy my fun without worry."'
@@ -585,7 +585,7 @@ if $ARGS[0] = 'pc_day_events':
 			gs'sex_ev_pillow_talk2', 'small_talk'
 		end
 	end
-	
+
 	if (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1 and hour < 15) or (AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] ! 0):
 		act'Dance practice':
 			cla & *nl
@@ -599,10 +599,10 @@ if $ARGS[0] = 'pc_day_events':
 			gs'sex_ev_pillow_talk2', 'dance_talk'
 		end
 	end
-	
+
 !!{	if shot_porn = daystart:
 		act'Filmed a porno':
-		
+
 		end
 	end}
 end
@@ -627,7 +627,7 @@ if $ARGS[0] = 'dance_talk':
 				act'Keep talking':cla & gs'sex_ev_pillow_talk2', 'small_talk'
 				gs'sex_ev_pillow_talk2', 'show_dance'
 			end
-			
+
 			act'Irritation':
 				npc_rel[$boy] -= 2
 				cla & *nl
@@ -643,7 +643,7 @@ if $ARGS[0] = 'dance_talk':
 				act'Keep talking':cla & gs'sex_ev_pillow_talk2', 'small_talk'
 				gs'sex_ev_pillow_talk2', 'show_dance'
 			end
-			
+
 			act'Sensual':
 				$sex_ev['dance_type'] = 'sexy'
 				cla & *nl
@@ -671,7 +671,7 @@ if $ARGS[0] = 'dance_talk':
 						act'Keep talking':cla & gs'sex_ev_pillow_talk2', 'small_talk'
 						gs'sex_ev_pillow_talk2', 'show_dance'
 					end
-				end					
+				end
 			end
 			gs'sex_ev_pillow_talk2', 'show_dance'
 		end
@@ -718,7 +718,7 @@ if $ARGS[0] = 'dance_talk':
 						gs'sex_ev_pillow_talk2', 'show_dance_end2'
 					end
 				end
-				
+
 				act'A sexy one':
 					gs 'stat'
 					cla & *clr
@@ -775,7 +775,7 @@ if $ARGS[0] = 'show_dance':
 		if $sex_ev['dance_type'] ! 'sexy' and $sex_ev['dance_type'] ! 'starlet':gs'sex_ev_pillow_talk2', 'show_shuffle'
 		if $sex_ev['dance_type'] ! 'modern' and $sex_ev['dance_type'] ! 'starlet':gs'sex_ev_pillow_talk2', 'show_sexy'
 		if $sex_ev['dance_type'] ! 'modern' and $sex_ev['dance_type'] ! 'sexy':gs'sex_ev_pillow_talk2', 'show_starlets'
-		
+
 	end
 end
 
@@ -852,7 +852,7 @@ if $ARGS[0] = 'show_starlets':
 						'"I''m glad you enjoyed it," you smile back, finally managing to catch your breath as you stand up straight.'
 						gs'sex_ev_pillow_talk2', 'show_dance_end'
 					end
-					
+
 					act'Not usually naked':
 						cla & *nl
 						'"Kind of weird doing it naked," you smile, easing out of the pose. "Usually all the guys are trying to stare <i>through</i> our clothes. They don''t get to see what you do."'
@@ -875,7 +875,7 @@ if $ARGS[0] = 'show_dance_end':
 		end
 		gs'sex_ev_pillow_talk2', 'small_talk'
 	end
-	
+
 	act'Do something else':
 		cla & *clr
 		$sex_ev['bed_room']
@@ -891,7 +891,7 @@ if $ARGS[0] = 'show_dance_end2':
 		'You giggle as <<$npc_firstname[$boy]>> pulls you down, kicking off your shoes along the way as you let him pull you back into sexy times.'
 		gs'sex_ev_pillow_talk2', 'show_dance_end3'
 	end
-	
+
 	act'Shoes!':
 		cla & *clr
 		$sex_ev['bed_room']
@@ -1027,7 +1027,7 @@ if $ARGS[0] = 'dicks_are_weird':
 					'"Dicks are <i>so</i> weird," you say, experimentally squishing the flesh of his manhood between your fingers in bemusement. It twitches at your touch, causing you to pull back in alarm for a moment.'
 				else
 					'"Dicks are <i>so</i> weird," you say, experimentally squishing the hard flesh of his cock between your fingers in bemusement. It twitches at your touch, causing you to pull back in alarm for a moment.'
-				end	
+				end
 			else
 				if sex_ev['cum_count'] >= npc_sexdrive[$boy] + sex_ev['extra_cum']:
 					'"Dicks are <i>so</i> weird," you say, experimentally squishing the flesh of his manhood between your fingers in bemusement. "It was so hard, now it''s so soft. I can''t believe I had this thing inside me..."'
@@ -1058,7 +1058,7 @@ if $ARGS[0] = 'dick_compliment':
 				'<<$npc_firstname[$boy]>> looks more than a little smug after your compliment.'
 				gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 			end
-			
+
 			if $npc_dick_desc[$boy] = 'thick' or $npc_dick_desc[$boy] = 'long' or $npc_dick_desc[$boy] = 'huge' or $npc_dick_desc[$boy] = 'enormous' or $npc_dick_desc[$boy] = 'lengthy' or $npc_dick_desc[$boy] = 'gigantic' or $npc_dick_desc[$boy] = 'monster':
 				act'It''s huge':
 					cla & *nl
@@ -1067,7 +1067,7 @@ if $ARGS[0] = 'dick_compliment':
 				end
 			end
 		end
-		
+
 		if sex_ev['cum_count'] >= 5 and sex_ev['cum_count'] < npc_sexdrive[$boy] + sex_ev['extra_cum']:
 			act'How are you still hard?!':
 				cla & *clr
@@ -1081,7 +1081,7 @@ if $ARGS[0] = 'dick_compliment':
 				gs'sex_ev_pillow_talk2', 'dick_talk_topics'
 			end
 		end
-		
+
 	end
 end
 
@@ -1140,14 +1140,14 @@ if $ARGS[0] = 'morning_start_day':
 					'"It feels really good," you giggle, rubbing your thighs together, maybe still a little dick drunk.'
 					gs'sex_ev_pillow_talk', 'topic_route'
 				end
-				
+
 				act'I know you like it':
 					npc_rel[$boy] += 2
 					cla & *nl
 					'"I know you like doing it," you smile fondly. "It makes you happy, so it makes me happy too."'
 					gs'sex_ev_pillow_talk', 'topic_route'
 				end
-				
+
 				act'You''re my favorite alarm cock':
 					cla & *nl
 					'"You''re my favorite alarm cock," you giggle. "It''s the best way to wake up."'
@@ -1160,27 +1160,27 @@ if $ARGS[0] = 'morning_start_day':
 					'"Well, this is a nice way to start the day," you sigh happily, stretching out on the bed.'
 				end
 				'"Sorry I didn''t wake you first. You just looked so hot, I had to put it in while you were still asleep."'
-				
-				
+
+
 				act'I didn''t mind':
 					cla & *nl
 					'"I didn''t mind," you smile fondly. "It felt nice."'
 					gs'sex_ev_pillow_talk2', 'morning_sleep_fuck_okay'
 				end
-				
+
 				act'I loved it':
 					cla & *nl
 					'"Don''t be sorry," you say, grinning openly. "I loved it."'
 					gs'sex_ev_pillow_talk2', 'morning_sleep_fuck_okay'
 				end
-				
+
 				if $sex_ev['type'] ! 'hookup':
 					act'Next time':
 						cla & *nl
 						'"Maybe next time," you smirk wryly.'
 						gs'sex_ev_pillow_talk', 'topic_route'
 					end
-					
+
 					act'You should do it more often':
 						npc_sleep_sex_okay[$boy] = 2
 						cla & *nl
@@ -1209,13 +1209,13 @@ if $ARGS[0] = 'morning_sore_pussy':
 				'You give him a rueful smile, rubbing your thighs together over your sore pussy'
 				gs'sex_ev_pillow_talk', 'topic_route'
 			end
-			
+
 			act'Hard to stay awake':
 				gs'sex_ev_pillow_talk', 'talk_time_add'
 				sex_ev['morning_sore_pussy'] = 1
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-				if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+				if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 					'"How am I going to get through my classes today?" you say, giving <<$npc_firstname[$boy]>> a loopy smile. "If I fall asleep in school today, it''s your fault."'
 					'"I''ll take credit for that," <<$npc_firstname[$boy]>> grins.'
 				else
@@ -1234,20 +1234,20 @@ if $ARGS[0] = 'morning_sore_pussy':
 					sex_ev['morning_sore_pussy'] = 1
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-					if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+					if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 						'"We might have overdone it," you half smile, rubbing your thighs together over your sore pussy. "I still have to go to school today. My classmates are going to know you fucked me silly just by the way I walk."'
 					else
 						'"We might have overdone it," you say with a half smile, rubbing your thighs together over your sore pussy. "I''m going to walk funny for the rest of the day because of you."'
 					end
 					gs'sex_ev_pillow_talk', 'topic_route'
 				end
-				
+
 				act'Hard time sitting down':
 					gs'sex_ev_pillow_talk', 'talk_time_add'
 					sex_ev['morning_sore_pussy'] = 1
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-					if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+					if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 						'"We might have overdone it," you half smile, rubbing your thighs together over your sore pussy. "I still have to go to school. I''m going to have a hard time sitting through class the rest of the day."'
 					else
 						'"We might have overdone it," you say with a half smile, rubbing your thighs together over your sore pussy. "I''m going to have a hard time sitting down today."'
@@ -1261,7 +1261,7 @@ end
 
 
 if $ARGS[0] = 'wakeup_sex_late_for_school':
-	if sex_ev['late_for_school'] = 0 and kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and (hour = 7 or hour = 8):
+	if sex_ev['late_for_school'] = 0 and kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and (hour = 7 or hour = 8):
 		act'Late for school':
 			sex_ev['late_for_school'] = 1
 			sex_ev['sex_over'] = 1
@@ -1292,13 +1292,13 @@ if $ARGS[0] = 'wakeup_sex_late_for_school':
 						gs'sex_ev_pillow_talk', 'topic_route'
 					end
 				end
-				
+
 				act'I need to hurry':
 					cla & *nl
 					'"I gotta get out of here," you say. "I really don''t want to be late."'
 					gs'sex_ev_after', 'after_sex2'
 				end
-				
+
 				act'Worth it':
 					cla & *nl
 					'"If I am, it was still worth it," you smirk.'
@@ -1318,26 +1318,26 @@ if $ARGS[0] = 'wakeup_sex_late_for_school':
 				else
 					'"Sorry," <<$npc_firstname[$boy]>> says, the grin on his face making him not look like he means it at all.'
 				end
-				
+
 				act'I need to hurry':
 					cla & *nl
 					'"I gotta get out of here," you say. "I can''t afford to be absent too many times."'
 					gs'sex_ev_morning', 'wakeup2'
 				end
-				
+
 				act'Worth it':
 					cla & *nl
 					'"Oh well," you smirk. "That fuck was worth it."'
 					gs'sex_ev_pillow_talk2', 'morning_sex_talk'
 				end
-				
+
 				if schoolprogul = 2:
 					act'I''m gonna get kicked out of school':
 						cla & *nl
 						'"Fuck!" you swear again. "If I don''t make it by the end of first period, I''m gonna get expelled!"'
 						gs'sex_ev_morning', 'wakeup2'
 					end
-				end				
+				end
 			end
 			if cum_loc['vagina'] > 0:
 				act'Gonna leak all day':
@@ -1393,14 +1393,14 @@ if $ARGS[0] = 'morning_sleep_fuck_okay':
 			'"No," you roll your eyes. "It was fine this time, but you should still wait till I wake up."'
 			gs'sex_ev_pillow_talk', 'topic_route'
 		end
-		
+
 		act'Yes':
 			npc_sleep_sex_okay[$boy] = 2
 			cla & *nl
 			'"Sure," you smirk wryly. "Why not?"'
 			gs'sex_ev_pillow_talk', 'topic_route'
 		end
-		
+
 		act'Do whatever you want to me':
 			npc_sleep_sex_okay[$boy] = 2
 			cla & *nl
@@ -1417,7 +1417,7 @@ if $ARGS[0] = 'new_with_you_boy':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 	'"So, anything new going on with you?" <<$npc_firstname[$boy]>> asks.'
-	
+
 	act'Nothing new':
 		cla & *nl
 		'"Not really," you shrug. "Same old same old."'
@@ -1433,25 +1433,25 @@ if $ARGS[0] = 'how_was_day_boy':
 	'"How was your day?" <<$npc_firstname[$boy]>> asks.'
 	act'It was fine':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
-	
+
 	act'It was good':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
-	
+
 	act'It was bad':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
-	
+
 	act'It was okay':
 		cla & *nl
-		
+
 		gs'sex_ev_pillow_talk2', 'share_life_menu'
 	end
 end
@@ -1463,7 +1463,7 @@ end
 if $ARGS[0] = 'share_life_single':
 	if pcs_lover + pcs_girlfriends = 0:
 		act'Single now':
-			
+
 			cla
 			act'Broke up with...':
 				cla
@@ -1471,37 +1471,37 @@ if $ARGS[0] = 'share_life_single':
 					cla & *nl
 					'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
 					if npc_know_have_girlfriend[$boy] = 1 or npc_know_have_boyfriend[$boy] = 1:
-					
+
 					else
-					
+
 					end
 					gs 'sex_ev_stats', 'single_know'
 				end
-				
+
 				act'My girlfriend':
 					cla & *nl
 					'"I broke up with my boyfriend," you tell <<$npc_firstname[$boy]>>. "So I guess I''m single now."'
 					if npc_know_have_girlfriend[$boy] = 1 or npc_know_have_boyfriend[$boy] = 1:
-					
+
 					else
-					
+
 					end
 					gs 'sex_ev_stats', 'single_know'
 				end
 			end
-			
+
 		!!{	act'Got broken up with...':
 				cla
 				act'By my boyfriend':
-				
+
 				end
-				
+
 				act'By my girlfriend':
-				
+
 				end
 			end}
 		end
 	end
 end
 
---- sex_ev_pillow_talk2 ---------------------------------
+--- sex_ev_pillow_talk2 ---------------------------------

+ 24 - 24
locations/sex_ev_stats.qsrc

@@ -44,70 +44,70 @@ 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 had sex with an npc
 	npc_fuck_times[$boy] += sex_ev['fuck']
-	
+
 	!! number of times you have fucked bareback
 	npc_fuck_times[$boy] += sex_ev['no_condom']
-	
+
 	!! number of times you have fucked with condoms
 	npc_fuck_times[$boy] += sex_ev['condom']
-	
+
 	!! number of times you have been eaten out by an npc
 	npc_kuni_times[$boy] += sex_ev['kuni']
-	
+
 	!! number of times you have made your fuckbuddy cum
 	npc_cum_count[$boy] += sex_ev['cum_count']
-	
+
 	!! number of times your fuckbuddy has brought you to orgasm
 	npc_orgasm_count[$boy] += sex_ev['orgasm_count']
-	
+
 	!! number of times you have faked an orgasm
 	npc_fake_orgasm_count[$boy] += sex_ev['fake_orgasm_count']
-	
+
 	!! number of times you have been creampied by your fuckbudy
 	npc_creampie_count[$boy] += sex_ev['creampie']
-	
+
 	!! number of times you have cum together with your fuckbuddy
 	npc_cum_together_count[$boy] += sex_ev['creampie_orgasm']
-	
+
 	!! number of times your fuckbuddy has cum on your face
 	npc_facial_count[$boy] += sex_ev['facial_count']
-	
+
 	!! number of times your fuckbuddy has cum on your tits
 	npc_creampie_count[$boy] += sex_ev['cum_tits']
-	
+
 	!! number of times your fuckbuddy has pulled out
 	npc_pullout_count[$boy] += sex_ev['pullout']
-	
+
 	!! number of times your fuckbuddy has cum in your mouth
 	npc_mouth_cum_count[$boy] += sex_ev['mouth_cum_count']
-	
+
 	!! number of times you have jerked him to completion
 	npc_cum_hand_count[$boy] += sex_ev['cum_hand']
-	
+
 	!! number of times you have swallowed for your fuckbuddy
 	npc_swallow_count[$boy] += sex_ev['swallow_count']
-	
+
 	!! number of times you have spit out his cum
 	npc_spit_count[$boy] += sex_ev['spit_count']
-	
+
 	!! number of times you have fucked in the shower
 	npc_shower_sex_count[$boy] += sex_ev['shower_sex']
-	
+
 	!! number of times your fuckbuddy has cum in your mouth
 	npc_mouth_cum_count[$boy] += sex_ev['mouth_cum_count']
-	
+
 	!! number of times you have denied letting your fuckbuddy take your virginity
 	npc_virgin_deny[$boy] += sex_ev['virgin_deny']
-	
+
 	!! if your fuckbuddy takes your virginity without consent
 	npc_virgin_rapist[$boy] += sex_ev['virgin_rape']
-	
+
 	if sex_ev['sleep_fuck'] > 0: npc_sleep_fuck += 1
-	
-	if hour >= 8 and hour < 14 and week < 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
+
+	if hour >= 8 and hour < 14 and week < 6 and $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
 		!!absence from school
 		npc_school_absences[$boy] = schoolprogul
 	end
@@ -150,4 +150,4 @@ if $ARGS[0] = 'sleep_check':
 end
 
 
---- sex_ev_stats ---------------------------------
+--- sex_ev_stats ---------------------------------

+ 17 - 17
locations/sex_ev_work_talk1.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'job_talk':
 		gs'sex_ev_work_talk1', 'whats_your_job'
 	else
 !!		act'Ask him about work':
-		
+
 !!		end
 	end
 end
@@ -52,7 +52,7 @@ if $ARGS[0] = 'whats_your_job':
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
 				gs'sex_ev_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'Tease him':
 				cla & *nl
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
@@ -70,7 +70,7 @@ if $ARGS[0] = 'whats_your_job':
 				end
 				gs'sex_ev_pillow_talk2', 'small_talk'
 			end
-			
+
 		elseif $npc_occupation[$boy] = 'masseuse_sexual':
 			'"I work as a masseuse in the city," <<$npc_firstname[$boy]>> says.'
 			act'That''s cool':
@@ -78,7 +78,7 @@ if $ARGS[0] = 'whats_your_job':
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
 				gs'sex_ev_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'Tease him':
 				cla & *nl
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
@@ -90,7 +90,7 @@ if $ARGS[0] = 'whats_your_job':
 					'"Oh..." you trail off, not really sure what else to say.'
 					gs'sex_ev_pillow_talk2', 'small_talk'
 				end
-				
+
 				act'Do you fuck too?':
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh..." you trail off, not really sure what else to say.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Do I get a discount?':
 						cla & *nl
 						'"So if I show up at you work do I get a fuckbuddy discount?" you grin.'
@@ -116,7 +116,7 @@ if $ARGS[0] = 'whats_your_job':
 				'"I work at the textile factory," <<$npc_firstname[$boy]>> says.'
 			else
 				'"I work at the textile factory in the next town over," <<$npc_firstname[$boy]>> says.'
-				if mid($start_type,1,2) = 'sg':
+				if $start_loc = 'sg':
 					'"The one in Pavlovsk?"'
 					'"Yeah, how''d you know?"'
 					'"I grew up in Pav."'
@@ -154,7 +154,7 @@ if $ARGS[0] = 'whats_your_job':
 				end
 				gs'sex_ev_pillow_talk2', 'small_talk'
 			end
-			
+
 			act'Tease him':
 				cla & *nl
 				'"Oh, that''s cool. So you train lots of MILFs and cougars and young fuckable girls like me, right? In all tight pants that let you see their ass right through the spandex?" You grin, bouncing your eyebrows at him.'
@@ -177,7 +177,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh." You gulp uncomfortably, unsure of what else to say.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Nonchallant':
 						cla & *nl
 						'"Oh, all right. That''s cool I guess."'
@@ -187,7 +187,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Cool, cool."'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Impressed':
 						cla & *nl
 						'"Seriously?" You sit up on the bed.'
@@ -196,7 +196,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Not as much as you''d think," he shrugs. "Bosses gotta get their cut. I only make a percentage of what sells."'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 				elseif $npc_crime_type[$boy] = 'enforcer':
 					'"I''m an enforcer for a gang," <<$npc_firstname[$boy]>> says blatantly.'
 					act'Uncomfortable':
@@ -205,7 +205,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh." You gulp uncomfortably, unsure of what else to say.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Nonchallant':
 						cla & *nl
 						'"Oh, all right. That''s cool I guess."'
@@ -215,7 +215,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Cool, cool."'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Impressed':
 						cla & *nl
 						'"Seriously?" You sit up on the bed.'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Oh." You gulp uncomfortably, unsure of what else to say.'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Nonchallant':
 						cla & *nl
 						'"Oh, all right. That''s cool I guess."'
@@ -243,7 +243,7 @@ if $ARGS[0] = 'whats_your_job':
 						'"Cool, cool."'
 						gs'sex_ev_pillow_talk2', 'small_talk'
 					end
-					
+
 					act'Impressed':
 						cla & *nl
 						'"Seriously?" You sit up on the bed.'
@@ -256,7 +256,7 @@ if $ARGS[0] = 'whats_your_job':
 			else
 				if $npc_crime_type[$boy] = 'drug_dealer':
 					'"I work in pharmaceuticals," <<$npc_firstname[$boy]>> says.'
-					if mid($start_type,1,2) = 'sg':
+					if $start_loc = 'sg':
 						'"That''s cool. My aunt is a pharmacist too."'
 						'"Oh. Good to know."'
 					else
@@ -314,4 +314,4 @@ if $ARGS[0] = 'whats_your_job':
 	end
 end
 
---- sex_ev_work_talk1 ---------------------------------
+--- sex_ev_work_talk1 ---------------------------------

+ 7 - 7
locations/sexshop.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 
 	act 'Leave': minut += 5 & gt 'city_redlight', 'start'
 	act 'Adult toys & items': gt 'sexshop', 'sexshop_menu'
-	
+
 
 	if analplug = 1 and dildo = 1 and hotcat >= 5 and Peter = 0:
 		if rand(0,1) = 1:
@@ -101,7 +101,7 @@ if $ARGS[0] = 'start':
 									act 'How and where is it all sold?':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/city/redlight/studio_porn/pierre_2.jpg"></center>'
-										'"We mostly sell it digitally on our premium websites, but we have guys at the sauna in the residential area and in the sex shop for those who want to buy physically.' 
+										'"We mostly sell it digitally on our premium websites, but we have guys at the sauna in the residential area and in the sex shop for those who want to buy physically.'
 										'We''re thinking of moving in on the university as well- and not just selling our films there. We could possibly shoot a few films on campus. There''s a huge market for young college students and we want a slice."'
 
 										act 'Is that legal?':
@@ -166,7 +166,7 @@ if $ARGS[0] = 'sexshop_menu' or $ARGS[0] = '':
 		killvar '$message'
 	else
 		''
-	end	
+	end
 	*pl '<center><table align="center" width=80%>'
 	*P func ('$stock_item', 20, 'Lubricant', 145, 'lubri', 'sexshop', 'sexshop_menu')
 	*p func ('$single_stock_item', 5, 'Selection of porn magazines (5)', 400, 'pornMagazine', 'sexshop', 'sexshop_menu')
@@ -526,7 +526,7 @@ if $ARGS[0] = 'pip':
 		GHchance = rand(1,10)
 		ghnowcheck = ghnow * 2
 	end
-	
+
 	if ghnow > 0:'You served <<ghnow>> cocks this visit.'
 
 	act 'Leave the booth':gt 'sexshop', 'podval'
@@ -546,7 +546,7 @@ if $ARGS[0] = 'pip':
 				'You caress your pussy as you watch the film, enjoying the pleasant sensation between your legs.'
 				gs 'arousal', 'clit_finger', 5, 'masturbate'
 				gs 'arousal', 'end'
-				gs 'stat'	
+				gs 'stat'
 
 				act 'The film ends':gt 'sexshop', 'pip'
 			end
@@ -582,7 +582,7 @@ if $ARGS[0] = 'pip':
 						'After a few minutes, he stranger''s cock begins to throb and he cums in your mouth, filling it with a huge amount of thick cum. You swallow it, and once you''ve licked his cock clean, it disappears back into the hole. You hear the man sighing in satisfaction before he leaves the booth.'
 						gs 'arousal', 'bj', 5
 						gs 'arousal', 'end'
-						gs 'stat'	
+						gs 'stat'
 						if mistressqwest > 0:
 							mistressqwest += 1
 							'You have sucked <<mistressqwest - 1>> cocks for Mistress.'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'kendra':
 			meet_kendra = 1
 			npc_rel['A84'] = 45
 			'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend01.jpg"></center>'
-			if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+			if $start_loc = 'sg' and SchoolAtestat = 0:
 			  'You ask her about her clothes and start talking with her. You tell her that you live in Pavlovsk and are in your final year of school and she replies by saying that she''s a student from the Republic of Congo and is attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says "You''re very pretty. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'
 			else
 			  'You ask her about her clothes and start talking with her. You tell her a bit about yourself and she replies by saying that she''s a student from the Republic of Congo and is attending the local university on a student visa. You talk about a wide range of subjects for a while before she eventually says "You''re very pretty. I love making pretty little Russian bitches my slaves. Call me Mistress Kendra, <<$pcs_nickname>>, and become mine." Should you call her mistress? You have no doubt where that will lead.'

+ 6 - 6
locations/sitrPar.qsrc

@@ -62,7 +62,7 @@ if $ARGS[0] = '':
 			pcs_mood += 100
 			gs 'food', 'l_meal'
 			gs 'stat'
-			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten as everyone is has fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside as your mother gives you an envelope with a greeting card and 5000 <b>₽</b>.' 
+			'You sit at the festive table laid in front of the TV and celebrate the New Year with your family, the TV providing some background noise. At the table, people strike up a conversation and common problems are forgotten as everyone is has fun talking to each other. At midnight, everyone wishes one another a happy New Year and enjoys the champagne and fireworks outside as your mother gives you an envelope with a greeting card and 5000 <b>₽</b>.'
 			'You continue to watch TV and enjoy the champagne and company of your family, but everyone eventually grows tired and they go to bed, one by one.'
 
 			act 'Leave': gt 'korrPar'
@@ -93,13 +93,13 @@ if $ARGS[0] = '':
 	elseif locat['Mother'] = 24:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka1.jpg"></center>'
-		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
+		if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6:
 			if CloStyle2 = 4:
-				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing here? Go to school, now!" She practically pushes you out of the apartment and closes the door.' 
+				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing here? Go to school, now!" She practically pushes you out of the apartment and closes the door.'
 				act 'Continue': gt 'pod_ezd','etaj_2'
 			else
 				gs 'wardrobe', 'school_outfit'
-				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing here and ehy are you not wearing your uniform? Get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform. After that, she practically pushes you out of the apartment and closes the door.' 
+				'As you walk into the living room, you see your mother sweeping the floor. She looks up and gives you a disappointed look. "What are you still doing here and ehy are you not wearing your uniform? Get changed and go to school, now!" She follows you back to your room and watches as you change into your uniform. After that, she practically pushes you out of the apartment and closes the door.'
 				act 'Continue': gt 'pod_ezd','etaj_2'
 			end
 		else
@@ -112,7 +112,7 @@ if $ARGS[0] = '':
 		!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/momvladtv.jpg"></center>'
 		'As you walk into the living room, you see your mother and Vladimir sitting on the couch watching TV.'
 		act 'Leave':gt 'korrPar'
-		
+
 		act 'Join them':
 			cla & *clr
 			pcs_mood += 10
@@ -124,7 +124,7 @@ if $ARGS[0] = '':
 			!!'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/familytv.jpg"></center>'
 			'You move over to join them, and your mother scoots away from Vladimir and pats the spot between her and him. You take a seat between them and Vlad barely even glances at you with a brief smile before he goes back to watching TV. Your mother pats you on the shoulder before returning her attention to the TV, apparently happy the family is spending time together.'
 			act 'Leave':gt 'korrPar'
-			
+
 			act 'Keep watching':gt 'sitrPar', 'TVfam'
 			act 'Finish watching':gt 'sitrPar', 'TVend'
 		end

+ 11 - 11
locations/sleep.qsrc

@@ -97,9 +97,9 @@ if $ARGS[0] = 'full':
 				gs 'underwear', 'wear'
 			end
 			if disable_autosave = 0:
-				if mid($start_type,1,4) = 'city':
+				if $start_loc = 'city':
 					savegame 'autosave_city.sav'
-				elseif mid($start_type,1,3) = 'uni':
+				elseif $start_loc = 'uni':
 					savegame 'autosave_uni.sav'
 				else
 					savegame 'autosave_sg.sav'
@@ -168,7 +168,7 @@ if $ARGS[0] = 'sleep':
 	end
 	pcs_hairbsh = 0
 	pain['killer'] = 0
-	if mid($start_type,1,2) = 'sg' and $loc ! 'bedrPar' and SchoolAtestat = 0:
+	if $start_loc = 'sg' and $loc ! 'bedrPar' and SchoolAtestat = 0:
 		notathomesleep += 1
 	else
 		notathomesleep = 0
@@ -521,7 +521,7 @@ if $ARGS[0] = 'wake_horny':
 end
 
 if $ARGS[0] = 'wake':
-	if mid($start_type,1,2) = 'sg' and locat['Fam_inGad'] = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
+	if $start_loc = 'sg' and locat['Fam_inGad'] = 0 and motherQW['bathroom_dildos'] > 0 and MarishaQW["marisha_sleepover"] = 0:gt'mother_sextalk','dildo_wakeup1'
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
@@ -533,7 +533,7 @@ if $ARGS[0] = 'wake':
 	if MarishaQW["marisha_sleepover"] = 1: gs 'marisha_ev', 'morning'
 	if daystart < 10 and $start_type[1] = 'tg':'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
 	if daystart >= 10 and daystart < 30 and $start_type[1] = 'tg':'Looking at your female body, you are still a little surprised it''s actually you.'
-	if slept_in = 1 and kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14 and suspended['on'] ! 1:
+	if slept_in = 1 and kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 9 and hour < 14 and suspended['on'] ! 1:
 		if schoolprogul > 2 and schoolPredupr = 2:
 			pcs_mood -= 35
 			gs 'stat'
@@ -552,7 +552,7 @@ if $ARGS[0] = 'wake':
 			msg '<center>Damn it''s <b><<$mid(100+hour,2,2)>>:<<$mid(100+minut,2,2)>></b>. It''s too late to go to school now!<br><<$npc_nickname[''A29'']>> will be very upset if I''m not at school every day.</center>'
 		end
 	end
-	if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
+	if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9:
 		if slept_in = 1 and (hour = 7 or hour = 8) and suspended['on'] ! 1:
 			pcs_mood -= 10
 			gs 'stat'
@@ -589,7 +589,7 @@ if $ARGS[0] = 'wake':
 			end
 			gs 'sleep', 'end'
 		end
-		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
+		if kanikuli = 0 and $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour >= 4 and hour < 9 and suspended['on'] ! 1:
 			act 'Full morning routine for School (01:00)':
 				fullmorrout = 1
 				minut += 15
@@ -652,9 +652,9 @@ if $ARGS[0] = 'succhoice':
 	'<font color="red"><b>You also feel that both are <i>permanent</i> choices.</b></font>'
 	act 'Try to ignore it and go to sleep':
 		if disable_autosave = 0:
-			if mid($start_type,1,4) = 'city':
+			if $start_loc = 'city':
 				savegame 'autosave_city.sav'
-			elseif mid($start_type,1,3) = 'uni':
+			elseif $start_loc = 'uni':
 				savegame 'autosave_uni.sav'
 			else
 				savegame 'autosave_sg.sav'
@@ -682,9 +682,9 @@ if $ARGS[0] = 'succhoiceNO':
 	gs 'stat'
 	act 'Go to sleep':
 		if disable_autosave = 0:
-			if mid($start_type,1,4) = 'city':
+			if $start_loc = 'city':
 				savegame 'autosave_city.sav'
-			elseif mid($start_type,1,3) = 'uni':
+			elseif $start_loc = 'uni':
 				savegame 'autosave_uni.sav'
 			else
 				savegame 'autosave_sg.sav'

+ 9 - 9
locations/soniadisco.qsrc

@@ -5,11 +5,11 @@
 
 if $ARGS[0] = 'cikl':
 !!Making Sonia''s fall progress if the player do not see the scenes at the disco, by making it such that if at a Sunday her fall have not advanced this weekend it will automatically advance.
-	if mid($start_type,1,2) = 'sg' and week = 7 and soniaPS = 0 and month > 9 and daystart >= soniafallDay + 6:
+	if $start_loc = 'sg' and week = 7 and soniaPS = 0 and month > 9 and daystart >= soniafallDay + 6:
 		if soniafall < 7:
 			soniafallDay = daystart -1
 			soniafall += 1
-		else	
+		else
 			soniaPS = 1
 			soniaPSdays = daystart
 			npc_grupTipe['A25'] = 5
@@ -174,7 +174,7 @@ if $ARGS[0] = 'soniashowsboobs':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'disco':
 	menu_off = 0
 	*clr & cla
@@ -441,7 +441,7 @@ if $ARGS[0] = 'dance':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/2.jpg"></center>'
 			'You tell her, "You have a nice set of boobs, Sonia. I can see why you''d be so willing to show them off to the world."'
 			'She looks at you with a slightly puzzled look on her face but never stops dancing. "Wha- what are you talking about?"'
-			'With a grin, you put your hand on her other shoulder and slide that strap down too, fully exposing her breasts to everyone looking her way. She barely notices and doesn''t understand why you are staring at her so intently. Once you walk away, she dances with both her breasts bouncing freely for several minutes before some guy''s pawing at her exposed breasts finally make her notice. She blushes but also laughs about it, pulling her top back in place.' 
+			'With a grin, you put your hand on her other shoulder and slide that strap down too, fully exposing her breasts to everyone looking her way. She barely notices and doesn''t understand why you are staring at her so intently. Once you walk away, she dances with both her breasts bouncing freely for several minutes before some guy''s pawing at her exposed breasts finally make her notice. She blushes but also laughs about it, pulling her top back in place.'
 			gs 'arousal', 'erotic_nudity', 10
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'walkhome':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'chasesonia':
 	*clr & cla
 	minut += 5
@@ -1176,7 +1176,7 @@ if $ARGS[0] = 'dance1':
 	act 'Ignore Sonia': gt 'pav_disco'
 	act 'Follow Sonia': gt 'soniadisco', 'followsonia'
 end
-	
+
 if $ARGS[0] = 'soniabang':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/disco/gangbang2.jpg"></center>'
@@ -1563,7 +1563,7 @@ if $ARGS[0] = 'strapon_fucked':
 		end
 	end
 end
-	
+
 if $ARGS[0] = 'strapon_fucking':
 	*clr & cla
 	gs 'stat'
@@ -1623,7 +1623,7 @@ if $ARGS[0] = 'strapon_anal':
 		'You finally work the full length up her ass until your hips and the leather of the harness are slapping against her butt cheeks. Then you start fucking her ass with firm strokes that bottom the dildo out in her butt. She bites her lower lip, and you can tell it hurts, but you also know at least part of her is enjoying this. As you start to really pound her little ass, she finally says, "Not so hard, <<$pcs_nickname>>."'
 		gs 'arousal', 'anal_strap_give', 5, 'lesbian'
 		gs 'stat'
-		act 'Ease up': 
+		act 'Ease up':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/sonia/sex/home/bedroom/strapon/straponanal1.jpg"></center>'
 			'You decide to take pity on her and ease up a bit. You no longer fuck her with the full length of the shaft and try to read her body language, adjusting your speed and depth to what makes her moan the most. After a few minutes of this, her body is wracked by another orgasm. With that, you finally pull the dildo out of her and start taking off the harness. "Now you''re going to eat my pussy," you tell her.'
@@ -1721,4 +1721,4 @@ if $ARGS[0] = 'strapon_eaten':
 	end
 end
 
---- soniadisco ---------------------------------
+--- soniadisco ---------------------------------

+ 13 - 12
locations/stat.qsrc

@@ -519,16 +519,16 @@ if minut >= 60:
 	if pcs_stam > stammax: pcs_stam = stammax
 
 	gs 'femcyc'
-	
+
 	if Insleep = 0 and period['cramp'] = 0 and placebopart > 0 and LutH > 0 and knowpreg = 0:
 		period['cramp'] = 1
 		msg'Your stomach suddenly twinges, muscles tightening with involuntarily contractions, causing you to nearly double over in pain. With a grimace, you realize it''s probably a sign your period is going to start soon.'
 	elseif mesec > 0:
 		period['cramp'] = 0
 	end
-	
+
 	!! code to trigger vomitting based on morning sickness, hangovers, or just plain bad luck
-    if Insleep = 0:   
+    if Insleep = 0:
 		vomit['daily_check'] = 0
     end
 
@@ -539,12 +539,12 @@ if minut >= 60:
 		    	vomit['hangover'] = 1
 		     elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
 		    	 vomit['morning_sick'] = 1
-		     elseif rand(1,100) = 100: 
+		     elseif rand(1,100) = 100:
 		    	vomit['unlucky'] = 1
             end
 		end
 	end
-	
+
 	if hypnoAddict > 0:dynamic $hypnoAddiction
 
 	!!mana regen
@@ -599,10 +599,10 @@ if minut >= 60:
 	if SLomka > 0 and pcs_mood > 10:SLomka += 1 & pcs_mood -= pcs_mood / 10
 	if SLomka > 100 and StrongNarkota <= 0:SLomka = 0 & SNarkTimes = 0
 	if jointhigh > 0: jointhigh -= 1
-	
+
 	if narkoman = 1 and narkday ! daystart:
 		pcs_health -= 5
-		if pcs_mood > 40: 
+		if pcs_mood > 40:
 			pcs_mood -= 40
 		else
 			pcs_mood = 5
@@ -615,12 +615,12 @@ if minut >= 60:
 		elseif pcs_traits['commando_lvl'] = 1:
 			mosol += 1
 		end
-		
+
 		if mosol >= 100: pcs_mood -= 5
 
 		if mosol >= 60 and pain['pubic'] < 80: gs 'pain', 1, 'pubic', 'ache'
 	end
-	
+
 
 	if pcs_energy > 100:
 		fat += (pcs_energy - 100) / 4
@@ -887,9 +887,9 @@ else
 					end
 				end
 			end
-!!{			
+!!{
 			if $braworntype = 'none':
-				
+
 			end}
 		end
 
@@ -1239,7 +1239,7 @@ if hotelRoom['city_hotel'] > 0:
 	end
 end
 
-if hour >= 8 and hour < 14 and week < 6 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
+if hour >= 8 and hour < 14 and week < 6 and $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
 	!!absence from school
 	schoolprogul += 1
 	schoolProgulDay = daystart
@@ -1352,5 +1352,6 @@ end
 
 if arrsize('$FuckBuddy') > 0  and hour > 1: gs 'booty_call', 'SMS raiser'
 
+if $start_loc = '' : $start_loc = iif(instr($start_type,'_'),$STRFIND($start_type,'^\w*(?=_)'),$start_type)
 --- stat ---------------------------------
 

+ 22 - 22
locations/stat_display.qsrc

@@ -68,7 +68,7 @@ if Enable_showstatimg = 1:
 		$img_temp = FUNC('$body_image','bodysuit')
 		if $img_temp ! null:  $stat_imgextra_msg += '<a href="exec:view ''<<$img_temp>>''"><img <<$set_statimgh>> src="<<$img_temp>>"></a> '
 	end
-	
+
 	if Enable_statimg_shoes = 0:
 		$stat_imgtool_msg += ' <a href="exec:Enable_statimg_shoes = 1 & gs ''$menu_obnovit''">◇Shoes</a>'
 	else
@@ -96,7 +96,7 @@ gs 'emp_functions', 'evt_day_suffix'
 if timeHidden = 0: $stat_msg += '<BR><<$stat_android>> <<$week[week]>> <<day>><<$date_suffix>> <<$month>> <<year>>'
 $stat_android += '<<$week[week]>> <<day>>/<<month>>, <<money>> ₽, <a href="exec:clr & pl $stat_android">Status</a>'
 ! $stat_android for short desc in android mode, $stat_msg for status bar.
-if mid($start_type,1,2) = 'sg' and SchoolAtestat ! 1 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
+if $start_loc = 'sg' and SchoolAtestat ! 1 and $holyday ! '': $stat_msg += '<BR><<$holyday>>' & $stat_msg += '<BR>'
 if birthday = day and birthmonth = month: $stat_msg += '<BR><b>Today is your birthday.</b>' & $stat_msg += '<BR>'
 if telefon['UnreadSMS'] > 0: $stat_msg += '<BR><b>You have <<telefon[''UnreadSMS'']>> unread message(s).</b><BR>'
 killvar '$evt_suffix'
@@ -298,7 +298,7 @@ if hypnoAddict > 0:
 	end
 end
 if therapistday ! daystart and hypnoSchedule = 1:
-	if $stat_hypno_msg ! '': 
+	if $stat_hypno_msg ! '':
 		$stat_hypno_msg += '<br>'
 		$stat_hypno_tooltip += '<br>'
 	end
@@ -355,10 +355,10 @@ if SchoolBlock = 0:
 		$stat_school_schedule = ''
 	end
 
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
 		$stat_school_msg = 'You have to be at school before 07:55 if you don''t want to be late.'
 		$stat_school_tooltip = 'School starts at 07:55.'
-	elseif mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
+	elseif $start_loc = 'sg' and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
 		$stat_school_msg = 'You have detention this morning and must be at school before 09:00.'
 		$stat_school_tooltip = 'Detention starts at 09:00.'
 	else
@@ -1102,7 +1102,7 @@ if cheatStatusIcons = 0:
 	elseif menu_off = 1 and cheatSlut = 0:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/vagina.png"></a></td>'
 	end
-	
+
 	if menu_off = 0 and birth_control['remind_icon'] = 1:
 		if tabletki = 0 and pillsleft[ptype] = 0:
 			$statusIconBarTab += '<td><a href="exec:msg ''You are out of birth control pills!''"><img title="It''s time to take your birth control pill, but you are out of pills" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
@@ -1112,7 +1112,7 @@ if cheatStatusIcons = 0:
 	elseif menu_off = 1 and birth_control['remind_icon'] = 1:
 		$statusIconBarTab += '<td><a href="exec:msg $stat_disable_msg"><img title="<<$stat_disable_msg>>" height = <<set_siconht>> src="images/system/icons/status/bc_pill.png"></a></td>'
 	end
-	
+
 	if mesec > 0 and isprok = 0 and isprokp = 0:
 		$stat_bleed_msg = 'You need to use your feminine hygiene products'+iif($pantyworntype = 'none', ' and you need to also wear panties if you want to use a sanitary pad.', '.')
 		$statusIconBarTab += '<td><a href="exec:msg $stat_bleed_msg"><img title="<<$stat_bleed_msg>>" height = <<set_siconht>> src="images/system/icons/status/vperiod_bleeding.png"></a></td>'
@@ -1296,7 +1296,7 @@ if cheatStatusIcons = 0:
 				$stat_masseuse_msg += '17:00, '
 			end
 			$stat_masseuse_msg += 'and you have worked <<masseuse[''shifts_worked'']>> of the required <<masseuse[''shifts_required'']>> shifts.'
-		
+
 			$statusIconBarTab += '<td><a href="exec: msg $stat_masseuse_msg"><img title="<<$stat_masseuse_msg>>" height = <<set_siconht>> src="images/system/icons/status/masseuse.png"></a></td>'
 		end
 	end
@@ -1329,7 +1329,7 @@ if cheatStatusIcons = 0:
 		$stat_volleyball_msg = 'There is volleyball tournament today at 18:00.'
 		$statusIconBarTab += '<td><a href="exec: msg $stat_volleyball_msg"><img title="<<$stat_volleyball_msg>>" height = <<set_siconht>> src="images/system/icons/status/volleball.png"></a></td>'
 	end
-	
+
 	if pfilmNO ! 1:
 		if pornstar['icon'] = 1 and pornstar['icon_disable'] ! daystart:
 		   if hour < 11:
@@ -1344,7 +1344,7 @@ if cheatStatusIcons = 0:
 			end
 		end
 	end
-	
+
 	$statusIconBarTab += '</tr><tr>'
 
 	!!Row 5: Clothes,...
@@ -1695,7 +1695,7 @@ else
 	if pcs_lovers[0] = 1:gs'show_table', 'BF <<$loverdesc[0]>>: <<loverrelation[0]>>','2'
 	if pcs_lovers[1] = 1:gs'show_table', 'BF <<$loverdesc[1]>>: <<loverrelation[1]>>','2'
 	if pcs_lovers[2] = 1:gs'show_table', 'BF <<$loverdesc[2]>>: <<loverrelation[2]>>','2'
-	if mid($start_type,1,2) = 'sg':
+	if $start_loc = 'sg':
 		if npc_rel['A29'] > 0:gs'show_table','Mother: <<npc_rel[''A29'']>>','2'
 		if npc_rel['A28'] > 0:gs'show_table','Father: <<npc_rel[''A28'']>>','2'
 		if npc_rel['A33'] > 0:gs'show_table','Sister: <<npc_rel[''A33'']>>','2'
@@ -1948,9 +1948,9 @@ if enable_extra_msg = 1:
 	$stat_msg += $stat_clothes_text
 
 	if SchoolBlock = 0:
-		if $stat_school_msg ! '' and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
+		if $stat_school_msg ! '' and $start_loc = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and week < 6 and hour < 9:
 			$stat_msg += '<BR><b><<$stat_school_msg>></b>'
-		elseif $stat_school_msg ! '' and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
+		elseif $stat_school_msg ! '' and $start_loc = 'sg' and SchoolAtestat = 0 and week = 6 and hour < 9 and detention_set = 1 and SchoolAtestat = 0:
 			$stat_msg += '<BR><b><<$stat_school_msg>></b>'
 		end
 	end
@@ -2003,20 +2003,20 @@ end
 if StrongNarkota > 20 or jointhigh > 0:$stat_msg += '<BR><b><font color="red">You are stoned.</font></b>'
 if amphHigh > 0: $stat_msg += '<BR><b><font color="red">You feel a little wired.</font></b>'
 
-!!--------------- mid($start_type,1,2) = 'sg' Events (Start) ------------------------
+!!--------------- $start_loc = 'sg' Events (Start) ------------------------
 
-if mid($start_type,1,2) = 'sg' and sisboyday + 1 = daystart and hour < 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or (npc_QW['A33'] >= 9 and sisboytrioQW ! 1)):$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister not to go into your room at 16:00.'
-if mid($start_type,1,2) = 'sg' and sisboyday + 1 = daystart and hour < 18 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 16:00.'
+if $start_loc = 'sg' and sisboyday + 1 = daystart and hour < 18 and (npc_QW['A33'] = 3 or npc_QW['A33'] = 5 or npc_QW['A33'] = 7 or (npc_QW['A33'] >= 9 and sisboytrioQW ! 1)):$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister not to go into your room at 16:00.'
+if $start_loc = 'sg' and sisboyday + 1 = daystart and hour < 18 and sisboytrioQW = 1:$stat_msg += '<BR>' & $stat_msg += '<BR>You promised your sister to meet her in your room at 16:00.'
 
-if mid($start_type,1,2) = 'sg' and day = nyp_day and month = 12 and SchoolAtestat = 0 and hour >= 5 and hour <= 14 and mid($start_type,1,2) = 'sg':
+if $start_loc = 'sg' and day = nyp_day and month = 12 and SchoolAtestat = 0 and hour >= 5 and hour <= 14 and $start_loc = 'sg':
 	$stat_msg += '<BR>At 14:00, your school''s New Year''s party will start.'
-elseif mid($start_type,1,2) = 'sg' and InvitationToDimkaNYparty = 1 and month = 12 and day = 31:
+elseif $start_loc = 'sg' and InvitationToDimkaNYparty = 1 and month = 12 and day = 31:
 	$stat_msg += '<BR><b>Go to the residential area between 15:00 and 18:00 to go to Dimka''s New Year party.</b>'
 end
-if mid($start_type,1,2) = 'sg' and gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight.</b>'
-if mid($start_type,1,2) = 'sg' and nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight.</b>'
+if $start_loc = 'sg' and gopnik_initiation = 1 and gopnik_initiation_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Meet Lena and Lera at the apartment garages at eight.</b>'
+if $start_loc = 'sg' and nerd_night_game = 1 and nerd_night_game_day = daystart and hour > 15 and hour < 21: $stat_msg += '<BR><b>Join nerds at the community center at eight.</b>'
 
-!!--------------- mid($start_type,1,2) = 'sg' Events (End) ------------------------
+!!--------------- $start_loc = 'sg' Events (End) ------------------------
 
 if accessible_property['city_house'] = 1 and accessible_property['old_town_apartment'] > 0:
 	$stat_msg += '<BR>You have rented an apartment in the city residential area, which is paid up for <b><<func(''homes_properties'', ''get_rent_days'', ''city_apartment'')>></b> days, and you also have an apartment in Pushkin, which is paid up for <b><<func(''homes_properties'', ''get_rent_days'', ''old_town_apartment'')>></b> days. Utilities are due on the 25th of <<$month>>.'
@@ -2421,4 +2421,4 @@ if bimbowithdrawal > 14:
 	msg 'You suddenly feel as if your head is clear, instead of filled with pink thoughts.'
 end
 
---- stat_display ---------------------------------
+--- stat_display ---------------------------------

+ 3 - 3
locations/street_event.qsrc

@@ -564,7 +564,7 @@ if $ARGS[1] = 'main':
 			exit
 		end
 
-		if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,4) = 'city':
+		if pcs_magik >= 1 and mainQW = 0 and $start_loc = 'city':
 			*clr & cla
 			menu_off = 1
 			mainQW = 1
@@ -579,7 +579,7 @@ if $ARGS[1] = 'main':
 	!!end home-related events
 
 	!!street incidental events
-!!Can this be changed. How it is coded now it is really hard to add new random street events with how the code is done. How it was meant to be is the first group can happen anywhere, second group in the city only and thirds group in Pav. Perhaps doing it like you did the school breaks would be a better way than it currently is so we can add new events easily in the future. 
+!!Can this be changed. How it is coded now it is really hard to add new random street events with how the code is done. How it was meant to be is the first group can happen anywhere, second group in the city only and thirds group in Pav. Perhaps doing it like you did the school breaks would be a better way than it currently is so we can add new events easily in the future.
 	if streetrand > 90:
 		streetrand = rand(0,100)
 		if streetrand > 98:
@@ -1983,7 +1983,7 @@ if $ARGS[0] = 'rape':
 		end
 	end
 
-	act 'Fight back': 
+	act 'Fight back':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/locations/shared/street/alleynight.jpg"></center>'
 		'You hesitate a moment, relaxing your body, making him think you''re about to submit. Then without warning, you throw your head back, smashing it into your attacker''s forehead. He stumbles backward and you bring your hands up. You''re not going to go down on this guy without a fight!'

+ 20 - 20
locations/telefon.qsrc

@@ -667,7 +667,7 @@ end &! --- phone_call_receive ---
 
 if $ARGS[0] = 'phone_balance':
 	if subscription['monthly_calls'] = 0 and subscription['metered_calls'] < 4:
-		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		if subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 			$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 		elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 			$contractmessage = '<font size=6>Not enough minutes left on your contract to make a call</font><br>'
@@ -711,11 +711,11 @@ if $ARGS[0] = 'phone_call_reject':
 end &! --- phone_call_reject ---
 
 if $ARGS[0] = 'Phone_megafon':
-	if subscription['monthly_calls'] = 1: 
-		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>' 
+	if subscription['monthly_calls'] = 1:
+		$contractmessage = 'You have a valid monthly contract that will renew on <<subscription[''monthly_calls-date'']>>/<<month+1>>'
 	elseif subscription['metered_calls'] = 1:
-		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left' 
-	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0: 
+		$contractmessage = 'You have a valid minutes based contract that still has <<subscription[''metered_calls'']>> minuets left'
+	elseif subscription['monthly_calls'] = 0 and subscription['monthly_calls-date'] > 0:
 		$contractmessage = '<font size=6>Your mobile contract has expired, you have renew it or buy some minutes.</font><br>'
 	elseif subscription['metered_calls'] < 4 and subscription['metered_calls-date'] > 0:
 		$contractmessage = '<font size=6>You have a minute based plan, but it doesn''t have enough minutes left to make a call</font><br>'
@@ -1334,7 +1334,7 @@ if $ARGS[0] = 'Phone_notebook':
 		if m1 = 6 and d1 = 13:$calendarday += $list + 'National holiday'
 		if m1 = 11 and d1 = 4:$calendarday += $list + 'Unity Day'
 
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0:
+		if $start_loc = 'sg' and SchoolAtestat = 0:
 			if m1 = 1 and d1 = 1:$calendarday += $list + 'First day of Winter break.'
 			if m1 = 1 and d1 = 15:$calendarday += $list + 'Last day of Winter break.'
 			if m1 = 3 and d1 = 20:$calendarday += $list + 'First day of Spring break.'
@@ -1360,7 +1360,7 @@ if $ARGS[0] = 'Phone_notebook':
 !!		if maidqw > 0:$calendarday += '<br>&emsp;<b>•</b> Working as maid. <i>(16:00 - 19:00)</i>'
 		if pfilmday[i] > 0:$calendarday += $list + 'Porn shoot: <i><<$porndesc[pfilmday[i]]>></i>'
 		if d1 = 25 and (BurgerQW['Secretary'] = 1 or workKafe['job'] = 1 or workhosp = 1 or worksalon = 1 or tanwork = 1 or workSec = 1 or workFabrika = 1):$calendarday += $list + '<i>Pay day!</i>'
-		if d1 = nyp_day and m1 = 12 and SchoolAtestat = 0 and mid($start_type,1,2) = 'sg':$calendarday += $list + 'New Year''s party at 14:00!'
+		if d1 = nyp_day and m1 = 12 and SchoolAtestat = 0 and $start_loc = 'sg':$calendarday += $list + 'New Year''s party at 14:00!'
 		if (npc_QW['A33']-2) mod 2 = 1 and sisboyday+1 = daynum:
 			if sisboytrioQW = 1:
 				$calendarday += $list + '<font color="orange">Threesome with Anya and Roma at 18:00</font>'
@@ -1663,8 +1663,8 @@ end
 !{
 	Send SMS lists the current contacts, then clicking on a contact gives a list of messages that can be sent.
 	Receive messages lists the sms messages sent to the player, these can be deleted, they will be in bold until read.
-	
-	To add an incoming message 
+
+	To add an incoming message
 	gs 'telefon', 'add_sms', 'A1', 'Test message the text goes here', 'images/pc/activities/phone/selfies/bathroom/underwear/1.jpg', 'images/pc/activities/phone/selfies/school_bathroom/pussyflash/1.jpg'
 	A1 is the NPC code (A1 is Dmitriy Nosov "Dimka")
 	You can have up to 4 pictures attached to the message
@@ -1688,19 +1688,19 @@ end
 	$SMSPicture4[] = url for fourth picture sent as part of the message
 	SMSMessageRead[] = 0 unread, 1 read
 
-	Send Messages 
+	Send Messages
 	$SMSSendContact[] = NPC code for contact. ('A129', 'A29', 'B13', 'C14') that sent the sms
 	$SMSSendMessage[] = text for the sms message
 	$SMSSendCode[] = Code to execute for Incoming call
 	SMSSendRepeatable[] = 0 delete option after send, 1 don't delete option
-	$SMSSendDeleteId[] = id passed by the caller 
+	$SMSSendDeleteId[] = id passed by the caller
 }
 
 if $ARGS[0] = 'Phone_sms':
 	$telefon['body'] = '
 	<font size=6>SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	
+
 	$telefon['body'] += '<b><a href="exec:gs ''telefon'', ''send_sms''">Send new SMS</a></b><br>'
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%"><TR><TH>Icon</TH><TH>Name</TH><TH align="right">Received</TH><TH></TH></TR>'
 
@@ -1718,7 +1718,7 @@ if $ARGS[0] = 'Phone_sms':
 		else
 			$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 			$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-		end 
+		end
 
 		if SMSMessageRead[i] = 0: telefon['UnreadSMS'] += 1
 		$telefon['body'] += dyneval($telefon['SMS'],i,$telefonCon['Icon'],$telefonCon['NPCName'],$SMSTime[i],SMSMessageRead[i])
@@ -1732,7 +1732,7 @@ if $ARGS[0] = 'Phone_sms':
 	killvar 'i'
 end &! --- Phone_sms ---
 
-!{ 
+!{
 	New SMS Message
 	If NPC is not in the contacts list of the phone it will be displayed as unknown until the contact has been added
 	$ARGS[1] = NPC code for contact. ('A129', 'A29', 'B13', 'C14')
@@ -1768,7 +1768,7 @@ if $ARGS[0] = 'delete_sms':
 	telefon['SMSCount'] -= 1
 	if $ARGS[2] = 'all' and telefon['SMSCount'] > 0 :
 		gs 'telefon','delete_sms','0','all'
-	end	
+	end
 	gs 'telefon', 'Phone_sms'
 end
 
@@ -1788,7 +1788,7 @@ if $ARGS[0] = 'show_sms':
 	else
 		$telefonCon['NPCName'] = $npc_nickname[$contact[telefon['contactid']]]
 		$telefonCon['Icon'] = $contactIcon[telefon['contactid']]
-	end 
+	end
 
 	!!If file extension is not given, .png is assumed
 	if instr($telefonCon['Icon'],'.') = 0:
@@ -1824,9 +1824,9 @@ if $ARGS[0] = 'show_sms':
 end
 
 !! This is the formatting function for a row in the SMS message table. SHould be run as a DYNEVAL()
-!{	
+!{
 	SMS Row in messages table
-	ARGS[0] = message id 
+	ARGS[0] = message id
 	$ARGS[1] = NPC icon
 	$ARGS[2] = NPC Nickname
 	$ARGS[3] = Time received
@@ -1869,12 +1869,12 @@ if $ARGS[0] = 'send_sms':
 	$telefon['body'] = '
 	<font size=6>Send SMS</font><br>
 	<img src="images/system/phone/theme/<<$phonetheme_name[pcs_phonetheme]>>/<<iif(telefon[''UnreadSMS'']=0,''icon_sms.png'',''icon_sms_new.gif'')>>" height="80" width="80"><br>'
-	if $subscription['metered_calls'] = 1 and $subscription['sms_limit'] > 0: 
+	if $subscription['metered_calls'] = 1 and $subscription['sms_limit'] > 0:
 		$telefon['body'] += '<br/>'
 		$telefon['body'] += '<b>You still can send <<$subscription[''sms_limit'']>> text messages on your contract</b>'
 	end
 !! Colour correction for editor ''''
-	
+
 	$telefon['body'] += '<TABLE cellspacing="0" width="80%">'
 	!!iterating all Contacts
 	i=0

+ 56 - 78
locations/therapist.qsrc

@@ -11,7 +11,7 @@ $loc = 'pav_clinic'
 $location_type = 'public_indoors'
 thingsTheTherapistLikes = 0
 if age < 18:thingsTheTherapistLikes += 1
-if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:thingsTheTherapistLikes += 1
+if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:thingsTheTherapistLikes += 1
 
 if $ARGS[0] = '':
 	$cumdesciption3 = ''
@@ -242,7 +242,6 @@ if $ARGS[0] = 'therapyOptions':
 			$therapyTalkMessage = 'You talk about your troubles at school'
 			$therapyTalkMessage[1] = '"I''ve been having some trouble fitting in at school. I would like some help with that," you say.'
 			dynamic $therapyMethod
-
 		end
 	end
 
@@ -399,12 +398,10 @@ if $ARGS[0] = 'hypno':
 				end
 			elseif $therapy = 'trauma':
 				pcs_childtrauma -= rand(2,4)
-				if pcs_childtrauma > 0:
-					$session = 'You are able to observe the events that happened to you without the sharp emotional effect. You still feel the emotions, but they are no longer enormous, and you can put them aside."'
-				else
+				$session = 'You are able to observe the events that happened to you without the sharp emotional effect. You still feel the emotions, but they are no longer enormous, and you can put them aside."'
+				if pcs_childtrauma <= 0:
 					killvar 'pcs_childtrauma'
 					npc_rel['A217'] = 20
-					$session = 'You are able to observe the events that happened to you without the sharp emotional effect. You still feel the emotions, but they are no longer enormous, and you can put them aside."'
 					'...'
 					'...'
 					'...'
@@ -642,7 +639,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'"Very Good, Cunt. Untouched girls are wasted on boys these days. You must be in school right?"'
-							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+							if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
@@ -668,7 +665,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'"Such a shame, Are you enrolled in school?"'
-							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+							if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									cla
 									*clr
@@ -703,7 +700,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'Very good, a fresh young virgin. Are you in school?'
-							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+							if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
@@ -734,7 +731,7 @@ if $ARGS[0] = 'firstHypnoStage':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
 							'No? That''s too bad. Are you in school?'
-							if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+							if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 								act 'Yes, <i>Master</i>':
 									*clr & cla
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
@@ -1244,7 +1241,7 @@ if $ARGS[0] = 'fuck':
 	'<<$hypnofuck>> As soon as he is inside your pussy, he starts to fuck you.'
 	if stat['think_virgin'] = 1 and pcs_vag = 0:
 		gs 'pain', 5, 'vaginal', 'stretch'
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+		if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 			'You feel a sharp pain as Dr. Pavlov pushes through your maidenhead, taking it away. "Fresh virgin school girl pussy! So tight..."'
 		else
 			'You feel a sharp pain as Dr. Pavlov pushes through your maidenhead, taking it away. "Ahhh, nothing beats a virgin hole." He pushes himself deeper into your unexplored depths, enjoying himself immensely.'
@@ -1262,7 +1259,7 @@ if $ARGS[0] = 'fuck':
 	else
 		$therapistDoneFuckingDesc0 = 'You feel his cock expanding inside of you. He groans loudly.'
 	end
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
 		$therapistDoneFuckingDesc1 = '"This school girl pussy is too tight...! Cum now!"'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc1 = '"So tight! Cum! Cum now!"'
@@ -1278,7 +1275,7 @@ if $ARGS[0] = 'fuck':
 	else
 		$therapistDoneCumDesc1 = 'You feel his dick press deep into your pussy and feel his cock swell inside of you. His grip tightens on your hips. You feel a huge load of cum spurting into you. You obediently cum on his cock.'
 	end
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
 		$therapistDoneFuckingDesc3 = '"Your little school girl pussy was amazing, Miss <<$pcs_lastname>>."'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc3 = '"Ahh, dumping a load in a young girl is the best." he says as he wipes his dick on your ass.'
@@ -1361,7 +1358,7 @@ if $ARGS[0] = 'hypnoFuck':
 	'As soon as he is inside your pussy, he starts to fuck you.'
 	if stat['think_virgin'] = 1 and pcs_vag = 0:
 		gs 'pain', 5, 'vaginal', 'stretch'
-		if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
+		if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0:
 			'You feel a sharp pain as your <i>Master</i> pushes through your maidenhead, taking it away. "Fresh virgin school girl pussy! So tight... I will pump you full of cum every day until you bear my child."'
 		else
 			'You feel a sharp pain as your <i>Master</i> pushes through your maidenhead, taking it away. "Ahhh, nothing beats a virgin hole." He pushes himself deeper into your unexplored depths, enjoying himself immensely.'
@@ -1379,7 +1376,7 @@ if $ARGS[0] = 'hypnoFuck':
 	else
 		$therapistDoneFuckingDesc0 = 'You feel his cock expanding inside of you. He groans loudly.'
 	end
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
 		$therapistDoneFuckingDesc1 = '"This school girl pussy is too tight...! Cum now, <i>Cunt</i>!"'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc1 = '"So tight! Cum <i>Cunt</i>! Cum now!"'
@@ -1395,7 +1392,7 @@ if $ARGS[0] = 'hypnoFuck':
 	else
 		$therapistDoneCumDesc1 = 'You feel his dick press deep into your pussy and feel his cock swell inside of you. His grip tightens on your hips. You feel a huge load of cum spurting into you. You obediently cum on his cock.'
 	end
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and rand(0,1) = 0:
 		$therapistDoneFuckingDesc3 = '"Your little schoolgirl pussy was amazing, <i>Cunt</i>."'
 	elseif rand(0,2) = 0:
 		$therapistDoneFuckingDesc3 = '"Ahh, dumping a load in a young girl is the best," he says as he wipes his dick on your ass.'
@@ -2105,13 +2102,11 @@ end
 
 if $ARGS[0] = 'hypnoProstitute':
 	*clr & cla
-	foundGuy = rand(0, 2)
 
-	if foundGuy > 0:
-		hypnoProstGuy = rand(1,8)
-		if hypnoProstRand = 1:
+	$randomArr[] = {
+		$randomArr[] = {
 			if hypnoProstDates[1] = daystart:
-				jump 'hypnoProstNothingHappens'
+				dynamic $hypnoProstNothingHappens
 			else
 				gs 'boyStat', 'A250'
 				if hypnoProstGuyFlag[1] = 0:
@@ -2209,9 +2204,10 @@ if $ARGS[0] = 'hypnoProstitute':
 					end
 				end
 			end
-		elseif hypnoProstRand = 2:
+		}
+		$randomArr[] = {
 			if hypnoProstDates[2] = daystart:
-				jump 'hypnoProstNothingHappens'
+				dynamic $hypnoProstNothingHappens
 			else
 				gs 'boyStat', 'A249'
 				if hypnoProstGuyFlag[2] = 0:
@@ -2320,9 +2316,10 @@ if $ARGS[0] = 'hypnoProstitute':
 					end
 				end
 			end
-		elseif hypnoProstRand = 3:
+		}
+		$randomArr[] = {
 			if hypnoProstDates[3] = daystart:
-				jump 'hypnoProstNothingHappens'
+				dynamic $hypnoProstNothingHappens
 			else
 				gs 'boyStat', 'A251'
 				if hypnoProstGuyFlag[3] = 0:
@@ -2419,9 +2416,10 @@ if $ARGS[0] = 'hypnoProstitute':
 					end
 				end
 			end
-		elseif hypnoProstRand = 4:
+		}
+		$randomArr[] = {
 			if hypnoProstDates[4] = daystart or hypnoProstTimes < 50:
-				jump 'hypnoProstNothingHappens'
+				dynamic $hypnoProstNothingHappens
 			else
 				if hypnoProstGuyFlag[4] = 0:
 					hypnoProstDates[4] = daystart
@@ -2431,9 +2429,10 @@ if $ARGS[0] = 'hypnoProstitute':
 
 				end
 			end
-		elseif hypnoProstRand = 5:
+		}
+		$randomArr[] = {
 			if hypnoProstDates[5] = daystart:
-				jump 'hypnoProstNothingHappens'
+				dynamic $hypnoProstNothingHappens
 			else
 				hypnoProstDates[5] = daystart
 				if hypnoProstGuyFlag[5] = 0:
@@ -2573,9 +2572,10 @@ if $ARGS[0] = 'hypnoProstitute':
 					end
 				end
 			end
-		elseif hypnoProstRand = 6:
+		}
+		$randomArr[] = {
 			if hypnoProstDates[6] = daystart:
-				jump 'hypnoProstNothingHappens'
+				dynamic $hypnoProstNothingHappens
 			else
 				if hypnoProstGuyFlag[6] = 0:
 					hypnoProstDates[6] = daystart
@@ -2585,30 +2585,25 @@ if $ARGS[0] = 'hypnoProstitute':
 
 				end
 			end
-
-		elseif hypnoProstRand = 7:
+		}
+		$randomArr[] = {
 			if hypnoProstDates[7] = daystart:
-				jump 'hypnoProstNothingHappens'
+				dynamic $hypnoProstNothingHappens
 			else
 				if hypnoProstGuyFlag[7] = 0:
 					hypnoProstDates[7] = daystart
 					hypnoProstRubles[7] = 1300
 					!!This one should not be blocked from happening again
 					'As you are waiting, you come across a trucker.'
-				else
-
 				end
 			end
-		elseif hypnoProstRand = 8:
+		}
+		$randomArr[] = {
 			gs 'npcgeneratec', 0, 'Stranger', rand(18,35)
 			gs 'boyStat', $npclastgenerated
 			gs 'stat'
-			if rand(0,1) = 1:
-				$vehicleName = 'car'
-			else
-				$vehicleName = 'truck'
-			end
-			hypnoProstRubles[7] = rand(800,2000)
+			$vehicleName = iif(rand(0,1), 'car', 'truck')
+			hypnoProstRubles[8] = rand(800,2000)
 			'As you are waiting, a man who parked his <<$vehicleName>> nearby approaches you.'
 			randomResponse = rand(1,5)
 			if randomResponse = 1:
@@ -2726,42 +2721,25 @@ if $ARGS[0] = 'hypnoProstitute':
 					end
 				end
 			end
-		end
-	elseif foundGuy = 0:
-		:hypnoProstNothingHappens
-		hypnoProstRand = rand(1,9)
-		if hypnoProstRand = 1:
-			'As you are waiting, you come across a girl walking her dog.'
-		elseif hypnoProstRand = 2:
-			'As you are waiting, you come across an elderly woman.'
-		elseif hypnoProstRand = 3:
-			'As you are waiting, you come across two girls holding hands. They seem to be to engrossed in their conversation and don''t notice you.'
-		elseif hypnoProstRand = 4:
-			'As you are waiting, a dog comes trotting along. He seems very happy to see you and wags his tail excitedly. You are oblivious and continue waiting.'
-		elseif hypnoProstRand = 5:
-			'As you are waiting, you come across an elderly couple.'
-		elseif hypnoProstRand = 6:
-			'As you are waiting, you come across a girl walking her dog.'
-		elseif hypnoProstRand = 7:
-			'As you are waiting, you come across a girl walking her dog.'
-		elseif hypnoProstRand = 8:
-			'As you are waiting, you come across a .'
-		elseif hypnoProstRand = 9:
-			'As you are waiting, you come across a .'
-		else
-			'As you are waiting, you come across a .'
-		end
-
-		act 'Continue waiting':
-			gt 'therapist', 'hypnoProstitute'
-		end
-	else
-		! This should never occur but I''m leaving it here in case the randomization is changed
+		}
+		gs 'getrandom' , 1
+	}
+	$hypnoProstNothingHappens = {
+		$randomArr[] = 'As you are waiting, you come across a girl walking her dog.'
+		$randomArr[] = 'As you are waiting, you come across an elderly woman.'
+		$randomArr[] = 'As you are waiting, you come across two girls holding hands. They seem to be to engrossed in their conversation and don''t notice you.'
+		$randomArr[] = 'As you are waiting, a dog comes trotting along. He seems very happy to see you and wags his tail excitedly. You are oblivious and continue waiting.'
+		$randomArr[] = 'As you are waiting, you come across an elderly couple.'
+		func('getrandom')
+
+		act 'Continue waiting': gt 'therapist', 'hypnoProstitute'
+	}
+	$randomArr[] = $hypnoProstNothingHappens
+	$randomArr[] = {
 		'You wait for some time, but nothing interesting happens.'
-		act 'Continue waiting':
-			gt 'therapist', 'hypnoProstitute'
-		end
-	end
+		act 'Continue waiting': gt 'therapist', 'hypnoProstitute'
+	}
+	gs 'getrandom' , 1
 end
 
 !!To be used if you went to somewhere after therapist fucking you

+ 3 - 3
locations/tobiQW.qsrc

@@ -124,7 +124,7 @@ if $ARGS[0] = '8':
 	'"If anyone asks, you are my apprentice, and I am helping you with your magic studies."'
 	'"You should carry on learning from Tatiana and Gustav, and occasionally, I may need you to carry out tasks or accompany me on missions."'
 	'"Tatiana is something of a magical detective and private eye, so she can help you develop by getting you to help her."'
-		
+
 	act 'Continue':gt 'tobiQW', '9'
 end
 
@@ -146,9 +146,9 @@ if $ARGS[0] = '10':
 	'"OK, I have to go. Look after yourself, and don''t do anything to attract too much attention."'
 	'After these words, Reinhold creates a vortex into which he is pulled, and everything is back to normal.'
 
-	if mid($start_type,1,4) = 'city':
+	if $start_loc = 'city':
 		act 'Get out of bed':gt 'bedr'
-	elseif mid($start_type,1,2) = 'sg':
+	elseif $start_loc = 'sg':
 		act 'Get out of bed':gt 'bedrPar'
 	else
 		act 'Get out of bed':gt 'uni_dorm', 'dorm_room'

+ 6 - 6
locations/uni_admin.qsrc

@@ -4,7 +4,7 @@
 !!It is important to include an option to enroll in university, and therefore set the variable regarding the choice of study.
 
 !!The following variables will be set in this file.
-!! university['prep_enrolled'] is set to 1 if the player enrolls in the university preparation program. 
+!! university['prep_enrolled'] is set to 1 if the player enrolls in the university preparation program.
 !! university['student'] is set to 1 if the player enrolls in a university program.
 !! $university['enrolled_in'] is set to the name of the university program the player enrolls in. There is the following programs: teaching_studies
 !! university['enrolled_in_semester'] is set to the semester the player enrolls in starting at 1 for the first semester and ending with 8 for the last.
@@ -36,7 +36,7 @@ if $ARGS[0] = 'start':
 		'You''ve been expelled from the university for reasons unrelated to your exam results.'
 	elseif university['student'] = 0:
 		if university['enrolled_in_semester'] = 0:
-			'The enrollment period for new students is from May to August. All new students will start their classes in the week that includes September 1st.' 
+			'The enrollment period for new students is from May to August. All new students will start their classes in the week that includes September 1st.'
 		end
 		if university['prep_enrolled'] = 1 and month = 8:
 			'You''ve enrolled in the preparatory classes.'
@@ -55,11 +55,11 @@ if $ARGS[0] = 'start':
 	if university['prep_enrolled'] = 1 and university['entrance_exam_passed'] = 0 and month = 8:
 		act 'Attend preparatory class (1:00)': gt 'uni_admin', 'take_prep'
 	end
-	!!if graduated school with good grade or 
-	if university['entrance_exam_passed'] = 0 and university['prep_enrolled'] = 1 and month = 8: 
+	!!if graduated school with good grade or
+	if university['entrance_exam_passed'] = 0 and university['prep_enrolled'] = 1 and month = 8:
 		act 'Take the entrance exam (1:00)': gt 'uni_admin', 'take_test'
 	end
-	if (university['entrance_exam_passed'] = 1 or university['prep_enrolled'] = 0) and university['student'] = 0 and university['diploma'] = 0 and age >= 17 and (mid($start_type,1,2) ! 'sg' or SchoolAtestat = 1) and month < 9 and month > 4 and university['exam_week'] = 0:
+	if (university['entrance_exam_passed'] = 1 or university['prep_enrolled'] = 0) and university['student'] = 0 and university['diploma'] = 0 and age >= 17 and ($start_loc ! 'sg' or SchoolAtestat = 1) and month < 9 and month > 4 and university['exam_week'] = 0:
 		act 'Enroll at the university': gt 'uni_admin', 'enrollment'
 	end
 	if university['enrolled_in_semester'] > 0 and university['enrolled_in_semester'] = university['semester_passed'] and university['semeter_passed'] < 8:
@@ -100,7 +100,7 @@ if $ARGS[0] = 'enrollment':
 					university['student'] = 1
 					$university['enrolled_in']= 'teaching_studies'
 					university['enrolled_in_semester'] = 1
-					
+
 					gs 'homes_properties', 'give_access', 'university_dorm'
 
 					!!This creates the classes for the first semester of the teaching program to be used by the grade system, and gives the player a starting grade value (which is a failing grade, the player have to study if they want to pass)

+ 14 - 14
locations/uni_library.qsrc

@@ -17,16 +17,16 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">The University Library</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/library.jpg"></center>'
 	'One of the medium sized buildings is the university''s library. It is three stories tall and filled with books, sections with tables scattered around to study or relax at and computer stations to help students with their studying.'
-	
+
 	if locat['katja'] = 29:
 		'You see '+iif(katjaQW['know_katja_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'a cute redheaded girl', '<a href="exec:gt ''katja_uni'', ''library''">Katja</a>')+' sitting at one of the desks with a laptop and a pile of books.'
 	end
-	
+
 	!!if locat['albina'] = 6:
 		!!'You see '+iif(AlbinaQW['know_albina_uni'] = 0 and ($start_type = 'city_tg' or $start_type = 'uni_tg'), 'an attractive looking brunette', '<a href="exec:gt ''albina_uni'', ''library''">Albina</a>')+' searching the shelves for books.'
 	!!end
-	
-	if mid($start_type,1,2) = 'sg' and yearstart > 1 and week > 5 and hour >= 12 and hour < 14:
+
+	if $start_loc = 'sg' and yearstart > 1 and week > 5 and hour >= 12 and hour < 14:
 		if nataliaQW['library_day_check'] ! daystart:
 			nataliaQW['library_day_check'] = daystart
 			if  rand(0,3) = 0: nataliaQW['library_day'] = daystart
@@ -35,7 +35,7 @@ if $ARGS[0] = 'start':
 			'You see your former classmate <a href="exec: gt ''natalia_pavlova'',''library''">Natalia Pavlova</a> .'
 		end
 	end
-	
+
 	if (week < 6 or hour < 23) and hour > 7:
 		 if university['enrolled_in_semester'] > university['semester_passed']:
 			act 'Study': gt 'uni_library', 'study'
@@ -57,7 +57,7 @@ if $ARGS[0] = 'study':
 	gs 'stat'
 	'<center><b><font color="maroon">The University Library</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/study' + rand(1,7) + '.jpg"></center>'
-	'You spend some time collecting some books on your subjects and grab one of the library''s laptops before finding a quiet place to sit.' 
+	'You spend some time collecting some books on your subjects and grab one of the library''s laptops before finding a quiet place to sit.'
 	if university['semester_week'] > 0:
 		i = 0
 		:study_loop
@@ -69,7 +69,7 @@ if $ARGS[0] = 'study':
 				'You don''t need to study any more this week for your <<$class_list_name[i]>> class.'
 			end
 		end
-		
+
 		i += 1
 		if ARRSIZE('class_list_institution') >= i: jump 'study_loop'
 		killvar 'i'
@@ -79,11 +79,11 @@ if $ARGS[0] = 'study':
 		if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>' and func('uni_programs', 'exam', 'is_over', $class_list_name[i]) = 0:
 			dynamic '	act ''Study intensely for your <<$class_list_name[i]>> exam (30 minuts)'': gt ''uni_library'', ''studying_exam'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'' '
 		end
-		
+
 		i += 1
 		if ARRSIZE('class_list_institution') >= i: jump 'exam_loop'
 		killvar 'i'
-	end	
+	end
 	act 'Leave':
 		minut += 5
 		gt 'uni_grounds', 'main'
@@ -198,15 +198,15 @@ if $ARGS[0] = 'studying_exam':
 			'You study for half an hour and believe that you''re making good progress in getting ready for the exam.'
 		else
 			'You study for half an hour and believe that you''re improving a lot.'
-		end		
+		end
 		gs 'grades', 'grade_award', '<<$ARGS[1]>>', '<<$ARGS[2]>>', study_mod
 	end
-	
+
 	gs 'stat'
-	
+
 	killvar 'study_mod'
 	killvar 'nod_study'
-	
+
 	act 'Leave':
 		minut += 5
 		gt 'uni_grounds', 'main'
@@ -296,7 +296,7 @@ if $ARGS[0] = 'wander':
 		end
 		act 'Wander around':
 			gt 'uni_library', 'wander'
-		end 
+		end
 	else
 		'The library is closing for the night.'
 	end

+ 8 - 8
locations/wardrobe.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = 'main':
 		*p '<TH>Bodysuit worn</TH><TH>Outfit worn</TH><TH>Coat (only worn outside when cold)</TH>'
 		*P '<TR><TD ROWSPAN=4><center><a href="exec:gt ''wardrobe'', ''underwear_options'', ''full''"><img Height = <<ward_img_hgt>>*2 src="<<FUNC(''$body_image'',''bodysuit'')>>"></a></center></TD><TD><center><a href="exec:gt ''clothing_QV'', ''list''"><img Height = <<ward_img_hgt * 2>> src="<<FUNC(''$body_image'',''clothes'')>>"></a></center></TD><TD><center>'
 	end
-		
+
 	if $coatworntype = 'none':
 		'<a href="exec:gt ''coats'', ''view_coat_list'', ''wardrobe''">Search the wardrobe</a>'
 	else
@@ -129,7 +129,7 @@ if $ARGS[0] = 'main':
 	else
 		'<a href="exec:gt ''purses'', ''view_purse_list'',''wardrobe''">Search the wardrobe</a>'
 	end
-	
+
 	if underwear['type'] = 0:
 		'</center></TD><TR><TD><center>'
 		if $pantyworntype ! 'none':
@@ -163,7 +163,7 @@ if $ARGS[0] = 'main':
 	*nl
 	'<center><font color="grey">Save/load outfits with "Managed saved clothing sets".</font></center>'
 	'<TD></center></TD></table></center>'
-	
+
 	act 'Close wardrobe': gt $loc, $loc_arg
 
 	act 'Strip all clothing':
@@ -233,7 +233,7 @@ $default_clothing_line = {
 	$RESULT = '<TR bgcolor='+$bgcolor+'>'
 
 	$RESULT +='<TD><b><<$def_clothing_name[default_entry]>></b></TD>'
-	
+
 	if defclothingnumber[default_entry] = 0:
 		$RESULT +='<TD><img width="100" src="images/pc/items/blank.jpg"></TD>'
 	else
@@ -353,7 +353,7 @@ if $ARGS[0] = 'default_actions':
 	act 'Return':
 		gt $loc, $loc_arg
 	end
- 
+
 	act 'Select outfit to wear':
 		cla
 		gs 'wardrobe', 'default_actions_wear'
@@ -576,7 +576,7 @@ if $ARGS[0] = 'default_entry_wear':
 	end
 
 	!! default school girl uniform is always allowed to be worn if still in school
-	if mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
+	if $start_loc = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and $temp1 = 'gm_school' and temp2 = 6:
 		cls
 		'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 		'Your put on your <<$def_clothing_name[default_entry]>> outfit without any problems.'
@@ -838,7 +838,7 @@ if $ARGS[0] = 'default_entry_delete':
 	$defcoattype[i] = ''
 	defcoatnumber[i] = ''
 	$def_clothing_name[i] = ''
-    if default_sport_number = i: 
+    if default_sport_number = i:
 		default_sport_number = 0
 	end
 	gt 'wardrobe', $wloc
@@ -858,7 +858,7 @@ end
 
 if $ARGS[0] = 'school_outfit':
 	! if they have worn a uniform recently we will use that rather than the one in the outfit
-	if default_school_number = 0:	
+	if default_school_number = 0:
 		clothingwornnumber = schtype
 		$clothingworntype = $schbrand
 		gs  'wardrobe', 'school_outfit_end'