Browse Source

Merge remote-tracking branch 'kevin/master'

f95Lok 2 weeks ago
parent
commit
19cad97e29
52 changed files with 8795 additions and 7035 deletions
  1. 24 0
      locations/KatjaHomeTalk.qsrc
  2. 10 10
      locations/MagEncounterFairy.qsrc
  3. 1 1
      locations/_attributes_cats_dress.qsrc
  4. 1 1
      locations/anushkachat.qsrc
  5. 2 2
      locations/anushkachat_city.qsrc
  6. 4 4
      locations/artem_katja_sex.qsrc
  7. 64 106
      locations/bank.qsrc
  8. 1 1
      locations/din_van.qsrc
  9. 3 0
      locations/femcyc.qsrc
  10. 67 76
      locations/foto.qsrc
  11. 1 1
      locations/gschool_detention.qsrc
  12. 10 13
      locations/intro_sg_tg.qsrc
  13. 3 3
      locations/katja_pantyquest.qsrc
  14. 11 10
      locations/newspaper_pages.qsrc
  15. 2 1
      locations/npcgeneratec.qsrc
  16. 565 458
      locations/pav_disco.qsrc
  17. 145 262
      locations/pav_disco_sex.qsrc
  18. 3 2
      locations/pav_hotelReception.qsrc
  19. 1 0
      locations/pav_parkev.qsrc
  20. 1 1
      locations/phone_selfies.qsrc
  21. 484 208
      locations/selfplay.qsrc
  22. 264 263
      locations/sex_ev_after.qsrc
  23. 328 205
      locations/sex_ev_boy_pillow_talk.qsrc
  24. 226 226
      locations/sex_ev_condoms.qsrc
  25. 429 212
      locations/sex_ev_cowgirl.qsrc
  26. 342 233
      locations/sex_ev_cum.qsrc
  27. 402 205
      locations/sex_ev_doggy.qsrc
  28. 265 262
      locations/sex_ev_dress_talking.qsrc
  29. 215 193
      locations/sex_ev_events.qsrc
  30. 259 259
      locations/sex_ev_favorite_part.qsrc
  31. 219 219
      locations/sex_ev_foreplay.qsrc
  32. 20 22
      locations/sex_ev_foreplay_desc.qsrc
  33. 139 139
      locations/sex_ev_hookup_leave.qsrc
  34. 294 271
      locations/sex_ev_leave.qsrc
  35. 391 195
      locations/sex_ev_miss.qsrc
  36. 262 244
      locations/sex_ev_morning.qsrc
  37. 301 271
      locations/sex_ev_pillow_talk.qsrc
  38. 480 214
      locations/sex_ev_pillow_talk2.qsrc
  39. 410 167
      locations/sex_ev_reactions.qsrc
  40. 259 259
      locations/sex_ev_reactions_creampie.qsrc
  41. 267 226
      locations/sex_ev_sex.qsrc
  42. 229 229
      locations/sex_ev_shower.qsrc
  43. 274 222
      locations/sex_ev_start.qsrc
  44. 70 66
      locations/sex_ev_stats.qsrc
  45. 288 288
      locations/sex_ev_talk.qsrc
  46. 48 44
      locations/sex_ev_talk2.qsrc
  47. 243 243
      locations/sex_ev_virgin.qsrc
  48. 269 269
      locations/sex_ev_wakeup.qsrc
  49. 192 222
      locations/sex_ev_work_talk1.qsrc
  50. 2 2
      locations/shop_utils.qsrc
  51. 4 4
      locations/shortgs.qsrc
  52. 1 1
      locations/zoomagazine.qsrc

+ 24 - 0
locations/KatjaHomeTalk.qsrc

@@ -1409,6 +1409,30 @@ if $ARGS[0] = 'first_boy_sex_follow_up':
 	end
 	end
 end	
 end	
 
 
+if $ARGS[0] = 'first_boy_sex_Artem_follow_up':
+	*clr & cla
+	katjaQW['QWstage'] = 6
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+	'Katja gives you a big hug. "Thank you! The experience with Artem was great!" she says with a huge grin.'
+	if npc_vag['A14'] + 5 < npc_dick['A2']:
+		'"It didn''t hurt too much?" you ask.' 
+		'"It hurt, that was why I couldn''t take it any longer. But it was fun and I think it''ll hurt less the next time," she answers.' 
+		'"So you want to have sex with a boy again?" you reply.'
+	else
+		'"It did look like you had fun," you say.' 
+		'"I definitely had fun, I thought it would hurt, but I didn''t feel any pain," she answers.' 
+		'"Might be all the times I used my dildo on you," you reply.'
+	end
+	'"We should definitely do this again sometime," she finishes.' 
+	'"We''ll see if the opportunity comes up again," you answer.'
+	act 'Talk about something else': gt 'KatjaHomeTalk'
+	if katjaQW['birth_control_start_day'] = 0:
+		act 'Tell her that she should use birth control': gt 'KatjaHomeTalk', 'preventation_talk'
+	end
+end	
+
 if $ARGS[0] = 'anal_sex_with_boy_ask':
 if $ARGS[0] = 'anal_sex_with_boy_ask':
 	*clr & cla
 	*clr & cla
 	minut += 5
 	minut += 5

+ 10 - 10
locations/MagEncounterFairy.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'fairy_chat_no1':
 	knowsfairy = 1
 	knowsfairy = 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/fae.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/fae.jpg"></center>'
 	'You take a closer look at the floating glowing orb. What you mistook for a large firefly is actually a small woman with translucent wings on her back: A fairy!'
 	'You take a closer look at the floating glowing orb. What you mistook for a large firefly is actually a small woman with translucent wings on her back: A fairy!'
-	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?'
+	'"Hello, biggie!", she says in a high pitched voice. "You can see me, right?"'
 	'"It''s so nice to meet you! Finally someone who can see me!", she goes on before you have a chance to answer. "Finally someone to chat with!!! You have no idea how annoying it is to be here and nobody recognizes you. It''s sooo BORING!!!"'
 	'"It''s so nice to meet you! Finally someone who can see me!", she goes on before you have a chance to answer. "Finally someone to chat with!!! You have no idea how annoying it is to be here and nobody recognizes you. It''s sooo BORING!!!"'
 	act 'Chat with the fairy':
 	act 'Chat with the fairy':
 		cla
 		cla
@@ -44,9 +44,9 @@ if $ARGS[0] = 'fairy_chat_no1':
 		pcs_mood += 15
 		pcs_mood += 15
 		gs 'stat'
 		gs 'stat'
 		'You chat with the fairy. At first it feels strange to talk with a creature, you thought was a myth from children''s books. More so, since the small beautiful woman flutters in front of your face the whole time. But the fairy is so amicable that half hour has passed before you even notice.'
 		'You chat with the fairy. At first it feels strange to talk with a creature, you thought was a myth from children''s books. More so, since the small beautiful woman flutters in front of your face the whole time. But the fairy is so amicable that half hour has passed before you even notice.'
-		if fairyday['skin_increase'] <= 10:
+		if fairyQW['skin_increase'] <= 10:
 			pcs_skin += 10
 			pcs_skin += 10
-			fairyday['skin_increase'] += 1
+			fairyQW['skin_increase'] += 1
 			pcs_horny += 10
 			pcs_horny += 10
 			gs 'stat'
 			gs 'stat'
 			'The fairy bids you farewell. Just as she flies off, she returns fluttering in front of your face.'
 			'The fairy bids you farewell. Just as she flies off, she returns fluttering in front of your face.'
@@ -104,12 +104,12 @@ if $ARGS[0] = 'fairy_chat':
 		pcs_mood += 15
 		pcs_mood += 15
 		gs 'stat'
 		gs 'stat'
 		gs 'MagEncounterFairy', 'fairychattopic'
 		gs 'MagEncounterFairy', 'fairychattopic'
-		if fairyday['skin_increase'] <= 10 and fairyday ! daystart and fairyshoo = 0:
+		if fairyQW['skin_increase'] <= 10 and fairyQW['day'] ! daystart and fairyshoo = 0:
 			cla
 			cla
 			pcs_skin += 10
 			pcs_skin += 10
 			if pcs_skin > 1000: pcs_skin = 1000
 			if pcs_skin > 1000: pcs_skin = 1000
-			fairyday['skin_increase'] += 1
-			fairyday = daystart
+			fairyQW['skin_increase'] += 1
+			fairyQW['day'] = daystart
 			gs 'stat'
 			gs 'stat'
 			'The fairy bids you farewell.'
 			'The fairy bids you farewell.'
 			wait 725
 			wait 725
@@ -118,12 +118,12 @@ if $ARGS[0] = 'fairy_chat':
 			'"You know, you could still look lovelier.", she says. "Don''t move."'
 			'"You know, you could still look lovelier.", she says. "Don''t move."'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel your skin start tingling, again, as if brushed by a feather.'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel your skin start tingling, again, as if brushed by a feather.'
 			act 'Go on your way': gt $loc, $loc_arg
 			act 'Go on your way': gt $loc, $loc_arg
-		elseif fairyday['skin_increase'] > 10 and fairyday < daystart and fairyshoo = 0 and pcs_magik >= 8 and fairychat > 9 and succubusQW < 1:
+		elseif fairyQW['skin_increase'] > 10 and fairyQW['day'] < daystart and fairyshoo = 0 and pcs_magik >= 8 and fairychat > 9 and succubusQW < 1:
 			!Sets the Succubus setup dream
 			!Sets the Succubus setup dream
 			cla
 			cla
 			succubusQW = 1
 			succubusQW = 1
 			pcs_horny = 100
 			pcs_horny = 100
-			fairyday = daystart
+			fairyQW['day'] = daystart
 			gs 'stat'
 			gs 'stat'
 			'The fairy bids you farewell.'
 			'The fairy bids you farewell.'
 			wait 725
 			wait 725
@@ -132,8 +132,8 @@ if $ARGS[0] = 'fairy_chat':
 			'"You know, you''re almost a magical creature now.", she says. "Don''t move."'
 			'"You know, you''re almost a magical creature now.", she says. "Don''t move."'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel a much more intense tingling, this time seeming to go all the way through you.'
 			'Remembering the last time you hold your breath and close your eyes. Just a moment later you feel a much more intense tingling, this time seeming to go all the way through you.'
 			act 'Go on your way': gt $loc, $loc_arg
 			act 'Go on your way': gt $loc, $loc_arg
-		elseif fairyday ! daystart and (pcs_nips < 80 or clit_size < 80):
-			fairyday = daystart
+		elseif fairyQW['day'] ! daystart and (pcs_nips < 80 or clit_size < 80):
+			fairyQW['day'] = daystart
 			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you."'
 			'The fairy takes another quick look at you, rubs her chin, and says "Hmm, since you''ve been a little nice to me, maybe I could be a little nice to you."'
 			act 'Huh?':
 			act 'Huh?':
 				cla
 				cla

+ 1 - 1
locations/_attributes_cats_dress.qsrc

@@ -21,7 +21,7 @@ elseif ARGS[1] = 2:
 elseif ARGS[1] = 3:
 elseif ARGS[1] = 3:
 	CloQuality = 4
 	CloQuality = 4
 	CloThinness = 5
 	CloThinness = 5
-	CloTopCut = 1
+	CloTopCut = 3
 	CloSkirtShortness = 2
 	CloSkirtShortness = 2
 	CloDress = 1
 	CloDress = 1
 	CloPrice = 3000
 	CloPrice = 3000

+ 1 - 1
locations/anushkachat.qsrc

@@ -497,7 +497,7 @@ if $ARGS[0] = 'chat':
 				act 'Stop kissing and talk more': gt 'anushkachat', 'chat'
 				act 'Stop kissing and talk more': gt 'anushkachat', 'chat'
 			end
 			end
 		end
 		end
-	else
+	elseif anushkaQW['kiss_day'] ! daystart:
 		act 'Kiss her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		act 'Kiss her (<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 photographyEv = 2 and portfolio_people[5] = 0:
 	if photographyEv = 2 and portfolio_people[5] = 0:

+ 2 - 2
locations/anushkachat_city.qsrc

@@ -457,7 +457,7 @@ if $ARGS[0] = 'chat':
 				act 'Stop kissing and talk more': gt 'anushkachat_city', 'chat'
 				act 'Stop kissing and talk more': gt 'anushkachat_city', 'chat'
 			end
 			end
 		end
 		end
-	else
+	elseif anushkaQW['kiss_day'] ! daystart:
 		act 'Kiss her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		act 'Kiss her (<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 photographyEv = 2 and portfolio_people[5] = 0:
 	if photographyEv = 2 and portfolio_people[5] = 0:
@@ -1064,7 +1064,7 @@ if $ARGS[0] = 'tell_about_djibril_gangbang':
 		'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to join in next time?'
 		'You get into some pretty graphic details as you tell your story and are feeling more than a little turned on; by the looks of things, she is as well. Maybe you could invite her to join in next time?'
 		act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 		act 'Hang out in her room': gt 'anush_bedroom_city','anushroom'
 		act 'Talk about something else': gt 'anushkachat_city', 'chat'
 		act 'Talk about something else': gt 'anushkachat_city', 'chat'
-		if and npc_sex['A144'] > 0: act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril_gangbang'
+		if npc_sex['A144'] > 0: act 'Ask her if she wants join in': gt 'anushkachat_city', 'invite_djibril_gangbang'
 	end
 	end
 end
 end
 
 

+ 4 - 4
locations/artem_katja_sex.qsrc

@@ -413,7 +413,7 @@ if $ARGS[0] = 'first_time_pussy':
 							'This makes Katja feel some pain which Artem quickly notice. "I''m sorry Katja. I will be more careful" he says and slows down. This makes Katja''s pain seem to go away, and by the end she is moaning quietly.'
 							'This makes Katja feel some pain which Artem quickly notice. "I''m sorry Katja. I will be more careful" he says and slows down. This makes Katja''s pain seem to go away, and by the end she is moaning quietly.'
 						else
 						else
 							katjaQW['horny'] += rand(5,10)
 							katjaQW['horny'] += rand(5,10)
-							'AS he goes faster Katja''s moans becomes large, and the makes Artem pick up more speed. By the end he is pounding her hard  and she moan very loudly.'
+							'As he goes faster Katja''s moans becomes large, and the makes Artem pick up more speed. By the end he is pounding her hard  and she moan very loudly.'
 						end
 						end
 					end
 					end
 				end
 				end
@@ -588,12 +588,12 @@ if $ARGS[0] = 'first_time_pussy':
 	end
 	end
 end
 end
 
 
-if $ARGS[0] = 'artem_katja_sex', 'first_time_next':
+if $ARGS[0] = 'first_time_next':
 	if artemQW['confidence'] < 10:
 	if artemQW['confidence'] < 10:
 		if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 		if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 			gt 'artem_katja_sex', 'first_time_katja_titjob'
 			gt 'artem_katja_sex', 'first_time_katja_titjob'
 		else
 		else
-			gt 'artem_katja_sex', 'first_time_cowgirl'
+			gt 'artem_katja_sex', 'first_time_ride'
 		end
 		end
 	else
 	else
 		gt 'artem_katja_sex', 'first_time_on_table'
 		gt 'artem_katja_sex', 'first_time_on_table'
@@ -621,7 +621,7 @@ if $ARGS[0] = 'first_time_on_table':
 			if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 			if katjaQW['titjob'] > 0 or katjaQW['slut'] > 80:
 				gt 'artem_katja_sex', 'first_time_katja_titjob'
 				gt 'artem_katja_sex', 'first_time_katja_titjob'
 			else
 			else
-				gt 'artem_katja_sex', 'first_time_cowgirl'
+				gt 'artem_katja_sex', 'first_time_ride'
 			end
 			end
 		end
 		end
 	end
 	end

+ 64 - 106
locations/bank.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 				bankAccount = 1
 				bankAccount = 1
 				karta = 5000
 				karta = 5000
 				bankDebtLimit = 5000
 				bankDebtLimit = 5000
-				'You are led to on open office and a member of the bank staff goes through your details and ID, then takes 50 <b>₽</b> from you before setting up your account'
+				'You''re led to an open office where a member of the bank staff goes through your details and ID, then takes 50 <b>₽</b> from you before setting up your account.'
 				'"Your account is now open with your 50 <b>₽</b> and an overdraft protection of 5,000 <b>₽</b>"'
 				'"Your account is now open with your 50 <b>₽</b> and an overdraft protection of 5,000 <b>₽</b>"'
 				gs 'stat'
 				gs 'stat'
 
 
@@ -53,12 +53,12 @@ if $ARGS[0] = 'start':
 					karta += kartaIN
 					karta += kartaIN
 					money -= kartaIN
 					money -= kartaIN
 
 
-					'<br>You deposited <<kartaIN>> <b>₽</b>, your account balance is now ' + iif(karta >= bankDebtLimit, '<<karta - bankDebtLimit>>', '<font color="red"><<bankDebtLimit - karta>></font>') + ' <b>₽</b>.'
+					'<br>You deposit <<kartaIN>> <b>₽</b>. Your account balance is now ' + iif(karta >= bankDebtLimit, '<<karta - bankDebtLimit>>', '<font color="red"><<bankDebtLimit - karta>></font>') + ' <b>₽</b>.'
 				end
 				end
 				killvar 'kartaIN'
 				killvar 'kartaIN'
 				gs 'stat'
 				gs 'stat'
 
 
-				act 'Walk away':gt 'bank', 'start'
+				act 'Walk away': gt 'bank', 'start'
 			end
 			end
 		end
 		end
 
 
@@ -84,7 +84,7 @@ if $ARGS[0] = 'start':
 				killvar 'kartaOUT'
 				killvar 'kartaOUT'
 				gs 'stat'
 				gs 'stat'
 
 
-				act 'Walk away':gt 'bank', 'start'
+				act 'Walk away': gt 'bank', 'start'
 			end
 			end
 
 
 			if bankDebtLimitRaised = 0 and karta >= 15000:
 			if bankDebtLimitRaised = 0 and karta >= 15000:
@@ -92,9 +92,8 @@ if $ARGS[0] = 'start':
 					if $region = 'city':
 					if $region = 'city':
 						gt 'bank', 'loan_officer', 'start'
 						gt 'bank', 'loan_officer', 'start'
 					else
 					else
-						'You approach the teller and say, “Hello, I''d like to talk to someone about increasing my credit limit.”'
-						*nl
-						'The teller nods and tells you, “Unfortunately our credit limit functions are being handled through our Saint Petersburg branch. I''m sure they''d be happy to help you there.”'
+						'You approach the teller. "Hello. I''d like to talk to someone about increasing my credit limit."'
+						'The teller nods. "Unfortunately, our credit limit functions are being handled through our Saint Petersburg branch. I''m sure they''d be happy to help you there."'
 						delact 'See about increasing your credit limit'
 						delact 'See about increasing your credit limit'
 					end
 					end
 				end
 				end
@@ -118,7 +117,7 @@ if $ARGS[0] = 'start':
 			minut += 15
 			minut += 15
 			BurgerQW['BankTask'] = 2
 			BurgerQW['BankTask'] = 2
 			gs 'stat'
 			gs 'stat'
-			'You went to the office and showed the required documents to the manager.'
+			'You enter the office and show the required documents to the manager.'
 
 
 			act 'Leave': minut += 5 & gt 'bank', 'leave'
 			act 'Leave': minut += 5 & gt 'bank', 'leave'
 		end
 		end
@@ -132,54 +131,49 @@ if $ARGS[0] = 'loan_officer':
 		menu_off = 1
 		menu_off = 1
 		minut += 15
 		minut += 15
 		gs 'stat'
 		gs 'stat'
-
-		'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/001.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/001.jpg"></center>'
 		'You speak to the teller, who tells you to have a seat in the waiting room.'
 		'You speak to the teller, who tells you to have a seat in the waiting room.'
-		'After waiting about 15 minutes, you are called back to an office, where a handsome young executive awaits.'
-		'Standing, he extends his hand and says, "Hello, Miss <<$pcs_lastname>>, my name is Filip Karpenko. I''m the Loan Officer here at VTB Bank. How can I help you today?"'
+		'After waiting about 15 minutes, you''re called back to an office where a handsome young executive awaits.'
+		'He extends his hand. "Hello, Miss <<$pcs_lastname>>, I''m Filip Karpenko, the Loan Officer here at VTB Bank. How can I help you today?"'
 
 
-		act 'I''d like to talk about increasing my credit limit, please.':
+		act 'Talk about increasing your credit limit':
 			*clr & cla
 			*clr & cla
-			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/002.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/002.jpg"></center>'
-			'Karpenko nods and asks, "How large a loan were you thinking of taking out?"'
-			'Marshaling your nerve and trying to appear confident, you say, "I was thinking of maybe... 50.000 rubles?"'
+			'Karpenko nods. "How large a loan were you thinking of taking out?"'
+			'You try to appear confident. "I was thinking of maybe... 50,000 <b>₽</b>?"'
 			*nl
 			*nl
-			'"Let me just review your information for a moment," Karpenko says, typing into his computer.'
-			'He reads what appears on his monitor, a ghost of a frown appearing on his face. Suddenly you feel rather foolish for asking for so much money when you''re a young girl not even established in the world yet!'
+			'"Let me just review your information for a moment," he replies and starts typing into his computer.'
+			'He reads what appears on his monitor, a ghost of a frown appearing on his face as you suddenly feel rather foolish for asking for so much money.'
 			*nl
 			*nl
-			'You shift in your chair, and the next couple of minutes seem very long indeed before Karpenko finally looks up from his screen and says, "I''m sorry, but you seem to have very little in the way of assets or collateral, and you''re very young to be taking out such a significant loan. I''m afraid the bank can''t take a risk on this proposition at this time."'
+			'You shift in your chair and the next few minutes seem to drag in before Karpenko finally looks up from his screen. "I''m sorry, but you seem to have very little in the way of assets or collateral, and you''re very young to be taking out such a significant loan. I''m afraid the bank can''t take a risk on this proposition at this time."'
 			gs 'stat'
 			gs 'stat'
 
 
-			act 'Isn''t there some way you could reconsider, Mr. Karpenko?':
+			act 'Try and seduce him':
 				*clr & cla
 				*clr & cla
-				'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/003.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/003.jpg"></center>'
-				'"I''m sorry, Miss <<$pcs_lastname>>, but my decision is final," Karpenko says firmly.'
+				'"I''m sorry, Miss <<$pcs_lastname>>, but my decision is final," he says firmly.'
 				*nl
 				*nl
-				'You rise from your chair, but you don''t turn and walk away. Instead you approach the loan officer and lean in, giving him an excellent view of your cleavage.'
-				'"It''s true I don''t have any real collateral" you tell him in a soft, sultry voice, "but that doesn''t mean I don''t have something you want. I think if we put our minds to it, we can come up with conditions that benefit us both."'
+				'You rise from your chair, but you don''t turn and walk away. Instead, you approach him and lean in, giving him an excellent view of your cleavage.'
+				'"It''s true I don''t have any real collateral," you tell him in a soft, sultry voice. "but that doesn''t mean I don''t have something you want. If we put our minds to it, we can come up with conditions that benefit us both..."'
 				*nl
 				*nl
-				'Karpenko stares at your breasts as they strain against your top, then looks into your eyes. "I suppose there may be some way we can work out a deal, if you''re willing to be... cooperative."'
+				'Karpenko stares at your breasts, then looks into your eyes. "I suppose there may be some way we can work out a deal, if you''re willing to be... cooperative."'
 
 
 				gs 'bank', 'loan_officer', 'sex_start'
 				gs 'bank', 'loan_officer', 'sex_start'
 			end
 			end
 
 
-			act 'Sadly rise and head for the door':
+			act 'Leave':
 				*clr & cla
 				*clr & cla
-				'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/004.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/004.jpg"></center>'
 				'"Wait, Miss <<$pcs_lastname>>," Karpenko says as you turn away. "You seem like a trustworthy young lady. There may be a way I can arrange this loan if you''re willing to be... cooperative."'
 				'"Wait, Miss <<$pcs_lastname>>," Karpenko says as you turn away. "You seem like a trustworthy young lady. There may be a way I can arrange this loan if you''re willing to be... cooperative."'
 				*nl
 				*nl
-				'You''re young, but even so there''s little doubt about what sort of cooperation he''s talking about – the way his eyes are undressing you as you stand before him makes his intentions quite plain.'
+				'You''re young, but even so there''s little doubt about what sort of cooperation he''s implying. The way his eyes are undressing you as you stand before him makes his intentions quite plain.'
 				'He wants you to use your body as collateral! Is that really something you would consider? Is the loan really worth that much to you?'
 				'He wants you to use your body as collateral! Is that really something you would consider? Is the loan really worth that much to you?'
 
 
 				gs 'bank', 'loan_officer', 'sex_start'
 				gs 'bank', 'loan_officer', 'sex_start'
 			end
 			end
 		end
 		end
 
 
-		act 'Actually, I''ve changed my mind. Sorry to bother you.':
+		act 'Change your mind':
 			minut += 3
 			minut += 3
 			gt 'bank', 'start'
 			gt 'bank', 'start'
 		end
 		end
@@ -190,7 +184,7 @@ if $ARGS[0] = 'loan_officer':
 		if pcs_inhib >= 35 and stat['vaginal'] ! 0:
 		if pcs_inhib >= 35 and stat['vaginal'] ! 0:
 			gs 'willpower', 'sex', 'self', 'medium'
 			gs 'willpower', 'sex', 'self', 'medium'
 			if will_cost <= pcs_willpwr:
 			if will_cost <= pcs_willpwr:
-				act 'I think you''ll find that I can be very cooperative, Mr. Karpenko..." (<<will_cost>> Willpower)':
+				act 'Co-operate (<<will_cost>> Willpower)':
 					*clr & cla
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
 					gs 'stat'
@@ -203,41 +197,29 @@ if $ARGS[0] = 'loan_officer':
 					$npc_notes[$npclastgenerated] = 'A young Loan Officer for VTB Bank'
 					$npc_notes[$npclastgenerated] = 'A young Loan Officer for VTB Bank'
 					gs 'npcpreservec', $npclastgenerated
 					gs 'npcpreservec', $npclastgenerated
 					$boy = $npclastsaved
 					$boy = $npclastsaved
-
-					'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/005.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/005.jpg"></center>'
 					'"Time to put your mouth where my money is, girl," Karpenko says with a grin that''s just a little unnerving. You start to get the sense that you might just be in for more than you bargained for with this man, but it''s too late to back out now.'
 					'"Time to put your mouth where my money is, girl," Karpenko says with a grin that''s just a little unnerving. You start to get the sense that you might just be in for more than you bargained for with this man, but it''s too late to back out now.'
-					*nl
 					'Affecting your sultriest walk and your hungriest gaze, you approach him as he rises from his chair. You open your mouth to say some sophisticated-sounding banter, but Karpenko cuts you off by grabbing your waist and pulling you toward him, stopping your speech by filling your mouth with his probing tongue.'
 					'Affecting your sultriest walk and your hungriest gaze, you approach him as he rises from his chair. You open your mouth to say some sophisticated-sounding banter, but Karpenko cuts you off by grabbing your waist and pulling you toward him, stopping your speech by filling your mouth with his probing tongue.'
-					*nl
-					'You gasp involuntarily at his forceful approach, but after a moment you regain some sense of composure. You know what you have to do, so you might as well do it. And who knows? You might actually like it too. You begin kissing him back, alternately probing his mouth and sucking his tongue like a miniature cock.'
-					*nl
-
+					'You gasp involuntarily at his forceful approach, but after a moment you regain some sense of composure. You begin kissing him back, alternately probing his mouth and sucking his tongue like a miniature cock.'
 					gs 'arousal', 'kiss', 10, 'sub'
 					gs 'arousal', 'kiss', 10, 'sub'
 					gs 'stat'
 					gs 'stat'
 
 
-					act 'Get his cock ready to fuck you':
+					act 'Get his cock ready':
 						*clr & cla
 						*clr & cla
-						'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/007.jpg"></center>'
 						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/007.jpg"></center>'
-						'After a few moments of tangling tongues, Karpenko sits down in his chair with a nasty grin and says, "You came in here to beg for a loan, didn''t you? I think sluts beg best on their knees with their mouths full."'
-						*nl
-						'"Yes, sir," you murmur as you sink to your knees and crawl under the table to go between his legs. Fifty thousand rubles is a lot of money, and if Karpenko wants you to perform like a submissive whore for it, then that''s exactly what you''ll do. And if your pussy is getting a little wet at this treatment, well, you can''t be blamed for that. It is rather thrilling!'
-						*nl
-						'His cock is already hard in his pants as you undo his zipper and fish it out. You pause only for a moment to admire the tool – at 21 thick, glorious centimeters, it is worthy of a little admiration – before putting your skilled mouth to work. You run your tongue up the thick vein on the underside, feeling his heat and tasting his salty flavor, until you come to his flaring mushroom head. Your eyes lock with his as you swirl your tongue around the glans before you swallow him into your throat. You spend the next several minutes on your knees and he spends the next several minutes loving your attentions.'
+						'After a few minutes, Karpenko sits on his chair with a nasty grin. "You came in here to beg for a loan, didn''t you? I think sluts beg best on their knees with their mouths full."'
+						'"Yes, sir," you murmur as you sink to your knees and crawl under the table.'
+						'His cock is already hard in his pants as you undo his zipper and fish it out. You pause only for a moment to admire the tool – at 21 thick, glorious centimeters, it''s worthy of a little admiration – before putting your skilled mouth to work. You run your tongue up the thick vein on the underside, feeling his heat and tasting his salty flavor until you come to his flaring head. Your eyes lock with his as you swirl your tongue around the glans before you swallow him into your throat.'
 						*nl
 						*nl
-						'Finally your efforts bear fruit as Karpenko says, "Let''s move over to the sofa. Time to put that pussy of yours to work!"'
-
+						'Finally your efforts bear fruit. "Let''s move over to the sofa. Time to put that pussy of yours to work!"'
 						gs 'arousal', 'bj', 15, 'sub'
 						gs 'arousal', 'bj', 15, 'sub'
 						gs 'stat'
 						gs 'stat'
 
 
 						act 'Lie on your side':
 						act 'Lie on your side':
 							*clr & cla
 							*clr & cla
-							'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
-							'Karpenko leads you to the leather-covered sofa in his room and lies down on it, pulling you in to spoon with him. You barely get settled before he turns your head and puts his mouth on yours, and you''re still kissing him when, a few moments later, he pushes his cock into your tight, hungry pussy. In a single, swift movement he has buried himself into you up to the balls, its thick length making you gasp into his mouth. Without a pause he begins to fuck you, his hips pushing forward into your ass as he plunders your depths, and before long you lose yourself in the pleasure and find yourself pushing back into him to take every millimeter into you.'
-							*nl
-
+							'Karpenko leads you to the leather-covered sofa and lies down on it, pulling you in to spoon with him. You barely get settled before he turns your head and starts kissing you. A few minutes later, he pushes his cock into your pussy.'
+							'In a single, swift movement, he has buried himself in you, his thick length making you gasp into his mouth as he starts to fuck you, his hips pushing forward into your ass. Before long, you lose yourself in the pleasure and find yourself pushing back into him.'
 							gs 'arousal', 'kiss', -5, 'sub'
 							gs 'arousal', 'kiss', -5, 'sub'
 							gs 'arousal', 'vaginal', 15, 'sub'
 							gs 'arousal', 'vaginal', 15, 'sub'
 							gs 'stat'
 							gs 'stat'
@@ -246,37 +228,28 @@ if $ARGS[0] = 'loan_officer':
 								*clr & cla
 								*clr & cla
 								'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 								'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
-								'With a growled, “I want you on top, you sweet little whore,” Karpenko pulls his dick out of you and rolls to his back. You swing atop him, and he holds your hips as you reach between your legs and grasp his cock to hold it upright, and both of you gasp in unison as you settle down on it and feel it fill your hungry cunt. You take it all the way down until you''re sitting on his balls and then, eyes closed begin to ride him.'
-								*nl
-								'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, and you can''t really argue the point since you''re fucking him to get a bank loan. And damn but it feels good, with his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him putting friction on your clit, then start riding him again, making yourself gasp every time you take him to the hilt.'
-								*nl
-
+								'"I want you on top, you sweet little whore," he growls as pulls his dick out of you and rolls onto his back. You swing atop him, and he holds your hips as you reach between your legs and grasp his cock. Both of you gasp in unison as you settle down on it and feel it fill your pussy once again. You take it all inside you and then, eyes closed, begin to ride him.'
+								'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him, putting friction on your clit as you take him to the hilt.'
 								gs 'arousal', 'vaginal', 15, 'sub'
 								gs 'arousal', 'vaginal', 15, 'sub'
 								gs 'stat'
 								gs 'stat'
 
 
-								act 'Taking it like a bitch': gt 'bank', 'loan_officer', 'sex_finish'
+								act 'Take it': gt 'bank', 'loan_officer', 'sex_finish'
 							end
 							end
 						end
 						end
 
 
 						act 'Get on top':
 						act 'Get on top':
 							*clr & cla
 							*clr & cla
-							'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
 							'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/009.jpg"></center>'
-							'Karpenko leads you to the plush leather sofa and lies down on his back, and you waste no time climbing atop him. He holds your hips as you reach between your legs and grasp his cock to hold it upright, and both of you gasp in unison as you settle down on it and feel it fill your hungry cunt. You take it all the way down until you''re sitting on his balls and then, eyes closed begin to ride him.'
-							*nl
-							'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, and you can''t really argue the point since you''re fucking him to get a bank loan. And damn but it feels good, with his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him putting friction on your clit, then start riding him again, making yourself gasp every time you take him to the hilt.'
-							*nl
-
+							'Karpenko leads you to the plush leather sofa and lies down on his back. You waste no time climbing atop him and he holds your hips as you reach between your legs and grasp his cock. Both of you gasp in unison as you settle down on it and feel it fill your pussy once again. You take it all inside you and then, eyes closed, begin to ride him.'
+								'"You''re a dirty little slut, Miss <<$pcs_lastname>>," Karpenko muses as you bounce on him, his thick cock stretching you and finding wonderful depths to your pussy. You grind your hips against him, putting friction on your clit as you take him to the hilt.'
 							gs 'arousal', 'vaginal', 15, 'sub'
 							gs 'arousal', 'vaginal', 15, 'sub'
 							gs 'stat'
 							gs 'stat'
 
 
 							act 'Spoon-fucking':
 							act 'Spoon-fucking':
 								*clr & cla
 								*clr & cla
-								'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
 								'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/008.jpg"></center>'
-								'"On your side now," Karpenko tells you gruffly. You clamber off and let him adjust himself against the back of the sofa before moving to join him. He grabs you roughly, pulling you in to spoon with him. You barely get settled before he turns your head and puts his mouth on yours, and you''re still kissing him when, a few moments later, he pushes his cock into your tight, hungry pussy. In a single, swift movement he has buried himself into you up to the balls, its thick length making you gasp into his mouth. Without a pause he begins to fuck you, his hips pushing forward into your ass as he plunders your depths, and before long you find yourself pushing back into him to take every millimeter into you.'
-								*nl
-
+								'"On your side now," Karpenko tells you gruffly and you clamber off and let him adjust himself against the back of the sofa before moving to join him. He grabs you roughly, pulling you in to spoon with him. You barely get settled before he turns your head and starts kissing you. A few minutes later, he pushes his cock into your pussy.'
+								'In a single, swift movement, he has buried himself in you, his thick length making you gasp into his mouth as he starts to fuck you, his hips pushing forward into your ass. Before long, you lose yourself in the pleasure and find yourself pushing back into him.'
 								gs 'arousal', 'kiss', -5
 								gs 'arousal', 'kiss', -5
 								gs 'arousal', 'vaginal', 15, 'sub'
 								gs 'arousal', 'vaginal', 15, 'sub'
 								gs 'stat'
 								gs 'stat'
@@ -287,21 +260,19 @@ if $ARGS[0] = 'loan_officer':
 					end
 					end
 				end
 				end
 			else
 			else
-				act 'I think you''ll find that I can be very cooperative, Mr. Karpenko..." (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Co-operate(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			end
 		end
 		end
 
 
-		act 'No, sleeping with a man for money is not something you''re willing to do!':
+		act 'Refuse':
 			*clr & cla
 			*clr & cla
-			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/006.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/006.jpg"></center>'
-			'"I''m sorry, Mr. Karpenko," you say as you pull away, "but I really can''t do this after all I''m just not that sort of girl. I''m sorry to waste your time."'
+			'"I''m sorry," you say as you pull away, "I''m just not that sort of girl. Sorry to waste your time."'
 			'You turn and head for the door, but Karpenko''s voice stops you before you reach it. "Wait a moment, Miss <<$pcs_lastname>>. Before you go, I want you to know that this offer remains open. If you change your mind, you can return at any time and we can arrange the loan you desire."'
 			'You turn and head for the door, but Karpenko''s voice stops you before you reach it. "Wait a moment, Miss <<$pcs_lastname>>. Before you go, I want you to know that this offer remains open. If you change your mind, you can return at any time and we can arrange the loan you desire."'
-			'"I... will keep that in mind," you mutter as you throw open the door and run back to the safety of the lobby.'
-			*nl
+			'"I''ll... Keep that in mind," you mutter as you throw the door open and run back to the safety of the lobby.'
 			gs 'stat'
 			gs 'stat'
 
 
-			act 'Flee the room':
+			act 'Flee':
 				minut += 10
 				minut += 10
 				gt 'bank', 'start'
 				gt 'bank', 'start'
 			end
 			end
@@ -309,41 +280,28 @@ if $ARGS[0] = 'loan_officer':
 
 
 	elseif $ARGS[1] = 'sex_finish':
 	elseif $ARGS[1] = 'sex_finish':
 		*clr & cla
 		*clr & cla
-		'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/010.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/010.jpg"></center>'
-		'After several long, wonderful minutes of railing you hard, Karpenko swats your ass loudly and says, "I want to fuck you from behind now. Bend over the table."'
-		*nl
-		'He''s ordering you around like a whore he paid for, but the whole thing is quite thrilling – and he really knows how to use that big dick he''s swinging! You almost jump off the couch and run to the table, bending over and swinging one leg up onto the surface to brace yourself. An instant later Karepenko''s hands are on your upturned ass and then his cock is back inside you – and this time he''s not holding back a bit! He thrusts so fiercely that your whole body shakes every time his hips collide with your ass, and your pussy sucks fiercely at his rod as it hammers in and out.'
-		*nl
-		'You''re trying to be quiet – it would be mortifying if anyone outside this room heard you being screwed like a cheap prostitute! – but he is too forceful and too skilled, and soon you are giving a loud, moaning gasp with every thrust, too lost in the bliss he is giving you to care a damn what happens after he''s done with you. You don''t even know how long that state lasts, lost in pleasure as you are, but you suddenly become aware that he has given you one last particularly deep thrust and is now still as his cock leaps and jumps inside you.'
-		*nl
-
+		'After several minutes, Karpenko smacks your ass. "I want to fuck you from behind now. Bend over the table."'
+		'You slide off the couch and move to bend over, swinging one leg up onto the surface to brace yourself. An instant later, Karepenko''s hands are on your ass and his cock is back inside you. He thrusts so fiercely that your whole body shakes every time his hips collide with your ass and your pussy clenches tightly around him as he hammers in and out.'
+		'You''re trying to be quiet, but he''s too forceful and you''re soon letting out loud, moaning gasps with every thrust, too lost in the bliss he''s giving you to care what happens. You don''t know how long this lasts, lost in pleasure as you are, but you suddenly become aware that he has given you one last particularly deep thrust and suddenly feel his cock twitching inside you.'
 		gs 'arousal', 'vaginal', 15, 'sub'
 		gs 'arousal', 'vaginal', 15, 'sub'
 		gs 'stat'
 		gs 'stat'
 
 
 		act 'What did you do?!':
 		act 'What did you do?!':
 			*clr & cla
 			*clr & cla
-			'<center><b><font color="maroon">Mr. Karpenko</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/011.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/bank/sex/011.jpg"></center>'
-			'Sudden panic surges in you chest and dispels the pleasure-cobwebs in an instant as you demand, "Did you just come inside me?!?"'
-			*nl
-			'Karpenko steps back and a flood of his spunk pours out of your pussy to run down your thighs, but you have no delusions that all of it came out. With a smug grin he grabs a tissue from his desk and starts wiping his dick off, saying, "You just got a loan of 50.000 rubles. Did you really think I would authorize that sort of loan to a girl like you and not finish inside?"'
-			*nl
+			'Sudden panic surges in your chest and dispels the pleasure in an instant. "Did you just cum inside me?!?"'
+			'Karpenko steps back and you feel his cum dribbling out of your pussy and down your thigh as he pants loudly. "You just got a loan of 50,000 <b>₽</b>. Did you really think I would authorize that sort of loan to a girl like you and not finish inside?"'
 			'"But I could get pregnant!" you object.'
 			'"But I could get pregnant!" you object.'
 			*nl
 			*nl
-			'"You can afford a hell of a lot of morning after pills," he says with a shrug as he tucks his cock away and sits back at his desk. "Remember, you will need to pay this loan back like any other, and don''t think you can come back for another loan like it in the future. Now, if you''ll excuse me, I have work to do. I trust you can see yourself out."'
-			*nl
-			'Feeling humiliated but richer, you adjust your clothing and open the office door to step out into the hallway. The first thing you see is a cluster of three female bank employees looking at you, and you can see from their smirks and how they whisper to each other that they know exactly what you were up to with the loan officer. Cheeks burning with shame, you hurry away.'
-			*nl
-
+			'"You can afford a hell of a lot of morning after pills," he says with a shrug as he tucks his cock away and sits back at his desk. "Remember, you''ll need to pay this loan back like any other, and don''t think you can come back for another loan like it in the future. Now, if you''ll excuse me, I have work to do. I trust you can see yourself out."'
+			'Feeling humiliated, you adjust your clothing and open the office door to step out into the hallway. The first thing you see is a cluster of three female bank employees looking at you, and you can see from their smirks and how they whisper to each other that they know exactly what you were up to with the loan officer. Cheeks burning with shame, you hurry away.'
 			gs 'cum_call', '', $boy, 1, '', '', 110
 			gs 'cum_call', '', $boy, 1, '', '', 110
 			gs 'cuminsidereact', 'Mr. Karpenko'
 			gs 'cuminsidereact', 'Mr. Karpenko'
 			gs 'fame', 'city', 'sex', 3
 			gs 'fame', 'city', 'sex', 3
 			gs 'arousal', 'end'
 			gs 'arousal', 'end'
-
 			bankDebtLimit += 45000
 			bankDebtLimit += 45000
 			money += 45000
 			money += 45000
-
 			bankDebtLimitRaised = 1
 			bankDebtLimitRaised = 1
 			minut += 30
 			minut += 30
 			gs 'stat'
 			gs 'stat'
@@ -500,10 +458,10 @@ if $ARGS[0] = 'cikl':
 		if mey_vika['mey_vika_qw'] >= 35 and mey_tamara['qw_end'] = 0:
 		if mey_vika['mey_vika_qw'] >= 35 and mey_tamara['qw_end'] = 0:
 			if mey_tamara['help_count'] < 10:
 			if mey_tamara['help_count'] < 10:
 				karta += 10000
 				karta += 10000
-				'<b><font color=green>For your efforts aunt Tamara gave you 10,000 rubles</font></b>'
+				'<b><font color=green>Aunt Tamara gave you 10,000 rubles for your efforts</font></b>'
 			else
 			else
 				karta += 15000
 				karta += 15000
-				'<b><font color=green>For your efforts aunt Tamara gave you 15,000 rubles</font></b>'
+				'<b><font color=green>Aunt Tamara gave you 15,000 rubles for your efforts</font></b>'
 			end
 			end
 			mey_tamara['help_count'] = 0
 			mey_tamara['help_count'] = 0
 		end
 		end
@@ -537,7 +495,7 @@ if $ARGS[0] = 'cikl':
 			karta += pay
 			karta += pay
 			smenaSalon = 0
 			smenaSalon = 0
 			nopaysalon = 1
 			nopaysalon = 1
-			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in a beauty salon.</font></b>'
+			'<b><font color="green">Your salary of <<pay>> <b>₽</b> has been paid into your bank account for your work in the beauty salon.</font></b>'
 		end
 		end
 
 
 		if tanwork = 1 and nopaytanwork = 0:
 		if tanwork = 1 and nopaytanwork = 0:
@@ -588,28 +546,28 @@ if $ARGS[0] = 'cikl':
 		if func('homes_properties', 'get_owned_homes_count') > 0 and electroday = 0:
 		if func('homes_properties', 'get_owned_homes_count') > 0 and electroday = 0:
 			gs 'housing', 'util'
 			gs 'housing', 'util'
 			if bankAccount = 1 and karta - bankDebtLimit >= elektro:
 			if bankAccount = 1 and karta - bankDebtLimit >= elektro:
-				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account.</font></b>'
+				'<b><font color="green"><<elektro>> <b>₽</b> for utilities has been automatically deducted from your bank account.</font></b>'
 				electroday = 1
 				electroday = 1
 				if elektro >= 2000:
 				if elektro >= 2000:
-					elektro = 2000 + rand(0, 100)
+					elektro = 2000 + rand(0,100)
 					karta -= elektro * hcount_util
 					karta -= elektro * hcount_util
 				end
 				end
 			elseif bankAccount = 1 and karta >= elektro:
 			elseif bankAccount = 1 and karta >= elektro:
-				'<b><font color="green"><<elektro>> <b>₽</b> for utilities, has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
+				'<b><font color="green"><<elektro>> <b>₽</b> for utilities has been automatically deducted from your bank account and overdraw facility. Please contact your bank.</font></b>'
 				electroday = 1
 				electroday = 1
 				if elektro >= 2000:
 				if elektro >= 2000:
-					elektro = 2000 + rand(0, 100)
+					elektro = 2000 + rand(0,100)
 					karta -= elektro * hcount_util
 					karta -= elektro * hcount_util
 				end
 				end
 			elseif bankAccount = 0 and money >= elektro:
 			elseif bankAccount = 0 and money >= elektro:
-				'<b><font color="red">You currently do not have a bank account setup for automatic utilities payments. <<elektro>> <b>₽</b> has been deducted from your cash holdings.</font></b>'
+				'<b><font color="red">You currently do not have a bank account set up for automatic utilities payments. <<elektro>> <b>₽</b> has been deducted from your cash holdings.</font></b>'
 				electroday = 1
 				electroday = 1
 				if elektro >= 2000:
 				if elektro >= 2000:
-					elektro = 2000 + rand(0, 100)
+					elektro = 2000 + rand(0,100)
 					money -= elektro * hcount_util
 					money -= elektro * hcount_util
 				end
 				end
 			else
 			else
-				'<b><font color="red">Your card was declined during automatic debit of <<elektro>> <b>₽</b>, for automatic utilities payment.</font></b>'
+				'<b><font color="red">Your card was declined during automatic debit of <<elektro>> <b>₽</b> for automatic utilities payment.</font></b>'
 			end
 			end
 		end
 		end
 
 
@@ -617,15 +575,15 @@ if $ARGS[0] = 'cikl':
 		if kabel > 0 and kabelday = 0:
 		if kabel > 0 and kabelday = 0:
 			gs 'housing', 'cable'
 			gs 'housing', 'cable'
 			if bankAccount = 1 and karta - bankDebtLimit >= (300 * hcount_cable):
 			if bankAccount = 1 and karta - bankDebtLimit >= (300 * hcount_cable):
-				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account, for you cable TV subscription.</font></b>'
+				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account for your cable TV subscription.</font></b>'
 				kabelday = 1
 				kabelday = 1
 				karta -= 300 * hcount_cable
 				karta -= 300 * hcount_cable
 			elseif bankAccount = 1 and karta >= (300 * hcount_cable):
 			elseif bankAccount = 1 and karta >= (300 * hcount_cable):
-				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility, for you cable TV subscription.</font></b>'
+				'<b><font color="green">300 <b>₽</b> has been deducted from your bank account and overdraw facility for your cable TV subscription.</font></b>'
 				kabelday = 1
 				kabelday = 1
 				karta -= 300 * hcount_cable
 				karta -= 300 * hcount_cable
 			elseif bankAccount = 0 and money >= (300 * hcount_cable):
 			elseif bankAccount = 0 and money >= (300 * hcount_cable):
-				'<b><font color="red">You currently do not have a bank account setup for automatic payment of your cable TV subscription. 300 <b>₽</b> has been deducted from your cash holdings.</font></b>'
+				'<b><font color="red">You currently do not have a bank account set up for automatic payment of your cable TV subscription. 300 <b>₽</b> has been deducted from your cash holdings.</font></b>'
 				kabelday = 1
 				kabelday = 1
 				money -= 300 * hcount_cable
 				money -= 300 * hcount_cable
 			else
 			else

+ 1 - 1
locations/din_van.qsrc

@@ -213,7 +213,7 @@ if $ARGS[0] = 'shower':
 
 
 		if vanr_lock = 0 and $loc = 'vanrPar':
 		if vanr_lock = 0 and $loc = 'vanrPar':
 			*nl
 			*nl
-			'In your absentmindedness, you have forgotton to close the door.'
+			'In your absentmindedness, you have forgotten to close the door.'
 			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if your brother or stepfather looked in at the wrong time.'
 			'The idea that the door is open occupies your mind while you are showering. It would be very embarrassing if your brother or stepfather looked in at the wrong time.'
 			if locat['Fam_inGad'] = 0: gs 'vanrPar', 'peek'
 			if locat['Fam_inGad'] = 0: gs 'vanrPar', 'peek'
 		end
 		end

+ 3 - 0
locations/femcyc.qsrc

@@ -469,10 +469,13 @@ if $ARGS[0] = '':
 
 
 	if cycle > 3:
 	if cycle > 3:
 		stat['safe_day'] = 1
 		stat['safe_day'] = 1
+		$stat['preg_risk'] = 'safe'
 	elseif cycle = 0 or cycle = 3:
 	elseif cycle = 0 or cycle = 3:
 		stat['probably_safe_day'] = 1
 		stat['probably_safe_day'] = 1
+		$stat['preg_risk'] = 'prob_safe'
 	else
 	else
 		stat['dangerous_day'] = 1
 		stat['dangerous_day'] = 1
+		$stat['preg_risk'] = 'danger'
 	end
 	end
 
 
 
 

+ 67 - 76
locations/foto.qsrc

@@ -1,17 +1,12 @@
 # foto
 # foto
 !!2021/04/15
 !!2021/04/15
 if $ARGS[0] = 'start':
 if $ARGS[0] = 'start':
-	$loc = 'foto'
-	$loc_arg = 'start'
-
+	*clr & cla
 	close all
 	close all
+	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'start'
 	$location_type = 'indoors'
 	$location_type = 'indoors'
 	if model['status'] = 0:gt 'foto', 'studio'
 	if model['status'] = 0:gt 'foto', 'studio'
-	*clr & cla
-
-	$menu_loc = 'foto'
-	$menu_arg = 'start'
-	menu_off = 0
 
 
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if studio_strip = 0:
 	if studio_strip = 0:
@@ -24,7 +19,7 @@ if $ARGS[0] = 'start':
 	foto['documentary'] = rand(1,100)
 	foto['documentary'] = rand(1,100)
 	act 'Leave': gt'city_center'
 	act 'Leave': gt'city_center'
 	act'Strip down':
 	act'Strip down':
-		cla & *clr
+		*clr & cla
 		menu_off = 1
 		menu_off = 1
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 		'<center><video autoplay loop src="images/locations/city/citycenter/photo/fullstrip.mp4"></video></center>'
 		studio_strip += 1
 		studio_strip += 1
@@ -94,7 +89,7 @@ if $ARGS[0] = 'start':
 				lastwornpantynumber['foto'] = pantywornnumber
 				lastwornpantynumber['foto'] = pantywornnumber
 				$lastwornbratype['foto'] = $braworntype
 				$lastwornbratype['foto'] = $braworntype
 				lastwornbranumber['foto'] = brawornnumber
 				lastwornbranumber['foto'] = brawornnumber
-				cla & *clr
+				*clr & cla
 				menu_off = 1
 				menu_off = 1
 				inhib_exp += 2
 				inhib_exp += 2
 				if studio_strip_talk = 0:
 				if studio_strip_talk = 0:
@@ -129,7 +124,7 @@ if $ARGS[0] = 'start':
 					lastwornbranumber['foto'] = brawornnumber
 					lastwornbranumber['foto'] = brawornnumber
 				end
 				end
 				gs 'stat'
 				gs 'stat'
-				cla & *clr
+				*clr & cla
 				menu_off = 1
 				menu_off = 1
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip3.mp4"></video></center>'
 				'<center><video autoplay loop src="images/locations/city/citycenter/photo/strip3.mp4"></video></center>'
 				inhib_exp += 1
 				inhib_exp += 1
@@ -170,14 +165,14 @@ end
 if $ARGS[0] = 'studio':
 if $ARGS[0] = 'studio':
 	if hour < 3:gt 'foto', 'studio_closing'
 	if hour < 3:gt 'foto', 'studio_closing'
 
 
-	$loc_arg = 'studio'
-	$menu_loc = 'foto'
-	$menu_arg = 'studio'
+	*clr & cla
 	menu_off = 0
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'studio'
+	$location_type = 'indoors'
 	practice_session = 0
 	practice_session = 0
-	*clr & cla
 	killvar '$modelopt'
 	killvar '$modelopt'
 
 
+
 	minut += 5
 	minut += 5
 	gs 'stat'
 	gs 'stat'
 	gs 'themes', 'indoors'
 	gs 'themes', 'indoors'
@@ -313,14 +308,11 @@ if $ARGS[0] = 'studio':
 end
 end
 
 
 if $ARGS[0] = 'bathroom':
 if $ARGS[0] = 'bathroom':
-	$loc_arg = 'bathroom'
-	$menu_loc = 'foto'
-	$menu_arg = 'bathroom'
-	$locM = 'foto'
-	$locM_arg = 'bathroom'
+	*clr & cla
 	menu_off = 0
 	menu_off = 0
-	gs'stat'
-	cla & *clr
+	gs 'shortgs', 'setloc', 'foto', 'bathroom'
+	$location_type = 'bathroom'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models<<rand(1,2)>>.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models<<rand(1,2)>>.jpg"></center>'
 	'A gaggle of models crowd the <a href="exec:gt ''mirror'',''start''">mirrors</a> and sinks, loudly chatting, giggling, and generally gossiping about life in the city and the studio.'
 	'A gaggle of models crowd the <a href="exec:gt ''mirror'',''start''">mirrors</a> and sinks, loudly chatting, giggling, and generally gossiping about life in the city and the studio.'
 	*nl
 	*nl
@@ -341,34 +333,36 @@ if $ARGS[0] = 'bathroom':
 		end
 		end
 	end
 	end
 	if AlexandriaQW = 1:
 	if AlexandriaQW = 1:
-	    act'Listen to the gossip':
-	        *clr & cla
+		act'Listen to the gossip':
+			*clr & cla
 			AlexandriaQW = 2
 			AlexandriaQW = 2
 			gs 'stat'
 			gs 'stat'
-           	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
-            'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
-            '"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
-            '"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
-            '"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
-            '"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
-            '"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
-            '"You mean the props room?"'
-            'Okay, that''s a clue! Maybe you should search the props room?'
-            act 'Continue': gt 'foto', 'bathroom'
-        end
-    else
-	    act 'Listen to the gossip': gt 'foto_models', 'model_chatter'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
+			'You are trying to find the "McGuffin" that Tatiana told you was somewhere in the agency and that was cursing the place, but you haven''t had much luck... until now. You feel a magic tingle and snoop on an interesting titbit.'
+			'"Oh my god! You need to meet this girl! She is an incredible mass... massa... masse... Damn! She is good with her hands!"'
+			'"Sorry, I don''t swing that way. Well... except on my boyfriend''s birthday."'
+			'"Huh?! No! Well... maybe? I mean that she can help you with your boob pains!"'
+			'"You mean my BACK pains? Are you feeling alright? You sound a little off today."'
+			'"What? Yes! I''m feeling great! You <i>must</i> meet her! She''s a redhead named Tatiana! She hangs out back there, in the room where we store the... umm... the things that we use for the shoots!"'
+			'"You mean the props room?"'
+			'Okay, that''s a clue! Maybe you should search the props room?'
+			act 'Continue': gt 'foto', 'bathroom'
+		end
+	else
+		act 'Listen to the gossip': gt 'foto_models', 'model_chatter'
 	end
 	end
 	if AlexandriaQW = 2:
 	if AlexandriaQW = 2:
-	    act'Search the props'' room':gt 'tatiana_missions', 'mission2A'
+		act'Search the props'' room':gt 'tatiana_missions', 'mission2A'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'showers':
 if $ARGS[0] = 'showers':
-	$loc_arg = 'showers'
-	gs'stat'
-	cla & *clr
+	*clr & cla
 	menu_off = 1
 	menu_off = 1
+	gs 'shortgs', 'setloc', 'foto', 'showers'
+	$location_type = 'bathroom'
+	gs 'stat'
+
 	krystal['shower_sex'] = rand(1,7)
 	krystal['shower_sex'] = rand(1,7)
 	if krystal['shower_sex'] = 7 and krystal['status'] >= 3:gt 'model_krystal','krystalshower'
 	if krystal['shower_sex'] = 7 and krystal['status'] >= 3:gt 'model_krystal','krystalshower'
 
 
@@ -380,10 +374,11 @@ if $ARGS[0] = 'showers':
 
 
 	act 'Go to the studio floor':pcs_shave['free_razor'] = 0 & gt 'foto', 'studio'
 	act 'Go to the studio floor':pcs_shave['free_razor'] = 0 & gt 'foto', 'studio'
 
 
-	if mc_inventory['shampoo'] > 0:
+	if mc_inventory['shampoo'] <= 0:
+		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
+	else
 		act 'Take a shower (0:15)':
 		act 'Take a shower (0:15)':
-			cla
-			*clr
+			*clr & cla
 			minut += 15
 			minut += 15
 			pcs_horny += 1
 			pcs_horny += 1
 			pcs_hairbsh = 0
 			pcs_hairbsh = 0
@@ -395,8 +390,7 @@ if $ARGS[0] = 'showers':
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			if pcs_horny >= 40:
 			if pcs_horny >= 40:
 				act 'Use the showerhead on your pussy':
 				act 'Use the showerhead on your pussy':
-					cla
-					*clr
+					*clr & cla
 					$orgasm_or = 'no'
 					$orgasm_or = 'no'
 					gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 					gs 'arousal', 'clit_vibe', -5, 'masturbate', 'exhibitionism'
 					$orgasm_or = 'no'
 					$orgasm_or = 'no'
@@ -455,8 +449,6 @@ if $ARGS[0] = 'showers':
 			dynamic $brit
 			dynamic $brit
 			act 'Get out of the shower':gt 'foto', 'showers'
 			act 'Get out of the shower':gt 'foto', 'showers'
 		end
 		end
-	else
-		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
 	end
 	end
 	'<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	'<a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>'
 	if mesec > 0 and isprok = 0:
 	if mesec > 0 and isprok = 0:
@@ -493,14 +485,11 @@ if $ARGS[0] = 'showers':
 end
 end
 
 
 if $ARGS[0] = 'makeup':
 if $ARGS[0] = 'makeup':
-	gs'stat'
 	*clr & cla
 	*clr & cla
-	$locM = 'foto'
-	$locM_arg = 'makeup'
-	$loc_arg = 'makeup'
-	$menu_loc = 'foto'
-	$menu_arg = 'makeup'
 	menu_off = 0
 	menu_off = 0
+	gs 'shortgs', 'setloc', 'foto', 'makeup'
+	$location_type = 'indoors'
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/mirrors.jpg"></center>'
 	'The backstage area where you and the other girls put on your makeup.'
 	'The backstage area where you and the other girls put on your makeup.'
 	act 'Back to the studio': gt 'foto', 'studio'
 	act 'Back to the studio': gt 'foto', 'studio'
@@ -521,7 +510,7 @@ if $ARGS[0] = 'makeup':
 		act'Do your own makeup': menu_off = 1 & gt 'mirror', 'start'
 		act'Do your own makeup': menu_off = 1 & gt 'mirror', 'start'
 
 
 		act'Go to the makeup artists (0:30)':
 		act'Go to the makeup artists (0:30)':
-			cla & *clr
+			*clr & cla
 			menu_off = 1
 			menu_off = 1
 			minut += 30
 			minut += 30
 			pcs_hairbsh = 1
 			pcs_hairbsh = 1
@@ -552,7 +541,10 @@ end
 
 
 
 
 if $ARGS[0] = 'manager_talk':
 if $ARGS[0] = 'manager_talk':
+	*clr & cla
+	menu_off = 1
 	minut += 1
 	minut += 1
+	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'You approach the manager''s desk.'
 	'You approach the manager''s desk.'
 	'"Something I can help you with <<$model[''firstname'']>>?"'
 	'"Something I can help you with <<$model[''firstname'']>>?"'
@@ -627,7 +619,7 @@ end
 
 
 if $ARGS[0] = 'hiring_ask':
 if $ARGS[0] = 'hiring_ask':
 	act 'Ask about working as a glamor model':
 	act 'Ask about working as a glamor model':
-		cla & *clr
+		*clr & cla
 		menu_off = 1
 		menu_off = 1
 		minut += 1
 		minut += 1
 		gs 'stat'
 		gs 'stat'
@@ -713,7 +705,7 @@ if $ARGS[0] = 'hiring_ask':
 end
 end
 
 
 if $ARGS[0] = 'interview':
 if $ARGS[0] = 'interview':
-	cla & *clr
+	*clr & cla
 	menu_off = 1
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	if anushkaQW['model_referral'] = 1:	'You walk up to the front desk and say Anushka sent you. You only have to wait a few minutes before somebody arrives to interview you.'
 	if anushkaQW['model_referral'] = 1:	'You walk up to the front desk and say Anushka sent you. You only have to wait a few minutes before somebody arrives to interview you.'
@@ -739,7 +731,7 @@ if $ARGS[0] = 'interview':
 end
 end
 
 
 if $ARGS[0] = 'interview2':
 if $ARGS[0] = 'interview2':
-	cla & *clr
+	*clr & cla
 	menu_off = 1
 	menu_off = 1
 	if pcs_inhib > 40:
 	if pcs_inhib > 40:
 		gs 'willpower', 'skill', 'pcs_inhib', 'easy'
 		gs 'willpower', 'skill', 'pcs_inhib', 'easy'
@@ -889,7 +881,7 @@ if $ARGS[0] = 'job_decline':
 	if foto_weight >= 25:
 	if foto_weight >= 25:
 		'"I''m sorry," he says shaking his head. "You did lose weight, I''ll give you that, but it''s not quite enough for our requirements. But you''ve made progress. Give it a few more weeks of effort and come back again. We can still use you if you''re within the limit."'
 		'"I''m sorry," he says shaking his head. "You did lose weight, I''ll give you that, but it''s not quite enough for our requirements. But you''ve made progress. Give it a few more weeks of effort and come back again. We can still use you if you''re within the limit."'
 		act'Sigh':
 		act'Sigh':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You sigh in disappointment as you pick your clothes back up and start to get dressed again. Still more weight to lose? Now what are you going to do? Keep trying or give up?'
 			'You sigh in disappointment as you pick your clothes back up and start to get dressed again. Still more weight to lose? Now what are you going to do? Keep trying or give up?'
 			gs 'clothing', 'wear_last_worn'
 			gs 'clothing', 'wear_last_worn'
@@ -902,7 +894,7 @@ if $ARGS[0] = 'job_decline':
 		'The man''s words sting heavily at your confidence and you cover yourself in shame by instinct. He still continues to eye you up and down and you squirm as his gaze roams your breasts, stomach, and pussy.'
 		'The man''s words sting heavily at your confidence and you cover yourself in shame by instinct. He still continues to eye you up and down and you squirm as his gaze roams your breasts, stomach, and pussy.'
 		'"That being said, I can still see that you have some potential. So go running, start working out. If you lose some weight, I could see you getting another shot at working here in the future."'
 		'"That being said, I can still see that you have some potential. So go running, start working out. If you lose some weight, I could see you getting another shot at working here in the future."'
 		act'React solemnly':
 		act'React solemnly':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You glumly pick your clothes up off the floor and get dressed before leaving. As you do, you stop at the door and look back in.'
 			'You glumly pick your clothes up off the floor and get dressed before leaving. As you do, you stop at the door and look back in.'
 			'<i>Is this it for me? Am I ever going to be able to lose enough weight to work here?</i>'
 			'<i>Is this it for me? Am I ever going to be able to lose enough weight to work here?</i>'
@@ -915,7 +907,7 @@ if $ARGS[0] = 'job_decline':
 		end
 		end
 
 
 		act'React determinedly':
 		act'React determinedly':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'You nod at him, feeling a bit dejected but more determined than ever. You get dressed with purpose and head to the door. As you do, you think to yourself...'
 			'You nod at him, feeling a bit dejected but more determined than ever. You get dressed with purpose and head to the door. As you do, you think to yourself...'
 			'<i>I will be able to do this! I''ll get in shape and I''ll work here one day! I''m not going to lose my shot at this!</i>'
 			'<i>I will be able to do this! I''ll get in shape and I''ll work here one day! I''m not going to lose my shot at this!</i>'
@@ -1029,7 +1021,7 @@ if $ARGS[0] = 'job_offer':
 	elseif age_truth = 1:
 	elseif age_truth = 1:
 		if fotofit ! 1:
 		if fotofit ! 1:
 			act '"Oh. Okay..."':
 			act '"Oh. Okay..."':
-				cla & *clr
+				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 				'You put your clothes back on, slightly annoyed as you get ready to leave. If he knew you were underage, why did he have you strip in the first place?!'
 				'You put your clothes back on, slightly annoyed as you get ready to leave. If he knew you were underage, why did he have you strip in the first place?!'
 				gs 'clothing', 'wear_last_worn'
 				gs 'clothing', 'wear_last_worn'
@@ -1040,7 +1032,7 @@ if $ARGS[0] = 'job_offer':
 		end
 		end
 
 
 		act 'Plead':
 		act 'Plead':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 			fakepassport = 2
 			fakepassport = 2
 			fotofakepassport = 2
 			fotofakepassport = 2
@@ -1150,7 +1142,7 @@ end
 
 
 
 
 if $ARGS[0] = 'model_name1':
 if $ARGS[0] = 'model_name1':
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'"A few more things to fill out your profile. Did you want to have a model name or a pseudonym? Or would you prefer to use your real name?"'
 	'"A few more things to fill out your profile. Did you want to have a model name or a pseudonym? Or would you prefer to use your real name?"'
 	gs 'foto', 'model_name2'
 	gs 'foto', 'model_name2'
@@ -1171,7 +1163,7 @@ if $ARGS[0] = 'model_name2':
 
 
 	if model['ask_model_name'] = 0:
 	if model['ask_model_name'] = 0:
 		act'Why would I?':
 		act'Why would I?':
-			cla & *clr
+			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 			'"Why would I want to use a fake name?" you ask. "Is there a reason I should?"'
 			'"Why would I want to use a fake name?" you ask. "Is there a reason I should?"'
 			'"Not <i>should</i>," he explains. "But some girls like to have a little distance from their personal lives. Or they use it to sound more professional or to stand out more. A name like ''Elena Ivanova'' isn''t exactly uncommon."'
 			'"Not <i>should</i>," he explains. "But some girls like to have a little distance from their personal lives. Or they use it to sound more professional or to stand out more. A name like ''Elena Ivanova'' isn''t exactly uncommon."'
@@ -1184,7 +1176,7 @@ if $ARGS[0] = 'model_name3':
 	$model['firstname'] = input("What is the first name of your model persona?")
 	$model['firstname'] = input("What is the first name of your model persona?")
 	$model['nickname'] = input("What is the shortened version or nickname of your model persona?")
 	$model['nickname'] = input("What is the shortened version or nickname of your model persona?")
 	$model['lastname'] = input("What is the last name of your model persona?")
 	$model['lastname'] = input("What is the last name of your model persona?")
-	cla & *clr
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/foto.jpg"></center>'
 	'"<<$model[''firstname'']>>..." he mutters, slowly typing. "<<$model[''lastname'']>>... Okay, there. Is this correct?"'
 	'"<<$model[''firstname'']>>..." he mutters, slowly typing. "<<$model[''lastname'']>>... Okay, there. Is this correct?"'
 	'He turns the screen around so you can see what he wrote.'
 	'He turns the screen around so you can see what he wrote.'
@@ -1224,7 +1216,7 @@ if $ARGS[0] = 'model_profile':
 end
 end
 
 
 if $ARGS[0] = 'pay_type':
 if $ARGS[0] = 'pay_type':
-	cla & *clr
+	*clr & cla
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><b><font color="maroon">Photographer</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/fotograph.jpg"></center>'
 	'"One last question. How do you want to be paid? Cash on the spot or direct deposit into your bank account?"'
 	'"One last question. How do you want to be paid? Cash on the spot or direct deposit into your bank account?"'
@@ -1349,8 +1341,7 @@ if $ARGS[0] = 'microcamera_ask':
 end
 end
 
 
 if $ARGS[0] = 'blackm':
 if $ARGS[0] = 'blackm':
-	*clr
-	cla
+	*clr & cla
 	menu_off = 1
 	menu_off = 1
 	gs 'stat'
 	gs 'stat'
 
 
@@ -1494,19 +1485,19 @@ if $ARGS[0] = 'underwear':
 end
 end
 
 
 if $ARGS[0] = 'cikl':
 if $ARGS[0] = 'cikl':
-	if modelfoto['erotic']  >= 10 or (modelfoto['erotic'] > modelfoto['fashion']  and modelfoto['erotic']  > modelfoto['fitness']  and modelfoto['erotic']  > modelfoto['glamour']  and modelfoto['erotic']  > modelfoto['lingerie']  and modelfoto['erotic']  > modelfoto['catalog'] and modelfoto['erotic'] > modelfoto['nude']):
+	if modelfoto['erotic'] >= 10 or (modelfoto['erotic'] > modelfoto['fashion'] and modelfoto['erotic'] > modelfoto['fitness'] and modelfoto['erotic'] > modelfoto['glamour'] and modelfoto['erotic'] > modelfoto['lingerie'] and modelfoto['erotic'] > modelfoto['catalog'] and modelfoto['erotic'] > modelfoto['nude']):
 		$model['type'] = 'erotic'
 		$model['type'] = 'erotic'
-	elseif modelfoto['nude']  > modelfoto['fashion']  and modelfoto['nude']  > modelfoto['fitness']  and modelfoto['nude']  > modelfoto['glamour']  and modelfoto['nude']  > modelfoto['lingerie']  and modelfoto['nude']  > modelfoto['catalog'] :
+	elseif modelfoto['nude'] > modelfoto['fashion'] and modelfoto['nude'] > modelfoto['fitness'] and modelfoto['nude'] > modelfoto['glamour'] and modelfoto['nude'] > modelfoto['lingerie'] and modelfoto['nude'] > modelfoto['catalog'] :
 		$model['type'] = 'artistic nude'
 		$model['type'] = 'artistic nude'
-	elseif modelfoto['fitness']  > modelfoto['fashion']  and modelfoto['fitness']  > modelfoto['nude']  and modelfoto['fitness']  > modelfoto['glamour']  and modelfoto['fitness']  > modelfoto['lingerie']  and modelfoto['fitness']  > modelfoto['catalog'] :
+	elseif modelfoto['fitness'] > modelfoto['fashion'] and modelfoto['fitness'] > modelfoto['nude'] and modelfoto['fitness'] > modelfoto['glamour'] and modelfoto['fitness'] > modelfoto['lingerie'] and modelfoto['fitness'] > modelfoto['catalog'] :
 		$model['type'] = 'fitness'
 		$model['type'] = 'fitness'
-	elseif modelfoto['glamour']  > modelfoto['fashion']  and modelfoto['glamour']  > modelfoto['nude']  and modelfoto['glamour']  > modelfoto['fitness']  and modelfoto['glamour']  > modelfoto['lingerie']  and modelfoto['glamour']  > modelfoto['catalog'] :
+	elseif modelfoto['glamour'] > modelfoto['fashion'] and modelfoto['glamour'] > modelfoto['nude'] and modelfoto['glamour'] > modelfoto['fitness'] and modelfoto['glamour'] > modelfoto['lingerie'] and modelfoto['glamour'] > modelfoto['catalog'] :
 		$model['type'] = 'glamour'
 		$model['type'] = 'glamour'
-	elseif modelfoto['lingerie']  > modelfoto['fashion']  and modelfoto['lingerie']  > modelfoto['nude']  and modelfoto['lingerie']  > modelfoto['fitness']  and modelfoto['lingerie']  > modelfoto['glamour']  and modelfoto['lingerie']  > modelfoto['catalog'] :
+	elseif modelfoto['lingerie'] > modelfoto['fashion'] and modelfoto['lingerie'] > modelfoto['nude'] and modelfoto['lingerie'] > modelfoto['fitness'] and modelfoto['lingerie'] > modelfoto['glamour'] and modelfoto['lingerie'] > modelfoto['catalog'] :
 		$model['type'] = 'lingerie'
 		$model['type'] = 'lingerie'
-	elseif modelfoto['fashion']  > modelfoto['lingerie']  and modelfoto['fashion']  > modelfoto['nude']  and modelfoto['fashion']  > modelfoto['fitness']  and modelfoto['fashion']  > modelfoto['glamour']  and modelfoto['fashion']  > modelfoto['catalog'] :
+	elseif modelfoto['fashion'] > modelfoto['lingerie'] and modelfoto['fashion'] > modelfoto['nude'] and modelfoto['fashion'] > modelfoto['fitness'] and modelfoto['fashion'] > modelfoto['glamour'] and modelfoto['fashion'] > modelfoto['catalog'] :
 		$model['type'] = 'fashion'
 		$model['type'] = 'fashion'
-	elseif modelfoto['catalog']  > 0:
+	elseif modelfoto['catalog'] > 0:
 		$model['type'] = 'catalog'
 		$model['type'] = 'catalog'
 	end
 	end
 !!	if model = 1 and week = 1 and model['job_reset'] ! daystart: model_job_week = 0 & model['job_reset'] = daystart
 !!	if model = 1 and week = 1 and model['job_reset'] ! daystart: model_job_week = 0 & model['job_reset'] = daystart

+ 1 - 1
locations/gschool_detention.qsrc

@@ -279,7 +279,7 @@ if $ARGS[0] = 'upskirt1':
 	jump_counter = 0
 	jump_counter = 0
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/spreadg.jpg"></center>'
-	'You are sitting at a table, bored out of your mind and waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you. After a few minutes she leans back in her chair and relaxes, spreading her legs slightly as she does. The movement draws your eyes and you are given an eye full. She seems to have forgotton her panties today because her pussy is now on full display for anyone to see.'
+	'You are sitting at a table, bored out of your mind and waiting for detention to end. You start looking around and you notice <<$rand_girl>> sitting at a table across from you. After a few minutes she leans back in her chair and relaxes, spreading her legs slightly as she does. The movement draws your eyes and you are given an eye full. She seems to have forgotten her panties today because her pussy is now on full display for anyone to see.'
 	gs 'arousal', 'erotic', 5
 	gs 'arousal', 'erotic', 5
 	gs 'arousal', 'end'
 	gs 'arousal', 'end'
 	gs 'stat'
 	gs 'stat'

+ 10 - 13
locations/intro_sg_tg.qsrc

@@ -119,12 +119,16 @@ if $ARGS[0] = 'intro_4':
 	'You did the best you could to repress any resentment towards <<$pcs_nickname>> about how little she appreciated what she had.'
 	'You did the best you could to repress any resentment towards <<$pcs_nickname>> about how little she appreciated what she had.'
 
 
 	act 'When she talks about her mother, she calls her ...':
 	act 'When she talks about her mother, she calls her ...':
-
-		$npc_nickname['A29'] = '<<$npc_nickname[''A29'']>>'
-		$temp_nickname = $npc_nickname['A29']
-
-		$npc_nickname['A29'] = input('<center>What name does she use to address her mother?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
-		if $npc_nickname['A29'] = '':$npc_nickname['A29'] = '<<$temp_nickname>>'
+		gs 'npcstatic1'
+		gs 'npcstatic2'
+		gs 'npcstatic3'
+		gs 'npcstatic4'
+		gs 'npcstatic5'
+		gs 'npcstatic6'
+
+		$temp_nickname = input('<center>What name does she use to address her mother?<br>Mother (default), Mum, Mom, Mama, etc.</center>')
+		if $temp_nickname = '': $temp_nickname = $npc_nickname['A29']
+		$npc_nickname['A29'] = $temp_nickname
 		killvar '$temp_nickname'
 		killvar '$temp_nickname'
 
 
 		gt 'intro_sg_tg', 'intro_5'
 		gt 'intro_sg_tg', 'intro_5'
@@ -167,13 +171,6 @@ if $ARGS[0] = 'settings':
 
 
 	ml_update_1 = 1
 	ml_update_1 = 1
 
 
-	gs 'npcstatic1'
-	gs 'npcstatic2'
-	gs 'npcstatic3'
-	gs 'npcstatic4'
-	gs 'npcstatic5'
-	gs 'npcstatic6'
-
 	!! default friendship is 30 for all  npcs
 	!! default friendship is 30 for all  npcs
 	gs 'npc_relationship', 'default'
 	gs 'npc_relationship', 'default'
 	!! changes the values for family members and old friends
 	!! changes the values for family members and old friends

+ 3 - 3
locations/katja_pantyquest.qsrc

@@ -11,7 +11,7 @@
 
 
 if $ARGS[0] = 'kitchen':
 if $ARGS[0] = 'kitchen':
 	katjaQW['kitchen_day'] = daystart
 	katjaQW['kitchen_day'] = daystart
-	minuts += 5
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'kitchen', 1
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'kitchen', 1
 	if (katjaQW['pantiesQWstage'] < 3 or (katjaQW['pantiesQWstage'] = 3 and katjaQW['slut'] < 65)) and katjaQW['take_of_panties_day'] ! daystart:
 	if (katjaQW['pantiesQWstage'] < 3 or (katjaQW['pantiesQWstage'] = 3 and katjaQW['slut'] < 65)) and katjaQW['take_of_panties_day'] ! daystart:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting1.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/kitchen_sitting1.jpg"></center>'
@@ -315,7 +315,7 @@ end
 
 
 if $ARGS[0] = 'uni_hallway':
 if $ARGS[0] = 'uni_hallway':
 	katjaQW['uni_hallway_day'] = daystart
 	katjaQW['uni_hallway_day'] = daystart
-	minuts += 5
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_hallway.jpg"></center>'
 	'You walk up to the redhead, who is sitting comfortably on a chair. She notices you and smiles.'
 	'You walk up to the redhead, who is sitting comfortably on a chair. She notices you and smiles.'
@@ -517,7 +517,7 @@ end
 
 
 if $ARGS[0] = 'uni_exit':
 if $ARGS[0] = 'uni_exit':
 	katjaQW['uni_hallway_day'] = daystart
 	katjaQW['uni_hallway_day'] = daystart
-	minuts += 5
+	minut += 5
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	gs 'npc_relationship', 'modify', 'A14', 'like', 'hallway', 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_exit.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/pantyquest/uni_exit.jpg"></center>'
 	'You walk up to Katja, who is standing next to one of the side doors to the outside. As you approach, she looks to you and smiles.'
 	'You walk up to Katja, who is standing next to one of the side doors to the outside. As you approach, she looks to you and smiles.'

+ 11 - 10
locations/newspaper_pages.qsrc

@@ -67,26 +67,27 @@ end
 	!!=======================================================!!
 	!!=======================================================!!
 
 
 if $ARGS[0] = 'generic_0':
 if $ARGS[0] = 'generic_0':
-	'<center>Mysterious lights over pushkin</center>'
+	'<center>Mysterious lights over Pushkin</center>'
 	*nl
 	*nl
-	'Last night there was several reports of floating lights over Pushkin lake, authorities have dismissed it as light bouncing off the water into low mist. However eye witness reports and photographs discredit the official report.'
+	'Last night saw several reports of floating lights over Pushkin lake. Authorities have dismissed eyewitness reports and photographs as light bouncing off the water into low mist.'
 	'Read more on page 4.'
 	'Read more on page 4.'
 end
 end
 
 
 if $ARGS[0] = 'generic_1':
 if $ARGS[0] = 'generic_1':
 	'<center>Missing cosmonaut found living in cave in Vladivostok</center>'
 	'<center>Missing cosmonaut found living in cave in Vladivostok</center>'
 	*nl
 	*nl
-	'Former cosmonaut Valentin Vitalyevich Lebedev (82) had been reported missing 3 weeks ago after he failed to turn up for a state function celebrating the 25th anniversary of the Scientific Geoinformation Center of the Russian Academy of Science which Valentin started and is the director of. He was found in a cave with only basic amenities and a small supply of food. When asked why he was there he simply said he''d grown sick of fancy dinners and red tape. He plans to return to his home and duties next week.'
+	'Former cosmonaut Valentin Vitalyevich Lebedev (82), who was reported missing 3 weeks ago after he failed to turn up for a state function celebrating the 25th anniversary of the Scientific Geoinformation Center of the Russian Academy of Science (of which he is the director) was found in a cave with only basic amenities and a small supply of food.'
+	'When asked why he was there, he simply said he''d grown sick of fancy dinners and red tape. He plans to return to his home and duties next week.'
 end
 end
 
 
 if $ARGS[0] = 'generic_2':
 if $ARGS[0] = 'generic_2':
 	'<center>Help advance medical research today</center>'
 	'<center>Help advance medical research today</center>'
 	*nl
 	*nl
-	'A St. Petersburg based medical clinic is offering significant payments to those that are willing to take part in their medical trials. We have interviewed various participants.'
+	'A St. Petersburg based medical clinic is offering significant payments to those who are willing to take part in their medical trials. We have interviewed various participants.'
 	'"All I had to do was swallow a pill and report back a week later. Took me less than 10 minutes and haven''t regretted it!"'
 	'"All I had to do was swallow a pill and report back a week later. Took me less than 10 minutes and haven''t regretted it!"'
-	'"The staff is very friendly and helpful. My hair grew 20 cm, and even got paid for it! That''s a steal if you ask me."'
+	'"The staff are very friendly and helpful. My hair grew 20 cm and I got paid for it! That''s a steal if you ask me."'
 	'[Redacted]'
 	'[Redacted]'
-	'"I''ve taken part in multiple trials now, and I haven''t had any complaints! Best decision of my life to take part."'
+	'"I''ve taken part in multiple trials now, and I haven''t had any complaints! Best decision of my life!"'
 	*nl
 	*nl
 	'Signup for a medical trial today, and help build a brighter future!'
 	'Signup for a medical trial today, and help build a brighter future!'
 
 
@@ -106,14 +107,14 @@ end
 if $ARGS[0] = 'Gad_missing':
 if $ARGS[0] = 'Gad_missing':
 	'<center>More missing people in Gadukino</center>'
 	'<center>More missing people in Gadukino</center>'
 	*nl
 	*nl
-	'Today <<$NewspaperVars[''gad_missing_name'']>> name, <<NewspaperVars[''gad_missing_age'']>> has been reported missing in Gadukino. They was last seen four days ago foraging in the forest. This makes this the <<NewspaperVars[''gad_missing_counter'']>> person that has gone missing in recent months and the authorities are at a loss in trying to locate to what has happened to them.'
+	'<<$NewspaperVars[''gad_missing_name'']>>, <<NewspaperVars[''gad_missing_age'']>>, has been reported missing in Gadukino. Last seen four days ago while foraging in the forest, they are the <<NewspaperVars[''gad_missing_counter'']>> person who has disappeared from the village in recent months and authorities are at a loss in trying to locate them.'
 end
 end
 
 
 if $ARGS[0] = 'boris_arrested':
 if $ARGS[0] = 'boris_arrested':
-	'<center>Mayor Election Scandal</center>'
+	'<center>Mayoral Candidate Disgraced</center>'
 	*nl
 	*nl
-	'In a shocking turn of events the Mayoral candidate Boris Barlovsky has been arrested and is under investigation for numerous offences including running an escort services in Pavlosk.'
-	'We can exclusively reveal the full scandal on page 3.'
+	'In a turn of events that has shocked many, mayoral candidate Boris Barlovsky has been arrested following an extensive investigation carried out by FSB agents. The once popular Pavlovsk businessman (57) was charged with bribery, fraud and embezzlement among a string of other offences.'
+	'Read the exclusive story on page 3.'
 end
 end
 
 
 
 

+ 2 - 1
locations/npcgeneratec.qsrc

@@ -4,8 +4,9 @@
 !! You can also set their approx. home location
 !! You can also set their approx. home location
 !! All data produced is random so if you need a specific value you will have to overwrite it
 !! All data produced is random so if you need a specific value you will have to overwrite it
 
 
+if $ARGS[0] = '' or isnum($ARGS[0]):
+	if $ARGS[0] ! '': ARGS[0] = val($ARGS[0])
 
 
-if $ARGS[0] = '':
 	!! npcgen_lastrun is a flag to help track whether npcgeneratec or npcpreservec has been run last
 	!! npcgen_lastrun is a flag to help track whether npcgeneratec or npcpreservec has been run last
 	!! npcgeneratec is 1
 	!! npcgeneratec is 1
 	!! npcpreservec is 2
 	!! npcpreservec is 2

File diff suppressed because it is too large
+ 565 - 458
locations/pav_disco.qsrc


File diff suppressed because it is too large
+ 145 - 262
locations/pav_disco_sex.qsrc


+ 3 - 2
locations/pav_hotelReception.qsrc

@@ -586,9 +586,10 @@ if $ARGS[0] = 'pavgenprosmf':
 	pavproscount += 1
 	pavproscount += 1
 	guy += 1
 	guy += 1
 	gs 'fame', 'pav', 'prostitute', rand(2,4)
 	gs 'fame', 'pav', 'prostitute', rand(2,4)
-	gs'stat'
-	gs 'npcgeneratec', '0', '', rand(18,40)
+	gs 'stat'
+	gs 'npcgeneratec', 0, '', rand(18,40)
 	gs 'boyStat', $npclastgenerated
 	gs 'boyStat', $npclastgenerated
+
 	'The customer introduces himself as <<$boydesc>>.'
 	'The customer introduces himself as <<$boydesc>>.'
 	'Then you both get undressed and you start doing your job.'
 	'Then you both get undressed and you start doing your job.'
 	picrand = rand(0, 14)
 	picrand = rand(0, 14)

+ 1 - 0
locations/pav_parkev.qsrc

@@ -619,6 +619,7 @@ if $ARGS[0] = 'gopgirls':
 	'Lena, Lera, Alyona and Anushka are sitting at a picnic table, drinking beers and smoking cigarettes and weed. They''re getting wasted and having a good time, laughing and messing around.'
 	'Lena, Lera, Alyona and Anushka are sitting at a picnic table, drinking beers and smoking cigarettes and weed. They''re getting wasted and having a good time, laughing and messing around.'
 	act 'Move away':gt 'pav_park', 'deeper_park'
 	act 'Move away':gt 'pav_park', 'deeper_park'
 	act 'Join them':
 	act 'Join them':
+		cla
 		'You walk over to them. "Hey guys, mind if I join you?"'
 		'You walk over to them. "Hey guys, mind if I join you?"'
 		if grupTipe = 5:
 		if grupTipe = 5:
 			'Lena and Lera give you a look of disgust. "Get lost, loser!" Alyona ignores you, and Anushka sighs, but you can''t tell if the sigh is directed at you or the other girls.'
 			'Lena and Lera give you a look of disgust. "Get lost, loser!" Alyona ignores you, and Anushka sighs, but you can''t tell if the sigh is directed at you or the other girls.'

+ 1 - 1
locations/phone_selfies.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = 'open_camera':
 	!! Flashing selfie
 	!! Flashing selfie
 	if $clothingworntype ! 'nude' and $phone_loc <> '':
 	if $clothingworntype ! 'nude' and $phone_loc <> '':
 		if Enable_Android = 1:
 		if Enable_Android = 1:
-			locIndex = arrpos('$selfieLoc', $phone_loc,1)
+			locIndex = arrpos('$selfieLoc', $phone_loc, 1)
 		else
 		else
 			locIndex = arrpos(1, '$selfieLoc', $phone_loc)
 			locIndex = arrpos(1, '$selfieLoc', $phone_loc)
 		end
 		end

File diff suppressed because it is too large
+ 484 - 208
locations/selfplay.qsrc


File diff suppressed because it is too large
+ 264 - 263
locations/sex_ev_after.qsrc


File diff suppressed because it is too large
+ 328 - 205
locations/sex_ev_boy_pillow_talk.qsrc


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


File diff suppressed because it is too large
+ 429 - 212
locations/sex_ev_cowgirl.qsrc


File diff suppressed because it is too large
+ 342 - 233
locations/sex_ev_cum.qsrc


File diff suppressed because it is too large
+ 402 - 205
locations/sex_ev_doggy.qsrc


File diff suppressed because it is too large
+ 265 - 262
locations/sex_ev_dress_talking.qsrc


+ 215 - 193
locations/sex_ev_events.qsrc

@@ -2,174 +2,177 @@
 !! for special events
 !! for special events
 
 
 if $ARGS[0] = 'sex_film_code':
 if $ARGS[0] = 'sex_film_code':
-	if sex_ev['phone_film'] = 0 and npc_sex_filmer[$boy] = 1 and rand(1,20) < npc_sexdrive[$boy]: gt 'sex_ev_events', 'sex_film1'
+	if sex_ev['phone_film'] = 0 and npc_sex_filmer[$npcID] = 1 and rand(1,20) < npc_sexdrive[$npcID]:
+		!! i = arrsize('$sex_video') + 1
+		gt 'sex_ev_events', 'sex_film1'
+	end
 end
 end
 
 
 if $ARGS[0] = 'sex_film1':
 if $ARGS[0] = 'sex_film1':
 	sex_ev['phone_film'] = 1
 	sex_ev['phone_film'] = 1
 	cla & *clr
 	cla & *clr
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/hard5.mp4"></video></center>'
 	'<center><video autoplay loop src="images/shared/sex/vag/miss/hard5.mp4"></video></center>'
-	'You''re panting in time with <<$npc_firstname[$boy]>>''s thrusts on top of you when you suddenly become aware of a glow coming from above you. <<$npc_firstname[$boy]>> has his phone out. And it''s pointed directly at you.'
+	'You''re panting in time with <<$npc_firstname[$npcID]>>''s thrusts on top of you when you suddenly become aware of a glow coming from above you. <<$npc_firstname[$npcID]>> has his phone out. And it''s pointed directly at you.'
 	gs 'sex_ev_events', 'sex_film_protest'
 	gs 'sex_ev_events', 'sex_film_protest'
 	gs 'sex_ev_events', 'sex_film_accept'
 	gs 'sex_ev_events', 'sex_film_accept'
 end
 end
 
 
 if $ARGS[0] = 'sex_film_protest':
 if $ARGS[0] = 'sex_film_protest':
-	act'Cover your face':
+	act 'Cover your face':
 		cla
 		cla
-		act'Shy':
+		act 'Shy':
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-			'"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!" you protest weakly. A flush of total embarrassment burns through your cheeks and you hold your hand up in a futile attempt to block the view of your quickly reddening face.'
-			if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-				'"Smile for the camera," <<$npc_firstname[$boy]>> grins, still fucking you as he holds the camera right up to you.'
+			'"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!" you protest weakly. A flush of total embarrassment burns through your cheeks and you hold your hand up in a futile attempt to block the view of your quickly reddening face.'
+			if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+				'"Smile for the camera," <<$npc_firstname[$npcID]>> grins, still fucking you as he holds the camera right up to you.'
 			else
 			else
-				'"Fuck, you look so hot," <<$npc_firstname[$boy]>> grins, still fucking you as he holds the camera right up to you.'
+				'"Fuck, you look so hot," <<$npc_firstname[$npcID]>> grins, still fucking you as he holds the camera right up to you.'
 			end
 			end
-			
-			act'Let him film you (reluctant)':
+
+			act 'Let him film you (reluctant)':
 				sex_ev['phone_film'] = 2
 				sex_ev['phone_film'] = 2
-				$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-				if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-					$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Smile for the camera."'
+				$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+				if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+					$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Smile for the camera."'
 				else
 				else
-					$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Fuck, you look so hot."'
+					$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Fuck, you look so hot."'
 				end
 				end
 				cla & *clr
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
-				'With great reluctance, you silence your protests and let <<$npc_firstname[$boy]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
+				'With great reluctance, you silence your protests and let <<$npc_firstname[$npcID]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
 				*nl
 				*nl
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				gs 'sex_ev_events', 'sex_film_end'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
 			end
-			
-			act'Keep protesting':
-				if npc_caretaker[$boy] > 0:
+
+			act 'Keep protesting':
+				if npc_caretaker[$npcID] > 0:
 					cla & *clr
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'"Please~! Mmph~! I don''t want to be filmed~!" you whine as cold panic fills your chest.'
 					'"Please~! Mmph~! I don''t want to be filmed~!" you whine as cold panic fills your chest.'
-					'The look on <<$npc_firstname[$boy]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
+					'The look on <<$npc_firstname[$npcID]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"You''ll delete it later, right?" you ask.'
 					'"You''ll delete it later, right?" you ask.'
 					'"I will," he promises with a smile.'
 					'"I will," he promises with a smile.'
-					!! if npc_abusive[$boy] > 0: he doesn''t delete it
-					!! $sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					!! $sex_video_dialogue[] = 'Please~! Mmph~! I don''t want to be filmed~!'
-					!! $sex_video_author[] = $boy
+					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
+					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					!! $sex_ev['video_dialogue'] = 'Please~! Mmph~! I don''t want to be filmed~!'
+					!! $sex_ev['video_author'] = $boy
 				else
 				else
-					$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-						$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Smile for the camera."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
+					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+						$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Smile for the camera."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
 					else
 					else
-						$sex_video_dialogue[] = '"Hngh~! Ungh~! <<$npc_firstname[$boy]>>, nooo~!"<br>"Fuck, you look so hot."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
+						$sex_ev['video_dialogue'] = '"Hngh~! Ungh~! <<$npc_firstname[$npcID]>>, nooo~!"<br>"Fuck, you look so hot."<br>"Please~! Mmph~! I don''t want to be filmed~!"<br>"Come on, don''t be like that. You look so sexy. This is hot."'
 					end
 					end
-					
-					$sex_video_author[] = $boy
+
+					$sex_ev['video_author'] = $boy
 					sex_ev['phone_film'] = 2
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					cla & *nl
 					'"Please~! Mmph~! I don''t want to be filmed~!" you whimper again, feeling cold panic fill your chest.'
 					'"Please~! Mmph~! I don''t want to be filmed~!" you whimper again, feeling cold panic fill your chest.'
-					'"Come on, don''t be like that," <<$npc_firstname[$boy]>> says, ignoring your pleas. "This is great. You look so sexy."'
+					'"Come on, don''t be like that," <<$npc_firstname[$npcID]>> says, ignoring your pleas. "This is great. You look so sexy."'
 					*nl
 					*nl
 					'Your weak protests do nothing to sway him and he takes a decently long video of you getting railed before he finally puts the phone away.'
 					'Your weak protests do nothing to sway him and he takes a decently long video of you getting railed before he finally puts the phone away.'
 				end
 				end
 				gs 'sex_ev_events', 'sex_film_end'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
 			end
-			
+
 			gs 'sex_ev_events', 'sex_film_force_stop'
 			gs 'sex_ev_events', 'sex_film_force_stop'
 		end
 		end
-		
-		act'Annoyed':
+
+		act 'Annoyed':
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 			'"Ungh~! Hmph~! Hey! What do you think you''re doing?" you grunt as he pushes the camera towards your face and you immediately try to cover up with your hand.'
 			'"Ungh~! Hmph~! Hey! What do you think you''re doing?" you grunt as he pushes the camera towards your face and you immediately try to cover up with your hand.'
-			'"Don''t worry, you look great," <<$npc_firstname[$boy]>> grins, still fucking you as he films.'
-			act'Let him film you (reluctant)':
-				$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."'
+			'"Don''t worry, you look great," <<$npc_firstname[$npcID]>> grins, still fucking you as he films.'
+			act 'Let him film you (reluctant)':
+				$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."'
 				sex_ev['phone_film'] = 2
 				sex_ev['phone_film'] = 2
 				cla & *clr
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
-				'With great reluctance, you silence your protests and let <<$npc_firstname[$boy]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
+				'With great reluctance, you silence your protests and let <<$npc_firstname[$npcID]>> film you getting fucked by him. Though you still can''t stop yourself from shamefully (and ineffectively) trying to cover your face.'
 				*nl
 				*nl
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				gs 'sex_ev_events', 'sex_film_end'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
 			end
-			
-			act'Keep protesting':
-				if npc_caretaker[$boy] > 0:
+
+			act 'Keep protesting':
+				if npc_caretaker[$npcID] > 0:
 					cla & *clr
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'"Seriously~! Nngh~! Stop it~!" you complain loudly, feeling hot with self consciousness and annoyance.'
 					'"Seriously~! Nngh~! Stop it~!" you complain loudly, feeling hot with self consciousness and annoyance.'
-					'The look on <<$npc_firstname[$boy]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
+					'The look on <<$npc_firstname[$npcID]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"Make sure to delete it later," you tell him sternly.'
 					'"Make sure to delete it later," you tell him sternly.'
 					'"I will," he promises with a smile.'
 					'"I will," he promises with a smile.'
-					!! if npc_abusive[$boy] > 0: he doesn''t delete it
-					!! $sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					!!$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"'
-					!! $sex_video_author[] = $boy
+					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
+					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					!!$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"'
+					!! $sex_ev['video_author'] = $boy
 				else
 				else
-					$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					$sex_video_author[] = $boy
+					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					$sex_ev['video_author'] = $boy
 					sex_ev['phone_film'] = 2
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					cla & *nl
 					'"Seriously~! Nngh~! Stop it~!" you keep protesting, face hot with self consciousness and annoyance.'
 					'"Seriously~! Nngh~! Stop it~!" you keep protesting, face hot with self consciousness and annoyance.'
-					if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"You''re so hot when you''re mad."'
-						'"You''re so hot when you''re mad," <<$npc_firstname[$boy]>> says, grin growing wider while ignoring your pleas.'
+					if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"You''re so hot when you''re mad."'
+						'"You''re so hot when you''re mad," <<$npc_firstname[$npcID]>> says, grin growing wider while ignoring your pleas.'
 					else
 					else
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
-						'"Come on, don''t be that way," <<$npc_firstname[$boy]>> says, ignoring your pleas. "You look so sexy. This is hot."'
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What do you think you''re doing?"<br>"Don''t worry, you look great."<br>"Seriously~! Nngh~! Stop it~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
+						'"Come on, don''t be that way," <<$npc_firstname[$npcID]>> says, ignoring your pleas. "You look so sexy. This is hot."'
 					end
 					end
 					*nl
 					*nl
-					'Your irritation with <<$npc_firstname[$boy]>> do nothing to sway him and he takes a decently long video of you getting railed before he finally puts the phone away.'
+					'Your irritation with <<$npc_firstname[$npcID]>> do nothing to sway him and he takes a decently long video of you getting railed before he finally puts the phone away.'
 				end
 				end
 				gs 'sex_ev_events', 'sex_film_end'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
 			end
 			gs 'sex_ev_events', 'sex_film_force_stop'
 			gs 'sex_ev_events', 'sex_film_force_stop'
 		end
 		end
-		
-		act'Angry':
+
+		act 'Angry':
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
 			'"Ungh~! Hmph~! Hey! What the fuck!" you scream as you realize what he''s doing and immediately try to cover up with your hand.'
 			'"Ungh~! Hmph~! Hey! What the fuck!" you scream as you realize what he''s doing and immediately try to cover up with your hand.'
-			'"Don''t worry, you look great," <<$npc_firstname[$boy]>> grins, still fucking you as he films.'
-			act'Let him film you (reluctant)':
+			'"Don''t worry, you look great," <<$npc_firstname[$npcID]>> grins, still fucking you as he films.'
+			act 'Let him film you (reluctant)':
 				sex_ev['phone_film'] = 2
 				sex_ev['phone_film'] = 2
-				$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-				$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."'
-				$sex_video_author[] = $boy
+				$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+				$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."'
+				$sex_ev['video_author'] = $boy
 				cla & *clr
 				cla & *clr
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
 				'<center><video autoplay loop src="images/shared/sex/vag/miss/hard2.mp4"></video></center>'
-				'You let <<$npc_firstname[$boy]>> film you getting fucked by him, fuming in silence, occasionally turning to cover your face just to spite him.'
+				'You let <<$npc_firstname[$npcID]>> film you getting fucked by him, fuming in silence, occasionally turning to cover your face just to spite him.'
 				*nl
 				*nl
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				'You can''t help but breathe a sigh of relief when he finally puts the phone away. But only after getting a decently long video...'
 				gs 'sex_ev_events', 'sex_film_end'
 				gs 'sex_ev_events', 'sex_film_end'
 			end
 			end
-			
-			act'Keep protesting':
-				if npc_caretaker[$boy] > 0:
+
+			act 'Keep protesting':
+				if npc_caretaker[$npcID] > 0:
 					cla & *clr
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/3.jpg"></center>'
 					'"Fuck off~! Put that thing away~!" you shout, steaming hot with anger.'
 					'"Fuck off~! Put that thing away~!" you shout, steaming hot with anger.'
-					'The look on <<$npc_firstname[$boy]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
+					'The look on <<$npc_firstname[$npcID]>>''s face changes with your continued protests and he blinks, as if only just now aware of what he''s doing.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"Oh. Er... sorry," he mumbles. You sigh in relief as he pauses fucking you to put away the phone.'
 					'"Make sure to delete it later," you tell him sternly.'
 					'"Make sure to delete it later," you tell him sternly.'
 					'"I will," he promises with a smile.'
 					'"I will," he promises with a smile.'
-					!! if npc_abusive[$boy] > 0: he doesn''t delete it
-					!! $sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					!!$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck! Fuck off~! Put that thing away~!"'
+					!! if npc_abusive[$npcID] > 0: he doesn''t delete it
+					!! $sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					!!$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck! Fuck off~! Put that thing away~!"'
 				else
 				else
-					$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
-					$sex_video_author[] = $boy
+					$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/hard3.mp4"></video></center>'
+					$sex_ev['video_author'] = $boy
 					sex_ev['phone_film'] = 2
 					sex_ev['phone_film'] = 2
 					cla & *nl
 					cla & *nl
 					'"Fuck off~! Put that thing away~!" you shout, steaming hot with anger.'
 					'"Fuck off~! Put that thing away~!" you shout, steaming hot with anger.'
-					if npc_arrogant[$boy] > 0 or npc_assertive[$boy] > 0 or npc_abusive[$boy] > 0:
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"You''re so hot when you''re mad."'
-						'"You''re so hot when you''re mad," <<$npc_firstname[$boy]>> says, grin growing wider while ignoring your pleas.'
+					if npc_arrogant[$npcID] > 0 or npc_assertive[$npcID] > 0 or npc_abusive[$npcID] > 0:
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"You''re so hot when you''re mad."'
+						'"You''re so hot when you''re mad," <<$npc_firstname[$npcID]>> says, grin growing wider while ignoring your pleas.'
 					else
 					else
-						$sex_video_dialogue[] = '"Ungh~! Hmph~! Hey! What the fuck!"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
-						'"Come on, don''t be that way," <<$npc_firstname[$boy]>> says, ignoring your pleas. "You look so sexy. This is hot."'
+						$sex_ev['video_dialogue'] = '"Ungh~! Hmph~! Hey! What the fuck!"Ungh~! Hmph~! Hey! What the fuck!"<br>"Don''t worry, you look great."<br>"Fuck off~! Put that thing away~!"<br>"Come on, don''t be that way. You look so sexy. This is hot."'
+						'"Come on, don''t be that way," <<$npc_firstname[$npcID]>> says, ignoring your pleas. "You look so sexy. This is hot."'
 					end
 					end
 					*nl
 					*nl
 					'He takes a decently long video of you getting railed, screaming in rage the whole time, before he finally puts the phone away.'
 					'He takes a decently long video of you getting railed, screaming in rage the whole time, before he finally puts the phone away.'
@@ -190,23 +193,23 @@ if $ARGS[0] = 'sex_film_force_stop':
 			gs 'willpower', 'pay', 'self'
 			gs 'willpower', 'pay', 'self'
 			gs 'stat'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss1.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss1.jpg"></center>'
-			'"Seriously, knock it off!" you snap, practically slapping the phone out of his hand as you grab it. You stop the recording and immediately hit the gallery button to delete the video. "Asshole..." you mutter as you toss the phone far away from the bed as well, all without removing <<$npc_firstname[$boy]>> from inside you.'
-			act'"Way to kill the mood"':
+			'"Seriously, knock it off!" you snap, practically slapping the phone out of his hand as you grab it. You stop the recording and immediately hit the gallery button to delete the video. "Asshole..." you mutter as you toss the phone far away from the bed as well, all without removing <<$npc_firstname[$npcID]>> from inside you.'
+			act '"Way to kill the mood"':
 				cla & *clr
 				cla & *clr
 				$sex_ev['bed_room']
 				$sex_ev['bed_room']
 				sex_ev['cock_inserted'] = 0
 				sex_ev['cock_inserted'] = 0
-				'"Way to kill the mood, asshole," you scowl at <<$npc_firstname[$boy]>> as you push him off and out of you. "I''m done here."'
-				gs'sex_ev_after', 'quit2'
+				'"Way to kill the mood, asshole," you scowl at <<$npc_firstname[$npcID]>> as you push him off and out of you. "I''m done here."'
+				gs 'sex_ev_after', 'quit2'
 			end
 			end
-			
-			act'Keep going':
+
+			act 'Keep going':
 				cla & *clr
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/4.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/shared/sex/vag/4.jpg"></center>'
-				'"Finally," you sigh in relief. "Don''t do that again. Now get back to fucking me already."'
-				gs'sex_ev_sex', 'fuck_continue'
+				'"Finally," you sigh in relief, finally able to concentrate on the sex. "Don''t do that again."'
+				gs 'sex_ev_sex', 'fuck_continue'
 			end
 			end
-			
-			gs'sex_ev_after', 'quit'
+
+			gs 'sex_ev_after', 'quit'
 		end
 		end
 	else
 	else
 		act 'Make him put the phone away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		act 'Make him put the phone away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -214,42 +217,42 @@ if $ARGS[0] = 'sex_film_force_stop':
 end
 end
 
 
 if $ARGS[0] = 'sex_film_accept':
 if $ARGS[0] = 'sex_film_accept':
-	act'Let him film':
+	act 'Let him film':
 		sex_ev['phone_film'] = 2
 		sex_ev['phone_film'] = 2
 		!!if pcs_traits['exhibitionism'] > 0:
 		!!if pcs_traits['exhibitionism'] > 0:
 		if Exhibitionist_lvl > 0: gs 'arousal', 'vaginal', -5, 'no_orgasm_msg', 'exhibitionism'
 		if Exhibitionist_lvl > 0: gs 'arousal', 'vaginal', -5, 'no_orgasm_msg', 'exhibitionism'
 		cla
 		cla
-		act'Blush':
-			$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			$sex_video_dialogue[] = '"Mmph~! Mmph~! Mmm~! Nnn~!"<br>"You''re so fucking hot."'
-			$sex_video_author[] = $boy
+		act 'Blush':
+			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
+			$sex_ev['video_dialogue'] = '"Mmph~! Mmph~! Mmm~! Nnn~!"<br>"You''re so fucking hot."'
+			$sex_ev['video_author'] = $boy
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			'Your cheeks flush with warmth as you realize what <<$npc_firstname[$boy]>>''s doing and turn your face in embarrassment but don''t make any complaints.'
+			'Your cheeks flush with warmth as you realize what <<$npc_firstname[$npcID]>>''s doing and turn your face in embarrassment but don''t make any complaints.'
 			'"Mmph~! Mmph~! Mmm~! Nnn~!" Each pump of his cock inside you forces sheepish squeaks from your lips as you get caught between self-consciousness and pleasure.'
 			'"Mmph~! Mmph~! Mmm~! Nnn~!" Each pump of his cock inside you forces sheepish squeaks from your lips as you get caught between self-consciousness and pleasure.'
-			'"You''re so fucking hot,"  <<$npc_firstname[$boy]>> grins, continuing to fuck and film at the same time.'
+			'"You''re so fucking hot,"  <<$npc_firstname[$npcID]>> grins, continuing to fuck and film at the same time.'
 			*nl
 			*nl
 			'After a few minutes, he puts his phone away.'
 			'After a few minutes, he puts his phone away.'
 			gs 'sex_ev_sex', 'fuck_continue'
 			gs 'sex_ev_sex', 'fuck_continue'
 		end
 		end
-		
-		act'Ignore the camera':
-			$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			$sex_video_dialogue[] = '"Hah~! Haa~! Ah~! Haa~!"<br>"You''re so fucking hot."'
-			$sex_video_author[] = $boy
+
+		act 'Ignore the camera':
+			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
+			$sex_ev['video_dialogue'] = '"Hah~! Haa~! Ah~! Haa~!"<br>"You''re so fucking hot."'
+			$sex_ev['video_author'] = $boy
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy1.mp4"></video></center>'
-			'"Hah~! Haa~! Ah~! Haa~!" You ignore the camera completely, focusing on <<$npc_firstname[$boy]>>''s cock pumping inside you and just try to stay the moment, letting moans escape your lips as they come. If he wants to film it, he can do what he wants.'
-			'"You''re so fucking hot,"  <<$npc_firstname[$boy]>> grins, continuing to fuck and film at the same time.'
+			'"Hah~! Haa~! Ah~! Haa~!" You ignore the camera completely, focusing on <<$npc_firstname[$npcID]>>''s cock pumping inside you and just try to stay the moment, letting moans escape your lips as they come. If he wants to film it, he can do what he wants.'
+			'"You''re so fucking hot,"  <<$npc_firstname[$npcID]>> grins, continuing to fuck and film at the same time.'
 			*nl
 			*nl
 			'After a few minutes, he puts his phone away.'
 			'After a few minutes, he puts his phone away.'
 			gs 'sex_ev_sex', 'fuck_continue'
 			gs 'sex_ev_sex', 'fuck_continue'
 		end
 		end
-		
-		act'Put on a show':
-			$sex_video[] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
-			$sex_video_dialogue[] = '"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodI''mgonnacome~!"<br>"Yeah you like that?"<br>"Don''t stop~! Don''t stop~!"'
-			$sex_video_author[] = $boy
+
+		act 'Put on a show':
+			$sex_ev['video_media'] = '<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
+			$sex_ev['video_dialogue'] = '"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodI''mgonnacome~!"<br>"Yeah you like that?"<br>"Don''t stop~! Don''t stop~!"'
+			$sex_ev['video_author'] = $boy
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/sex/vag/miss/enjoy2.mp4"></video></center>'
 			'"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodImgonnacome~!"'
 			'"Aaah~! I''m so wet~! Ungh~! Your cock feels so good~! OhmygodImgonnacome~!"'
@@ -258,24 +261,32 @@ if $ARGS[0] = 'sex_film_accept':
 			else
 			else
 				'Unable to resist putting on a show, you turn on the moaning and the dirty talk. You shake your tits and arch your back with pleasure you aren''t really feeling.'
 				'Unable to resist putting on a show, you turn on the moaning and the dirty talk. You shake your tits and arch your back with pleasure you aren''t really feeling.'
 			end
 			end
-			'"Yeah you like that?"  <<$npc_firstname[$boy]>> grins'
+			'"Yeah you like that?"  <<$npc_firstname[$npcID]>> grins'
 			'"Don''t stop~! Don''t stop~!" you moan back.'
 			'"Don''t stop~! Don''t stop~!" you moan back.'
 			'Seeming extra excited by what you''re doing and makes sure to capture every moment of it, sending the lens up and down your body from where he fucks your pussy back up to your flushed face.'
 			'Seeming extra excited by what you''re doing and makes sure to capture every moment of it, sending the lens up and down your body from where he fucks your pussy back up to your flushed face.'
 			*nl
 			*nl
 			'After a few minutes of filming, he puts his phone away.'
 			'After a few minutes of filming, he puts his phone away.'
 			gs 'sex_ev_sex', 'fuck_continue'
 			gs 'sex_ev_sex', 'fuck_continue'
 		end
 		end
-		
+
 		!!{if sex_ev['prostituion_flag'] > 0:
 		!!{if sex_ev['prostituion_flag'] > 0:
-			act'This costs extra':
-				
+			act 'This costs extra':
+
 			end
 			end
 		end}
 		end}
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'sex_film_end':
 if $ARGS[0] = 'sex_film_end':
-	if (npc_abusive[$boy] = 1 or rand(1,3) = 1) and npc_caretaker[$boy] > 1 and sex_ev['phone_film'] ! -1:gs 'fame', 'sex', $region, 5
+	if (npc_abusive[$npcID] = 1 or rand(1,3) = 1) and npc_caretaker[$npcID] > 1 and sex_ev['phone_film'] ! -1:
+		gs 'fame', 'sex', $region, 5
+	end
+	if sex_ev['phone_film'] ! -1:
+		i = arrsize('$sex_video') + 1
+		$sex_video[i] = $sex_ev['video_media']
+		$sex_video_author[i] = $sex_ev['video_author']
+		$sex_video_dialogue[i] = $sex_ev['video_dialogue']
+	end
 	gs 'sex_ev_cum', 'fuck_cum'
 	gs 'sex_ev_cum', 'fuck_cum'
 end
 end
 
 
@@ -283,67 +294,67 @@ if $ARGS[0] = 'offer_ciga1':
 	*nl
 	*nl
 	'"You want one?" he asks, holding the open packet towards you.'
 	'"You want one?" he asks, holding the open packet towards you.'
 	if smoker > 20:
 	if smoker > 20:
-		gs 'willpower', 'drugs', 'self', 'medium'
+		gs 'willpower', 'drugs ', 'self', 'medium'
 		if will_cost <= pcs_willpwr:
 		if will_cost <= pcs_willpwr:
-			act'Trying to quit (<<will_cost>> Willpower)':
+			act 'Trying to quit (<<will_cost>> Willpower)':
 				cla & *clr
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 				'"I''m trying to quit," you reply ruefully.'
 				'"I''m trying to quit," you reply ruefully.'
-				'<<$npc_firstname[$boy]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long pull before exhaling a cloud of smoke in deep satisfaction'
+				'<<$npc_firstname[$npcID]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long pull before exhaling a cloud of smoke in deep satisfaction'
 				gs 'sex_ev_after', 'after_sex2'
 				gs 'sex_ev_after', 'after_sex2'
 			end
 			end
 		else
 		else
 			act 'Trying to quit (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			act 'Trying to quit (<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
 	else
-		act'No thanks':
+		act 'No thanks':
 			cla & *clr
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 			'"No thanks," you reply politely. "I''m good."'
 			'"No thanks," you reply politely. "I''m good."'
-			'<<$npc_firstname[$boy]>> nods and pulls one out for himself instead and lights up.'
+			'<<$npc_firstname[$npcID]>> nods and pulls one out for himself instead and lights up.'
 			gs 'sex_ev_after', 'after_sex2'
 			gs 'sex_ev_after', 'after_sex2'
 		end
 		end
 	end
 	end
-	
-	act'Yes please':
+
+	act 'Yes please':
 		sex_ev['bum_cigarette'] = 1
 		sex_ev['bum_cigarette'] = 1
 		cla & *clr
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
-		'"Sure," you smile. <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		'"Sure," you smile. <<$npc_firstname[$npcID]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
+		gs 'sex_ev_after', 'smoke_ciga_act '
 	end
 	end
-	
-	act'Love one':
+
+	act 'Love one':
 		sex_ev['bum_cigarette'] = 1
 		sex_ev['bum_cigarette'] = 1
 		cla & *clr
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
-		'"I''d love one," you smile. <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		'"I''d love one," you smile. <<$npc_firstname[$npcID]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
+		gs 'sex_ev_after', 'smoke_ciga_act '
 	end
 	end
-	
-	act'Read my mind':
+
+	act 'Read my mind':
 		sex_ev['bum_cigarette'] = 1
 		sex_ev['bum_cigarette'] = 1
 		cla & *clr
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke0.jpg"></center>'
-		'"You read my mind," you grin as <<$npc_firstname[$boy]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
-		gs'sex_ev_after', 'smoke_ciga_act'
+		'"You read my mind," you grin as <<$npc_firstname[$npcID]>> hands over one with his lighter and you accept gratefully, lighting up and inhaling deeply.'
+		gs 'sex_ev_after', 'smoke_ciga_act '
 	end
 	end
-	
+
 	if smoker = 0:
 	if smoker = 0:
-		act'I don''t smoke':
+		act 'I don''t smoke':
 			cla & *clr
 			cla & *clr
-			if stat['cigarettes_smoked'] > 20 and npc_caretaker[$boy] = 1:
+			if stat['cigarettes_smoked'] > 20 and npc_caretaker[$npcID] = 1:
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 				'"No thanks," you reply politely. "I don''t smoke anymore."'
 				'"No thanks," you reply politely. "I don''t smoke anymore."'
-				if npc_caretaker[$boy] = 1:
-					'"Oh, sorry. I didn''t realize," <<$npc_firstname[$boy]>> blinks. "I just won''t then. Don''t want to tempt you."'
-					act'How sweet':
+				if npc_caretaker[$npcID] = 1:
+					'"Oh, sorry. I didn''t realize," <<$npc_firstname[$npcID]>> blinks. "I just won''t then. Don''t want to tempt you."'
+					act 'How sweet':
 						cla & *nl
 						cla & *nl
 						'A swell of affection warms your chest as he puts away his pack. It''s so sweet how thoughtful he is!'
 						'A swell of affection warms your chest as he puts away his pack. It''s so sweet how thoughtful he is!'
 						gs 'sex_ev_after', 'after_sex2'
 						gs 'sex_ev_after', 'after_sex2'
 					end
 					end
-					
-					act'It''s okay ':
+
+					act 'It''s okay ':
 						gs 'npc_relationship', 'modify', $boy, 'like'
 						gs 'npc_relationship', 'modify', $boy, 'like'
 						cla & *clr
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 						'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
@@ -361,7 +372,7 @@ if $ARGS[0] = 'offer_ciga1':
 			else
 			else
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/bed_smoke2.jpg"></center>'
 				'"No thanks. I don''t smoke," you tell him.'
 				'"No thanks. I don''t smoke," you tell him.'
-				'<<$npc_firstname[$boy]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long drag before exhaling a cloud of smoke in deep satisfaction'
+				'<<$npc_firstname[$npcID]>> nods and pulls one out for himself to light up. As the end catches fire, he takes a long drag before exhaling a cloud of smoke in deep satisfaction'
 				gs 'sex_ev_after', 'after_sex2'
 				gs 'sex_ev_after', 'after_sex2'
 			end
 			end
 		end
 		end
@@ -374,92 +385,102 @@ if $ARGS[0] = 'sneak_phone':
 end
 end
 
 
 if $ARGS[0] = 'rummage_drawers_link':
 if $ARGS[0] = 'rummage_drawers_link':
-	if sex_ev['drawer_rummage'] = 0 and $sex_ev['loc'] ! 'pc_home' and $sex_ev['loc'] ! 'house_party':
+	if sex_ev['drawer_rummage'] = 0 and $sex_ev['loc'] ! 'pc_home' and sex_ev['action_restricted'] = 0:
 		if  $sex_ev['loc'] = 'hotel_room':
 		if  $sex_ev['loc'] = 'hotel_room':
-			'<<$npc_firstname[$boy]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of the hotel room <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
+			'<<$npc_firstname[$npcID]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of the hotel room <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
 		else
 		else
-			'<<$npc_firstname[$boy]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of his <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
+			'<<$npc_firstname[$npcID]>>''s <a href="exec:gs ''sex_ev_events'',''sneak_phone''">phone</a> lays on top of his <a href="exec:gs ''sex_ev_events'',''rummage_drawers_start''">dresser</a> unattended.'
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'rummage_drawers_start':
 if $ARGS[0] = 'rummage_drawers_start':
 	cla
 	cla
-	act'Go back':gs 'sex_ev_after', 'after_sex2_w_picture'
-	act'Rummage through his dresser':gt 'sex_ev_events', 'rummage_drawers1'
+	act 'Go back':gs 'sex_ev_after', 'after_sex2_w_picture'
+	act 'Rummage through his dresser':gt 'sex_ev_events', 'rummage_drawers1'
 end
 end
 
 
 if $ARGS[0] = 'rummage_drawers1':
 if $ARGS[0] = 'rummage_drawers1':
 	sex_ev['drawer_rummage'] = 1
 	sex_ev['drawer_rummage'] = 1
 	cla & *clr
 	cla & *clr
 	'<center><video autoplay loop src="images/pc/activities/misc/open_drawers1.mp4"></video></center>'
 	'<center><video autoplay loop src="images/pc/activities/misc/open_drawers1.mp4"></video></center>'
-	!! if $npc_occupation[$boy] = 'drug_dealer': find drugs
-	act'Close the drawer':gs'sex_ev_events', 'rummage_drawers_end_route'
-	
+	!! if $npc_occupation[$npcID] = 'drug_dealer': find drugs
+	act 'Close the drawer':gs 'sex_ev_events', 'rummage_drawers_end_route'
+
 	if rand(1,3) = 1:
 	if rand(1,3) = 1:
-		'You rummage through <<$npc_firstname[$boy]>>''s drawers. You don''t find anything of interest.'
-	!!{elseif npc_criminal[$boy] > 0:
-		'Your eyes go wide as you pull back on <<$npc_firstname[$boy]>>''s drawers and find a handgun inside.'
-		act'What is this???':gt'sex_ev_events', 'gun_ev_confront1'
+		if $sex_ev['loc'] ! 'hotel_room':
+			if npc_neat[$npcID] > 0:
+				'Rummaging through <<$npc_firstname[$npcID]>>''s drawers, you find rows of socks and underwear, all neatly folded. Seems he''s very organized...'
+			elseif npc_messy[$npcID] > 0:
+				'Rummaging through <<$npc_firstname[$npcID]>>''s drawers, you find a jumble of socks and underwear, all mixed in with each other like meat in a pasta. Seems like he''s not very organized...'
+			else
+				'You rummage through <<$npc_firstname[$npcID]>>''s drawers and find some clothes. Nothing interesting.'
+			end
+		else
+			'You rummage through <<$npc_firstname[$npcID]>>''s drawers. You don''t find anything of interest.'
+		end
+	!!{elseif npc_criminal[$npcID] > 0:
+		'Your eyes go wide as you pull back on <<$npc_firstname[$npcID]>>''s drawers and find a handgun inside.'
+		act 'What is this???':gt 'sex_ev_events', 'gun_ev_confront1'
 		if sveta_is_cop = 1:
 		if sveta_is_cop = 1:
-			act'Take note of the serial number':gt'sex_ev_events', 'gun_ev_serial1'
+			act 'Take note of the serial number':gt 'sex_ev_events', 'gun_ev_serial1'
 		end}
 		end}
 	else
 	else
 		sex_ev['boy_money'] = rand(3,9)
 		sex_ev['boy_money'] = rand(3,9)
-		if npc_finance[$boy] = 1: sex_ev['boy_money'] += rand(1,5)
-		if npc_finance[$boy] = 2: sex_ev['boy_money'] = sex_ev['boy_money'] * 2
-		'You rummage through <<$npc_firstname[$boy]>>''s drawers. You find <<sex_ev[''boy_money''] * 100>> <b>₽</b> in various notes, along with some of his other things.'
-		act'Steal it':
+		if npc_finance[$npcID] = 1: sex_ev['boy_money'] += rand(1,5)
+		if npc_finance[$npcID] = 2: sex_ev['boy_money'] = sex_ev['boy_money'] * 2
+		'You rummage through <<$npc_firstname[$npcID]>>''s drawers. You find <<sex_ev[''boy_money''] * 100>> <b>₽</b> in various notes, along with some of his other things.'
+		act 'Steal it':
 			cla & *clr
 			cla & *clr
 			$sex_ev['bed_room']
 			$sex_ev['bed_room']
 			sex_ev['stole_money'] = 1
 			sex_ev['stole_money'] = 1
 			if sex_ev['boy_in_shower'] = 1:
 			if sex_ev['boy_in_shower'] = 1:
-				gs'sex_ev_events', 'rummage_drawers_shower_route'
+				gs 'sex_ev_events', 'rummage_drawers_shower_route'
 			else
 			else
-				gs'sex_ev_events', 'rummage_drawers_sleeping_route'
+				gs 'sex_ev_events', 'rummage_drawers_sleeping_route'
 			end
 			end
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'rummage_drawers_sleeping_route':
 if $ARGS[0] = 'rummage_drawers_sleeping_route':
-	'You take another cautious glance at <<$npc_firstname[$boy]>> but he is still slumbering away. You decide to take your chance and grab the money, carefully close the drawer with minimal noise, and quietly stuff your stolen goods into your purse.'
-	act'Continue':gs'sex_ev_events', 'rummage_drawers_end_route'
+	'You take another cautious glance at <<$npc_firstname[$npcID]>> but he is still slumbering away. You decide to take your chance and grab the money, carefully close the drawer with minimal noise, and quietly stuff your stolen goods into your purse.'
+	act 'Continue':gs 'sex_ev_events', 'rummage_drawers_end_route'
 end
 end
 
 
 if $ARGS[0] = 'rummage_drawers_shower_route':
 if $ARGS[0] = 'rummage_drawers_shower_route':
 	if rand(1,2) = 1:
 	if rand(1,2) = 1:
-		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
+		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$npcID] = 2 or npc_apt_type[$npcID] = 3:
 			'You take a wary glance at the bathroom door. Right as you do, you hear the water shut off. Realizing there''s only seconds, you take your chance and grab the cash out of the drawer and running back to your things to stuff it into your bag.'
 			'You take a wary glance at the bathroom door. Right as you do, you hear the water shut off. Realizing there''s only seconds, you take your chance and grab the cash out of the drawer and running back to your things to stuff it into your bag.'
 		else
 		else
-			'You take a wary glance at the door. Seems like <<$npc_firstname[$boy]>> is still showering so it should be safe. But right as you pick up the cash, you hear footsteps in the hall. Panic shoots through you as you run back to stuff it into your bag.'
+			'You take a wary glance at the door. Seems like <<$npc_firstname[$npcID]>> is still showering so it should be safe. But right as you pick up the cash, you hear footsteps in the hall. Panic shoots through you as you run back to stuff it into your bag.'
 		end
 		end
-		act'Hide the money!':gs'sex_ev_events', 'rummage_drawers_end_route'
+		act 'Hide the money!':gs 'sex_ev_events', 'rummage_drawers_end_route'
 	else
 	else
-		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
+		if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$npcID] = 2 or npc_apt_type[$npcID] = 3:
 			'You take a wary glance at the bathroom door. The water''s still running. It doesn''t seem like he''s going to come out any time soon. You decide to take your chance and grab the cash, closing the drawer and stuffing it into your purse.'
 			'You take a wary glance at the bathroom door. The water''s still running. It doesn''t seem like he''s going to come out any time soon. You decide to take your chance and grab the cash, closing the drawer and stuffing it into your purse.'
 		else
 		else
-			'You take a wary glance at the door. You don''t hear <<$npc_firstname[$boy]>> coming so you decide to take your chance and grab the cash, closing the drawer and stuffing it into your purse.'
+			'You take a wary glance at the door. You don''t hear <<$npc_firstname[$npcID]>> coming so you decide to take your chance and grab the cash, closing the drawer and stuffing it into your purse.'
 		end
 		end
-		act'Wait for <<$npc_firstname[$boy]>> to finish':
+		act 'Wait for <<$npc_firstname[$npcID]>> to finish':
 			cla & *clr
 			cla & *clr
 			$sex_ev['bed_room']
 			$sex_ev['bed_room']
-			if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$boy] = 2 or npc_apt_type[$boy] = 3:
-				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before you hear the water shut off and <<$npc_firstname[$boy]>> comes out with wet hair and a towel wrapped around his waist.'
+			if $sex_ev['loc'] = 'hotel_room' or npc_apt_type[$npcID] = 2 or npc_apt_type[$npcID] = 3:
+				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before you hear the water shut off and <<$npc_firstname[$npcID]>> comes out with wet hair and a towel wrapped around his waist.'
 			else
 			else
-				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before <<$npc_firstname[$boy]>> comes strolling back into the bedroom with wet hair and a towel wrapped around his waist.'
+				'After hiding the money, you sit back on the bed and act natural. It''s only a couple minutes before <<$npc_firstname[$npcID]>> comes strolling back into the bedroom with wet hair and a towel wrapped around his waist.'
 			end
 			end
-			gs'sex_ev_shower', 'boy_shower_finish_acts'
+			gs 'sex_ev_shower', 'boy_shower_finish_acts'
 		end
 		end
-		act'Join him in the shower':gt'sex_ev_shower', 'shower_join1'
+		act 'Join him in the shower':gt 'sex_ev_shower', 'shower_join1'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'rummage_drawers_end_route':
 if $ARGS[0] = 'rummage_drawers_end_route':
 	if sex_ev['boy_in_shower'] = 1:
 	if sex_ev['boy_in_shower'] = 1:
-		gs'sex_ev_events', 'rummage_drawers_shower_end'
+		gs 'sex_ev_events', 'rummage_drawers_shower_end'
 	else
 	else
-		gs'sex_ev_after', 'after_sex2_w_picture'
+		gs 'sex_ev_after', 'after_sex2_w_picture'
 	end
 	end
 end
 end
 
 
@@ -469,37 +490,38 @@ if $ARGS[0] = 'rummage_drawers_shower_end':
 	!! if rand(1,3) = 1: he catches you
 	!! if rand(1,3) = 1: he catches you
 	if sex_ev['stole_money'] = 1:
 	if sex_ev['stole_money'] = 1:
 		money += sex_ev['boy_money'] * 100
 		money += sex_ev['boy_money'] * 100
-		'You finish hiding the money in your bag just as <<$npc_firstname[$boy]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
+		'You finish hiding the money in your bag just as <<$npc_firstname[$npcID]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
 	else
 	else
-		'You finish closing the drawer and step away just as <<$npc_firstname[$boy]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
+		'You finish closing the drawer and step away just as <<$npc_firstname[$npcID]>> comes into the room, hair wet from the shower, towel wrapped around his waist.'
 	end
 	end
-	gs'sex_ev_shower', 'boy_shower_finish_acts'
+	gs 'sex_ev_shower', 'boy_shower_finish_acts'
 end
 end
 
 
 
 
 if $ARGS[0] = 'boy_timecheck':
 if $ARGS[0] = 'boy_timecheck':
-	if hour >= npc_work_start[$boy] - 1 and hour < npc_work_end[$boy] and rand(1,5) = 1:
+	if hour >= npc_work_start[$npcID] - 1 and hour < npc_work_end[$npcID] and rand(1,5) = 1:
 		sex_ev['npc_late'] = 1
 		sex_ev['npc_late'] = 1
-		gs'sex_ev_events', 'boy_gotta_go'
+		gs 'sex_ev_events', 'boy_gotta_go'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'boy_gotta_go':
 if $ARGS[0] = 'boy_gotta_go':
 	cla
 	cla
-	act'Continue':
+	act 'Continue':
 		cla & *clr
 		cla & *clr
 		$sex_ev['bed_room']
 		$sex_ev['bed_room']
-		'<<$npc_firstname[$boy]>> checks the time.'
+		'<<$npc_firstname[$npcID]>> checks the time.'
 		if sex_ev['boy_shower'] = 1:
 		if sex_ev['boy_shower'] = 1:
-			'"Shit, I gotta go," he says, dropping his towel and reaching for his clothes. ' + iif(hour >= npc_work_start[$boy], '"I''m late for work."', '"I''m gonna be late for work."')
+			'"Shit, I gotta go," he says, dropping his towel and reaching for his clothes. ' + iif(hour >= npc_work_start[$npcID], '"I''m late for work."', '"I''m gonna be late for work."')
 		else
 		else
-			'"Shit, I gotta go," he says, hauling himself out of bed. ' + iif(hour >= npc_work_start[$boy], '"I''m late for work."', '"I''m gonna be late for work."')
+			'"Shit, I gotta go," he says, hauling himself out of bed. ' + iif(hour >= npc_work_start[$npcID], '"I''m late for work."', '"I''m gonna be late for work."')
 		end
 		end
-		gs'sex_ev_events', 'boy_gotta_go2'
+		gs 'sex_ev_events', 'boy_gotta_go2'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'boy_gotta_go2':
 if $ARGS[0] = 'boy_gotta_go2':
+	sex_ev['breakfast_finished'] = -1
 	cla
 	cla
 	if $sex_ev['loc'] ! 'pc_home':
 	if $sex_ev['loc'] ! 'pc_home':
 		'"Should I get dressed too then?" you ask.'
 		'"Should I get dressed too then?" you ask.'
@@ -507,37 +529,37 @@ if $ARGS[0] = 'boy_gotta_go2':
 	if $sex_ev['loc'] = 'hotel_room':
 	if $sex_ev['loc'] = 'hotel_room':
 		sex_ev['hotel_days'] = rand(1,3)
 		sex_ev['hotel_days'] = rand(1,3)
 		if sex_ev['hotel_days'] = 1:
 		if sex_ev['hotel_days'] = 1:
-			'"No need to rush. The room is booked until tomorrow," <<$npc_firstname[$boy]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$boy] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
+			'"No need to rush. The room is booked until tomorrow," <<$npc_firstname[$npcID]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$npcID] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
 		else
 		else
-			'"No need to rush. The room is booked for a few more days," <<$npc_firstname[$boy]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$boy] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
+			'"No need to rush. The room is booked for a few more days," <<$npc_firstname[$npcID]>> grins. "Feel free to order room service. Just make sure to be gone by checkout.' + iif($npc_rel_type[$npcID] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0, ' Your money''s on the dresser."','"')
 		end
 		end
 		*nl
 		*nl
-		'With that, <<$npc_firstname[$boy]>> finishes getting dressed and heads out the door, leaving you in the hotel room all to yourself.'
-		if $npc_rel_type[$boy] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0: money += npc_sugar_daddy_price[$boy]
-		act'Continue':gs'sex_ev_leave', 'exit'
+		'With that, <<$npc_firstname[$npcID]>> finishes getting dressed and heads out the door, leaving you in the hotel room all to yourself.'
+		if $npc_rel_type[$npcID] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0: money += npc_sugar_daddy_price[$npcID]
+		act 'Continue':gs 'sex_ev_leave', 'exit'
 	elseif $sex_ev['loc'] = 'npc_home':
 	elseif $sex_ev['loc'] = 'npc_home':
-		if npc_lover_keys[$boy] = 1:
+		if npc_lover_keys[$npcID] = 1:
 			'"No, it''s fine. You have a key right? Just lock up when you leave," he says, quickly getting dressed.'
 			'"No, it''s fine. You have a key right? Just lock up when you leave," he says, quickly getting dressed.'
 		else
 		else
 			'"Yeah, I need you to leave so I can lock up."'
 			'"Yeah, I need you to leave so I can lock up."'
-			'You hurry to get dressed beside <<$npc_firstname[$boy]>>.'
-			gs'sex_ev_leave', 'dress_loop_end'
-			gs'sex_ev_leave', 'leaving_dialogue_choices'
+			'You hurry to get dressed beside <<$npc_firstname[$npcID]>>.'
+			gs 'sex_ev_leave', 'dress_loop_end'
+			gs 'sex_ev_leave', 'leaving_dialogue_choices'
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'sugar_daddy_gift':
 if $ARGS[0] = 'sugar_daddy_gift':
-	npc_sugar_gifts[$boy] += 1
+	npc_sugar_gifts[$npcID] += 1
 	cla & *clr
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
-	'"I got you something," <<$npc_firstname[$boy]>> smiles.'
-	act'Surprise':
+	'"I got you something," <<$npc_firstname[$npcID]>> smiles.'
+	act 'Surprise':
 		cla & *nl
 		cla & *nl
 		'"For me?" you ask in bewilderment.'
 		'"For me?" you ask in bewilderment.'
 	end
 	end
-	if npc_sugar_gifts[$boy] > 1:
-	
+	if npc_sugar_gifts[$npcID] > 1:
+
 	end
 	end
 end
 end
 
 

File diff suppressed because it is too large
+ 259 - 259
locations/sex_ev_favorite_part.qsrc


File diff suppressed because it is too large
+ 219 - 219
locations/sex_ev_foreplay.qsrc


+ 20 - 22
locations/sex_ev_foreplay_desc.qsrc

@@ -1,66 +1,64 @@
 # sex_ev_foreplay_desc
 # sex_ev_foreplay_desc
 
 
 if $ARGS[0] = 'generous_initiative_bed1_desc':
 if $ARGS[0] = 'generous_initiative_bed1_desc':
-	if (rand(0,1) = 1 or npc_pussyeater[$boy] = 1) and sex_ev['sensitive_cuni'] ! 1:
+	if (rand(0,1) = 1 or npc_pussyeater[$npcID] = 1) and sex_ev['sensitive_cuni'] ! 1:
 		if $sex_ev['loc'] = 'player home':
 		if $sex_ev['loc'] = 'player home':
 			if sex_ev['start_shower'] = 1:
 			if sex_ev['start_shower'] = 1:
-				'You drag <<$npc_firstname[$boy]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and kneels between your legs.'
+				'You drag <<$npc_firstname[$npcID]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and kneels between your legs.'
 			else
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto your bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto your bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
 			end
 			end
 		elseif $sex_ev['loc'] = 'npc_home':
 		elseif $sex_ev['loc'] = 'npc_home':
 			if sex_ev['start_shower'] = 1:
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you into his bedroom, shoving you backwards onto the bed, and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
+				'<<$npc_firstname[$npcID]>> drags you into his bedroom, shoving you backwards onto the bed, and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
 			else
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
 			end
 			end
 		elseif $sex_ev['loc'] = 'hotel_room':
 		elseif $sex_ev['loc'] = 'hotel_room':
 			if sex_ev['start_shower'] = 1:
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
+				'<<$npc_firstname[$npcID]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your thighs leading straight towards your pussy.'
 			else
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
 			end
 			end
 		else
 		else
-			'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
+			'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed begins laying a trail of kisses, heading down between your legs.'
 		end
 		end
 	else
 	else
 		!! nipple play
 		!! nipple play
 		if $sex_ev['loc'] = 'player home':
 		if $sex_ev['loc'] = 'player home':
 			if sex_ev['start_shower'] = 1:
 			if sex_ev['start_shower'] = 1:
-				'You drag <<$npc_firstname[$boy]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+				'You drag <<$npc_firstname[$npcID]>> back into your bedroom. Before you can do anything, he shoves you backwards onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 			else
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto your bed and begins making a line of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto your bed and begins making a line of kisses up your stomach towards your breasts.'
 			end
 			end
 		elseif $sex_ev['loc'] = 'npc_home':
 		elseif $sex_ev['loc'] = 'npc_home':
 			if sex_ev['start_shower'] = 1:
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you into his bedroom and shoves you backwards onto onto the bed, making a line of kisses up your wet stomach, towards your breasts.'
+				'<<$npc_firstname[$npcID]>> drags you into his bedroom and shoves you backwards onto onto the bed, making a line of kisses up your wet stomach, towards your breasts.'
 			else
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 			end
 			end
 		elseif $sex_ev['loc'] = 'hotel_room':
 		elseif $sex_ev['loc'] = 'hotel_room':
 			if sex_ev['start_shower'] = 1:
 			if sex_ev['start_shower'] = 1:
-				'<<$npc_firstname[$boy]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> drags you out of the shower and back into the room, shoving you onto the bed and begins laying a trail of kisses up your stomach towards your breasts.'
 			else
 			else
-				'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+				'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 			end
 			end
 		else
 		else
-			'<<$npc_firstname[$boy]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
+			'<<$npc_firstname[$npcID]>> shoves you backwards onto onto the bed and begins making a line of kisses up your stomach towards your breasts.'
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'kuni_deny1':
 if $ARGS[0] = 'kuni_deny1':
-	if $npc_rel_type[$boy] = 'boyfriend':
+	if $npc_rel_type[$npcID] = 'lover':
 		'"That''s... I''m not really comfortable with guys... down there..." you stammer. "It''s kinda personal..."'
 		'"That''s... I''m not really comfortable with guys... down there..." you stammer. "It''s kinda personal..."'
-	elseif $npc_rel_type[$boy] = 'girlfriend':
-
 	else
 	else
 		'"That''s... I..." you stammer. "I don''t let guys go down on me unless I''m really comfortable with them. It''s a personal thing..."'
 		'"That''s... I..." you stammer. "I don''t let guys go down on me unless I''m really comfortable with them. It''s a personal thing..."'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'kuni_deny2':
 if $ARGS[0] = 'kuni_deny2':
-	if $npc_rel_type[$boy] = 'boyfriend' or $npc_rel_type[$boy] = 'girlfriend':
+	if $npc_rel_type[$npcID] = 'lover':
 		'"Woah!" you say, snapping your legs closed. "Sorry... I''m still not ready for that..."'
 		'"Woah!" you say, snapping your legs closed. "Sorry... I''m still not ready for that..."'
 	else
 	else
 		'"Nuh uh," you say, snapping your legs closed. "I''m still not ready for that."'
 		'"Nuh uh," you say, snapping your legs closed. "I''m still not ready for that."'
@@ -69,12 +67,12 @@ end
 
 
 if $ARGS[0] = 'transition1_desc':
 if $ARGS[0] = 'transition1_desc':
 	if $sex_ev['loc'] = 'player home':
 	if $sex_ev['loc'] = 'player home':
-		'You pant tiredly, laying back on your bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$boy]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
+		'You pant tiredly, laying back on your bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$npcID]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
 	elseif $sex_ev['loc'] = 'npc_home':
 	elseif $sex_ev['loc'] = 'npc_home':
 !!		$sex_ev['bed_room']
 !!		$sex_ev['bed_room']
-		'You pant tiredly, laying back on <<$npc_firstname[$boy]>>''s bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$boy]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
+		'You pant tiredly, laying back on <<$npc_firstname[$npcID]>>''s bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$npcID]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
 	else
 	else
-		'You pant tiredly, laying back on the bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$boy]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
+		'You pant tiredly, laying back on the bed as your orgasm slowly winds down. Suddenly <<$npc_firstname[$npcID]>>''s cock enters your view, dangling above your head, and he bends over you, trying to push it into your panting mouth.'
 	end
 	end
 end
 end
 
 

+ 139 - 139
locations/sex_ev_hookup_leave.qsrc

@@ -10,16 +10,16 @@ if $ARGS[0] = 'gotta_go':
 
 
 	if rand(1,20) < sex_ev['cum_count'] + sex_ev['extra_cum']: sex_ev['continuation'] = 1
 	if rand(1,20) < sex_ev['cum_count'] + sex_ev['extra_cum']: sex_ev['continuation'] = 1
 	if sex_ev['leaving'] = 0:
 	if sex_ev['leaving'] = 0:
-		act'I should go':
+		act 'I should go':
 			sex_ev['leaving'] = 1
 			sex_ev['leaving'] = 1
 			cla & *clr
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			if sex_ev['angry_after'] = 1 or sex_ev['annoyed'] > 0:
 			if sex_ev['angry_after'] = 1 or sex_ev['annoyed'] > 0:
-				'"I have to go," you say flatly, reaching down for your clothes without looking at <<$npc_firstname[$boy]>>.'
+				'"I have to go," you say flatly, reaching down for your clothes without looking at <<$npc_firstname[$npcID]>>.'
 			elseif sex_ev['sleepover'] = 1:
 			elseif sex_ev['sleepover'] = 1:
 				'"This has been nice," you say, <<$sex_ev[''dress_describe'']>>. "But I really should go."'
 				'"This has been nice," you say, <<$sex_ev[''dress_describe'']>>. "But I really should go."'
 			elseif sex_ev['get_up'] = 0:
 			elseif sex_ev['get_up'] = 0:
-				'As nice as this is, you really can''t stay and you heave yourself up and away from <<$npc_firstname[$boy]>>, getting up from the bed and moving over to where your discarded clothes were thrown.'
+				'As nice as this is, you really can''t stay and you heave yourself up and away from <<$npc_firstname[$npcID]>>, getting up from the bed and moving over to where your discarded clothes were thrown.'
 				'"I should go," you say, <<$sex_ev[''dress_describe'']>>.'
 				'"I should go," you say, <<$sex_ev[''dress_describe'']>>.'
 			else
 			else
 				'"I should go," you say, <<$sex_ev[''dress_describe'']>>.'
 				'"I should go," you say, <<$sex_ev[''dress_describe'']>>.'
@@ -27,7 +27,7 @@ if $ARGS[0] = 'gotta_go':
 			gs 'sex_ev_hookup_leave', 'hookup_continuation'
 			gs 'sex_ev_hookup_leave', 'hookup_continuation'
 		end
 		end
 		if sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
 		if sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
-			act'Thanks for the <<$sex_ev[''fun'']>>':
+			act 'Thanks for the <<$sex_ev[''fun'']>>':
 				sex_ev['leaving'] = 1
 				sex_ev['leaving'] = 1
 				cla & *clr
 				cla & *clr
 				gs 'sex_ev_leave', 'dress_loop'
 				gs 'sex_ev_leave', 'dress_loop'
@@ -43,13 +43,13 @@ if $ARGS[0] = 'gotta_go':
 			end
 			end
 		end
 		end
 	else
 	else
-		act'Prepare to leave':
+		act 'Prepare to leave':
 			cla & *clr
 			cla & *clr
 			$sex_ev['bed_room']
 			$sex_ev['bed_room']
-			if sex_ev['sleepover'] = 1 and npc_latesleeper[$boy] = 1 and sex_ev['boy_asleep'] ! 0:
-				gs'sex_ev_leave', 'sneak_out1'
+			if sex_ev['sleepover'] = 1 and npc_latesleeper[$npcID] = 1 and sex_ev['boy_asleep'] ! 0:
+				gs 'sex_ev_leave', 'sneak_out1'
 			else
 			else
-				gs'sex_ev_leave', 'leaving_dialogue'
+				gs 'sex_ev_leave', 'leaving_dialogue'
 			end
 			end
 		end
 		end
 	end
 	end
@@ -58,18 +58,18 @@ end
 if $ARGS[0] = 'hookup_continuation':
 if $ARGS[0] = 'hookup_continuation':
 	if $sex_ev['type'] = 'hookup':
 	if $sex_ev['type'] = 'hookup':
 		sex_ev['continuation'] = rand(-1,1)
 		sex_ev['continuation'] = rand(-1,1)
-		if rand(1,10) > 5 and (hour > 20 or hour < 4) and npc_caretaker[$boy] > 0 and npc_girlfriend[$boy] = 0 and sex_ev['cant_stay'] = 0 and sex_ev['sleepover'] ! 1:
-			'"You know, it''s kinda late." <<$npc_firstname[$boy]>> sits up in bed. "You don''t have to go right now. Did you want to maybe... spend the night?"'
+		if rand(1,10) > 5 and (hour > 20 or hour < 4) and npc_caretaker[$npcID] > 0 and npc_girlfriend[$npcID] = 0 and sex_ev['cant_stay'] = 0 and sex_ev['sleepover'] ! 1:
+			'"You know, it''s kinda late." <<$npc_firstname[$npcID]>> sits up in bed. "You don''t have to go right now. Did you want to maybe... spend the night?"'
 			gs 'sex_ev_hookup_leave', 'spend_the_night'
 			gs 'sex_ev_hookup_leave', 'spend_the_night'
 		else
 		else
 			if sex_ev['continuation'] > 0 and sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
 			if sex_ev['continuation'] > 0 and sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
 				sex_ev['hookup_continuation_check'] = 1
 				sex_ev['hookup_continuation_check'] = 1
 				cla
 				cla
-				if npc_finance[$boy] = 2 and $npc_rel_goal[$boy] ! 'serious' and (rand(-1,2) - npc_selfish[$boy] > 0 or sex_ev['prostitution'] = 1):
+				if npc_finance[$npcID] = 2 and npc_goal[$npcID] < 3 and (rand(-1,2) - npc_selfish[$npcID] > 0 or sex_ev['prostitution'] = 1):
 					gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer'
 					gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer'
-				elseif $npc_rel_goal[$boy] = 'sex':
+				elseif npc_goal[$npcID] = 1:
 					gs 'sex_ev_hookup_leave', 'npc_fuckbuddy_request'
 					gs 'sex_ev_hookup_leave', 'npc_fuckbuddy_request'
-				elseif $npc_rel_goal[$boy] ! '':
+				elseif npc_goal[$npcID] > 1:
 					gs 'sex_ev_hookup_leave', 'npc_date_request'
 					gs 'sex_ev_hookup_leave', 'npc_date_request'
 				end
 				end
 				gs 'sex_ev_leave', 'dressing_finish'
 				gs 'sex_ev_leave', 'dressing_finish'
@@ -101,12 +101,12 @@ if $ARGS[0] = 'hookup_continuation':
 		sex_ev['continuation'] = rand(-1,1)
 		sex_ev['continuation'] = rand(-1,1)
 		if sex_ev['continuation'] > 0 and sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
 		if sex_ev['continuation'] > 0 and sex_ev['mad'] < 1 and sex_ev['angry_after'] < 1:
 
 
-			if npc_finance[$boy] = 2 and $npc_rel_goal[$boy] ! 'serious' and (rand(-1,2) - npc_selfish[$boy] > 0 or sex_ev['prostitution'] = 1) and $npc_rel_type[$boy] ! 'sugar_daddy':
+			if npc_finance[$npcID] = 2 and npc_goal[$npcID] < 3 and (rand(-1,2) - npc_selfish[$npcID] > 0 or sex_ev['prostitution'] = 1) and $npc_rel_type[$npcID] ! 'sugar_daddy':
 				cla
 				cla
 				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer'
 				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer'
-	!!		elseif $npc_rel_goal[$boy] = 'sex' and $npc_rel_type[$boy] ! 'fuckbuddy' and $npc_rel_type[$boy] ! 'sugar_daddy':
+	!!		elseif npc_goal[$npcID] = 1 and $npc_rel_type[$npcID] ! 'fuckbuddy' and $npc_rel_type[$npcID] ! 'sugar_daddy':
 	!!			gs 'sex_ev_hookup_leave', 'npc_fuckbuddy_request'
 	!!			gs 'sex_ev_hookup_leave', 'npc_fuckbuddy_request'
-	!!		elseif $npc_rel_goal[$boy] ! '' and $npc_rel_type[$boy] ! 'fuckbuddy' and $npc_rel_type[$boy] ! 'sugar_daddy'::
+	!!		elseif npc_goal[$npcID] > 1 and $npc_rel_type[$npcID] ! 'fuckbuddy' and $npc_rel_type[$npcID] ! 'sugar_daddy'::
 	!!			gs 'sex_ev_hookup_leave', 'npc_date_request'
 	!!			gs 'sex_ev_hookup_leave', 'npc_date_request'
 			end
 			end
 	!!		gs 'sex_ev_leave', 'dressing_finish'
 	!!		gs 'sex_ev_leave', 'dressing_finish'
@@ -115,7 +115,7 @@ if $ARGS[0] = 'hookup_continuation':
 end
 end
 
 
 if $ARGS[0] = 'spend_the_night':
 if $ARGS[0] = 'spend_the_night':
-	act'No thanks':
+	act 'No thanks':
 		sex_ev['cant_stay'] = 1
 		sex_ev['cant_stay'] = 1
 		cla & *clr
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
@@ -123,10 +123,10 @@ if $ARGS[0] = 'spend_the_night':
 		gs 'sex_ev_hookup_leave', 'hookup_continuation'
 		gs 'sex_ev_hookup_leave', 'hookup_continuation'
 	end
 	end
 
 
-	act'Well...':
+	act 'Well...':
 		cla & *nl
 		cla & *nl
 		'"Well..." you pause for a moment, considering. You <i>could</i> stay over tonight. Maybe you don''t <i>have</i> to go...'
 		'"Well..." you pause for a moment, considering. You <i>could</i> stay over tonight. Maybe you don''t <i>have</i> to go...'
-		act'No, I shouldn''t':
+		act 'No, I shouldn''t':
 			sex_ev['cant_stay'] = 1
 			sex_ev['cant_stay'] = 1
 			cla & *clr
 			cla & *clr
 			$sex_ev['bed_room']
 			$sex_ev['bed_room']
@@ -134,23 +134,23 @@ if $ARGS[0] = 'spend_the_night':
 			gs 'sex_ev_hookup_leave', 'hookup_continuation'
 			gs 'sex_ev_hookup_leave', 'hookup_continuation'
 		end
 		end
 
 
-		act'I guess I could...':
+		act 'I guess I could...':
 			cla & *clr
 			cla & *clr
 			$sex_ev['bed_room']
 			$sex_ev['bed_room']
 			'"... I guess I could..." you relent, dropping the clothes you were holding.'
 			'"... I guess I could..." you relent, dropping the clothes you were holding.'
-			act'Undress and get into bed with him':
+			act 'Undress and get into bed with him':
 				if $clothingworntype ! 'nude':gs 'clothing', 'strip'
 				if $clothingworntype ! 'nude':gs 'clothing', 'strip'
 				if $braworntype ! 'none':gs 'bras', 'remove'
 				if $braworntype ! 'none':gs 'bras', 'remove'
 				if $pantyworntype ! 'none':gs 'panties', 'remove'
 				if $pantyworntype ! 'none':gs 'panties', 'remove'
 				cla & *clr
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
 				'<center><img <<$set_imgh>> src="images/shared/sex/after/cuddle1.jpg"></center>'
-				'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.'
+				'You slip back into bed and cuddle up with <<$npc_firstname[$npcID]>>, 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.'
 				gs 'sex_ev_after', 'sleep'
 				gs 'sex_ev_after', 'sleep'
 			end
 			end
 		end
 		end
 	end
 	end
 
 
-	act'I really need to go':
+	act 'I really need to go':
 		sex_ev['cant_stay'] = 1
 		sex_ev['cant_stay'] = 1
 		cla & *clr
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'spend_the_night':
 end
 end
 
 
 if $ARGS[0] = 'pc_fuckbuddy_request':
 if $ARGS[0] = 'pc_fuckbuddy_request':
-	act'We should hook up again later':
+	act 'We should hook up again later':
 		cla & *clr
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		if sex_ev['cant_stay'] = 1:
 		if sex_ev['cant_stay'] = 1:
@@ -168,17 +168,17 @@ if $ARGS[0] = 'pc_fuckbuddy_request':
 		else
 		else
 			'"This was fun. We should hook up again some time," you say, <<$sex_ev[''dress_describe'']>>.'
 			'"This was fun. We should hook up again some time," you say, <<$sex_ev[''dress_describe'']>>.'
 		end
 		end
-		act'Continue':
+		act 'Continue':
 			cla & *clr
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			if rand(1,3) = 1:
 			if rand(1,3) = 1:
-				'"Nah, this was a one time thing," <<$npc_firstname[$boy]>> replies. "I never fuck the same girl twice."'
+				'"Nah, this was a one time thing," <<$npc_firstname[$npcID]>> replies. "I never fuck the same girl twice."'
 				'You pause for a moment and give him a look.'
 				'You pause for a moment and give him a look.'
 				'"Seriously?"'
 				'"Seriously?"'
 				'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
 				'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
 				'<i>Free access to pussy and you''re just gonna turn it down? Whatever...</i> you think to yourself, <<$sex_ev[''dress_describe'']>>.'
 				'<i>Free access to pussy and you''re just gonna turn it down? Whatever...</i> you think to yourself, <<$sex_ev[''dress_describe'']>>.'
 				*nl
 				*nl
-				'Once you''re finished dressing, you grab your things and leave. <<$npc_firstname[$boy]>> doesn''t say a word as you close the door behind you.'
+				'Once you''re finished dressing, you grab your things and leave. <<$npc_firstname[$npcID]>> doesn''t say a word as you close the door behind you.'
 			else
 			else
 				gs 'sex_ev_leave', 'fuckbuddy_add'
 				gs 'sex_ev_leave', 'fuckbuddy_add'
 				'"What, like fuckbuddies?"'
 				'"What, like fuckbuddies?"'
@@ -188,28 +188,28 @@ if $ARGS[0] = 'pc_fuckbuddy_request':
 				*nl
 				*nl
 				gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
 				gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
 			end
 			end
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'pc_date_request':
 if $ARGS[0] = 'pc_date_request':
-	act'Maybe I could see you again sometime?':
+	act 'Maybe I could see you again sometime?':
 		cla & *clr
 		cla & *clr
-		gs'sex_ev_leave', 'dress_loop'
+		gs 'sex_ev_leave', 'dress_loop'
 		'"Maybe I could see you again? For like, dinner? Or a movie? Or something?" you say, <<$sex_ev[''dress_describe'']>>.'
 		'"Maybe I could see you again? For like, dinner? Or a movie? Or something?" you say, <<$sex_ev[''dress_describe'']>>.'
-		act'Continue':
+		act 'Continue':
 			cla & *clr
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			if rand(1,3) = 1:
 			if rand(1,3) = 1:
-				'"Nah, this was a one time thing," <<$npc_firstname[$boy]>> replies. "I never fuck the same girl twice."'
+				'"Nah, this was a one time thing," <<$npc_firstname[$npcID]>> replies. "I never fuck the same girl twice."'
 				'You pause for a moment and give him a look.'
 				'You pause for a moment and give him a look.'
 				'"Seriously?"'
 				'"Seriously?"'
 				'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
 				'"Do I look like I''m kidding?" he grins back, clearly satisfied with himself.'
 				'<i>Wow... You can really pick em, huh <<$pcs_nickname>>?</i> you think to yourself  <<$sex_ev[''dress_describe'']>>. <i>Ugh. Whatever...</i>'
 				'<i>Wow... You can really pick em, huh <<$pcs_nickname>>?</i> you think to yourself  <<$sex_ev[''dress_describe'']>>. <i>Ugh. Whatever...</i>'
 				*nl
 				*nl
-				'Once you''re done, you grab your things and leave. <<$npc_firstname[$boy]>> doesn''t say a word as you close the door behind you.'
-				act'Leave':gt 'sex_ev_leave', 'exit'
+				'Once you''re done, you grab your things and leave. <<$npc_firstname[$npcID]>> doesn''t say a word as you close the door behind you.'
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			else
 			else
 				!! set dating flag
 				!! set dating flag
 				'"You mean like a date?"'
 				'"You mean like a date?"'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'pc_date_request':
 				else
 				else
 					'That bit of business done, you cheerfully wave him goodbye and head out the door.'
 					'That bit of business done, you cheerfully wave him goodbye and head out the door.'
 				end
 				end
-				act'Leave':gt 'sex_ev_leave', 'exit'
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			end
 			end
 		end
 		end
 	end
 	end
@@ -249,13 +249,13 @@ if $ARGS[0] = 'npc_fuckbuddy_request':
 			'"Cool. Maybe we can hook up again sometime?"'
 			'"Cool. Maybe we can hook up again sometime?"'
 		end
 		end
 	end
 	end
-	act'You mean like fuckbuddies?':
+	act 'You mean like fuckbuddies?':
 		cla & *clr
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"Like what?" you ask back, <<$sex_ev[''dress_describe'']>>. "Friends with benefits? Fuckbuddies? Booty callers? No strings attached?"'
 		'"Like what?" you ask back, <<$sex_ev[''dress_describe'']>>. "Friends with benefits? Fuckbuddies? Booty callers? No strings attached?"'
 		'"Yeah, just like that. No strings attached."'
 		'"Yeah, just like that. No strings attached."'
 		gs 'sex_ev_hookup_leave', 'just_a_hookup'
 		gs 'sex_ev_hookup_leave', 'just_a_hookup'
-		act'Sure':
+		act 'Sure':
 			cla & *clr
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'fuckbuddy_add'
 			gs 'sex_ev_leave', 'fuckbuddy_add'
@@ -276,7 +276,7 @@ if $ARGS[0] = 'npc_fuckbuddy_request':
 			else
 			else
 				'Your little exchange done, you wave him goodbye and head out the door.'
 				'Your little exchange done, you wave him goodbye and head out the door.'
 			end
 			end
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		end
 		gs 'sex_ev_hookup_leave', 'have_a_boyfriend'
 		gs 'sex_ev_hookup_leave', 'have_a_boyfriend'
 		gs 'sex_ev_hookup_leave', 'have_a_girlfriend'
 		gs 'sex_ev_hookup_leave', 'have_a_girlfriend'
@@ -286,7 +286,7 @@ end
 if $ARGS[0] = 'npc_date_request':
 if $ARGS[0] = 'npc_date_request':
 	'"Well... Maybe I could see you again sometime? Not just sex, but like really see you, you know? Take you out on a date or something? Dinner? See a movie?"'
 	'"Well... Maybe I could see you again sometime? Not just sex, but like really see you, you know? Take you out on a date or something? Dinner? See a movie?"'
 	gs 'sex_ev_hookup_leave', 'just_a_hookup'
 	gs 'sex_ev_hookup_leave', 'just_a_hookup'
-	act'Sure':
+	act 'Sure':
 		cla & *clr
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'lover_add'
 		gs 'sex_ev_leave', 'lover_add'
@@ -307,49 +307,49 @@ if $ARGS[0] = 'npc_date_request':
 		else
 		else
 			'Your little exchange done, you wave him goodbye and head out the door.'
 			'Your little exchange done, you wave him goodbye and head out the door.'
 		end
 		end
-		act'Leave':gt 'sex_ev_leave', 'exit'
+		act 'Leave':gt 'sex_ev_leave', 'exit'
 	end
 	end
-	act'I''m not up for anything serious':
+	act 'I''m not up for anything serious':
 		cla & *clr
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"I''m not looking for anything serious right now," you say, more than a little awkwardly as you''re <<$sex_ev[''dress_describe'']>>.'
 		'"I''m not looking for anything serious right now," you say, more than a little awkwardly as you''re <<$sex_ev[''dress_describe'']>>.'
-		act'Sorry':
+		act 'Sorry':
 			cla & *clr
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Sorry..."'
 			'"Sorry..."'
-			'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you <<$sex_ev[''dress_describe'']>>.'
-			'<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 'sex_ev_leave', 'exit'
+			'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you <<$sex_ev[''dress_describe'']>>.'
+			'<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[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		end
 
 
-		act'If we were fuckbuddies...':
+		act 'If we were fuckbuddies...':
 			cla & *clr
 			cla & *clr
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"If it were something purely physical, like fuckbuddies or something," you say, <<$sex_ev[''dress_describe'']>>. "I wouldn''t mind getting together for some fun, but I''m not interested in a boyfriend."'
 			'"If it were something purely physical, like fuckbuddies or something," you say, <<$sex_ev[''dress_describe'']>>. "I wouldn''t mind getting together for some fun, but I''m not interested in a boyfriend."'
-			if rand(1,10) > 7 and $npc_rel_goal[$boy] ! 'serious':
+			if rand(1,10) > 7 and npc_goal[$npcID] ! 3:
 				gs 'sex_ev_leave', 'fuckbuddy_add'
 				gs 'sex_ev_leave', 'fuckbuddy_add'
-				'"Well... If it means I can see you again, then sure I guess." <<$npc_firstname[$boy]>> doesn''t really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.'
+				'"Well... If it means I can see you again, then sure I guess." <<$npc_firstname[$npcID]>> doesn''t really seem satisfied with the results, but he still tells you his number while you tap it into your contact list.'
 				'"So uhh, yeah... Call me sometime?"'
 				'"So uhh, yeah... Call me sometime?"'
-				iif($sex_ev['loc'] = 'house_party', 'With a shrug and an awkward wave goodbye, you head out back out into the party.', 'With a shrug and an awkward wave goodbye, you head out the door and out of <<$npc_firstname[$boy]>>''s apartment.')
-				act'Leave':gt 'sex_ev_leave', 'exit'
+				iif($sex_ev['loc'] = 'house_party', 'With a shrug and an awkward wave goodbye, you head out back out into the party.', 'With a shrug and an awkward wave goodbye, you head out the door and out of <<$npc_firstname[$npcID]>>''s apartment.')
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			else
 			else
 				'"No," he shakes his head. "I don''t want to get led on by you if you''re only interested in a fuck and not anything real. Guess this is just a one night stand."'
 				'"No," he shakes his head. "I don''t want to get led on by you if you''re only interested in a fuck and not anything real. Guess this is just a one night stand."'
-				act'It''s to be expected':
+				act 'It''s to be expected':
 					cla & *clr
 					cla & *clr
 					gs 'sex_ev_leave', 'dress_loop'
 					gs 'sex_ev_leave', 'dress_loop'
 					'You nod to yourself, continuing <<$sex_ev[''dress_describe'']>>. It''s to be expected from a guy like him. But if he wants something more, you just can''t give it to him. You''re only after pleasure, you don''t want to get tangled up in a relationship.'
 					'You nod to yourself, continuing <<$sex_ev[''dress_describe'']>>. It''s to be expected from a guy like him. But if he wants something more, you just can''t give it to him. You''re only after pleasure, you don''t want to get tangled up in a relationship.'
 					*nl
 					*nl
-					iif($sex_ev['loc'] = 'house_party', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$boy]>> and head out back out into the party.', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$boy]>> and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.')
-					act'Leave':gt 'sex_ev_leave', 'exit'
+					iif($sex_ev['loc'] = 'house_party', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$npcID]>> and head out back out into the party.', '"Well, I guess I won''t see you around then so... bye?" You wave to <<$npc_firstname[$npcID]>> and stride out the door, unable to feel that this little bit of fun took a bit of a damper turn right at the end.')
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 				end
 
 
-				act'Taken aback':
+				act 'Taken aback':
 					cla & *clr
 					cla & *clr
 					gs 'sex_ev_leave', 'dress_loop'
 					gs 'sex_ev_leave', 'dress_loop'
 					'You blink in surprise, stopping halfway through <<$sex_ev[''dress_describe'']>>. That response really wasn''t what you saw coming. After all, what guy just gives up free access to sex?'
 					'You blink in surprise, stopping halfway through <<$sex_ev[''dress_describe'']>>. That response really wasn''t what you saw coming. After all, what guy just gives up free access to sex?'
 					*nl
 					*nl
-					iif($sex_ev['loc'] = 'house_party', '"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 head out back out into the party.', '"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 'sex_ev_leave', 'exit'
+					iif($sex_ev['loc'] = 'house_party', '"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[$npcID]>> a strained smile and head out back out into the party.', '"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[$npcID]>> a strained smile and wave goodbye, quickly striding towards out the door.')
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 				end
 			end
 			end
 		end
 		end
@@ -359,20 +359,20 @@ end
 if $ARGS[0] = 'npc_sugar_daddy_offer':
 if $ARGS[0] = 'npc_sugar_daddy_offer':
 	sex_ev['sugar_daddy_offer'] = rand(10,20)
 	sex_ev['sugar_daddy_offer'] = rand(10,20)
 	if sex_ev['thank_for_fun'] = 1:
 	if sex_ev['thank_for_fun'] = 1:
-		'"Did you really enjoy it? Or are you just saying that?" <<$npc_firstname[$boy]>> asks.'
-		act'Just saying (honest)':
+		'"Did you really enjoy it? Or are you just saying that?" <<$npc_firstname[$npcID]>> asks.'
+		act 'Just saying (honest)':
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Just saying it," you shrug, <<$sex_ev[''dress_describe'']>>. "If I''m being honest, this wasn''t anything special. But I thought I''d try to be polite."'
 			'"Just saying it," you shrug, <<$sex_ev[''dress_describe'']>>. "If I''m being honest, this wasn''t anything special. But I thought I''d try to be polite."'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
 		end
 		end
 
 
-		act'Just saying (teasing)':
+		act 'Just saying (teasing)':
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Just saying," you say, <<$sex_ev[''dress_describe'']>> with a teasing smirk. "I was trying to be nice."'
 			'"Just saying," you say, <<$sex_ev[''dress_describe'']>> with a teasing smirk. "I was trying to be nice."'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
 		end
 		end
 
 
-		act'You mean it':
+		act 'You mean it':
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"No really," you smirk, <<$sex_ev[''dress_describe'']>>. "It was a good time."'
 			'"No really," you smirk, <<$sex_ev[''dress_describe'']>>. "It was a good time."'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
 			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_offer2'
@@ -383,94 +383,94 @@ if $ARGS[0] = 'npc_sugar_daddy_offer':
 end
 end
 
 
 if $ARGS[0] = 'npc_sugar_daddy_offer2':
 if $ARGS[0] = 'npc_sugar_daddy_offer2':
-	'"How about we do this again?" <<$npc_firstname[$boy]>> says.'
+	'"How about we do this again?" <<$npc_firstname[$npcID]>> says.'
 	'"Do what?" you ask back, <<$sex_ev[''dress_describe'']>>.'
 	'"Do what?" you ask back, <<$sex_ev[''dress_describe'']>>.'
 	if sex_ev['prostitution'] > 0:
 	if sex_ev['prostitution'] > 0:
 		'"This," he says again, gesturing vaguely around the room. "You can keep me company and I can get you some... compensation."'
 		'"This," he says again, gesturing vaguely around the room. "You can keep me company and I can get you some... compensation."'
 	else
 	else
 		'"This," he says again, gesturing vaguely around the room. "And maybe for your time and your company I could find you some... compensation."'
 		'"This," he says again, gesturing vaguely around the room. "And maybe for your time and your company I could find you some... compensation."'
 	end
 	end
-	act'Not a hooker':
+	act 'Not a hooker':
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"I''m not a hooker," you say, <<$sex_ev[''dress_describe'']>>.'
 		'"I''m not a hooker," you say, <<$sex_ev[''dress_describe'']>>.'
-		'"I didn''t say you were," <<$npc_firstname[$boy]>> snickers back. "Don''t think of it that way. Think of it more like... a sugar daddy relationship. Will you let me be your daddy?"'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+		'"I didn''t say you were," <<$npc_firstname[$npcID]>> snickers back. "Don''t think of it that way. Think of it more like... a sugar daddy relationship. Will you let me be your daddy?"'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
 	end
 	end
-	gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+	gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
 	gs 'sex_ev_hookup_leave', 'have_a_boyfriend'
 	gs 'sex_ev_hookup_leave', 'have_a_boyfriend'
 	gs 'sex_ev_hookup_leave', 'have_a_girlfriend'
 	gs 'sex_ev_hookup_leave', 'have_a_girlfriend'
 end
 end
 
 
 if $ARGS[0] = 'npc_sugar_daddy_refuse':
 if $ARGS[0] = 'npc_sugar_daddy_refuse':
-	act'Refuse him':
+	act 'Refuse him':
 		cla
 		cla
-		act'Nice try but no':
+		act 'Nice try but no':
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			iif($sex_ev['loc'] = 'house_party', '"Nice try but no," you grimace and pick up the rest of your things and head back out into the party.', '"Nice try but no," you grimace and pick up the rest of your things and head out the door.')
 			iif($sex_ev['loc'] = 'house_party', '"Nice try but no," you grimace and pick up the rest of your things and head back out into the party.', '"Nice try but no," you grimace and pick up the rest of your things and head out the door.')
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		end
 
 
-		act'Not that kind of girl':
+		act 'Not that kind of girl':
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"I''m not that kind of girl," you sneer.'
 			'"I''m not that kind of girl," you sneer.'
 			'"The missing money from my wallet would disagree," he chuckles back.'
 			'"The missing money from my wallet would disagree," he chuckles back.'
 			'Filled with disgust, you pick up the rest of your things and head out the door.'
 			'Filled with disgust, you pick up the rest of your things and head out the door.'
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		end
 
 
-		act'"You''re disgusting"':
+		act '"You''re disgusting"':
 			cla & *clr
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 			'"You''re disgusting," you sneer.'
 			'"You''re disgusting," you sneer.'
 			'"Hey, what''s the point of money if you don''t spend it?" he chuckles back.'
 			'"Hey, what''s the point of money if you don''t spend it?" he chuckles back.'
 			'Filled with revulsion, you pick up the rest of your things and head out the door.'
 			'Filled with revulsion, you pick up the rest of your things and head out the door.'
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		end
 
 
-		act'"You can''t afford me"':
+		act '"You can''t afford me"':
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"Please," you scoff, <<$sex_ev[''dress_describe'']>>. "You can''t afford me."'
 			'"Please," you scoff, <<$sex_ev[''dress_describe'']>>. "You can''t afford me."'
 			'"So you say, but your loss in the end I suppose," he smirks back.'
 			'"So you say, but your loss in the end I suppose," he smirks back.'
-			act'Leave':gt 'sex_ev_leave', 'exit'
+			act 'Leave':gt 'sex_ev_leave', 'exit'
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'npc_sugar_daddy_how_much':
 if $ARGS[0] = 'npc_sugar_daddy_how_much':
-	act'How much?':
+	act 'How much?':
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"Depends," you muse, <<$sex_ev[''dress_describe'']>>. "How much are we talking?"'
 		'"Depends," you muse, <<$sex_ev[''dress_describe'']>>. "How much are we talking?"'
 		'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a date?"'
 		'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a date?"'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'npc_sugar_daddy_accept':
 if $ARGS[0] = 'npc_sugar_daddy_accept':
-	act'Accept':
+	act 'Accept':
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"That sounds... mutually beneficial," you say, slowly <<$sex_ev[''dress_describe'']>>.'
 		'"That sounds... mutually beneficial," you say, slowly <<$sex_ev[''dress_describe'']>>.'
-		'"I''ll look forward to the next time you come over then," <<$npc_firstname[$boy]>> smirks. "Give me your number so I can tell you when to come over.'
+		'"I''ll look forward to the next time you come over then," <<$npc_firstname[$npcID]>> smirks. "Give me your number so I can tell you when to come over.'
 		*nl
 		*nl
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
-		gs'sex_ev_leave', 'leaving_dialogue_choices'
+		gs 'sex_ev_leave', 'leaving_dialogue_choices'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'npc_sugar_daddy_haggle':
 if $ARGS[0] = 'npc_sugar_daddy_haggle':
-	act'Haggle':
+	act 'Haggle':
 		:invalid_counter_offer
 		:invalid_counter_offer
 		sex_ev['sugar_daddy_counteroffer'] = input ("Pick a number between 10 and 50. The number will be multiplied by 100. (10 will be 1000, 25 will be 2500, 50 will be 5000)")
 		sex_ev['sugar_daddy_counteroffer'] = input ("Pick a number between 10 and 50. The number will be multiplied by 100. (10 will be 1000, 25 will be 2500, 50 will be 5000)")
 		if sex_ev['sugar_daddy_counteroffer'] > 50 or sex_ev['sugar_daddy_counteroffer'] < 10 :
 		if sex_ev['sugar_daddy_counteroffer'] > 50 or sex_ev['sugar_daddy_counteroffer'] < 10 :
 			msg 'Invalid input. Pick a number between 10 and 50.'
 			msg 'Invalid input. Pick a number between 10 and 50.'
 			jump 'invalid_counter_offer'
 			jump 'invalid_counter_offer'
 		else
 		else
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle2'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle2'
 		end
 		end
 	end
 	end
 end
 end
@@ -478,40 +478,40 @@ end
 if $ARGS[0] = 'npc_sugar_daddy_haggle2':
 if $ARGS[0] = 'npc_sugar_daddy_haggle2':
 	gs 'sex_ev_leave', 'dress_loop'
 	gs 'sex_ev_leave', 'dress_loop'
 	if sex_ev['sugar_daddy_counteroffer'] = sex_ev['sugar_daddy_offer']:
 	if sex_ev['sugar_daddy_counteroffer'] = sex_ev['sugar_daddy_offer']:
-		gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+		gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
 	elseif sex_ev['sugar_daddy_counteroffer'] < sex_ev['sugar_daddy_offer']:
 	elseif sex_ev['sugar_daddy_counteroffer'] < sex_ev['sugar_daddy_offer']:
 		sex_ev['sugar_daddy_offer'] = sex_ev['sugar_daddy_counteroffer']
 		sex_ev['sugar_daddy_offer'] = sex_ev['sugar_daddy_counteroffer']
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		'"Why don''t we say <<sex_ev[''sugar_daddy_counteroffer''] * 100>>? I''d feel bad if I took too much," you smirk, <<$sex_ev[''dress_describe'']>>.'
 		'"Why don''t we say <<sex_ev[''sugar_daddy_counteroffer''] * 100>>? I''d feel bad if I took too much," you smirk, <<$sex_ev[''dress_describe'']>>.'
-		'"Hey if you''re willing to put out for less, I won''t complain," <<$npc_firstname[$boy]>> grins back. "Give me your number so I can tell you when to come over.'
+		'"Hey if you''re willing to put out for less, I won''t complain," <<$npc_firstname[$npcID]>> grins back. "Give me your number so I can tell you when to come over.'
 		*nl
 		*nl
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
-		gs'sex_ev_leave', 'leaving_dialogue_choices'
+		gs 'sex_ev_leave', 'leaving_dialogue_choices'
 	elseif sex_ev['sugar_daddy_counteroffer'] > 25:
 	elseif sex_ev['sugar_daddy_counteroffer'] > 25:
 		if sex_ev['haggle_fail'] = 1:
 		if sex_ev['haggle_fail'] = 1:
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
 		else
 		else
 			'"How about <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you smirk, <<$sex_ev[''dress_describe'']>>.'
 			'"How about <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you smirk, <<$sex_ev[''dress_describe'']>>.'
-			'"You greedy bitch," <<$npc_firstname[$boy]>> snickers back. "You''re not worth that much. Come on, try again."'
+			'"You greedy bitch," <<$npc_firstname[$npcID]>> snickers back. "You''re not worth that much. Come on, try again."'
 			sex_ev['haggle_fail'] = 1
 			sex_ev['haggle_fail'] = 1
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
 		end
 		end
-	elseif rand(1,pcs_persuas) > npc_willpower[$boy] or sex_ev['sugar_daddy_counteroffer'] < sex_ev['sugar_daddy_offer'] + 2:
+	elseif rand(1,pcs_persuas) > npc_willpower[$npcID] or sex_ev['sugar_daddy_counteroffer'] < sex_ev['sugar_daddy_offer'] + 2:
 		sex_ev['sugar_daddy_offer'] = sex_ev['sugar_daddy_counteroffer']
 		sex_ev['sugar_daddy_offer'] = sex_ev['sugar_daddy_counteroffer']
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		gs 'sex_ev_leave', 'sugar_daddy_add'
 		'"Why don''t we say... <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you smirk, <<$sex_ev[''dress_describe'']>>. "That seems worth my time."'
 		'"Why don''t we say... <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you smirk, <<$sex_ev[''dress_describe'']>>. "That seems worth my time."'
-		'"You drive a hard bargain baby girl," <<$npc_firstname[$boy]>> grins back. "But I think I can work with that. Give me your number so I can tell you when to come over.'
+		'"You drive a hard bargain baby girl," <<$npc_firstname[$npcID]>> grins back. "But I think I can work with that. Give me your number so I can tell you when to come over.'
 		*nl
 		*nl
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
 		'You hand him your phone and when you get it back you see he''s the latest saved contact.'
-		gs'sex_ev_leave', 'leaving_dialogue_choices'
+		gs 'sex_ev_leave', 'leaving_dialogue_choices'
 	else
 	else
 		if sex_ev['haggle_fail'] = 1:
 		if sex_ev['haggle_fail'] = 1:
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle_fail'
 		else
 		else
 			sex_ev['sugar_daddy_offer'] += rand(1,2)
 			sex_ev['sugar_daddy_offer'] += rand(1,2)
 			'"How about... <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you ask, <<$sex_ev[''dress_describe'']>>.'
 			'"How about... <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you ask, <<$sex_ev[''dress_describe'']>>.'
-			'"Seems a little steep," <<$npc_firstname[$boy]>> frowns. "Why don''t we try <<sex_ev[''sugar_daddy_offer''] * 100>>?'
-			gs'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
+			'"Seems a little steep," <<$npc_firstname[$npcID]>> frowns. "Why don''t we try <<sex_ev[''sugar_daddy_offer''] * 100>>?'
+			gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_haggle'
 		end
 		end
 	end
 	end
 end
 end
@@ -519,16 +519,16 @@ end
 if $ARGS[0] = 'npc_sugar_daddy_haggle_fail':
 if $ARGS[0] = 'npc_sugar_daddy_haggle_fail':
 	'"How about <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you try again, <<$sex_ev[''dress_describe'']>>.'
 	'"How about <<sex_ev[''sugar_daddy_counteroffer''] * 100>>?" you try again, <<$sex_ev[''dress_describe'']>>.'
 	if sex_ev['sugar_daddy_counteroffer'] > 25:
 	if sex_ev['sugar_daddy_counteroffer'] > 25:
-		'"Who do you think you are?" <<$npc_firstname[$boy]>> scoffs. "I could fuck a supermodel for that kind of money. You know what? Forget it. I don''t need another gold digger in my life."'
+		'"Who do you think you are?" <<$npc_firstname[$npcID]>> scoffs. "I could fuck a supermodel for that kind of money. You know what? Forget it. I don''t need another gold digger in my life."'
 	else
 	else
-		'"Still too rich for my blood," <<$npc_firstname[$boy]>> says with a shake of his head. "You know what? Forget it. I don''t need another gold digger in my life."'
+		'"Still too rich for my blood," <<$npc_firstname[$npcID]>> says with a shake of his head. "You know what? Forget it. I don''t need another gold digger in my life."'
 	end
 	end
 	if sex_ev['dress_end'] = 1:
 	if sex_ev['dress_end'] = 1:
 		'Everything becomes very awkward very quickly and you take that as your cue to grab your things and hurry out the door.'
 		'Everything becomes very awkward very quickly and you take that as your cue to grab your things and hurry out the door.'
 	else
 	else
 		'Everything becomes very awkward very quickly and you take that as your cue to finish getting dressed in a hurry and head out the door.'
 		'Everything becomes very awkward very quickly and you take that as your cue to finish getting dressed in a hurry and head out the door.'
 	end
 	end
-	act'Leave':gt 'sex_ev_leave', 'exit'
+	act 'Leave':gt 'sex_ev_leave', 'exit'
 end
 end
 
 
 if $ARGS[0] = 'fuckbuddy_text':
 if $ARGS[0] = 'fuckbuddy_text':
@@ -559,7 +559,7 @@ if $ARGS[0] = 'just_a_hookup':
 	else
 	else
 		$sex_ev['just_a'] = 'random hookup'
 		$sex_ev['just_a'] = 'random hookup'
 	end
 	end
-	act'This was a <<$sex_ev[''just_a'']>>':
+	act 'This was a <<$sex_ev[''just_a'']>>':
 		cla & *clr
 		cla & *clr
 		gs 'sex_ev_leave', 'dress_loop'
 		gs 'sex_ev_leave', 'dress_loop'
 		'"No," you shake your head, <<$sex_ev[''dress_describe'']>>. "This was just a <<$sex_ev[''just_a'']>>. I''m not looking for anything lasting."'
 		'"No," you shake your head, <<$sex_ev[''dress_describe'']>>. "This was just a <<$sex_ev[''just_a'']>>. I''m not looking for anything lasting."'
@@ -567,111 +567,111 @@ if $ARGS[0] = 'just_a_hookup':
 			'"Whatever, your loss," he shrugs.'
 			'"Whatever, your loss," he shrugs.'
 			'"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
 			'"Pfft-! Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
 		elseif sex_ev['continuation'] = 2:
 		elseif sex_ev['continuation'] = 2:
-			'"Oh. Uhh, well..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-			'<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.'
+			'"Oh. Uhh, well..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
+			'<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[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
 		end
 		end
-		act'Leave':gt 'sex_ev_leave', 'exit'
+		act 'Leave':gt 'sex_ev_leave', 'exit'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'have_a_boyfriend':
 if $ARGS[0] = 'have_a_boyfriend':
-	if stat['boyfriends_current'] > 0:
-		act'I have a boyfriend':
-			npc_know_girlfriend[$boy] = 0
+	if pcs_lover - pcs_girlfriends > 0:
+		act 'I have a boyfriend':
+			npc_know_girlfriend[$npcID] = 0
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"I have a boyfriend," you say, giving him a look as you''re <<$sex_ev[''dress_describe'']>>.'
 			'"I have a boyfriend," you say, giving him a look as you''re <<$sex_ev[''dress_describe'']>>.'
 			if sex_ev['sugar_daddy_offer'] > 0:
 			if sex_ev['sugar_daddy_offer'] > 0:
-				'"So?" <<$npc_firstname[$boy]>> grins shamelessly. "Does that change the value of the money?"'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
-				act'So long as you know':
+				'"So?" <<$npc_firstname[$npcID]>> grins shamelessly. "Does that change the value of the money?"'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+				act 'So long as you know':
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
 					gs 'sex_ev_leave', 'fuckbuddy_add'
 					gs 'sex_ev_leave', 'fuckbuddy_add'
 					'"Just wanted to make sure you knew," you reply, shrugging as you''re <<$sex_ev[''dress_describe'']>>. "So how much are we talking here?"'
 					'"Just wanted to make sure you knew," you reply, shrugging as you''re <<$sex_ev[''dress_describe'']>>. "So how much are we talking here?"'
 					'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a ''date?''"'
 					'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a ''date?''"'
-					gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+					gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
 				end
 				end
-			elseif npc_fidelity[$boy] <= 5:
-				if npc_girlfriend[$boy] = 1 and $npc_rel_goal[$boy] = 'sex':
+			elseif npc_fidelity[$npcID] <= 5:
+				if npc_girlfriend[$npcID] = 1 and npc_goal[$npcID] = 1:
 					'"So? I have a girlfriend," he grins shamelessly. "Doesn''t mean we can''t keep fucking."'
 					'"So? I have a girlfriend," he grins shamelessly. "Doesn''t mean we can''t keep fucking."'
-					act'No way':
+					act 'No way':
 						cla & *clr
 						cla & *clr
 						'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 						'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 						'"Yeah, no," you grimace. "That''s a kind of drama I <i>don''t</i> want to deal with.'
 						'"Yeah, no," you grimace. "That''s a kind of drama I <i>don''t</i> want to deal with.'
 						'And with that, you pick up the rest of your things and head out the door.'
 						'And with that, you pick up the rest of your things and head out the door.'
-						act'Leave':gt 'sex_ev_leave', 'exit'
+						act 'Leave':gt 'sex_ev_leave', 'exit'
 					end
 					end
-					act'So long as you know':
+					act 'So long as you know':
 						cla & *clr
 						cla & *clr
 						gs 'sex_ev_leave', 'dress_loop'
 						gs 'sex_ev_leave', 'dress_loop'
 						gs 'sex_ev_leave', 'fuckbuddy_add'
 						gs 'sex_ev_leave', 'fuckbuddy_add'
 						'"So long as you know," you reply, <<$sex_ev[''dress_describe'']>>. You exchange numbers with him and a moment later a notification pings in your messages.'
 						'"So long as you know," you reply, <<$sex_ev[''dress_describe'']>>. You exchange numbers with him and a moment later a notification pings in your messages.'
 						*nl
 						*nl
 						gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
 						gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
-						act'Leave':gt 'sex_ev_leave', 'exit'
+						act 'Leave':gt 'sex_ev_leave', 'exit'
 					end
 					end
 				else
 				else
 					'"Whatever, your loss," he shrugs. "Looks like I''m a better lay than him anyways."'
 					'"Whatever, your loss," he shrugs. "Looks like I''m a better lay than him anyways."'
 					'"Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
 					'"Yeah, sure," you snigger back, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
-					act'Leave':gt 'sex_ev_leave', 'exit'
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 				end
 			else
 			else
-				'"Oh. Uhh, well..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-				'<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 'sex_ev_leave', 'exit'
+				'"Oh. Uhh, well..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
+				'<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[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+				act 'Leave':gt 'sex_ev_leave', 'exit'
 			end
 			end
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'have_a_girlfriend':
 if $ARGS[0] = 'have_a_girlfriend':
-	if stat['girlfriends_current'] > 0:
-		act'I have a girlfriend':
-			npc_know_girlfriend[$boy] = 1
+	if pcs_girlfriends > 0:
+		act 'I have a girlfriend':
+			npc_know_girlfriend[$npcID] = 1
 			gs 'sex_ev_leave', 'dress_loop'
 			gs 'sex_ev_leave', 'dress_loop'
 			'"I have a girlfriend," you say, giving him a look as you''re <<$sex_ev[''dress_describe'']>>.'
 			'"I have a girlfriend," you say, giving him a look as you''re <<$sex_ev[''dress_describe'']>>.'
 			if sex_ev['sugar_daddy_offer'] > 0:
 			if sex_ev['sugar_daddy_offer'] > 0:
-				'"So?" <<$npc_firstname[$boy]>> grins shamelessly. "Does that change the value of the money?"'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
-				gs'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
-				act'So long as you know':
+				'"So?" <<$npc_firstname[$npcID]>> grins shamelessly. "Does that change the value of the money?"'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_refuse'
+				gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_how_much'
+				act 'So long as you know':
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
 					gs 'sex_ev_leave', 'fuckbuddy_add'
 					gs 'sex_ev_leave', 'fuckbuddy_add'
 					'"Just wanted to make sure you knew," you reply, shrugging as you''re <<$sex_ev[''dress_describe'']>>. "So how much are we talking here?"'
 					'"Just wanted to make sure you knew," you reply, shrugging as you''re <<$sex_ev[''dress_describe'']>>. "So how much are we talking here?"'
 					'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a ''date?''"'
 					'"How about... <<sex_ev[''sugar_daddy_offer''] * 100>> <b>₽</b> a ''date?''"'
-					gs'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
+					gs 'sex_ev_hookup_leave', 'npc_sugar_daddy_accept'
 				end
 				end
 			else
 			else
-				if npc_fidelity[$boy] <= 5:
-					if npc_girlfriend[$boy] = 1 and $npc_rel_goal[$boy] = 'sex':
+				if npc_fidelity[$npcID] <= 5:
+					if npc_girlfriend[$npcID] = 1 and npc_goal[$npcID] = 1:
 						'"Hey, me too!" he grins shamelessly.'
 						'"Hey, me too!" he grins shamelessly.'
-						act'No way':
+						act 'No way':
 							cla & *clr
 							cla & *clr
 							'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 							'<center><video autoplay loop src="images/shared/romance/misc/depart_annoyed1.mp4"></video></center>'
 							'"Nice try but no," you grimace, and pick up the rest of your things and head out the door.'
 							'"Nice try but no," you grimace, and pick up the rest of your things and head out the door.'
-							act'Leave':gt 'sex_ev_leave', 'exit'
+							act 'Leave':gt 'sex_ev_leave', 'exit'
 						end
 						end
 
 
-						act'So long as you know':
+						act 'So long as you know':
 							cla & *clr
 							cla & *clr
 							$sex_ev['bed_room']
 							$sex_ev['bed_room']
 							gs 'sex_ev_leave', 'fuckbuddy_add'
 							gs 'sex_ev_leave', 'fuckbuddy_add'
 							'"So long as you know," you reply, <<$sex_ev[''dress_describe'']>>. You exchange numbers with him and a moment later a notification pings in your messages.'
 							'"So long as you know," you reply, <<$sex_ev[''dress_describe'']>>. You exchange numbers with him and a moment later a notification pings in your messages.'
 							*nl
 							*nl
 							gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
 							gs 'sex_ev_hookup_leave', 'fuckbuddy_text'
-							act'Leave':gt 'sex_ev_leave', 'exit'
+							act 'Leave':gt 'sex_ev_leave', 'exit'
 						end
 						end
 					else
 					else
 						'"Whatever, your loss," he shrugs. "Bi girls always come back when they start missing dick."'
 						'"Whatever, your loss," he shrugs. "Bi girls always come back when they start missing dick."'
 						'"That''s what strapons are for," you roll your eyes, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
 						'"That''s what strapons are for," you roll your eyes, pulling on the rest of your clothes. You give yourself a once over, making sure everything''s in place and wave goodbye as you head towards the door.'
-						act'Leave':gt 'sex_ev_leave', 'exit'
+						act 'Leave':gt 'sex_ev_leave', 'exit'
 					end
 					end
 				else
 				else
-					'"Oh. Uhh, well..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
-					'<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 'sex_ev_leave', 'exit'
+					'"Oh. Uhh, well..." <<$npc_firstname[$npcID]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
+					'<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[$npcID]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+					act 'Leave':gt 'sex_ev_leave', 'exit'
 				end
 				end
 			end
 			end
 		end
 		end

File diff suppressed because it is too large
+ 294 - 271
locations/sex_ev_leave.qsrc


File diff suppressed because it is too large
+ 391 - 195
locations/sex_ev_miss.qsrc


File diff suppressed because it is too large
+ 262 - 244
locations/sex_ev_morning.qsrc


File diff suppressed because it is too large
+ 301 - 271
locations/sex_ev_pillow_talk.qsrc


File diff suppressed because it is too large
+ 480 - 214
locations/sex_ev_pillow_talk2.qsrc


File diff suppressed because it is too large
+ 410 - 167
locations/sex_ev_reactions.qsrc


File diff suppressed because it is too large
+ 259 - 259
locations/sex_ev_reactions_creampie.qsrc


File diff suppressed because it is too large
+ 267 - 226
locations/sex_ev_sex.qsrc


File diff suppressed because it is too large
+ 229 - 229
locations/sex_ev_shower.qsrc


+ 274 - 222
locations/sex_ev_start.qsrc

@@ -50,16 +50,16 @@ end
 if $ARGS[0] = 'exit_set':
 if $ARGS[0] = 'exit_set':
 	!! exit should be based on type of apartment and location
 	!! exit should be based on type of apartment and location
 	if $sex_ev['loc'] ! 'pc_home':
 	if $sex_ev['loc'] ! 'pc_home':
-		if $npc_residence[$boy] = 'pav_residential':
+		if npc_residence[$npcID] = 1:
 			!! Pav residential exit
 			!! Pav residential exit
 			gt 'pav_residential'
 			gt 'pav_residential'
-		elseif $npc_residence[$boy] = 'uni_grounds':
+		elseif npc_residence[$npcID] = 2:
 			!! Student dorms exit
 			!! Student dorms exit
-			gt 'uni_grounds', 'main'
-		elseif $npc_residence[$boy] = 'city_residential':
+			gt 'city_island'
+		elseif npc_residence[$npcID] = 3:
 			!! St. Petersburg Residential exit
 			!! St. Petersburg Residential exit
 			gt 'city_residential'
 			gt 'city_residential'
-		elseif $npc_residence[$boy] = 'city_center':
+		elseif npc_residence[$npcID] = 4:
 			!! St. Petersburg City Center exit
 			!! St. Petersburg City Center exit
 			gt 'city_center'
 			gt 'city_center'
 	!!{ disabled for bug testing
 	!!{ disabled for bug testing
@@ -88,8 +88,8 @@ end
 if $ARGS[0] = 'initiate_pre':
 if $ARGS[0] = 'initiate_pre':
 	gs 'npcStat', $ARGS[1]
 	gs 'npcStat', $ARGS[1]
 	dynamic $npc_preferences[$npcID]
 	dynamic $npc_preferences[$npcID]
-!!	if $npc_rel_type[$boy] = 'husband' or $npc_rel_type[$boy] = 'boyfriend' or $npc_rel_type[$boy] = 'fuckbuddy':
-	if $npc_rel_type[$boy] ! '':
+!!	if $npc_rel_type[$npcID] = 'husband' or $npc_rel_type[$npcID] = 'boyfriend' or $npc_rel_type[$npcID] = 'fuckbuddy':
+	if $npc_rel_type[$npcID] ! '':
 		gs 'sex_ev_start', 'lover_initiate'
 		gs 'sex_ev_start', 'lover_initiate'
 	else
 	else
 		gs 'sex_ev_start', 'hookup_initiate'
 		gs 'sex_ev_start', 'hookup_initiate'
@@ -105,60 +105,61 @@ if $ARGS[0] = 'boystat_init':
 end
 end
 
 
 if $ARGS[0] = 'lover_initiate':
 if $ARGS[0] = 'lover_initiate':
-	if $npc_rel_type[$boy] = 'husband':
+	if $npc_rel_type[$npcID] = 'husband':
 		$sex_ev['type'] = 'married_sex'
 		$sex_ev['type'] = 'married_sex'
-	elseif $npc_rel_type[$boy] = 'boyfriend':
+	elseif $npc_rel_type[$npcID] = 'boyfriend':
 		$sex_ev['type'] = 'dating_sex'
 		$sex_ev['type'] = 'dating_sex'
-	elseif $npc_rel_type[$boy] = 'fuckbuddy':
+	elseif $npc_rel_type[$npcID] = 'fuckbuddy':
 		$sex_ev['type'] = 'booty_call'
 		$sex_ev['type'] = 'booty_call'
-		if $booty_call_hotel[$boy] = 'pav':
+		if $booty_call_hotel[$npcID] = 'pav':
 			gs 'sex_ev_start', 'pav_hotel_img_init'
 			gs 'sex_ev_start', 'pav_hotel_img_init'
 			gt 'sex_ev_start', 'fb_invited_start'
 			gt 'sex_ev_start', 'fb_invited_start'
-		elseif $booty_call_hotel[$boy] = 'city':
+		elseif $booty_call_hotel[$npcID] = 'city':
 			gs 'sex_ev_start', 'city_hotel_img_init'
 			gs 'sex_ev_start', 'city_hotel_img_init'
 			gt 'sex_ev_start', 'fb_invited_start'
 			gt 'sex_ev_start', 'fb_invited_start'
 		else
 		else
-			if (booty_call_invite[$boy] = daystart or npc_booty_call_date[$boy] = daystart or npc_booty_call_date[$boy] = daystart) and npc_last_booty_call[$boy] ! daystart:
+			if (booty_call_invite[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart) and npc_last_booty_call[$npcID] ! daystart:
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gt 'sex_ev_start', 'fb_invited_start'
 				gt 'sex_ev_start', 'fb_invited_start'
-			elseif npc_start_free_time[$boy] >= hour and hour <= npc_end_free_time[$boy] and npc_last_booty_call[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart:
+			elseif npc_start_free_time[$npcID] >= hour and hour <= npc_end_free_time[$npcID] and npc_last_booty_call[$npcID] ! daystart and npc_no_booty_call[$npcID] ! daystart:
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gt 'sex_ev_start', 'fb_uninvited_start'
 				gt 'sex_ev_start', 'fb_uninvited_start'
 			else
 			else
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'neighborhood_image'
 				gs 'sex_ev_start', 'neighborhood_image'
-				'You knock on <<$npc_firstname[$boy]>>''s door but there is no answer.'
-				act'Leave':gt $loc
+				'You knock on <<$npc_firstname[$npcID]>>''s door but there is no answer.'
+				act 'Leave':gt $loc
 			end
 			end
 		end
 		end
-	elseif $npc_rel_type[$boy] = 'sugar_daddy':
+	elseif $npc_rel_type[$npcID] = 'sugar_daddy':
 		$sex_ev['type'] = 'booty_call'
 		$sex_ev['type'] = 'booty_call'
-		sugar_daddy_call[$boy] = 1
-		if $booty_call_hotel[$boy] = 'pav':
+		sugar_daddy_call[$npcID] = 1
+		if $booty_call_hotel[$npcID] = 'pav':
 			gs 'sex_ev_start', 'pav_hotel_img_init'
 			gs 'sex_ev_start', 'pav_hotel_img_init'
 			gt 'sex_ev_start', 'fb_invited_start'
 			gt 'sex_ev_start', 'fb_invited_start'
-		elseif $booty_call_hotel[$boy] = 'city':
+		elseif $booty_call_hotel[$npcID] = 'city':
 			gs 'sex_ev_start', 'city_hotel_img_init'
 			gs 'sex_ev_start', 'city_hotel_img_init'
 			gt 'sex_ev_start', 'fb_invited_start'
 			gt 'sex_ev_start', 'fb_invited_start'
 		else
 		else
-			if (booty_call_invite[$boy] = daystart or npc_booty_call_date[$boy] = daystart or npc_booty_call_date[$boy] = daystart) and npc_last_booty_call[$boy] ! daystart:
+			if (booty_call_invite[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart) and npc_last_booty_call[$npcID] ! daystart:
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gt 'sex_ev_start', 'fb_invited_start'
 				gt 'sex_ev_start', 'fb_invited_start'
-			!!{elseif npc_start_free_time[$boy] >= hour and hour <= npc_end_free_time[$boy] and npc_last_booty_call[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart:
+			!!{elseif npc_start_free_time[$npcID] >= hour and hour <= npc_end_free_time[$npcID] and npc_last_booty_call[$npcID] ! daystart and npc_no_booty_call[$npcID] ! daystart:
 				this is disabled until cheating events can be established
 				this is disabled until cheating events can be established
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gt 'sex_ev_start', 'fb_uninvited_start'}
 				gt 'sex_ev_start', 'fb_uninvited_start'}
 			else
 			else
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'lover_home_img_init'
 				gs 'sex_ev_start', 'neighborhood_image'
 				gs 'sex_ev_start', 'neighborhood_image'
-				'You knock on <<$npc_firstname[$boy]>>''s door but there is no answer.'
-				act'Leave':gt $loc
+				'You knock on <<$npc_firstname[$npcID]>>''s door but there is no answer.'
+				act 'Leave':gt $loc
 			end
 			end
 		end
 		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'hookup_initiate':
 if $ARGS[0] = 'hookup_initiate':
+	$npc_rel_type[$npcID] = 'hookup'
 	$sex_ev['type'] = 'hookup'
 	$sex_ev['type'] = 'hookup'
 	if $npcID ! $npclastgenerated and $npcID ! $npclastsaved:
 	if $npcID ! $npclastgenerated and $npcID ! $npclastsaved:
 		if npcgen_lastrun = 1:
 		if npcgen_lastrun = 1:
@@ -168,8 +169,13 @@ if $ARGS[0] = 'hookup_initiate':
 			gs 'npcStat', $npclastgenerated
 			gs 'npcStat', $npclastgenerated
 			dynamic $npc_preferences[$npcID]
 			dynamic $npc_preferences[$npcID]
 		end
 		end
+	elseif mid($boy,1,1) = 'C':
+		gs 'npcpreservec', $npclastgenerated
+		gs 'boystat', $npclastsaved
 	end
 	end
-	stat['hookup'] += 1
+	stat['hookup_count'] += 1
+	if arrpos('$hookup_partners', $npcID) < 0: $hookup_partners[] = $npcID
+	stat['last_hookup'] = daystart
 end
 end
 
 
 if $ARGS[0] = 'pc_home_img_init':
 if $ARGS[0] = 'pc_home_img_init':
@@ -185,12 +191,11 @@ end
 
 
 if $ARGS[0] = 'lover_home_img_init':
 if $ARGS[0] = 'lover_home_img_init':
 	$sex_ev['loc'] = 'npc_home'
 	$sex_ev['loc'] = 'npc_home'
-	$sex_ev['bed_room'] = $npc_apt_bedroom[$boy]
-	$sex_ev['bath_room'] = $npc_apt_bathroom[$boy]
-	$sex_ev['kitchen_room'] = $npc_apt_kitchen[$boy]
-	$sex_ev['living_room'] = $npc_apt_livingroom[$boy]
-	$sex_ev['hall_way'] = $npc_apt_hall[$boy]
-	$sex_ev['spare_room'] = $npc_apt_spare[$boy]
+	$sex_ev['bed_room'] = $npc_apt_bedroom[$npcID]
+	$sex_ev['bath_room'] = $npc_apt_bathroom[$npcID]
+	$sex_ev['kitchen_room'] = $npc_apt_kitchen[$npcID]
+	$sex_ev['living_room'] = $npc_apt_livingroom[$npcID]
+	$sex_ev['hall_way'] = $npc_apt_hall[$npcID]
 end
 end
 
 
 if $ARGS[0] = 'pav_hotel_img_init':
 if $ARGS[0] = 'pav_hotel_img_init':
@@ -213,31 +218,66 @@ end
 
 
 if $ARGS[0] = 'fb_npc_home_start':
 if $ARGS[0] = 'fb_npc_home_start':
 !!	gs 'boystat', $ARGS[1]
 !!	gs 'boystat', $ARGS[1]
-!!	dymamic $npc_preferences[$npcID]
 	$sex_ev['type'] = 'booty_call'
 	$sex_ev['type'] = 'booty_call'
-	if (booty_call_invite[$boy] = daystart or npc_booty_call_date[$boy] = daystart or npc_booty_call_date[$boy] = daystart) and npc_last_booty_call[$boy] ! daystart:
+	if (booty_call_invite[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart or npc_booty_call_date[$npcID] = daystart) and npc_last_booty_call[$npcID] ! daystart:
 		gt 'sex_ev_start', 'fb_invited_start'
 		gt 'sex_ev_start', 'fb_invited_start'
-	elseif npc_start_free_time[$boy] >= hour and hour <= npc_end_free_time[$boy] and npc_last_booty_call[$boy] ! daystart and npc_no_booty_call[$boy] ! daystart:
+	elseif npc_start_free_time[$npcID] >= hour and hour <= npc_end_free_time[$npcID] and npc_last_booty_call[$npcID] ! daystart and npc_no_booty_call[$npcID] ! daystart:
 		gt 'sex_ev_start', 'fb_uninvited_start'
 		gt 'sex_ev_start', 'fb_uninvited_start'
 	else
 	else
 		gs 'sex_ev_start', 'neighborhood_image'
 		gs 'sex_ev_start', 'neighborhood_image'
-		'You knock on <<$npc_firstname[$boy]>>''s door but there is no answer.'
-		act'Leave':gt $loc
+		'You knock on <<$npc_firstname[$npcID]>>''s door but there is no answer.'
+		act 'Leave':gt $loc
 	end
 	end
 end
 end
 
 
+if $ARGS[0] = 'fb_npc_home_fast_start':
+	gs 'sex_ev_start', 'begin'
+	gs 'sex_ev_start', 'lover_home_img_init'
+	gs 'sex_ev_start', 'frantic_undress'
+end
+
+if $ARGS[0] = 'date_npc_home_start':
+!!	gs 'boystat', $ARGS[1]
+	$sex_ev['type'] = 'lover_sex'
+	gs 'sex_ev_start', 'begin'
+	gs 'sex_ev_start', 'lover_home_img_init'
+!!	act 'Take it slow': gt 'sex_ev_start', 'slow_undress'
+	gs 'sex_ev_start', 'frantic_undress'
+end
+
+if $ARGS[0] = 'unique_pc_home_start':
+	sex_ev['unique_npc'] = 1
+	gs 'sex_ev_start', 'pc_home_img_init'
+	gs 'sex_ev_start', 'begin'
+	gs 'sex_ev_start', 'frantic_undress'
+end
+
 if $ARGS[0] = 'hookup_pc_home_start':
 if $ARGS[0] = 'hookup_pc_home_start':
 	gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'pc_home_img_init'
 	gs 'sex_ev_start', 'pc_home_img_init'
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'undress'
+	gs 'sex_ev_start', 'frantic_undress'
 end
 end
 
 
 if $ARGS[0] = 'hookup_npc_home_start':
 if $ARGS[0] = 'hookup_npc_home_start':
 	gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'undress'
+	gs 'sex_ev_start', 'frantic_undress'
+end
+
+if $ARGS[0] = 'pc_home_start':
+	if $ARGS[1] = 'hookup': gs 'sex_ev_start', 'hookup_initiate'
+	gs 'sex_ev_start', 'pc_home_img_init'
+	gs 'sex_ev_start', 'begin'
+	gs 'sex_ev_start', 'frantic_undress'
+end
+
+if $ARGS[0] = 'npc_home_start':
+	if $ARGS[1] = 'hookup': gs 'sex_ev_start', 'hookup_initiate'
+	gs 'sex_ev_start', 'lover_home_img_init'
+	gs 'sex_ev_start', 'begin'
+	gs 'sex_ev_start', 'frantic_undress'
 end
 end
 
 
 if $ARGS[0] = 'hookup_hotel_start':
 if $ARGS[0] = 'hookup_hotel_start':
@@ -248,22 +288,23 @@ if $ARGS[0] = 'hookup_hotel_start':
 		gs 'sex_ev_start', 'city_hotel_img_init'
 		gs 'sex_ev_start', 'city_hotel_img_init'
 	end
 	end
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'undress'
+	gs 'sex_ev_start', 'frantic_undress'
 end
 end
 
 
 if $ARGS[0] = 'hookup_party_start':
 if $ARGS[0] = 'hookup_party_start':
 	gs 'sex_ev_start', 'hookup_initiate'
 	gs 'sex_ev_start', 'hookup_initiate'
 	$sex_ev['loc'] = 'house_party'
 	$sex_ev['loc'] = 'house_party'
 	$sex_ev['bed_room'] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<rand(1,2)>>/bedroom.jpg"></center>'
 	$sex_ev['bed_room'] = '<center><img <<$set_imgh>> src="images/shared/romance/lovers/homes/multibedroom/<<rand(1,2)>>/bedroom.jpg"></center>'
+	sex_ev['action_restricted'] = 1
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'undress'
+	gs 'sex_ev_start', 'frantic_undress'
 end
 end
 
 
 if $ARGS[0] = 'unique_npc_start':
 if $ARGS[0] = 'unique_npc_start':
 	sex_ev['unique_npc'] = 1
 	sex_ev['unique_npc'] = 1
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'undress'
+	gs 'sex_ev_start', 'frantic_undress'
 end
 end
 
 
 if $ARGS[0] = 'unique_npc_bed_start':
 if $ARGS[0] = 'unique_npc_bed_start':
@@ -284,12 +325,12 @@ if $ARGS[0] = 'begin':
 	end
 	end
 	gs 'sex_ev_stats', 'starting_stats'
 	gs 'sex_ev_stats', 'starting_stats'
 	gs 'sex_ev_stats', 'npc_update'
 	gs 'sex_ev_stats', 'npc_update'
-	if sugar_daddy_call[$boy] = 1 or sex_ev['prostitution'] = 1:
+	if sugar_daddy_call[$npcID] = 1 or sex_ev['prostitution'] = 1:
 		$sex_ev['prostitution_flag'] = 'prostitution'
 		$sex_ev['prostitution_flag'] = 'prostitution'
 		sex_ev['prostitution'] = 1
 		sex_ev['prostitution'] = 1
-		npc_sugar_daddy_timer[$boy] = daystart + 10
+		npc_sugar_daddy_timer[$npcID] = daystart + 10
 	end
 	end
-	npc_last_booty_call[$boy] = daystart
+	npc_last_booty_call[$npcID] = daystart
 end
 end
 
 
 if $ARGS[0] = 'fb_hotel_start':
 if $ARGS[0] = 'fb_hotel_start':
@@ -299,7 +340,7 @@ if $ARGS[0] = 'fb_hotel_start':
 		gs 'sex_ev_start', 'city_hotel_img_init'
 		gs 'sex_ev_start', 'city_hotel_img_init'
 	end
 	end
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'begin'
-	gs 'sex_ev_start', 'undress'
+	gs 'sex_ev_start', 'frantic_undress'
 end
 end
 
 
 if $ARGS[0] = 'fb_invited_start':
 if $ARGS[0] = 'fb_invited_start':
@@ -308,19 +349,19 @@ if $ARGS[0] = 'fb_invited_start':
 !!	savegame 'autosave_sex_ev.sav'
 !!	savegame 'autosave_sex_ev.sav'
 	gs 'sex_ev_start', 'begin'
 	gs 'sex_ev_start', 'begin'
 	$sex_ev['hall_way']
 	$sex_ev['hall_way']
-	'You knock on the door and <<$npc_firstname[$boy]>> opens up.'
+	'You knock on the door and <<$npc_firstname[$npcID]>> opens up.'
 	if pcs_sweat > 29:
 	if pcs_sweat > 29:
 !!		if AlbinaQW['startletsday'] = daystart:
 !!		if AlbinaQW['startletsday'] = daystart:
-			act'Didn''t have time':
+			act 'Didn''t have time':
 				cla & *nl
 				cla & *nl
 				'"I didn''t have time," you smile. "I came as soon as I saw your message."'
 				'"I didn''t have time," you smile. "I came as soon as I saw your message."'
 				gs 'sex_ev_start', 'fuck_or_what'
 				gs 'sex_ev_start', 'fuck_or_what'
 				gs 'sex_ev_shower', 'before_borrow_shower'
 				gs 'sex_ev_shower', 'before_borrow_shower'
 			end
 			end
 			if stat['last_workout'] > totminut - 120:
 			if stat['last_workout'] > totminut - 120:
-				act'Working out':
+				act 'Working out':
 					cla & *nl
 					cla & *nl
-					if npc_gymrat[$boy] = 1:
+					if npc_gymrat[$npcID] = 1:
 						'"Yeah," you smile back.'
 						'"Yeah," you smile back.'
 					else
 					else
 						'"I was working out when you messaged," you shrug.'
 						'"I was working out when you messaged," you shrug.'
@@ -330,35 +371,35 @@ if $ARGS[0] = 'fb_invited_start':
 			end
 			end
 
 
 			if stat['dance_day'] = daystart:
 			if stat['dance_day'] = daystart:
-				act'Came from dance':
+				act 'Came from dance':
 					cla & *nl
 					cla & *nl
 					'"I came straight from dance practice," you shrug.'
 					'"I came straight from dance practice," you shrug.'
 					gs 'sex_ev_start', 'fb_sweaty'
 					gs 'sex_ev_start', 'fb_sweaty'
 				end
 				end
 			end
 			end
 
 
-!!{			act'Came from football':
+!!{			act 'Came from football':
 				cla & *nl
 				cla & *nl
 				'"I was playing football when I saw your message," you shrug.'
 				'"I was playing football when I saw your message," you shrug.'
 					gs 'sex_ev_start', 'fb_sweaty'
 					gs 'sex_ev_start', 'fb_sweaty'
 			end}
 			end}
 
 
 			if stat['volleyball_day'] = daystart:
 			if stat['volleyball_day'] = daystart:
-				act'Came from volleyball':
+				act 'Came from volleyball':
 					cla & *nl
 					cla & *nl
 					'"I came straight from volleyball practice," you shrug.'
 					'"I came straight from volleyball practice," you shrug.'
 					gs 'sex_ev_start', 'fb_sweaty'
 					gs 'sex_ev_start', 'fb_sweaty'
 				end
 				end
 			end
 			end
 			if stat['run_day'] = daystart:
 			if stat['run_day'] = daystart:
-				act'I was running':
+				act 'I was running':
 					cla & *nl
 					cla & *nl
 					'"I was on a run when I saw your message," you shrug.'
 					'"I was on a run when I saw your message," you shrug.'
 					gs 'sex_ev_start', 'fb_sweaty'
 					gs 'sex_ev_start', 'fb_sweaty'
 				end
 				end
 			end
 			end
 
 
-			act'Came from work':
+			act 'Came from work':
 				cla & *nl
 				cla & *nl
 				'"I came straight from work," you shrug. "Didn''t want to go home and clean up first."'
 				'"I came straight from work," you shrug. "Didn''t want to go home and clean up first."'
 				gs 'sex_ev_start', 'fuck_or_what'
 				gs 'sex_ev_start', 'fuck_or_what'
@@ -367,8 +408,8 @@ if $ARGS[0] = 'fb_invited_start':
 
 
 			gs 'sex_ev_start', 'couldnt_wait'
 			gs 'sex_ev_start', 'couldnt_wait'
 !!		end
 !!		end
-		if pcs_sweat > 39 and npc_gymrat[$boy] < 1:
-			if npc_argumentative[$boy] = 1:
+		if pcs_sweat > 39 and npc_gymrat[$npcID] < 1:
+			if npc_argumentative[$npcID] = 1:
 				'"What the fuck?" he says, wrinkling his nose. "You stink."'
 				'"What the fuck?" he says, wrinkling his nose. "You stink."'
 			else
 			else
 				'"A little fresh today, huh?" he says, as the scent of your sweaty body makes him wince; though the smiles wryly.'
 				'"A little fresh today, huh?" he says, as the scent of your sweaty body makes him wince; though the smiles wryly.'
@@ -379,234 +420,234 @@ if $ARGS[0] = 'fb_invited_start':
 			else
 			else
 				'"Hey," he says, looking up and down your sweaty body in amusement. "You''re soaking wet."'
 				'"Hey," he says, looking up and down your sweaty body in amusement. "You''re soaking wet."'
 				if pcs_horny >= 70:
 				if pcs_horny >= 70:
-					act'Yeah':
+					act 'Yeah':
 						cla & *nl
 						cla & *nl
-						'"Yeah," you say huskily, letting your arousal seep into your voice. <<$npc_firstname[$boy]>> locks eyes with you for a split second.'
+						'"Yeah," you say huskily, letting your arousal seep into your voice. <<$npc_firstname[$npcID]>> locks eyes with you for a split second.'
 						'"Bed?"'
 						'"Bed?"'
 						'"Now," you pant and rush inside.'
 						'"Now," you pant and rush inside.'
-						act'Clothes. Off. Now.':gt 'sex_ev_start', 'undress'
+						act 'Clothes. Off. Now.':gt 'sex_ev_start', 'frantic_undress'
 					end
 					end
 				end
 				end
 			end
 			end
 		end
 		end
 	else
 	else
-		if npc_selfish[$boy] > 0 and rand(0,1) = 1:
+		if npc_selfish[$npcID] > 0 and rand(0,1) = 1:
 			'"About fucking time," he says.'
 			'"About fucking time," he says.'
 		else
 		else
 			'"Hey," he grins at you.'
 			'"Hey," he grins at you.'
 		end
 		end
-		act'Hey':
+		act 'Hey':
 			cla & *nl
 			cla & *nl
 			'"Hey," you smile back. "So..."'
 			'"Hey," you smile back. "So..."'
-			if npc_selfish[$boy] > 0 and rand(0,1) = 1:
-				'"Let''s get you naked," <<$npc_firstname[$boy]>> says, pulling you inside and immediately tugging at your clothes.'
+			if npc_selfish[$npcID] > 0 and rand(0,1) = 1:
+				'"Let''s get you naked," <<$npc_firstname[$npcID]>> says, pulling you inside and immediately tugging at your clothes.'
 			else
 			else
 				'"Come on in," he says, and leads you inside.'
 				'"Come on in," he says, and leads you inside.'
 			end
 			end
-			act'Take it to the bed':gt 'sex_ev_start', 'undress'
+			act 'Take it to the bed':gt 'sex_ev_start', 'frantic_undress'
 		end
 		end
 
 
-		act'Shut up and let''s fuck':
+		act 'Shut up and let''s fuck':
 			cla & *nl
 			cla & *nl
-			if npc_apt_type[$boy] < 3:
+			if npc_apt_type[$npcID] < 3:
 				'"Shut up and fuck me already," you say, putting your hands on his chest and pushing him inside towards the bed. "I''m here to fuck. So let''s fuck."'
 				'"Shut up and fuck me already," you say, putting your hands on his chest and pushing him inside towards the bed. "I''m here to fuck. So let''s fuck."'
 			else
 			else
 				'"Shut up and fuck me already," you say, putting your hands on his chest and pushing him inside towards the bedroom. "I''m here to fuck. So let''s fuck."'
 				'"Shut up and fuck me already," you say, putting your hands on his chest and pushing him inside towards the bedroom. "I''m here to fuck. So let''s fuck."'
 			end
 			end
-			act'Undress':gt 'sex_ev_start', 'undress'
+			act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 		end
 		end
 
 
 		if pcs_makeup > 1:
 		if pcs_makeup > 1:
-			act'Don''t mess up my makeup':
+			act 'Don''t mess up my makeup':
 				sex_ev['dont_ruin_makeup'] = 1
 				sex_ev['dont_ruin_makeup'] = 1
 				cla & *clr
 				cla & *clr
 				$sex_ev['hall_way']
 				$sex_ev['hall_way']
-				if npc_apt_type[$boy] < 3:
+				if npc_apt_type[$npcID] < 3:
 					'"Don''t mess up my makeup," you say, walking past him towards the bed.'
 					'"Don''t mess up my makeup," you say, walking past him towards the bed.'
 				else
 				else
 					'"Don''t mess up my makeup," you say, walking past him towards the bedroom.'
 					'"Don''t mess up my makeup," you say, walking past him towards the bedroom.'
 				end
 				end
-				act'Undress':gt 'sex_ev_start', 'undress'
+				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 				if date = daystart and date_hour_meet <= hour + 1:
 				if date = daystart and date_hour_meet <= hour + 1:
-					act'I have a date soon':
+					act 'I have a date soon':
 						cla & *clr
 						cla & *clr
 						$sex_ev['hall_way']
 						$sex_ev['hall_way']
 						sex_ev['date_soon'] = 1
 						sex_ev['date_soon'] = 1
-						if npc_apt_type[$boy] < 3:
+						if npc_apt_type[$npcID] < 3:
 							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date right after this."'
 							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date right after this."'
 						else
 						else
 							'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I have a date right after this."'
 							'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I have a date right after this."'
 						end
 						end
-						act'Undress':gt 'sex_ev_start', 'undress'
+						act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 					end
 					end
 				elseif date = daystart:
 				elseif date = daystart:
-					act'I have a date later':
+					act 'I have a date later':
 						cla & *clr
 						cla & *clr
 						$sex_ev['hall_way']
 						$sex_ev['hall_way']
 						sex_ev['date_soon'] = 1
 						sex_ev['date_soon'] = 1
-						if npc_apt_type[$boy] < 3:
+						if npc_apt_type[$npcID] < 3:
 							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date later. I don''t want to do it again."'
 							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date later. I don''t want to do it again."'
 						else
 						else
 							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date later. I don''t want to do it again."'
 							'"Don''t mess up my makeup," you say, walking past him towards the bed. "I have a date later. I don''t want to do it again."'
 						end
 						end
-						act'Undress':gt 'sex_ev_start', 'undress'
+						act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 					end
 					end
 				end
 				end
 				if hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
 				if hour >= 18 and $region = 'pav' and (week = 5 or week = 6):
-					act'I''m going to the disco':
+					act 'I''m going to the disco':
 						cla & *clr
 						cla & *clr
 						$sex_ev['hall_way']
 						$sex_ev['hall_way']
 						sex_ev['disco_after'] = 1
 						sex_ev['disco_after'] = 1
-						!!if npc_apt_type[$boy] < 3:
+						!!if npc_apt_type[$npcID] < 3:
 							'"Don''t mess up my makeup," you say as you let him pull you inside. "I''m going to the disco after this."'
 							'"Don''t mess up my makeup," you say as you let him pull you inside. "I''m going to the disco after this."'
 						!!else
 						!!else
 						!!	'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I''m going to the disco after this."'
 						!!	'"Don''t mess up my makeup," you say, walking past him towards the bedroom. "I''m going to the disco after this."'
 						!!end
 						!!end
-						act'Undress':gt 'sex_ev_start', 'undress'
+						act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 					end
 					end
 				end
 				end
 			end
 			end
 		end
 		end
 		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour < 9 and hour >= 6:
 		if kanikuli = 0 and mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and SchoolBlock = 0 and week < 6 and hour < 9 and hour >= 6:
-			act'Make it fast (school)':
+			act 'Make it fast (school)':
 				cla & *nl
 				cla & *nl
 				'"Let''s make this fast," you say. "I have to get to class."'
 				'"Let''s make this fast," you say. "I have to get to class."'
-				act'Undress':gt 'sex_ev_start', 'undress'
+				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 			end
 			end
 		end
 		end
-		if mc_inventory['equipped_condoms'] > 0 and npc_bareback[$boy] = 0:
-			act'I brought condoms':
-				pc_buy_condoms[$boy] = 2
+		if mc_inventory['normal_condoms'] > 0 and npc_bareback[$npcID] = 0:
+			act 'I brought condoms':
+				pc_buy_condoms[$npcID] = 2
 				cla & *nl
 				cla & *nl
 				'"I brought condoms," you grin, holding up the rubbers for him to see.'
 				'"I brought condoms," you grin, holding up the rubbers for him to see.'
-				if know_virgin[$boy] = 1:
-					'<<$npc_firstname[$boy]>> stares in awe.'
+				if know_virgin[$npcID] = 1:
+					'<<$npc_firstname[$npcID]>> stares in awe.'
 					'"Does that mean...?"'
 					'"Does that mean...?"'
 					'"Come and find out," you say, moving inside.'
 					'"Come and find out," you say, moving inside.'
 				else
 				else
 					'"Fuck yeah," he says as he drags you inside.'
 					'"Fuck yeah," he says as he drags you inside.'
 				end
 				end
-				act'Undress':gt 'sex_ev_start', 'undress'
+				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 			end
 			end
 		end
 		end
-		if mc_inventory['morning_after_pill'] > 0 and npc_bareback[$boy] = 0 and npc_know_bc[$boy] = 0:
-			act'Brought a morning after pill':
+		if mc_inventory['morning_after_pill'] > 0 and npc_bareback[$npcID] = 0 and npc_know_bc[$npcID] = 0:
+			act 'Brought a morning after pill':
 				cla
 				cla
 				sex_ev['skip_condom'] = 1
 				sex_ev['skip_condom'] = 1
 				!! sex_ev['no_condom'] = 1
 				!! sex_ev['no_condom'] = 1
 				sex_ev['ma_pill'] = 1
 				sex_ev['ma_pill'] = 1
-				act'No condoms':
+				act 'No condoms':
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
 					'"I brought a morning after pill," you whisper in his ear. "<i>We can skip the condoms today.</i>"'
 					'"I brought a morning after pill," you whisper in his ear. "<i>We can skip the condoms today.</i>"'
-					act'Undress':gt 'sex_ev_start', 'undress'
+					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 				end
 				end
 
 
-				act'Come inside me':
+				act 'Come inside me':
 					sex_ev['creampie_allowance'] = 1
 					sex_ev['creampie_allowance'] = 1
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
 					'"I brought a morning after pill," you whisper in his ear. "<i>Fill me with your cum.</i>"'
 					'"I brought a morning after pill," you whisper in his ear. "<i>Fill me with your cum.</i>"'
-					act'Undress':gt 'sex_ev_start', 'undress'
+					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 				end
 				end
 			end
 			end
 		end
 		end
 		if $pantyworntype = 'none' and $braworntype = 'none':
 		if $pantyworntype = 'none' and $braworntype = 'none':
-			act'Tell him you''re not wearing underwear':
+			act 'Tell him you''re not wearing underwear':
 				cla & *clr
 				cla & *clr
 				$sex_ev['bed_room']
 				$sex_ev['bed_room']
-				'You step inside and draw close to <<$npc_firstname[$boy]>>. You lean in and whisper in his ear...'
+				'You step inside and draw close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear...'
 				*nl
 				*nl
 				'<i>"I''m not wearing any underwear."</i>'
 				'<i>"I''m not wearing any underwear."</i>'
-				act'Undress':gt 'sex_ev_start', 'undress'
+				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 			end
 			end
 		end
 		end
-		if birth_control['think_safe'] = 1 and npc_know_bc[$boy] = 0:
-			act'Tell him you''re on birth control':
+		if birth_control['think_safe'] = 1 and npc_know_bc[$npcID] = 0:
+			act 'Tell him you''re on birth control':
 				gs 'sex_ev_stats', 'birth_control_know'
 				gs 'sex_ev_stats', 'birth_control_know'
 				cla & *clr
 				cla & *clr
 				$sex_ev['bed_room']
 				$sex_ev['bed_room']
-				'You step inside and draw close to <<$npc_firstname[$boy]>>. You lean in and whisper in his ear...'
+				'You step inside and draw close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear...'
 				*nl
 				*nl
-				act'No condoms':
+				act 'No condoms':
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
-					if npc_know_bc_not_effective[$boy] = 1 or npc_bc_promise[$boy] = 1:
+					if npc_know_bc_not_effective[$npcID] = 1 or npc_bc_promise[$npcID] = 1:
 						'"<i>My birth control is ready. Let''s go bareback today.</i>"'
 						'"<i>My birth control is ready. Let''s go bareback today.</i>"'
 					else
 					else
 						'"<i>I''m on birth control now. Let''s go bareback today.</i>"'
 						'"<i>I''m on birth control now. Let''s go bareback today.</i>"'
 					end
 					end
-					act'Undress':gt 'sex_ev_start', 'undress'
+					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 				end
 				end
 
 
-				act'Creampies are okay today':
+				act 'Creampies are okay today':
 					sex_ev['creampie_allowance'] = 1
 					sex_ev['creampie_allowance'] = 1
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
-					if npc_know_bc_not_effective[$boy] = 1 or npc_bc_promise[$boy] = 1:
+					if npc_know_bc_not_effective[$npcID] = 1 or npc_bc_promise[$npcID] = 1:
 						'"<i>My birth control is ready. You can come inside me.</i>"'
 						'"<i>My birth control is ready. You can come inside me.</i>"'
 					else
 					else
 						'"<i>I''m on birth control now. You can come inside me.</i>"'
 						'"<i>I''m on birth control now. You can come inside me.</i>"'
 					end
 					end
-					act'Undress':gt 'sex_ev_start', 'undress'
+					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 				end
 				end
 			end
 			end
 		elseif mesec > 0:
 		elseif mesec > 0:
-			act'"I''m on my period"':
+			act '"I''m on my period"':
 				cla & *clr
 				cla & *clr
 				$sex_ev['bed_room']
 				$sex_ev['bed_room']
-				'You step inside and draw close to <<$npc_firstname[$boy]>>. You lean in and whisper in his ear...'
+				'You step inside and draw close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear...'
 				*nl
 				*nl
-				act'No condoms':
+				act 'No condoms':
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
 					'"<i>I''m on my period right now. Let''s go bareback today.</i>"'
 					'"<i>I''m on my period right now. Let''s go bareback today.</i>"'
-					act'Undress':gt 'sex_ev_start', 'undress'
+					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 				end
 				end
 
 
-				act'Come inside me':
+				act 'Come inside me':
 					sex_ev['creampie_allowance'] = 1
 					sex_ev['creampie_allowance'] = 1
 					cla & *clr
 					cla & *clr
 					$sex_ev['bed_room']
 					$sex_ev['bed_room']
 					'"<i>I''m on my period right now. You can come inside me.</i>"'
 					'"<i>I''m on my period right now. You can come inside me.</i>"'
-					act'Undress':gt 'sex_ev_start', 'undress'
+					act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 				end
 				end
 			end
 			end
 		end
 		end
 
 
-		if npc_shave_promise[$boy] > 0 and pcs_pubes < 4:
-			act'Tell him you shaved':
+		if npc_shave_promise[$npcID] > 0 and pcs_pubes < 4:
+			act 'Tell him you shaved':
 				cla & *clr
 				cla & *clr
 				$sex_ev['bed_room']
 				$sex_ev['bed_room']
-				'"I have a special surprise too," you say, stepping inside and drawing close to <<$npc_firstname[$boy]>>. You lean in and whisper in his ear, "<i>I shaved my pussy for you.</i>"'
-				act'Undress':gt 'sex_ev_start', 'undress'
+				'"I have a special surprise too," you say, stepping inside and drawing close to <<$npc_firstname[$npcID]>>. You lean in and whisper in his ear, "<i>I shaved my pussy for you.</i>"'
+				act 'Undress':gt 'sex_ev_start', 'frantic_undress'
 			end
 			end
 		end
 		end
-!!	act'Stumble over to the couch':gt 'sex_ev_start', 'couch_start'
+!!	act 'Stumble over to the couch':gt 'sex_ev_start', 'couch_start'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'couldnt_wait':
 if $ARGS[0] = 'couldnt_wait':
-	act'Couldn''t wait':
+	act 'Couldn''t wait':
 		cla & *nl
 		cla & *nl
 		'"I couldn''t wait," you grin. "<i>Can''t</i> wait. Bedroom?"'
 		'"I couldn''t wait," you grin. "<i>Can''t</i> wait. Bedroom?"'
 		'"Bedroom," he nods and drags you inside.'
 		'"Bedroom," he nods and drags you inside.'
-		act'Clothes. Off. Now.':gt 'sex_ev_start', 'undress'
+		act 'Clothes. Off. Now.':gt 'sex_ev_start', 'frantic_undress'
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'fuck_or_what':
 if $ARGS[0] = 'fuck_or_what':
-	act'Are we going to fuck or what?':
+	act 'Are we going to fuck or what?':
 		cla & *nl
 		cla & *nl
 		'"So are are we going to fuck or are you going just to keep standing there?" you grin.'
 		'"So are are we going to fuck or are you going just to keep standing there?" you grin.'
-		'<<$npc_firstname[$boy]>> doesn''t say anything, instead grabbing you by the arms and dragging you inside.'
-		act'Clothes. Off. Now.':gt 'sex_ev_start', 'undress'
+		'<<$npc_firstname[$npcID]>> doesn''t say anything, instead grabbing you by the arms and dragging you inside.'
+		act 'Clothes. Off. Now.':gt 'sex_ev_start', 'frantic_undress'
 	end
 	end
 end
 end
 
 
 
 
 if $ARGS[0] = 'fb_sweaty':
 if $ARGS[0] = 'fb_sweaty':
-	if npc_gymrat[$boy] = 1 or $npc_apt_sparetype[$boy] = 'gym':
+	if npc_gymrat[$npcID] = 1 or $npc_apt_spare[$npcID] = 'gym':
 		gs 'sex_ev_start', 'fuck_or_what'
 		gs 'sex_ev_start', 'fuck_or_what'
 		gs 'sex_ev_shower', 'before_borrow_shower'
 		gs 'sex_ev_shower', 'before_borrow_shower'
 	else
 	else
@@ -621,10 +662,10 @@ if $ARGS[0] = 'fb_uninvited_start':
 	gs 'sex_ev_start', 'lover_home_img_init'
 	gs 'sex_ev_start', 'lover_home_img_init'
 	$sex_ev['hall_way']
 	$sex_ev['hall_way']
 	'You knock on the door and you hear the latch unlock and the door swings open.'
 	'You knock on the door and you hear the latch unlock and the door swings open.'
-	act'I was in the neighborhood':
+	act 'I was in the neighborhood':
 		cla & *nl
 		cla & *nl
-		'"Hey," you smile at <<$npc_firstname[$boy]>> who blinks in surprise. "I was in the neighborhood and I started thinking about you, wondering if you wanted to fool around some...?"'
-		if npc_booty_call_date[$boy] = daystart:
+		'"Hey," you smile at <<$npc_firstname[$npcID]>> who blinks in surprise. "I was in the neighborhood and I started thinking about you, wondering if you wanted to fool around some...?"'
+		if npc_booty_call_date[$npcID] = daystart:
 			'"I was just about to text you," he grins.'
 			'"I was just about to text you," he grins.'
 			'So am I coming in or what?" you grin back.'
 			'So am I coming in or what?" you grin back.'
 		else
 		else
@@ -633,40 +674,40 @@ if $ARGS[0] = 'fb_uninvited_start':
 			'"Wanted to surprise you. So am I coming in or what?"'
 			'"Wanted to surprise you. So am I coming in or what?"'
 		end
 		end
 
 
-		if rand(1,10) < npc_sexdrive[$boy]:
-			if $npc_humor[$boy] = 'perverted' and $npc_cum_pref[$boy] = 'creampie':
+		if rand(1,10) < npc_sexdrive[$npcID]:
+			if npc_humor[$npcID] = 2 and $npc_cum_pref[$npcID] = 'creampie':
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in.'
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in.'
-			elseif $npc_humor[$boy] = 'perverted' and $npc_cum_pref[$boy] = 'mouth':
+			elseif npc_humor[$npcID] = 2 and $npc_cum_pref[$npcID] = 'mouth':
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in. "In your mouth that is."'
 				'"I''m the only one who''s gonna be coming inside," he says, leering at your ass as he steps aside to let you in. "In your mouth that is."'
-			elseif npc_booty_call_date[$boy] = daystart:
+			elseif npc_booty_call_date[$npcID] = daystart:
 				'"As long as those clothes are coming off in the next 10 seconds," he says, leering at your ass as he steps aside to let you in.'
 				'"As long as those clothes are coming off in the next 10 seconds," he says, leering at your ass as he steps aside to let you in.'
 			else
 			else
 				'"Well I won''t say no to a free fuck," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 				'"Well I won''t say no to a free fuck," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 			end
 			end
-			act'Go to the bedroom':gt 'sex_ev_start', 'undress'
+			act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
 		else
 		else
 			gs 'sex_ev_start', 'uninvited_deny'
 			gs 'sex_ev_start', 'uninvited_deny'
 		end
 		end
 	end
 	end
 
 
-	act'Surprise!':
+	act 'Surprise!':
 		cla & *nl
 		cla & *nl
-		if rand(1,10) < npc_sexdrive[$boy]:
-			'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$boy]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
+		if rand(1,10) < npc_sexdrive[$npcID]:
+			'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$npcID]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
 			'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 			'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
-			act'Go to the bedroom':gt 'sex_ev_start', 'undress'
+			act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
 		else
 		else
 			gs 'sex_ev_start', 'uninvited_deny'
 			gs 'sex_ev_start', 'uninvited_deny'
 		end
 		end
 	end
 	end
 
 
-	act'I need a good fuck':
+	act 'I need a good fuck':
 		cla & *nl
 		cla & *nl
-		if rand(1,10) < npc_sexdrive[$boy]:
-			'<<$npc_firstname[$boy]>> stands there startled as you step forward, putting your hand on his chest.'
+		if rand(1,10) < npc_sexdrive[$npcID]:
+			'<<$npc_firstname[$npcID]>> stands there startled as you step forward, putting your hand on his chest.'
 			'"I need a good fuck and I need it right now," you say.'
 			'"I need a good fuck and I need it right now," you say.'
 			'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
 			'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
-			act'Go to the bedroom':gt 'sex_ev_start', 'undress'
+			act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
 		else
 		else
 			gs 'sex_ev_start', 'uninvited_deny'
 			gs 'sex_ev_start', 'uninvited_deny'
 		end
 		end
@@ -674,38 +715,38 @@ if $ARGS[0] = 'fb_uninvited_start':
 end
 end
 
 
 if $ARGS[0] = 'uninvited_deny':
 if $ARGS[0] = 'uninvited_deny':
-	npc_no_booty_call[$boy] = daystart
-	'"You should''ve texted," <<$npc_firstname[$boy]>> says shaking his head. "I''m not in the mood, maybe some other time."'
+	npc_no_booty_call[$npcID] = daystart
+	'"You should''ve texted," <<$npc_firstname[$npcID]>> says shaking his head. "I''m not in the mood, maybe some other time."'
 	'He closes the door on you abruptly and you''re left standing outside horny and alone.'
 	'He closes the door on you abruptly and you''re left standing outside horny and alone.'
-	act'Leave':gt $loc
+	act 'Leave':gt $loc
 end
 end
 
 
 if $ARGS[0] = 'girlfriend_surprise1':
 if $ARGS[0] = 'girlfriend_surprise1':
 	'You knock on the door and you hear the latch unlock and the door swings open.'
 	'You knock on the door and you hear the latch unlock and the door swings open.'
-	act'I was in the neighborhood':
+	act 'I was in the neighborhood':
 		cla & *nl
 		cla & *nl
-		'"Hey, I was in the neighborhood-" you start to smile and freeze when you realize it''s not <<$npc_firstname[$boy]>>, but another woman standing in front of you.'
+		'"Hey, I was in the neighborhood-" you start to smile and freeze when you realize it''s not <<$npc_firstname[$npcID]>>, but another woman standing in front of you.'
 
 
 	end
 	end
 
 
-	act'Surprise!':
+	act 'Surprise!':
 		cla & *nl
 		cla & *nl
-		'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$boy]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
+		'"Surprise!" you shout gleefully at a startled <<$npc_firstname[$npcID]>>. "Just happened to be walking by and I thought I might drop in, see if you wanted to fool around?" You grin at him, bouncing your eyebrows suggestively.'
 		'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
 		'"Well I won''t say no if that''s what you want," he smirks, stepping aside to let you in and leering at your ass as you walk past.'
-		act'Go to the bedroom':gt 'sex_ev_start', 'undress'
+		act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
 	end
 	end
 
 
-	act'I need a good fuck':
+	act 'I need a good fuck':
 		cla & *nl
 		cla & *nl
-		'<<$npc_firstname[$boy]>> stands there startled as you step forward, putting your hand on his chest.'
+		'<<$npc_firstname[$npcID]>> stands there startled as you step forward, putting your hand on his chest.'
 		'"I need a good fuck and I need it right now," you say.'
 		'"I need a good fuck and I need it right now," you say.'
 		'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
 		'A moment passes with you staring into his eyes with a smouldering gaze before he drags you inside, slamming the door behind you.'
-		act'Go to the bedroom':gt 'sex_ev_start', 'undress'
+		act 'Go to the bedroom':gt 'sex_ev_start', 'frantic_undress'
 	end
 	end
 
 
 	if drunk = 1:
 	if drunk = 1:
 		cla & *nl
 		cla & *nl
-		act'Guess who''s drunk!':
+		act 'Guess who''s drunk!':
 
 
 		end
 		end
 	end
 	end
@@ -716,56 +757,66 @@ if $ARGS[0] = 'girlfriend_surprise2':
 end
 end
 
 
 if $ARGS[0] = 'girlfriend_cheater1':
 if $ARGS[0] = 'girlfriend_cheater1':
-	'You walk into <<$npc_firstname[$boy]>>''s apartment, you freeze as you enter seeing a woman standing there, clearly not expecting someone else to arrive here today.'
+	'You walk into <<$npc_firstname[$npcID]>>''s apartment, you freeze as you enter seeing a woman standing there, clearly not expecting someone else to arrive here today.'
 	'woman: "who are you?"'
 	'woman: "who are you?"'
-	'Sveta: "Uhm, I''m <<$pcs_nickname>>, I''m here to see <<$npc_firstname[$boy]>>.'
+	'Sveta: "Uhm, I''m <<$pcs_nickname>>, I''m here to see <<$npc_firstname[$npcID]>>.'
 	'The woman looks at you questiongly, wondering why you''re here and how you got a key to the apartment. looking at her face you see she it''s dawning on here why you''re here.'
 	'The woman looks at you questiongly, wondering why you''re here and how you got a key to the apartment. looking at her face you see she it''s dawning on here why you''re here.'
-	'"oh fuck" you think inwardly realizing this is either another one of <<$npc_firstname[$boy]>> fuckbuddies who didn''t know he was fucking other girls or this is a girlfriend.'
+	'"oh fuck" you think inwardly realizing this is either another one of <<$npc_firstname[$npcID]>> fuckbuddies who didn''t know he was fucking other girls or this is a girlfriend.'
 	'"why?" she says with a hint of poison to her words'
 	'"why?" she says with a hint of poison to her words'
 	'Sveta: "ehhh, I''m just here to..."'
 	'Sveta: "ehhh, I''m just here to..."'
 end
 end
 
 
-if $ARGS[0] = 'undress':
-	cla & *clr
-	gs 'sex_ev_start', 'undress_function'
-	gs 'arousal', 'foreplay', 2
-	gs 'arousal', 'foreplay_give', -2
-	gs'stat'
-	'<center><video autoplay loop src="images/shared/sex/misc/undress1.mp4"></video></center>'
-	!! initiative call
-	if $sex_ev['loc'] = 'house_party':
-		if $npc_humor[$boy] = 'perverted' or $npc_fidelity[$boy] = 'cheater':
-			'You stumble into an empty room with <<$npc_firstname[$boy]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
-			'"Girls like you all want the same thing," he grins as he tears it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
-		elseif $npc_humor[$boy] = 'childish':
-			'You stumble into an empty room with <<$npc_firstname[$boy]>>, barely getting through the door before clothes start getting discarded. His eyes light up as your breasts are exposed and he openly leers at them.'
-			'"Fuck..." The way <<$npc_firstname[$boy]>> stares at your boobs, he looks like a boy on Christmas day. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
-		elseif $npc_humor[$boy] = 'intellectual':
-			'You stumble into an empty room with <<$npc_firstname[$boy]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
-			'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
+if $ARGS[0] = 'slow_undress_start':
+	gs 'sex_ev_start', 'begin'
+end
+
+if $ARGS[0] = 'frantic_undress_start':
+
+end
+
+if $ARGS[0] = 'frantic_undress':
+	act 'Clothes. Off. Bed. Now.':
+		cla & *clr
+		gs 'sex_ev_start', 'undress_function'
+		gs 'arousal', 'foreplay', 2
+		gs 'arousal', 'foreplay_give', -2
+		gs 'stat'
+		'<center><video autoplay loop src="images/shared/sex/misc/undress1.mp4"></video></center>'
+		!! initiative call
+		if $sex_ev['loc'] = 'house_party':
+			if npc_humor[$npcID] = 2 or $npc_fidelity[$npcID] = 'cheater':
+				'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
+				'"Girls like you all want the same thing," he grins as he tears it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
+			elseif npc_humor[$npcID] = 1:
+				'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. His eyes light up as your breasts are exposed and he openly leers at them.'
+				'"Fuck..." The way <<$npc_firstname[$npcID]>> stares at your boobs, he looks like a boy on Christmas day. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
+			elseif npc_humor[$npcID] = 3:
+				'You stumble into an empty room with <<$npc_firstname[$npcID]>>, barely getting through the door before clothes start getting discarded. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
+				'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
+			else
+				'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
+			end
 		else
 		else
-			'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
+			if npc_humor[$npcID] = 2 or $npc_fidelity[$npcID] = 'cheater':
+				'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
+				'"Girls like you all want the same thing," he says as he rips it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
+			elseif npc_humor[$npcID] = 1:
+				'<<$npc_firstname[$npcID]>> can''t keep his eyes off you as you lead him.'
+				'"Fuck," he groans as you start to undress once you''re inside the door. His eyes light up as your breasts are exposed and he openly leers at them. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
+			elseif npc_humor[$npcID] = 3:
+				'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
+				'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
+			else
+				'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
+			end
 		end
 		end
-	else
-		if $npc_humor[$boy] = 'perverted' or $npc_fidelity[$boy] = 'cheater':
-			'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, rough hands slide over your skin.'
-			'"Girls like you all want the same thing," he says as he rips it off and pins you to the wall. His hands seem to find every inch of your bare skin. By the time you''re at the bed, there''s a trail of clothing across the floor.'
-		elseif $npc_humor[$boy] = 'childish':
-			'<<$npc_firstname[$boy]>> can''t keep his eyes off you as you lead him.'
-			'"Fuck," he groans as you start to undress once you''re inside the door. His eyes light up as your breasts are exposed and he openly leers at them. He suddenly remembers he needs to get undressed as well and scrambles to take off his pants. His eyes never leave your body as you lead him toward the bed.'
-		elseif $npc_humor[$boy] = 'intellectual':
-			'The moment you''re through the door, the both of you begin discarding clothes in a hurry. Before you can fully get your <<$sex_ev[''top_noun'']>> off, warm hands slide stop you.'
-			'"Hold up your arms," he orders as he expertly pulls it over your shoulders. His slightly labored breath makes you want to rush but he takes his time. By the time you''re make the bed, you are naked and panting.'
+		if $sex_ev['loc'] ! 'pc_home' or $home['current'] ! 'parents_home':
+			gs 'sex_ev_foreplay', 'bed_start'
 		else
 		else
-			'You tear each other''s clothes off, leaving a trail of discarded fabrics.'
-		end
-	end
-	if $sex_ev['loc'] ! 'pc_home' or $home['current'] ! 'parents_home':
-		gs 'sex_ev_foreplay', 'bed_start'
-	else
-		act'Go to your bed':gs 'sex_ev_foreplay', 'bed_start'
+			act 'Go to your bed':gs 'sex_ev_foreplay', 'bed_start'
 
 
-		act'Go to Anya''s bed':$sex_ev['bed_choice'] = 'anya_bed' & sisterQW['sex_bed_count'] += 1 & sisterQW['sex_bed'] = daystart & gs 'sex_ev_foreplay', 'bed_start'
+			act 'Go to Anya''s bed':$sex_ev['bed_choice'] = 'anya_bed' & sisterQW['sex_bed_count'] += 1 & sisterQW['sex_bed'] = daystart & gs 'sex_ev_foreplay', 'bed_start'
+		end
 	end
 	end
 end
 end
 
 
@@ -787,7 +838,7 @@ if $ARGS[0] = 'undress_function':
 		else
 		else
 			$sex_ev['top_noun'] = 'top'
 			$sex_ev['top_noun'] = 'top'
 		end
 		end
-		if PCloStyle2 = 4: npc_know_schoolgirl[$boy] = 1
+		if CloStyle2 = 4: npc_know_schoolgirl[$npcID] = 1
 		if $clothingworntype ! 'nude':gs 'clothing', 'strip'
 		if $clothingworntype ! 'nude':gs 'clothing', 'strip'
 		if $braworntype ! 'none':gs 'bras', 'remove'
 		if $braworntype ! 'none':gs 'bras', 'remove'
 		if $pantyworntype ! 'none':gs 'panties', 'remove'
 		if $pantyworntype ! 'none':gs 'panties', 'remove'
@@ -795,30 +846,30 @@ if $ARGS[0] = 'undress_function':
 end
 end
 
 
 if $ARGS[0] = 'pre_reaction':
 if $ARGS[0] = 'pre_reaction':
-	if $npc_dick_desc[$boy] = 'tiny' or $npc_dick_desc[$boy] = 'short':
-		'<<$npc_firstname[$boy]>>''s pants drop, revealing... what the fuck? Is that a micropenis?'
+	if $npc_dick_desc[$npcID] = 'tiny' or $npc_dick_desc[$npcID] = 'short':
+		'<<$npc_firstname[$npcID]>>''s pants drop, revealing... what the fuck? Is that a micropenis?'
 		'It''s basically the same size as your little finger.'
 		'It''s basically the same size as your little finger.'
-	elseif $npc_dick_desc[$boy] = 'chode':
-		'<<$npc_firstname[$boy]>> pumps his short cock in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his chode slips in and out of you with ease.'
-	elseif $npc_dick_desc[$boy] = 'skinny':
-		'<<$npc_firstname[$boy]>> pumps his skinny dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his slim cock slips in and out of you with ease.'
-	elseif $npc_dick_desc[$boy] = 'normal':
-		'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his cock slips in and out of you with ease.'
-	elseif $npc_dick_desc[$boy] = 'thick':
-
-		'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his thick cock slips in and out of you with ease.'
-	elseif $npc_dick_desc[$boy] = 'long':
-			'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his dick is so long that it barely fits inside you, so the added lubrication is more than welcome.'
-	elseif $npc_dick_desc[$boy] = 'huge':
-		'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his huge cock filling you up with every thrust, so the added lubrication is more than welcome.'
-	elseif $npc_dick_desc[$boy] = 'enormous':
-		'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his huge cock filling you up with every thrust, so the added lubrication is more than welcome.'
-	elseif $npc_dick_desc[$boy] = 'lengthy':
-		'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his cock is so long that he bumps against your cervix with every thrust, so the added lubrication is more than welcome.'
-	elseif $npc_dick_desc[$boy] = 'gigantic':
-		'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his gigantic cock is so big that he fills you to the brim with every thrust, so the added lubrication is more than welcome.'
-	elseif $npc_dick_desc[$boy] = 'monster':
-		'<<$npc_firstname[$boy]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his monstrous cock is so big that he nearly splits you in half with every thrust, so the added lubrication is more than welcome.'
+	elseif $npc_dick_desc[$npcID] = 'chode':
+		'<<$npc_firstname[$npcID]>> pumps his short cock in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his chode slips in and out of you with ease.'
+	elseif $npc_dick_desc[$npcID] = 'skinny':
+		'<<$npc_firstname[$npcID]>> pumps his skinny dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his slim cock slips in and out of you with ease.'
+	elseif $npc_dick_desc[$npcID] = 'normal':
+		'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his cock slips in and out of you with ease.'
+	elseif $npc_dick_desc[$npcID] = 'thick':
+
+		'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But the added lubrication is welcome and his thick cock slips in and out of you with ease.'
+	elseif $npc_dick_desc[$npcID] = 'long':
+			'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his dick is so long that it barely fits inside you, so the added lubrication is more than welcome.'
+	elseif $npc_dick_desc[$npcID] = 'huge':
+		'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his huge cock filling you up with every thrust, so the added lubrication is more than welcome.'
+	elseif $npc_dick_desc[$npcID] = 'enormous':
+		'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But you still gasp with every thrust, his huge cock filling you up with every thrust, so the added lubrication is more than welcome.'
+	elseif $npc_dick_desc[$npcID] = 'lengthy':
+		'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Soft squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his cock is so long that he bumps against your cervix with every thrust, so the added lubrication is more than welcome.'
+	elseif $npc_dick_desc[$npcID] = 'gigantic':
+		'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his gigantic cock is so big that he fills you to the brim with every thrust, so the added lubrication is more than welcome.'
+	elseif $npc_dick_desc[$npcID] = 'monster':
+		'<<$npc_firstname[$npcID]>> pumps his dick in and out of you slowly, focusing more on technique than speed. Loud squelching comes from between your legs, a little wetter sounding than usual, probably on account of your period. But his monstrous cock is so big that he nearly splits you in half with every thrust, so the added lubrication is more than welcome.'
 	end
 	end
 end
 end
 
 
@@ -826,9 +877,9 @@ if $ARGS[0] = 'bed_start':
 	!! $sex_ev['bed_room']
 	!! $sex_ev['bed_room']
 	if rand(0,1) = 1:
 	if rand(0,1) = 1:
 		!! he wins initiative
 		!! he wins initiative
-		if npc_caretaker[$boy] = 1 or npc_pussyeater[$boy] = 1:
+		if npc_caretaker[$npcID] = 1 or npc_pussyeater[$npcID] = 1:
 			gs 'sex_ev_foreplay', 'generous_initiative'
 			gs 'sex_ev_foreplay', 'generous_initiative'
-		elseif npc_selfish[$boy] = 1:
+		elseif npc_selfish[$npcID] = 1:
 			gs 'sex_ev_foreplay', 'selfish_initiative'
 			gs 'sex_ev_foreplay', 'selfish_initiative'
 		else
 		else
 			if rand(0,1) = 1:
 			if rand(0,1) = 1:
@@ -846,7 +897,7 @@ end
 
 
 
 
 if $ARGS[0] = 'mey_home_start':
 if $ARGS[0] = 'mey_home_start':
-	if $npc_rel_type[$boy] ! '': gs 'sex_ev_start', 'hookup_initiate'
+	if $npc_rel_type[$npcID] ! '': gs 'sex_ev_start', 'hookup_initiate'
 	$sex_ev['bed_room'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	$sex_ev['bed_room'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	$sex_ev['bath_room'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 	$sex_ev['bath_room'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 	$sex_ev['kitchen_room'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/kitchen.jpg"></center>'
 	$sex_ev['kitchen_room'] = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/kitchen.jpg"></center>'
@@ -863,27 +914,28 @@ if $ARGS[0] = 'mey_home_start':
 	elseif locat['katja'] = 7 or locat['katja'] = 9:
 	elseif locat['katja'] = 7 or locat['katja'] = 9:
 
 
 	end
 	end
-	gs 'sex_ev_start', 'undress'
+	gs 'sex_ev_start', 'frantic_undress'
 end
 end
 
 
 if $ARGS[0] = 'mey_vicky_spot':
 if $ARGS[0] = 'mey_vicky_spot':
 	cla & *clr
 	cla & *clr
 	$sex_ev['hall_way']
 	$sex_ev['hall_way']
-	'You lead <<$npc_firstname[$boy]>> into the Meynold''s home.'
+	'You lead <<$npc_firstname[$npcID]>> into the Meynold''s home.'
 	if locat['Vicky'] = 15:
 	if locat['Vicky'] = 15:
 		if rand(1,2) = 1:
 		if rand(1,2) = 1:
 			'At that moment, Vicky comes tearing around the corner, her face pressed up against Vanya''s and arms wrapped around his neck as he slams her into the wall with a thud.'
 			'At that moment, Vicky comes tearing around the corner, her face pressed up against Vanya''s and arms wrapped around his neck as he slams her into the wall with a thud.'
-			'"<i>Oh!</i> Oh honey~!" she moans as he thrusts his hand under her skirt. "Fuck! I need you inside me now!"'
+			'"Oh! Oh <i>-fuck~!</i>" she moans as he thrusts his hand under her skirt. "Baby, I need you inside me now!"'
 			'The two of them stagger off down the hall towards Vicky''s room, apparently too caught up in each other to even notice you brought a guy home.'
 			'The two of them stagger off down the hall towards Vicky''s room, apparently too caught up in each other to even notice you brought a guy home.'
 		else
 		else
 			'At that moment, Vicky comes strolling around the corner, her arm in Vanya''s, giggling at something he said. She spots you out of the corner of her eye and pulls up short in surprise.'
 			'At that moment, Vicky comes strolling around the corner, her arm in Vanya''s, giggling at something he said. She spots you out of the corner of her eye and pulls up short in surprise.'
 			'"Oh! <<$pcs_nickname>>! Is this a boytoy of yours?"'
 			'"Oh! <<$pcs_nickname>>! Is this a boytoy of yours?"'
 			'"Yeah," you admit, somewhat embarrassed. She just smirks back in turn.'
 			'"Yeah," you admit, somewhat embarrassed. She just smirks back in turn.'
-			'"Well I don''t want to get in your way. Make sure you pork her good!" Vicky says, winking at <<$npc_firstname[$boy]>>. "She deserves it. If you don''t I''m gonna make sure I hear all about it later!"'
+			'"Well I don''t want to get in your way. Make sure you pork her good!" Vicky says, winking at <<$npc_firstname[$npcID]>>. "She deserves it. If you don''t I''m gonna make sure I hear all about it later!"'
 			'And with that, she and Vayna continue on to some other part of the house.'
 			'And with that, she and Vayna continue on to some other part of the house.'
 		end
 		end
 	else
 	else
-		'blahblah'
+		'At that moment Vicky just happens to come strolling around the corner giggling at something she sees on her phone when she spots you.'
+		'"Oh!" she squeaks as a hand comes up to her mouth, covering an obvious smile. "'
 	end
 	end
 end
 end
 
 

+ 70 - 66
locations/sex_ev_stats.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'starting_stats':
 	sex_ev['cum_clothes_groin'] = cum_loc['clothes_groin']
 	sex_ev['cum_clothes_groin'] = cum_loc['clothes_groin']
 	sex_ev['cum_clothes'] = cum_loc['clothes']
 	sex_ev['cum_clothes'] = cum_loc['clothes']
 	sex_ev['cum_back'] = cum_loc['back']
 	sex_ev['cum_back'] = cum_loc['back']
-	sex_ev['cum_legs'] = cum_loc['legs']
+	sex_ev['cum_legs '] = cum_loc['legs ']
 	sex_ev['cum_arms'] = cum_loc['arms']
 	sex_ev['cum_arms'] = cum_loc['arms']
 	sex_ev['cum_face'] = cum_loc['face']
 	sex_ev['cum_face'] = cum_loc['face']
 	sex_ev['cum_mouth'] = cum_loc['mouth']
 	sex_ev['cum_mouth'] = cum_loc['mouth']
@@ -37,17 +37,17 @@ if $ARGS[0] = 'starting_stats':
 	sex_ev['starting_sweat'] = pcs_sweat
 	sex_ev['starting_sweat'] = pcs_sweat
 	sex_ev['orgasm'] = orgasm
 	sex_ev['orgasm'] = orgasm
 	sex_ev['orgasm_limit'] = orgasm + 6
 	sex_ev['orgasm_limit'] = orgasm + 6
-    sex_ev['pc_condom_count'] = mc_inventory['equipped_condoms']
+    sex_ev['pc_condom_count'] = mc_inventory['normal_condoms']
 	sex_ev['start_time'] = totminut
 	sex_ev['start_time'] = totminut
 	sex_ev['start_hour'] = hour
 	sex_ev['start_hour'] = hour
 	if $start_type[1] ! 'nomagic': sex_ev['magik'] = pcs_magik
 	if $start_type[1] ! 'nomagic': sex_ev['magik'] = pcs_magik
-	if npc_fuckbuddy[$boy] ! 1: npc_fuckbuddy[$boy] = 1
+	if npc_fuckbuddy[$npcID] ! 1: npc_fuckbuddy[$npcID] = 1
 	if tabletkiday = daystart: sex_ev['bc_take'] = 1
 	if tabletkiday = daystart: sex_ev['bc_take'] = 1
-	if $npc_lovername[$boy] = '':
-		$npc_lovername[$boy] = 'babe'
-		$npc_lovername2[$boy] = 'baby'
+	if $npc_lovername[$npcID] = '':
+		$npc_lovername[$npcID] = 'babe'
+		$npc_lovername2[$npcID] = 'baby'
 	end
 	end
-	if npc_creampie_permission[$boy] = 1 or npc_free_creampies[$boy] = 2: sex_ev['creampie_allowance'] = 1
+	if npc_creampie_permission[$npcID] = 1 or npc_free_creampies[$npcID] = 2: sex_ev['creampie_allowance'] = 1
 	if birth_control['think_safe'] = 1:
 	if birth_control['think_safe'] = 1:
 		if tabletkishot > 0:
 		if tabletkishot > 0:
 			$sex_ev['bc_type'] = 'shot'
 			$sex_ev['bc_type'] = 'shot'
@@ -59,171 +59,175 @@ end
 
 
 if $ARGS[0] = 'save_stats':
 if $ARGS[0] = 'save_stats':
 	!! number of times you have initiated or responded to a booty call
 	!! number of times you have initiated or responded to a booty call
-	npc_bootycalls[$boy] += 1
+!!	npc_bootycalls[$npcID] += 1
 
 
 	!! number of times you have had jerked off an npc
 	!! number of times you have had jerked off an npc
-	if sex_ev['hj_count'] > 0: npc_hj_count[$boy] += 1
+	if sex_ev['hj_count'] > 0: npc_hj_count[$npcID] += 1
 
 
 	!! number of times you have had blown an npc
 	!! number of times you have had blown an npc
-	if sex_ev['bj_count'] > 0: npc_bj_count[$boy] += 1
+	if sex_ev['bj_count'] > 0: npc_bj_count[$npcID] += 1
 
 
 	!! number of times you have had sex with an npc
 	!! number of times you have had sex with an npc
-	if sex_ev['fuck'] > 0 or sex_ev['fuck_count'] > 0: npc_fuck_times[$boy] += 1
+	if sex_ev['fuck'] > 0 or sex_ev['fuck_count'] > 0: npc_fuck_times[$npcID] += 1
 
 
 	!! number of times you have fucked bareback
 	!! number of times you have fucked bareback
-	npc_bareback_times[$boy] += sex_ev['no_condom']
+	npc_bareback_times[$npcID] += sex_ev['no_condom']
 
 
 	!! number of times you have fucked with condoms
 	!! number of times you have fucked with condoms
-	npc_condom_times[$boy] += sex_ev['condom']
+	npc_condom_times[$npcID] += sex_ev['condom']
 
 
 	!! number of times you have been eaten out by an npc
 	!! number of times you have been eaten out by an npc
-	npc_kuni_times[$boy] += sex_ev['kuni']
+	npc_kuni_times[$npcID] += sex_ev['kuni']
 
 
 	!! number of times you have made your fuckbuddy cum
 	!! number of times you have made your fuckbuddy cum
-	npc_cum_count[$boy] += sex_ev['cum_count']
+	npc_cum_count[$npcID] += sex_ev['cum_count']
 
 
 	!! number of times your fuckbuddy has brought you to orgasm
 	!! number of times your fuckbuddy has brought you to orgasm
-	npc_orgasm_count[$boy] += sex_ev['orgasm_count']
+	npc_orgasm_count[$npcID] += sex_ev['orgasm_count']
 
 
 	!! number of times you have faked an orgasm
 	!! number of times you have faked an orgasm
-	npc_fake_orgasm_count[$boy] += sex_ev['fake_orgasm_count']
+	npc_fake_orgasm_count[$npcID] += sex_ev['fake_orgasm_count']
 
 
 	!! number of times you have been creampied by your fuckbudy
 	!! number of times you have been creampied by your fuckbudy
-	npc_creampie_count[$boy] += sex_ev['creampie_count']
+	npc_creampie_count[$npcID] += sex_ev['creampie_count']
 
 
 	!! number of times you have been accidentally creampied by your fuckbudy
 	!! number of times you have been accidentally creampied by your fuckbudy
-	npc_accidental_creampie_count[$boy] += sex_ev['accidental_creampie_count']
+	npc_accidental_creampie_count[$npcID] += sex_ev['accidental_creampie_count']
 
 
 	!! number of times you have cum together with your fuckbuddy
 	!! number of times you have cum together with your fuckbuddy
-	npc_cum_together_count[$boy] += sex_ev['creampie_orgasm']
+	npc_cum_together_count[$npcID] += sex_ev['creampie_orgasm']
 
 
 	!! number of simultaneous orgasms you have experienced
 	!! number of simultaneous orgasms you have experienced
 	stat['simultaneous_orgasm_count'] += sex_ev['simultaneous_orgasm_count']
 	stat['simultaneous_orgasm_count'] += sex_ev['simultaneous_orgasm_count']
 
 
 	!! number of times your fuckbuddy has cum on your face
 	!! number of times your fuckbuddy has cum on your face
-	npc_facial_count[$boy] += sex_ev['facial_count']
+	npc_facial_count[$npcID] += sex_ev['facial_count']
 
 
 	!! number of times your fuckbuddy has cum on your tits
 	!! number of times your fuckbuddy has cum on your tits
-	npc_cum_tits_count[$boy] += sex_ev['cum_tits']
+	npc_cum_tits_count[$npcID] += sex_ev['cum_tits']
 
 
 	!! number of times your fuckbuddy has pulled out
 	!! number of times your fuckbuddy has pulled out
-	npc_pullout_count[$boy] += sex_ev['pullout_count']
+	npc_pullout_count[$npcID] += sex_ev['pullout_count']
 
 
 	!! number of times your fuckbuddy has cum in your mouth
 	!! number of times your fuckbuddy has cum in your mouth
-	npc_mouth_cum_count[$boy] += sex_ev['mouth_cum_count']
+	npc_mouth_cum_count[$npcID] += sex_ev['mouth_cum_count']
 
 
 	!! number of times you have jerked him to completion
 	!! number of times you have jerked him to completion
-	npc_cum_hand_count[$boy] += sex_ev['cum_hand']
+	npc_cum_hand_count[$npcID] += sex_ev['cum_hand']
 
 
 	!! number of times you have swallowed for your fuckbuddy
 	!! number of times you have swallowed for your fuckbuddy
-	npc_swallow_count[$boy] += sex_ev['swallow_count']
+	npc_swallow_count[$npcID] += sex_ev['swallow_count']
 
 
 	!! number of times you have spit out his cum
 	!! number of times you have spit out his cum
-	npc_spit_count[$boy] += sex_ev['spit_count']
+	npc_spit_count[$npcID] += sex_ev['spit_count']
 
 
 	!! number of times you have fucked in the shower
 	!! number of times you have fucked in the shower
-	npc_shower_sex_count[$boy] += sex_ev['shower_sex']
+	npc_shower_sex_count[$npcID] += sex_ev['shower_sex']
 
 
 	!! number of times your fuckbuddy has cum in your mouth
 	!! number of times your fuckbuddy has cum in your mouth
-	npc_mouth_cum_count[$boy] += sex_ev['mouth_cum_count']
+	npc_mouth_cum_count[$npcID] += sex_ev['mouth_cum_count']
 
 
 	!! number of times you have denied letting your fuckbuddy take your virginity
 	!! number of times you have denied letting your fuckbuddy take your virginity
-	npc_virgin_deny[$boy] += sex_ev['virgin_deny']
+	npc_virgin_deny[$npcID] += sex_ev['virgin_deny']
 
 
 	!! if your lover takes your virginity without consent
 	!! if your lover takes your virginity without consent
-	npc_virgin_rapist[$boy] += sex_ev['virgin_rape']
+	npc_virgin_rapist[$npcID] += sex_ev['virgin_rape']
 
 
-	if sex_ev['sleep_fuck'] > 0: npc_sleep_fuck[$boy] += 1
+	if sex_ev['sleep_fuck'] > 0: npc_sleep_fuck[$npcID] += 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 mid($start_type,1,2) = 'sg' and SchoolAtestat = 0 and kanikuli = 0 and schoolProgulDay ! daystart:
 		!!absence from school
 		!!absence from school
-		npc_school_absences[$boy] = schoolprogul
+		npc_school_absences[$npcID] = schoolprogul
 	end
 	end
 
 
 	!! if your lover says they have pullout game and do not cum inside you, it will be remembered that the last time you had sex
 	!! if your lover says they have pullout game and do not cum inside you, it will be remembered that the last time you had sex
 	if sex_ev['pullout_game'] = 1 and sex_ev['no_condom'] = 1 and sex_ev['creampie_count'] = 0:
 	if sex_ev['pullout_game'] = 1 and sex_ev['no_condom'] = 1 and sex_ev['creampie_count'] = 0:
-		npc_no_creampie_mistakes[$boy] += 1
-		npc_no_creampie_mistakes_last_time[$boy] = 1
-		npc_pullout_failure_last_time[$boy] = 0
+		npc_no_creampie_mistakes[$npcID] += 1
+		npc_no_creampie_mistakes_last_time[$npcID] = 1
+		npc_pullout_failure_last_time[$npcID] = 0
 	elseif sex_ev['pullout_game'] = 1 and sex_ev['no_condom'] = 1 and sex_ev['creampie_count'] > 0 and sex_ev['broken_condom'] = 0:
 	elseif sex_ev['pullout_game'] = 1 and sex_ev['no_condom'] = 1 and sex_ev['creampie_count'] > 0 and sex_ev['broken_condom'] = 0:
-		npc_pullout_failure[$boy] += 1
-		npc_pullout_failure_last_time[$boy] = 1
-		npc_no_creampie_mistakes_last_time[$boy] = 0
+		npc_pullout_failure[$npcID] += 1
+		npc_pullout_failure_last_time[$npcID] = 1
+		npc_no_creampie_mistakes_last_time[$npcID] = 0
 	end
 	end
 
 
-	if sex_ev['prostitution_freebie'] = 1: stat['prostitution_freebies'] += 1
+	if sex_ev['prostitution_freebie'] = 1:
+		stat['prostitution_freebies'] += 1
+	elseif $sex_ev['prostitution_flag'] ! '' and $npc_rel_type ! 'sugar_daddy':
+		npc_prost_count[$npcID] += 1
+	end
 
 
-	if sex_ev['phone_film'] = 2 or (sex_ev['phone_film'] = 1 and npc_abusive[$boy] > 0):
-		npc_sex_video_count[$boy] += 1
-		!!npc_sex_video<<npc_sex_video_count[$boy]>> = 1
+	if sex_ev['phone_film'] = 2 or (sex_ev['phone_film'] = 1 and npc_abusive[$npcID] > 0):
+		npc_sex_video_count[$npcID] += 1
+		!!npc_sex_video<<npc_sex_video_count[$npcID]>> = 1
 	end
 	end
 end
 end
 
 
 
 
 if $ARGS[0] = 'birth_control_know':
 if $ARGS[0] = 'birth_control_know':
-	npc_know_bc_not_effective[$boy] = 0
-	npc_know_not_bc[$boy] = 0
-	npc_know_bc[$boy] = 1
+	npc_know_bc_not_effective[$npcID] = 0
+	npc_know_not_bc[$npcID] = 0
+	npc_know_bc[$npcID] = 1
 	sex_ev['bc_tell'] = 1
 	sex_ev['bc_tell'] = 1
-	if npc_pay_for_ma_pill[$boy] = 1: npc_pay_for_ma_pill[$boy] = -1
+	if npc_pay_for_ma_pill[$npcID] = 1: npc_pay_for_ma_pill[$npcID] = -1
 end
 end
 
 
 
 
 if $ARGS[0] = 'no_birth_control_know':
 if $ARGS[0] = 'no_birth_control_know':
-	npc_know_not_bc[$boy] = 1
-	npc_know_bc[$boy] = 0
-	npc_know_bc_not_effective[$boy] = 0
+	npc_know_not_bc[$npcID] = 1
+	npc_know_bc[$npcID] = 0
+	npc_know_bc_not_effective[$npcID] = 0
 	sex_ev['bc_tell'] = 1
 	sex_ev['bc_tell'] = 1
 end
 end
 
 
 if $ARGS[0] = 'bareback_risk_active':
 if $ARGS[0] = 'bareback_risk_active':
-	npc_bareback_risk[$boy] = 1
+	npc_bareback_risk[$npcID] = 1
 end
 end
 
 
 if $ARGS[0] = 'bareback_risk_deactive':
 if $ARGS[0] = 'bareback_risk_deactive':
-	npc_bareback_risk[$boy] = 0
+	npc_bareback_risk[$npcID] = 0
 end
 end
 
 
 if $ARGS[0] = 'prostitution_pay_code':
 if $ARGS[0] = 'prostitution_pay_code':
-	if $npc_rel_type[$boy] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0:
+	if $npc_rel_type[$npcID] = 'sugar_daddy' and sex_ev['sugar_daddy_paid'] = 0:
 		sex_ev['sugar_daddy_paid'] = 1
 		sex_ev['sugar_daddy_paid'] = 1
 		sex_ev['prostitution_paid'] = 1
 		sex_ev['prostitution_paid'] = 1
-		money += npc_sugar_daddy_price[$boy] + sex_ev['prostitution_bonus']
-	elseif $npc_rel_type[$boy] = 'p_customer' and sex_ev['prostitution_paid'] = 0:
+		money += npc_sugar_daddy_price[$npcID] + sex_ev['prostitution_bonus']
+	elseif $npc_rel_type[$npcID] = 'p_customer' and sex_ev['prostitution_paid'] = 0:
 		sex_ev['prostitution_paid'] = 1
 		sex_ev['prostitution_paid'] = 1
-		money += npc_prostitution_price[$boy] + sex_ev['prostitution_bonus']
+		money += npc_prostitution_price[$npcID] + sex_ev['prostitution_bonus']
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'single_know':
 if $ARGS[0] = 'single_know':
 	!! the npc knows player is single
 	!! the npc knows player is single
-	npc_know_have_boyfriend[$boy] = 0
-	npc_know_have_girlfriend[$boy] = 0
+	npc_know_have_boyfriend[$npcID] = 0
+	npc_know_have_girlfriend[$npcID] = 0
 end
 end
 
 
 if $ARGS[0] = 'dating_boy_know':
 if $ARGS[0] = 'dating_boy_know':
 	!! the npc knows player is single
 	!! the npc knows player is single
-	npc_know_have_boyfriend[$boy] = 1
+	npc_know_have_boyfriend[$npcID] = 1
 end
 end
 
 
 if $ARGS[0] = 'dating_girl_know':
 if $ARGS[0] = 'dating_girl_know':
 	!! the npc knows player is single
 	!! the npc knows player is single
-	npc_know_have_girlfriend[$boy] = 1
+	npc_know_have_girlfriend[$npcID] = 1
 end
 end
 
 
 if $ARGS[0] = 'npc_is_single':
 if $ARGS[0] = 'npc_is_single':
-	know_npc_girlfriend[$boy] = 0
-	know_npc_single[$boy] = 1
+	know_npc_girlfriend[$npcID] = 0
+	know_npc_single[$npcID] = 1
 end
 end
 
 
 if $ARGS[0] = 'npc_is_dating':
 if $ARGS[0] = 'npc_is_dating':
-	know_npc_girlfriend[$boy] = 1
-	know_npc_single[$boy] = 0
+	know_npc_girlfriend[$npcID] = 1
+	know_npc_single[$npcID] = 0
 end
 end
 
 
 if $ARGS[0] = 'npc_is_married':
 if $ARGS[0] = 'npc_is_married':
-	know_npc_wife[$boy] = 1
-	know_npc_single[$boy] = 0
+	know_npc_wife[$npcID] = 1
+	know_npc_single[$npcID] = 0
 end
 end
 
 
 if $ARGS[0] = 'sleep_check':
 if $ARGS[0] = 'sleep_check':

File diff suppressed because it is too large
+ 288 - 288
locations/sex_ev_talk.qsrc


+ 48 - 44
locations/sex_ev_talk2.qsrc

@@ -1,12 +1,16 @@
 # sex_ev_talk2
 # sex_ev_talk2
 
 
 
 
+if $ARGS[0] = 'preg_talk1':
+
+end
+
 if $ARGS[0] = 'preg_talk1':
 if $ARGS[0] = 'preg_talk1':
 	if (thinkpreg = 1 or knowpreg = 1) and func('body_din','pregnancyVisibility') ! 1:
 	if (thinkpreg = 1 or knowpreg = 1) and func('body_din','pregnancyVisibility') ! 1:
-		act'Tell him you''re pregnant':
+		act 'Tell him you''re pregnant':
 			cla & *clr
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
-			'"<<$npc_firstname[$boy]>>..." you say slowly. "I need to tell you something important."'
+			'"<<$npc_firstname[$npcID]>>..." you say slowly. "I need to tell you something important."'
 			'"What is it?"'
 			'"What is it?"'
 			'"I''m pregnant."'
 			'"I''m pregnant."'
 			gs 'sex_ev_talk2', 'preg_boy_react1'
 			gs 'sex_ev_talk2', 'preg_boy_react1'
@@ -15,16 +19,16 @@ if $ARGS[0] = 'preg_talk1':
 end
 end
 
 
 if $ARGS[0] = 'preg_boy_react1':
 if $ARGS[0] = 'preg_boy_react1':
-	if npc_creampie_count[$boy] = 0:
+	if npc_creampie_count[$npcID] = 0:
 		'His eyes go wide in shock. And then his brow furrows.'
 		'His eyes go wide in shock. And then his brow furrows.'
 		'"But... I''ve never come inside you..."'
 		'"But... I''ve never come inside you..."'
-		if (npc_rel_type[$boy] = 'boyfriend' or $npc_rel_type[$boy] = 'fiancee' or $npc_rel_type[$boy] = 'husband') and lover_open_rel[$boy] = 0:
+		if (npc_rel_type[$npcID] = 'lover' or $npc_rel_type[$npcID] = 'fiancee' or $npc_rel_type[$npcID] = 'husband') and lover_open_rel[$npcID] = 0:
 			gs 'sex_ev_talk2', 'preg_cheat_tell'
 			gs 'sex_ev_talk2', 'preg_cheat_tell'
 		else
 		else
 			gs 'sex_ev_talk2', 'preg_father_tell'
 			gs 'sex_ev_talk2', 'preg_father_tell'
 		end
 		end
-	elseif npc_childfree[$boy] = 0:
-		if npc_rel[$boy] >= 75:
+	elseif npc_childfree[$npcID] = 0:
+		if npc_rel[$npcID] >= 75:
 			'His eyes go wide in surprise. He moves his hand towards your belly with a look of awe.'
 			'His eyes go wide in surprise. He moves his hand towards your belly with a look of awe.'
 			'"And... it''s...? Am I...?"'
 			'"And... it''s...? Am I...?"'
 		else
 		else
@@ -41,14 +45,14 @@ end
 
 
 if $ARGS[0] = 'preg_father_tell':
 if $ARGS[0] = 'preg_father_tell':
 	if arrpos('$wombpotfath', $boy) >= 0 and arrsize('$wombpotfath') = 1:
 	if arrpos('$wombpotfath', $boy) >= 0 and arrsize('$wombpotfath') = 1:
-		act'Tell him he''s the father':
+		act 'Tell him he''s the father':
 			$sex_ev['boy_is_father'] = 'yes'
 			$sex_ev['boy_is_father'] = 'yes'
 			cla & *nl
 			cla & *nl
 			'"I''m pregnant." His eyes go wide. "You''re the father."'
 			'"I''m pregnant." His eyes go wide. "You''re the father."'
 			gs 'sex_ev_talk2', 'preg_talk2'
 			gs 'sex_ev_talk2', 'preg_talk2'
 		end
 		end
 	elseif arrpos('$wombpotfath', $boy) >= 0:
 	elseif arrpos('$wombpotfath', $boy) >= 0:
-		act'You''re unsure but say it''s his':
+		act 'You''re unsure but say it''s his':
 			$sex_ev['boy_is_father'] = 'yes'
 			$sex_ev['boy_is_father'] = 'yes'
 			cla & *nl
 			cla & *nl
 			'"Yes," you nod. "You''re the father."'
 			'"Yes," you nod. "You''re the father."'
@@ -56,22 +60,22 @@ if $ARGS[0] = 'preg_father_tell':
 			gs 'sex_ev_talk2', 'preg_talk2'
 			gs 'sex_ev_talk2', 'preg_talk2'
 		end
 		end
 
 
-		act'Tell him he <i>might</i> be the father':
+		act 'Tell him he <i>might</i> be the father':
 			$sex_ev['boy_is_father'] = 'maybe'
 			$sex_ev['boy_is_father'] = 'maybe'
 			cla & *nl
 			cla & *nl
 			'"Maybe," you say, chewing on your lip. "I''m... not sure if you''re the father..."'
 			'"Maybe," you say, chewing on your lip. "I''m... not sure if you''re the father..."'
 			gs 'sex_ev_talk2', 'preg_talk2'
 			gs 'sex_ev_talk2', 'preg_talk2'
 		end
 		end
 	elseif arrpos('$wombpotfath', $boy) = 0:
 	elseif arrpos('$wombpotfath', $boy) = 0:
-		act'Tell him he''s not the father':
+		act 'Tell him he''s not the father':
 			$sex_ev['boy_is_father'] = 'no'
 			$sex_ev['boy_is_father'] = 'no'
 			cla & *nl
 			cla & *nl
 			'"No," you shake your head. "It isn''t yours."'
 			'"No," you shake your head. "It isn''t yours."'
 
 
 			gs 'sex_ev_talk2', 'preg_talk2'
 			gs 'sex_ev_talk2', 'preg_talk2'
 		end
 		end
-		if npc_creampie_count[$boy] > 0:
-			act'Tell him he''s the father (lie)':
+		if npc_creampie_count[$npcID] > 0:
+			act 'Tell him he''s the father (lie)':
 				$sex_ev['boy_is_father'] = 'yes'
 				$sex_ev['boy_is_father'] = 'yes'
 				cla & *nl
 				cla & *nl
 				'"I''m pregnant." His eyes go wide. "And you''re the father."'
 				'"I''m pregnant." His eyes go wide. "And you''re the father."'
@@ -79,7 +83,7 @@ if $ARGS[0] = 'preg_father_tell':
 				gs 'sex_ev_talk2', 'preg_talk2'
 				gs 'sex_ev_talk2', 'preg_talk2'
 			end
 			end
 
 
-			act'Tell him he <i>might</i> be the father (lie)':
+			act 'Tell him he <i>might</i> be the father (lie)':
 				$sex_ev['boy_is_father'] = 'maybe'
 				$sex_ev['boy_is_father'] = 'maybe'
 				cla & *nl
 				cla & *nl
 				'"I''m pregnant." His eyes go wide. "And you might be the father."'
 				'"I''m pregnant." His eyes go wide. "And you might be the father."'
@@ -90,7 +94,7 @@ if $ARGS[0] = 'preg_father_tell':
 	!!elseif arrsize('$wombpotfath') > 1:
 	!!elseif arrsize('$wombpotfath') > 1:
 	end
 	end
 
 
-	act'You don''t know who the father is':
+	act 'You don''t know who the father is':
 		$sex_ev['boy_is_father'] = 'unknown'
 		$sex_ev['boy_is_father'] = 'unknown'
 		cla & *nl
 		cla & *nl
 		'"I''m pregnant." His eyes go wide. "But I don''t know who the father is."'
 		'"I''m pregnant." His eyes go wide. "But I don''t know who the father is."'
@@ -104,8 +108,8 @@ if $ARGS[0] = 'preg_talk2':
 end
 end
 
 
 if $ARGS[0] = 'preg_talk_worried':
 if $ARGS[0] = 'preg_talk_worried':
-	act'Worried':
-		$sex_ev['preg_react'] = 'worried'
+	act 'Worried':
+		$sex_ev['preg_react '] = 'worried'
 		cla & *nl
 		cla & *nl
 		'Saying it out loud fills you with indescribable anxiety and you chew on your lip, your face scrunching up with worry.'
 		'Saying it out loud fills you with indescribable anxiety and you chew on your lip, your face scrunching up with worry.'
 		gs 'sex_ev_talk2', 'preg_talk3'
 		gs 'sex_ev_talk2', 'preg_talk3'
@@ -114,8 +118,8 @@ end
 
 
 if $ARGS[0] = 'preg_talk_smile':
 if $ARGS[0] = 'preg_talk_smile':
 	if $sex_ev['boy_is_father'] = 'yes':
 	if $sex_ev['boy_is_father'] = 'yes':
-		act'Smile':
-			$sex_ev['preg_react'] = 'smile'
+		act 'Smile':
+			$sex_ev['preg_react '] = 'smile'
 			cla & *nl
 			cla & *nl
 			if arrpos('$wombpotfath', $boy) >= 0:
 			if arrpos('$wombpotfath', $boy) >= 0:
 				'Saying it out loud fills your chest with an uncontainable joy and your lips widen into a loving smile.'
 				'Saying it out loud fills your chest with an uncontainable joy and your lips widen into a loving smile.'
@@ -139,10 +143,10 @@ if $ARGS[0] = 'preg_talk3':
 end
 end
 
 
 if $ARGS[0] = 'preg_boy_father':
 if $ARGS[0] = 'preg_boy_father':
-	if npc_rel[$boy] >= 75 and npc_childfree[$boy] = 0:
+	if npc_rel[$npcID] >= 75 and npc_childfree[$npcID] = 0:
 		'"I''m... I''m going to be a father...?"'
 		'"I''m... I''m going to be a father...?"'
-		'<<$npc_firstname[$boy]>> is in awe. He tentatively places his hand on your belly.'
-	elseif (npc_rel[$boy] < 75 and npc_rel[$boy] > 50) or npc_childfree[$boy] > 0:
+		'<<$npc_firstname[$npcID]>> is in awe. He tentatively places his hand on your belly.'
+	elseif (npc_rel[$npcID] < 75 and npc_rel[$npcID] > 50) or npc_childfree[$npcID] > 0:
 		'"I''m... I''m not sure how I should feel about this..."'
 		'"I''m... I''m not sure how I should feel about this..."'
 	end
 	end
 end
 end
@@ -152,9 +156,9 @@ if $ARGS[0] = 'preg_boy_maybe_father':
 end
 end
 
 
 if $ARGS[0] = 'preg_boy_not_father':
 if $ARGS[0] = 'preg_boy_not_father':
-	if npc_rel[$boy] >= 75 and npc_childfree[$boy] = 0:
+	if npc_rel[$npcID] >= 75 and npc_childfree[$npcID] = 0:
 
 
-	elseif (npc_rel[$boy] < 75 and npc_rel[$boy] > 50) or npc_childfree[$boy] > 0:
+	elseif (npc_rel[$npcID] < 75 and npc_rel[$npcID] > 50) or npc_childfree[$npcID] > 0:
 		'"I''m... I''m not sure how I should feel about this..."'
 		'"I''m... I''m not sure how I should feel about this..."'
 	end
 	end
 end
 end
@@ -162,11 +166,11 @@ end
 
 
 
 
 if $ARGS[0] = 'preg_abortion1':
 if $ARGS[0] = 'preg_abortion1':
-	act'You''re getting an abortion':
+	act 'You''re getting an abortion':
 		cla & *clr
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk2.jpg"></center>'
 		'"I''m going to get an abortion."'
 		'"I''m going to get an abortion."'
-		if npc_childfree[$boy] > 0:
+		if npc_childfree[$npcID] > 0:
 
 
 		else
 		else
 
 
@@ -176,7 +180,7 @@ end
 
 
 if $ARGS[0] = 'preg_talk4':
 if $ARGS[0] = 'preg_talk4':
 	'"Could it be mine?" he asks.'
 	'"Could it be mine?" he asks.'
-	act'Maybe':
+	act 'Maybe':
 		cla & *nl
 		cla & *nl
 		if arrpos('$wombpotfath', $boy) >= 0:
 		if arrpos('$wombpotfath', $boy) >= 0:
 			'"It <i>could</i> be," you admit.'
 			'"It <i>could</i> be," you admit.'
@@ -188,8 +192,8 @@ if $ARGS[0] = 'preg_talk4':
 end
 end
 
 
 if $ARGS[0] = 'boy_is_father_talk1':
 if $ARGS[0] = 'boy_is_father_talk1':
-	if npc_childfree[$boy] = 0:
-		if npc_rel[$boy] >= 75:
+	if npc_childfree[$npcID] = 0:
+		if npc_rel[$npcID] >= 75:
 			'He''s happy about it.'
 			'He''s happy about it.'
 		else
 		else
 			'He doesn''t know how to feel about it.'
 			'He doesn''t know how to feel about it.'
@@ -201,14 +205,14 @@ end
 
 
 if $ARGS[0] = 'preg_cheat_tell':
 if $ARGS[0] = 'preg_cheat_tell':
 	if arrsize('$wombpotfath') > 0:
 	if arrsize('$wombpotfath') > 0:
-		act'Tell him you cheated':
+		act 'Tell him you cheated':
 			cla & *nl
 			cla & *nl
 			'"I... I cheated on you," you admit softly.'
 			'"I... I cheated on you," you admit softly.'
 
 
 		end
 		end
 
 
 		if arrsize('$wombpotfath') > 1:
 		if arrsize('$wombpotfath') > 1:
-			act'Tell him you cheated with multiple people':
+			act 'Tell him you cheated with multiple people':
 				cla & *nl
 				cla & *nl
 				'"I... I cheated on you," you admit softly. "And... I''m not sure who the father is. There are... several... it could be..."'
 				'"I... I cheated on you," you admit softly. "And... I''m not sure who the father is. There are... several... it could be..."'
 			end
 			end
@@ -221,25 +225,25 @@ if $ARGS[0] = 'rape_explain':
 	cla & *clr
 	cla & *clr
 	$sex_ev['bed_room']
 	$sex_ev['bed_room']
 	if stat['rape_count'] = 1:
 	if stat['rape_count'] = 1:
-		'<<$npc_firstname[$boy]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It''s as if you''re back in that moment, being violated all over again.'
+		'<<$npc_firstname[$npcID]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations of that time come flooding back to you, invading your mind. It''s as if you''re back in that moment, being violated all over again.'
 	elseif stat['rape_count'] < 5:
 	elseif stat['rape_count'] < 5:
-		'<<$npc_firstname[$boy]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won''t stop flashing before your eyes, memories of your body being violated like a montage you can''t escape.'
+		'<<$npc_firstname[$npcID]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. The images and sensations come flooding back to you, invading your mind. The memories of your various attackers won''t stop flashing before your eyes, memories of your body being violated like a montage you can''t escape.'
 	elseif stat['rape_count'] < 10:
 	elseif stat['rape_count'] < 10:
-		'<<$npc_firstname[$boy]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they''re all violating you at once.'
+		'<<$npc_firstname[$npcID]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. The memories of your attackers all blur together, combining into one horrible sensation like they''re all violating you at once.'
 	else
 	else
-		'<<$npc_firstname[$boy]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.'
+		'<<$npc_firstname[$npcID]>> stops in shock wondering what has just come over you as your body convulses in uncontrollable sobs. Images and sensations flood through you, invading your mind. Your countless rapes leave you a shuddering mess as the trauma threatens to overwhelm you.'
 	end
 	end
-	'"What just...?" <<$npc_firstname[$boy]>> stammers confusedly.'
-	act'Try to hide it':
+	'"What just...?" <<$npc_firstname[$npcID]>> stammers confusedly.'
+	act 'Try to hide it':
 		cla & *nl
 		cla & *nl
 		'"I... I just don''t like it rough," you sniff, tears running down your cheeks.'
 		'"I... I just don''t like it rough," you sniff, tears running down your cheeks.'
 	end
 	end
 
 
-	act'Tell him what happened':
+	act 'Tell him what happened':
 		cla & *clr
 		cla & *clr
-		npc_knows_rape_victim[$boy] = 1
+		npc_knows_rape_victim[$npcID] = 1
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
-		'You crawl up beside <<$npc_firstname[$boy]>>, still shivering as you wipe the tears from your eyes that won''t stop flowing.'
+		'You crawl up beside <<$npc_firstname[$npcID]>>, still shivering as you wipe the tears from your eyes that won''t stop flowing.'
 		if stat['rape_count'] = 1:
 		if stat['rape_count'] = 1:
 			'"Listen," you sniff, rubbing your hand across your cheek again. "I was raped once... It was awful and horrible and I... well I... I had a flashback about it just now..."'
 			'"Listen," you sniff, rubbing your hand across your cheek again. "I was raped once... It was awful and horrible and I... well I... I had a flashback about it just now..."'
 		elseif stat['rape_count'] < 5:
 		elseif stat['rape_count'] < 5:
@@ -250,20 +254,20 @@ if $ARGS[0] = 'rape_explain':
 			'"I''ve never told you this but..." you sniff, rubbing your hand across your cheek again. "I''ve been raped... A lot... I don''t know why it keeps happening but I''ve been raped so many times I''ve lost count... And sometimes the trauma just comes out..."'
 			'"I''ve never told you this but..." you sniff, rubbing your hand across your cheek again. "I''ve been raped... A lot... I don''t know why it keeps happening but I''ve been raped so many times I''ve lost count... And sometimes the trauma just comes out..."'
 		end
 		end
 		*nl
 		*nl
-		'<<$npc_firstname[$boy]>> is taken aback and goes quiet. Its several minutes before he finally speaks again.'
-		act'Continue':
+		'<<$npc_firstname[$npcID]>> is taken aback and goes quiet. Its several minutes before he finally speaks again.'
+		act 'Continue':
 			cla & *clr
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 			'"I''m... I''m so sorry for what happened to you," he says. "I had no idea."'
 			'"I''m... I''m so sorry for what happened to you," he says. "I had no idea."'
 			'"It''s not your fault," you sniff again. "You couldn''t have known. I never told you."'
 			'"It''s not your fault," you sniff again. "You couldn''t have known. I never told you."'
-			'"So... I should lay off the rough sex then?" <<$npc_firstname[$boy]>> asks hesitantly.'
-			act'Just tonight':
+			'"So... I should lay off the rough sex then?" <<$npc_firstname[$npcID]>> asks hesitantly.'
+			act 'Just tonight':
 				cla & *nl
 				cla & *nl
 				'"You don''t have to stop getting rough," you say, rubbing your eyes. "I just... it doesn''t always happen to me during this kind of sex, but I guess something triggered me. I like it rough sometimes, I promise. Just not... tonight..."'
 				'"You don''t have to stop getting rough," you say, rubbing your eyes. "I just... it doesn''t always happen to me during this kind of sex, but I guess something triggered me. I like it rough sometimes, I promise. Just not... tonight..."'
 				'The conversation trails off.'
 				'The conversation trails off.'
 			end
 			end
 
 
-			act'That would be nice':
+			act 'That would be nice':
 				cla & *nl
 				cla & *nl
 				'"That would be nice," you say wiping your eyes again. "It helps when it''s not rough..."'
 				'"That would be nice," you say wiping your eyes again. "It helps when it''s not rough..."'
 			end
 			end

File diff suppressed because it is too large
+ 243 - 243
locations/sex_ev_virgin.qsrc


File diff suppressed because it is too large
+ 269 - 269
locations/sex_ev_wakeup.qsrc


+ 192 - 222
locations/sex_ev_work_talk1.qsrc

@@ -1,129 +1,121 @@
 # sex_ev_work_talk1
 # sex_ev_work_talk1
 
 
 if $ARGS[0] = 'job_talk':
 if $ARGS[0] = 'job_talk':
-	gs'sex_ev_pillow_talk', 'stop_talk'
-	act'Change the subject':cla & gs 'sex_ev_pillow_talk', 'topics'
+	gs 'sex_ev_pillow_talk', 'stop_talk'
+	act 'Change the subject':cla & gs 'sex_ev_pillow_talk', 'topics'
 	if npc_job_known = 0:
 	if npc_job_known = 0:
-		gs'sex_ev_work_talk1', 'whats_your_job'
+		gs 'sex_ev_work_talk1', 'whats_your_job'
 	else
 	else
-!!		act'Ask him about work':
-
+!!		act 'Ask him about work':
+		
 !!		end
 !!		end
 	end
 	end
 end
 end
 
 
 if $ARGS[0] = 'whats_your_job':
 if $ARGS[0] = 'whats_your_job':
-	act'What is your job?':
+	act 'What is your job?':
 		cla & *clr
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 		'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 		'"Hey, I never asked," you muse. "What is it you do for work again?"'
 		'"Hey, I never asked," you muse. "What is it you do for work again?"'
-
-		if $npc_occupation[$boy] = 'cashier_supermarket':
-			'"Nothing special, just a cashier at a generic supermarket," <<$npc_firstname[$boy]>> shrugs.'
+		if $npc_occupation[$npcID] = 'cashier_supermarket':
+			'"Nothing special, just a cashier at a generic supermarket," <<$npc_firstname[$npcID]>> shrugs.'
 			'"Pyaterochka?" you ask and he nods.'
 			'"Pyaterochka?" you ask and he nods.'
 			'"That''s the one."'
 			'"That''s the one."'
 			if $region = 'pav':
 			if $region = 'pav':
 				'"Huh. I wonder if you know my sister?"'
 				'"Huh. I wonder if you know my sister?"'
 			end
 			end
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'cashier_liquor':
-			'"Cashier at a liquor store," <<$npc_firstname[$boy]>> shrugs. "Pretty boring."'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'cashier_coffee':
-			'"I work the register at a coffee shop," <<$npc_firstname[$boy]>> says. "It gets pretty hectic in there sometimes. Especially mornings."'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'cashier_liquor':
+			'"Cashier at a liquor store," <<$npc_firstname[$npcID]>> shrugs. "Pretty boring."'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'cashier_coffee':
+			'"I work the register at a coffee shop," <<$npc_firstname[$npcID]>> says. "It gets pretty hectic in there sometimes. Especially mornings."'
 			'"That''s cool. Is the coffee any good?"'
 			'"That''s cool. Is the coffee any good?"'
 			'"It''s fine I guess," he shrugs. "Nothing special. Just generic shit."'
 			'"It''s fine I guess," he shrugs. "Nothing special. Just generic shit."'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'barista':
-			'"I work as a barista at a coffee shop," <<$npc_firstname[$boy]>> says. "It gets pretty hectic in there sometimes. Especially mornings.'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'barista':
+			'"I work as a barista at a coffee shop," <<$npc_firstname[$npcID]>> says. "It gets pretty hectic in there sometimes. Especially mornings.'
 			'"That''s cool. Is the coffee any good?"'
 			'"That''s cool. Is the coffee any good?"'
 			'"It is when I make it," he smirks.'
 			'"It is when I make it," he smirks.'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'fast_food':
-			'"I flip burgers at this chain fast food joint," <<$npc_firstname[$boy]>> says. " Pay sucks and customers are all assholes. Service industry is shit."'
-
-		elseif $npc_occupation[$boy] = 'taxi_driver':
-			'"I drive a cab in the city," <<$npc_firstname[$boy]>> says. "Not much, but it pays the bills.'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'fast_food':
+			'"I flip burgers at this chain fast food joint," <<$npc_firstname[$npcID]>> says. " Pay sucks and customers are all assholes. Service industry is shit."'
+		elseif $npc_occupation[$npcID] = 'taxi_driver':
+			'"I drive a cab in the city," <<$npc_firstname[$npcID]>> says. "Not much, but it pays the bills.'
 			!! if taxi_bj > 10:
 			!! if taxi_bj > 10:
 			!! '"I like giving taxi guys blowjobs," you smirk mischievously.'
 			!! '"I like giving taxi guys blowjobs," you smirk mischievously.'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'masseuse':
-			'"I work as a masseuse in the city," <<$npc_firstname[$boy]>> says.'
-			act'That''s cool':
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'masseuse':
+			'"I work as a masseuse in the city," <<$npc_firstname[$npcID]>> says.'
+			act 'That''s cool':
 				cla & *nl
 				cla & *nl
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
-				gs'sex_ev_pillow_talk2', 'small_talk'
+				gs 'sex_ev_pillow_talk2', 'small_talk'
 			end
 			end
-
-			act'Tease him':
+			
+			act 'Tease him':
 				cla & *nl
 				cla & *nl
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
-				if npc_insecure[$boy] = 1:
+				if npc_insecure[$npcID] = 1:
 					gs 'npc_relationship', 'modify', $boy, 'hate'
 					gs 'npc_relationship', 'modify', $boy, 'hate'
-					'"What the fuck?" <<$npc_firstname[$boy]>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"'
+					'"What the fuck?" <<$npc_firstname[$npcID]>> gives you a deep frown of disgust. "What do you think I am, some kind of faggot?"'
 					'"I was just joking," you say.'
 					'"I was just joking," you say.'
 					'"Jokes are supposed to be funny."'
 					'"Jokes are supposed to be funny."'
-				elseif $npc_humor[$boy] = 'perverted':
+				elseif npc_humor = 2:
 					'"If the tip is big enough, I''ll jerk off any guy," he grins. "Too bad none of the women ask me to finger them instead."'
 					'"If the tip is big enough, I''ll jerk off any guy," he grins. "Too bad none of the women ask me to finger them instead."'
-				elseif $npc_humor = 'intellectual':
+				elseif npc_humor = 3:
 					'"The only dirty guy I jerk off is right here," he grins back, gesturing at his own cock.'
 					'"The only dirty guy I jerk off is right here," he grins back, gesturing at his own cock.'
 				else
 				else
 					'"No, not that kind of massage," he chuckles.'
 					'"No, not that kind of massage," he chuckles.'
 				end
 				end
-				gs'sex_ev_pillow_talk2', 'small_talk'
+				gs 'sex_ev_pillow_talk2', 'small_talk'
 			end
 			end
-
-		elseif $npc_occupation[$boy] = 'masseuse_sexual':
-			'"I work as a masseuse in the city," <<$npc_firstname[$boy]>> says.'
-			act'That''s cool':
+			
+		elseif $npc_occupation[$npcID] = 'masseuse_sexual':
+			'"I work as a masseuse in the city," <<$npc_firstname[$npcID]>> says.'
+			act 'That''s cool':
 				cla & *nl
 				cla & *nl
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
 				'"That''s cool. You''ll have to show me your skills sometime," you smile.'
-				gs'sex_ev_pillow_talk2', 'small_talk'
+				gs 'sex_ev_pillow_talk2', 'small_talk'
 			end
 			end
-
-			act'Tease him':
+			
+			act 'Tease him':
 				cla & *nl
 				cla & *nl
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
 				'"That''s cool. So, you give happy endings to dirty old guys?" you smirk, making a jerk-off motion with your hand.'
 				'"No, just girls," he smirks back.'
 				'"No, just girls," he smirks back.'
 				'"Ha! Good comeback."'
 				'"Ha! Good comeback."'
 				'"No, really." You look back at him and he seems totally serious. "I specialize in ''magic finger'' massages for women."'
 				'"No, really." You look back at him and he seems totally serious. "I specialize in ''magic finger'' massages for women."'
-				act'Oh':
+				act 'Oh':
 					cla & *nl
 					cla & *nl
 					'"Oh..." you trail off, not really sure what else to say.'
 					'"Oh..." you trail off, not really sure what else to say.'
-					gs'sex_ev_pillow_talk2', 'small_talk'
+					gs 'sex_ev_pillow_talk2', 'small_talk'
 				end
 				end
-
-				act'Do you fuck too?':
+				
+				act 'Do you fuck too?':
 					cla & *clr
 					cla & *clr
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 					'<center><img <<$set_imgh>> src="images/shared/sex/after/pillow_talk1.jpg"></center>'
 					'Unable to contain your curiosity, you ask the obvious next question.'
 					'Unable to contain your curiosity, you ask the obvious next question.'
 					'"Do you fuck them too?"'
 					'"Do you fuck them too?"'
 					'"Sometimes," he replies. "When paid for the privilege."'
 					'"Sometimes," he replies. "When paid for the privilege."'
-					act'Oh':
+					act 'Oh':
 						cla & *nl
 						cla & *nl
 						'"Oh..." you trail off, not really sure what else to say.'
 						'"Oh..." you trail off, not really sure what else to say.'
-						gs'sex_ev_pillow_talk2', 'small_talk'
+						gs 'sex_ev_pillow_talk2', 'small_talk'
 					end
 					end
-
-					act'Do I get a discount?':
+					
+					act 'Do I get a discount?':
 						cla & *nl
 						cla & *nl
 						'"So if I show up at you work do I get a fuckbuddy discount?" you grin.'
 						'"So if I show up at you work do I get a fuckbuddy discount?" you grin.'
 						'"Bitch, you''re getting it for free right now," he grins back.'
 						'"Bitch, you''re getting it for free right now," he grins back.'
-						gs'sex_ev_pillow_talk2', 'small_talk'
+						gs 'sex_ev_pillow_talk2', 'small_talk'
 					end
 					end
 				end
 				end
 			end
 			end
-
-		elseif $npc_occupation[$boy] = 'factory':
+		elseif $npc_occupation[$npcID] = 'factory':
 			if $region = 'pav':
 			if $region = 'pav':
-				'"I work at the textile factory," <<$npc_firstname[$boy]>> says.'
+				'"I work at the textile factory," <<$npc_firstname[$npcID]>> says.'
 			else
 			else
-				'"I work at the textile factory in the next town over," <<$npc_firstname[$boy]>> says.'
+				'"I work at the textile factory in the next town over," <<$npc_firstname[$npcID]>> says.'
 				if mid($start_type,1,2) = 'sg':
 				if mid($start_type,1,2) = 'sg':
 					'"The one in Pavlovsk?"'
 					'"The one in Pavlovsk?"'
 					'"Yeah, how''d you know?"'
 					'"Yeah, how''d you know?"'
@@ -131,209 +123,187 @@ if $ARGS[0] = 'whats_your_job':
 					'"Huh. Imagine that."'
 					'"Huh. Imagine that."'
 				end
 				end
 			end
 			end
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'bartender':
-			'"Bartender," <<$npc_firstname[$boy]>> says.'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'bartender':
+			'"Bartender," <<$npc_firstname[$npcID]>> says.'
 			'"That''s pretty cool. So you have to know how to make a lot of fancy drinks?"'
 			'"That''s pretty cool. So you have to know how to make a lot of fancy drinks?"'
 			'"Yeah, but everyone just orders vodka anyways," he snickers.'
 			'"Yeah, but everyone just orders vodka anyways," he snickers.'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'mechanic':
-			'"I work on cars," <<$npc_firstname[$boy]>> says.'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'mechanic':
+			'"I work on cars," <<$npc_firstname[$npcID]>> says.'
 			'"Oh cool, like a mechanic?"'
 			'"Oh cool, like a mechanic?"'
 			'"Yeah, exactly."'
 			'"Yeah, exactly."'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'line_cook':
-			'"I work in a kitchen," <<$npc_firstname[$boy]>> says.'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'line_cook':
+			'"I work in a kitchen," <<$npc_firstname[$npcID]>> says.'
 			'"Oh, cool. Like a chef?"'
 			'"Oh, cool. Like a chef?"'
 			'"No, I''m just a line cook. Nothing fancy."'
 			'"No, I''m just a line cook. Nothing fancy."'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'waiter':
-			'"I wait tables," <<$npc_firstname[$boy]>> says.'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'personal_trainer':
-			'"I work at a gym as a personal trainer," <<$npc_firstname[$boy]>> says.'
-			act'That''s cool':
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'waiter':
+			'"I wait tables," <<$npc_firstname[$npcID]>> says.'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'personal_trainer':
+			'"I work at a gym as a personal trainer," <<$npc_firstname[$npcID]>> says.'
+			act 'That''s cool':
 				cla & *nl
 				cla & *nl
 				'"Oh, that''s cool. So you know how to get people in shape? Got any tips to keep a girl''s figure?"'
 				'"Oh, that''s cool. So you know how to get people in shape? Got any tips to keep a girl''s figure?"'
-				if $npc_humor[$boy] = 'perverted':
+				if npc_humor[$npcID] = 2:
 					'"Lots of sex," he grins. "It''s great cardio."'
 					'"Lots of sex," he grins. "It''s great cardio."'
 				else
 				else
 					'"Watch what you eat," he shrugs. "Fewer calories in than out. That''s all that matters if you want to lose weight."'
 					'"Watch what you eat," he shrugs. "Fewer calories in than out. That''s all that matters if you want to lose weight."'
 				end
 				end
-				gs'sex_ev_pillow_talk2', 'small_talk'
+				gs 'sex_ev_pillow_talk2', 'small_talk'
 			end
 			end
-
-			act'Tease him':
+			
+			act 'Tease him':
 				cla & *nl
 				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.'
 				'"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.'
 				'"Fuck, I wish. I get as many old fat guys as I get girls. None of them want to fuck though. Most of them have boyfriends."'
 				'"Fuck, I wish. I get as many old fat guys as I get girls. None of them want to fuck though. Most of them have boyfriends."'
-				gs'sex_ev_pillow_talk2', 'small_talk'
+				gs 'sex_ev_pillow_talk2', 'small_talk'
 			end
 			end
-
-		elseif $npc_occupation[$boy] = 'programmer':
-			'"I work in tech," <<$npc_firstname[$boy]>> says. "Do the programming for an IT company in the city."'
+		elseif $npc_occupation[$npcID] = 'programmer':
+			'"I work in tech," <<$npc_firstname[$npcID]>> says. "Do the programming for an IT company in the city."'
 			'"So you can fix my computer if I have a problem?"'
 			'"So you can fix my computer if I have a problem?"'
 			'"Oh fuck," he groans. "Not you too."'
 			'"Oh fuck," he groans. "Not you too."'
 			gs 'sex_ev_pillow_talk2', 'small_talk'
 			gs 'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'drug_dealer':
-			if npc_criminal_open[$boy] = 1:
-				npc_criminal_known[$boy] = 1
-				'"I sell drugs," <<$npc_firstname[$boy]>> says blatantly.'
-				act 'Uncomfortable':
-					npc_criminal_discomfort[$boy] = 1
-					cla & *nl
-					'"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."'
-					'"Got a problem?"'
-					'"No, none at all," you assure him. "Gotta make a living somehow. What kind of drugs do you sell?"'
-					'"Coke mostly. Some weed on the side now and then."'
-					'"Cool, cool."'
-					gs 'sex_ev_pillow_talk2', 'small_talk'
-				end
-
-				act 'Impressed':
-					cla & *nl
-					'"Seriously?" You sit up on the bed.'
-					'"Yeah. Why? Got a problem?"'
-					'"No, no! That''s super cool!" you assure him. "You must make a lot of money."'
-					'"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
-			else
-				'"I work in pharmaceuticals," <<$npc_firstname[$boy]>> says.'
-				if $start_type['loc'] = 'sg':
-					'"That''s cool. My aunt is a pharmacist too."'
-					'"Oh. Good to know."'
+		elseif $npc_occupation[$npcID] = 'criminal':
+			if npc_criminal_open[$npcID] = 1:
+				npc_criminal_known[$npcID] = 1
+				if $npc_crime_type[$npcID] = 'drug_dealer':
+					'"I sell drugs," <<$npc_firstname[$npcID]>> says blatantly.'
+					act 'Uncomfortable':
+						npc_criminal_discomfort[$npcID] = 1
+						cla & *nl
+						'"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."'
+						'"Got a problem?"'
+						'"No, none at all," you assure him. "Gotta make a living somehow. What kind of drugs do you sell?"'
+						'"Coke mostly. Some weed on the side now and then."'
+						'"Cool, cool."'
+						gs 'sex_ev_pillow_talk2', 'small_talk'
+					end
+					
+					act 'Impressed':
+						cla & *nl
+						'"Seriously?" You sit up on the bed.'
+						'"Yeah. Why? Got a problem?"'
+						'"No, no! That''s super cool!" you assure him. "You must make a lot of money."'
+						'"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[$npcID] = 'enforcer':
+					'"I''m an enforcer for a gang," <<$npc_firstname[$npcID]>> says blatantly.'
+					act 'Uncomfortable':
+						npc_criminal_discomfort[$npcID] = 1
+						cla & *nl
+						'"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."'
+						'"Got a problem?"'
+						'"No, none at all," you assure him. "Gotta make a living somehow. What does an enforcer do exactly?"'
+						'"A lot of things. I represent the muscle. If the gang needs someone beaten up, I''ll beat them up. If they need someone protected, I''ll beat up anyone who tries to get past. If they need someone intimidated, I''ll threaten to beat them up."'
+						'"Cool, cool."'
+						gs 'sex_ev_pillow_talk2', 'small_talk'
+					end
+					
+					act 'Impressed':
+						cla & *nl
+						'"Seriously?" You sit up on the bed.'
+						'"Yeah. Why? Got a problem?"'
+						'"No, no! That''s badass!" you assure him. "Is it cool working for a gang?"'
+						'"It''s a living," he shrugs. "It''s the only thing I''ve ever known."'
+						gs 'sex_ev_pillow_talk2', 'small_talk'
+					end
 				else
 				else
-					'"Huh. What''s that like?"'
-					'"Like being a drug dealer," he snickers.'
-				end
-				gs 'sex_ev_pillow_talk2', 'small_talk'
-			end
-
-		elseif $npc_occupation[$boy] = 'enforcer':
-			if npc_criminal_open[$boy] = 1:
-				'"I''m an enforcer for a gang," <<$npc_firstname[$boy]>> says blatantly.'
-				act 'Uncomfortable':
-					npc_criminal_discomfort[$boy] = 1
-					cla & *nl
-					'"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."'
-					'"Got a problem?"'
-					'"No, none at all," you assure him. "Gotta make a living somehow. What does an enforcer do exactly?"'
-					'"A lot of things. I represent the muscle. If the gang needs someone beaten up, I''ll beat them up. If they need someone protected, I''ll beat up anyone who tries to get past. If they need someone intimidated, I''ll threaten to beat them up."'
-					'"Cool, cool."'
-					gs 'sex_ev_pillow_talk2', 'small_talk'
-				end
-
-				act 'Impressed':
-					cla & *nl
-					'"Seriously?" You sit up on the bed.'
-					'"Yeah. Why? Got a problem?"'
-					'"No, no! That''s badass!" you assure him. "Is it cool working for a gang?"'
-					'"It''s a living," he shrugs. "It''s the only thing I''ve ever known."'
-					gs 'sex_ev_pillow_talk2', 'small_talk'
+					!!$npc_crime_type[$npcID] = 'thief'
+					'"I steal things," <<$npc_firstname[$npcID]>> says blatantly.'
+					act 'Uncomfortable':
+						npc_criminal_discomfort[$npcID] = 1
+						cla & *nl
+						'"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."'
+						'"Got a problem?"'
+						'"No, none at all," you assure him. "Gotta make a living somehow. What kind of stuff do you steal?"'
+						'"Lots of things. Cars, jewelry, I''ll rob a house every now and then."'
+						'"Cool, cool."'
+						gs 'sex_ev_pillow_talk2', 'small_talk'
+					end
+					
+					act 'Impressed':
+						cla & *nl
+						'"Seriously?" You sit up on the bed.'
+						'"Yeah. Why? Got a problem?"'
+						'"No, no! That''s badass!" you assure him. "What''s it like being a thief?"'
+						'"It''s pretty fun," he grins. "There''s a certain high you get that only comes from successfully getting away with stealing something."'
+						gs 'sex_ev_pillow_talk2', 'small_talk'
+					end
 				end
 				end
 			else
 			else
-				'"I''m a sort of fixer," <<$npc_firstname[$boy]>> says.'
-				'"Fixer? You mean like a handyman?"'
-				'"Not really," he shrugs. "It''s more like I''m on call to help people out. When someone calls me, I head over and give them a hand."'
-				'"Sounds... chaotic."'
-				'"Yeah, a little. Never know exactly what the problem is until I get there."'
-				gs 'sex_ev_pillow_talk2', 'small_talk'
-			end
-
-		elseif $npc_occupation[$boy] = 'thief':
-			if npc_criminal_open[$boy] = 1:
-				!!$npc_crime_type[$boy] = 'thief'
-				'"I steal things," <<$npc_firstname[$boy]>> says blatantly.'
-				act 'Uncomfortable':
-					npc_criminal_discomfort[$boy] = 1
-					cla & *nl
-					'"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."'
-					'"Got a problem?"'
-					'"No, none at all," you assure him. "Gotta make a living somehow. What kind of stuff do you steal?"'
-					'"Lots of things. Cars, jewelry, I''ll rob a house every now and then."'
-					'"Cool, cool."'
-					gs 'sex_ev_pillow_talk2', 'small_talk'
-				end
-
-				act' Impressed':
-					cla & *nl
-					'"Seriously?" You sit up on the bed.'
-					'"Yeah. Why? Got a problem?"'
-					'"No, no! That''s badass!" you assure him. "What''s it like being a thief?"'
-					'"It''s pretty fun," he grins. "There''s a certain high you get that only comes from successfully getting away with stealing something."'
-					gs 'sex_ev_pillow_talk2', 'small_talk'
+				if $npc_crime_type[$npcID] = 'drug_dealer':
+					'"I work in pharmaceuticals," <<$npc_firstname[$npcID]>> says.'
+					if mid($start_type,1,2) = 'sg':
+						'"That''s cool. My aunt is a pharmacist too."'
+						'"Oh. Good to know."'
+					else
+						'"Huh. What''s that like?"'
+						'"Like being a drug dealer," he snickers.'
+					end
+				elseif $npc_crime_type[$npcID] = 'enforcer':
+					'"I''m a sort of fixer," <<$npc_firstname[$npcID]>> says.'
+					'"Fixer? You mean like a handyman?"'
+					'"Not really," he shrugs. "It''s more like I''m on call to help people out. When someone calls me, I head over and give them a hand."'
+					'"Sounds... chaotic."'
+					'"Yeah, a little. Never know exactly what the problem is until I get there."'
+				else
+					!!$npc_crime_type[$npcID] = 'thief'
+					'"I work in acquisitions and sales," <<$npc_firstname[$npcID]>> says.'
+					'"So... like a salesman?"'
+					'"Sort of? I''m kind of a middle man. I get things from people and then sell them to other people."'
 				end
 				end
-			else
-				'"I work in acquisitions and sales," <<$npc_firstname[$boy]>> says.'
-				'"So... like a salesman?"'
-				'"Sort of? I''m kind of a middle man. I get things from people and then sell them to other people."'
 				gs 'sex_ev_pillow_talk2', 'small_talk'
 				gs 'sex_ev_pillow_talk2', 'small_talk'
-
 			end
 			end
-
-		elseif $npc_occupation[$boy] = 'pimp':
-			if npc_criminal_open[$boy] = 1:
-
-			else
-
-			end
-
-		elseif $npc_occupation[$boy] = 'businessman':
-			'"I run a company I founded," <<$npc_firstname[$boy]>> says casually.'
+		elseif $npc_occupation[$npcID] = 'businessman':
+			'"I run a company I founded," <<$npc_firstname[$npcID]>> says casually.'
 			'"Oh wow. Explains the apartment. What do you sell?"'
 			'"Oh wow. Explains the apartment. What do you sell?"'
 			'"Imported cars from China. Everybody needs cars."'
 			'"Imported cars from China. Everybody needs cars."'
 			'"Very practical," you nod."'
 			'"Very practical," you nod."'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'lawyer':
-			'"I''m the partner at a law firm here in the city," <<$npc_firstname[$boy]>> says.'
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'lawyer':
+			'"I''m the partner at a law firm here in the city," <<$npc_firstname[$npcID]>> says.'
 			'"Oh wow. Impressive. Explains the condo."'
 			'"Oh wow. Impressive. Explains the condo."'
-			gs'sex_ev_pillow_talk2', 'small_talk'
-
-		elseif $npc_occupation[$boy] = 'investment_banker':
+			gs 'sex_ev_pillow_talk2', 'small_talk'
+		elseif $npc_occupation[$npcID] = 'investment_banker':
 			if $sex_ev['loc'] ! 'pc_home':
 			if $sex_ev['loc'] ! 'pc_home':
-				'"I work for one of the big banks here in the city," <<$npc_firstname[$boy]>> says.'
+				'"I work for one of the big banks here in the city," <<$npc_firstname[$npcID]>> says.'
 				'"Oh wow. Impressive. Explains the condo," you smirk. "So if I''m looking to start a career in finance I should come to you?"'
 				'"Oh wow. Impressive. Explains the condo," you smirk. "So if I''m looking to start a career in finance I should come to you?"'
 			elseif $sex_ev['loc'] = 'pc_home':
 			elseif $sex_ev['loc'] = 'pc_home':
-				'"I work for one of the big banks here in the city," <<$npc_firstname[$boy]>> says.'
+				'"I work for one of the big banks here in the city," <<$npc_firstname[$npcID]>> says.'
 				'"And you come over to my place instead of inviting me over to yours?" you smirk. "So if I''m looking to start a career in finance I should come to you?"'
 				'"And you come over to my place instead of inviting me over to yours?" you smirk. "So if I''m looking to start a career in finance I should come to you?"'
 			elseif $sex_ev['loc'] = 'hotel_room':
 			elseif $sex_ev['loc'] = 'hotel_room':
 				if $region = 'pav':
 				if $region = 'pav':
-					'"I work for one of the big banks in the city," <<$npc_firstname[$boy]>> says.'
+					'"I work for one of the big banks in the city," <<$npc_firstname[$npcID]>> says.'
 					'"Oh wow. Impressive. Explains this fancy hotel room," you smirk sarcastically at the cheap decor of the motel. "So if I''m looking to start a career in finance I should come to you?"'
 					'"Oh wow. Impressive. Explains this fancy hotel room," you smirk sarcastically at the cheap decor of the motel. "So if I''m looking to start a career in finance I should come to you?"'
 				else
 				else
-					'"I work for one of the big banks here in the city," <<$npc_firstname[$boy]>> says.'
+					'"I work for one of the big banks here in the city," <<$npc_firstname[$npcID]>> says.'
 					'"Oh wow. Impressive. Explains this fancy hotel room," you smirk. "So if I''m looking to start a career in finance I should come to you?"'
 					'"Oh wow. Impressive. Explains this fancy hotel room," you smirk. "So if I''m looking to start a career in finance I should come to you?"'
 				end
 				end
 			end
 			end
-
 			'"That depends on how good of a case you make for investment," he says teasingly.'
 			'"That depends on how good of a case you make for investment," he says teasingly.'
-
 			if sex_ev['bj_count'] > 0:
 			if sex_ev['bj_count'] > 0:
 				'"The blowjob wasn''t enough?" you grin back.'
 				'"The blowjob wasn''t enough?" you grin back.'
 			else
 			else

+ 2 - 2
locations/shop_utils.qsrc

@@ -77,7 +77,7 @@ elseif $ARGS[0] = 'wardrobe':
 		!!sort by filter
 		!!sort by filter
 		if (clothingfilter['quality'] = 0 and CloQuality = shop_display['clo_i']) or (clothingfilter['inhibition'] = 0 and CloInhibit = shop_display['clo_i']) or clothingfilter['number'] = 0:
 		if (clothingfilter['quality'] = 0 and CloQuality = shop_display['clo_i']) or (clothingfilter['inhibition'] = 0 and CloInhibit = shop_display['clo_i']) or clothingfilter['number'] = 0:
 			if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
 			if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
-				$result = STUFF_HERE
+				$result = 'STUFF_HERE'
 			end
 			end
 		end
 		end
 	end
 	end
@@ -90,7 +90,7 @@ elseif $ARGS[0] = 'cheat':
 	!!sort by filter
 	!!sort by filter
 	if (clothingfilter['quality'] = 0 and CloQuality = shop_display['clo_i']) or (clothingfilter['inhibition'] = 0 and CloInhibit = shop_display['clo_i']) or clothingfilter['number'] = 0:
 	if (clothingfilter['quality'] = 0 and CloQuality = shop_display['clo_i']) or (clothingfilter['inhibition'] = 0 and CloInhibit = shop_display['clo_i']) or clothingfilter['number'] = 0:
 		if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
 		if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1:
-			$result = STUFF_HERE
+			$result = 'STUFF_HERE'
 		end
 		end
 	end
 	end
 	exit
 	exit

+ 4 - 4
locations/shortgs.qsrc

@@ -834,8 +834,8 @@ if $ARGS[0] = 'payments':
 	!! Construct payment call
 	!! Construct payment call
 
 
 	if $epayments['item_variable'] ! '':
 	if $epayments['item_variable'] ! '':
-		$construct_cash = '<a href="exec: money -= <<epayments[''value'']>> & <<$epayments[''item_variable'']>> += <<epayments[''quantity'']>> & gs ''shortgs'', ''paymentcomplete'' ">Cash</a>'
-		$construct_card = '<a href="exec: karta -= <<epayments[''value'']>> & <<$epayments[''item_variable'']>> += <<epayments[''quantity'']>> & gs ''shortgs'', ''paymentcomplete'' ">Card</a>'
+		$construct_cash = '<a href="exec: $epayments[''method''] = ''cash'' & money -= <<epayments[''value'']>> & <<$epayments[''item_variable'']>> += <<epayments[''quantity'']>> & gs ''shortgs'', ''paymentcomplete'' ">Cash</a>'
+		$construct_card = '<a href="exec: $epayments[''method''] = ''card'' & karta -= <<epayments[''value'']>> & <<$epayments[''item_variable'']>> += <<epayments[''quantity'']>> & gs ''shortgs'', ''paymentcomplete'' ">Card</a>'
 	else
 	else
 		$construct_cash = '<a href="exec: $epayments[''method''] = ''cash'' & money -= <<epayments[''value'']>> & gs ''shortgs'', ''paymentcomplete'' ">Cash</a>'
 		$construct_cash = '<a href="exec: $epayments[''method''] = ''cash'' & money -= <<epayments[''value'']>> & gs ''shortgs'', ''paymentcomplete'' ">Cash</a>'
 		$construct_card = '<a href="exec: $epayments[''method''] = ''card'' & karta -= <<epayments[''value'']>> & gs ''shortgs'', ''paymentcomplete'' ">Card</a>'
 		$construct_card = '<a href="exec: $epayments[''method''] = ''card'' & karta -= <<epayments[''value'']>> & gs ''shortgs'', ''paymentcomplete'' ">Card</a>'
@@ -864,10 +864,10 @@ end
 if $ARGS[0] = 'paymentcomplete':
 if $ARGS[0] = 'paymentcomplete':
 	*clr & cla
 	*clr & cla
 
 
-	'Thank you for your custom. Please come again!'
+	'Thank you for your purchase! We look forward to seeing you again.'
 	*nl
 	*nl
 
 
-	'You paid ' + epayments['value'] + '<b>₽</b>' + iif ($epayments['method']  = 'cash',' in cash', ' with your bank card') + ' for your ' + $epayments['description']
+	'You paid ' + epayments['value'] + '<b>₽</b>' + iif($epayments['method'] = 'cash', ' in cash', ' with your bank card') + ' for your ' + $epayments['description']
 
 
 	gs 'stat'
 	gs 'stat'
 	!! clean up all the variables
 	!! clean up all the variables

+ 1 - 1
locations/zoomagazine.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 				gt 'city_mall'
 				gt 'city_mall'
 			end
 			end
 			act 'Show your body':
 			act 'Show your body':
-				gs 'npcgeneratec', '0'
+				gs 'npcgeneratec', 0
 				gs 'boyStat', $npclastgenerated
 				gs 'boyStat', $npclastgenerated
 				cla & *clr
 				cla & *clr
 				minut += 5
 				minut += 5

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