Pārlūkot izejas kodu

Merge remote-tracking branch 'hornguy6/master'

Kevin_Smarts 2 gadi atpakaļ
vecāks
revīzija
9983083f91

+ 1 - 0
locations/city_center.qsrc

@@ -2,6 +2,7 @@
 
 $loc_arg = $ARGS[0]
 $loc = 'city_center'
+$region = 'city_center'
 $menu_loc = 'city_center'
 $menu_arg = ''
 menu_off = 0

+ 2 - 0
locations/city_industrial.qsrc

@@ -3,6 +3,7 @@
 if $ARGS[0] = '':
 	$loc_arg = ''
 	$loc = 'city_industrial'
+	$region = 'city_industrial'
 	$location_type = 'public_outdoors'
 	$menu_loc = 'city_industrial'
 	$menu_arg = ''
@@ -132,6 +133,7 @@ end
 if $ARGS[0] = 'redlight':
 	$loc_arg = 'redlight'
 	$loc = 'city_industrial'
+	$region = 'city_redlight'
 	$location_type = 'public_outdoors'
 	$menu_loc = 'city_industrial'
 	$menu_arg = 'redlight'

+ 1 - 0
locations/city_island.qsrc

@@ -2,6 +2,7 @@
 
 $loc_arg = ''
 $loc = 'city_island'
+$region = 'city_island'
 $location_type = 'public_outdoors'
 $menu_loc = 'city_island'
 $menu_arg = ''

+ 1 - 0
locations/city_lake.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = 'start':
 	$loc = 'city_lake'
+	$region = 'city_lake'
 	$loc_arg = 'start'
 	$menu_loc = 'city_lake'
 	$menu_arg = 'start'

+ 1 - 0
locations/city_park.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'start':
 
 	$loc_arg = 'start'
 	$loc = 'city_park'
+	$region = 'city_park'
 	$menu_loc = 'city_park'
 	$menu_arg = 'start'
 	$locclass = 'city_park'

+ 1 - 0
locations/city_residential.qsrc

@@ -4,6 +4,7 @@ music_loop = 0
 CLOSE ALL
 $loc_arg = ''
 $loc = 'city_residential'
+$region = 'city_residential'
 $location_type = 'public_outdoors'
 $menu_loc = 'city_residential'
 $menu_arg = ''

+ 4 - 3
locations/gadforest.qsrc

@@ -11,8 +11,9 @@ if $ARGS[0] = 'forest_edge':
 
 	$loc = 'gadforest'
 	$loc_arg = 'forest_edge'
+	$region = 'gad_forest'
 	$location_type = 'secluded'
-
+	
 	$menu_loc = 'gadforest'
 	$menu_arg = 'forest_edge'
 	menu_off = 0
@@ -350,7 +351,7 @@ if $ARGS[0] = 'forest_outskirts':
 	$loc = 'gadforest'
 	$loc_arg = 'forest_outskirts'
 	$location_type = 'secluded'
-
+	$region = 'gad_forest'
 	$menu_loc = 'gadforest'
 	$menu_arg = 'forest_outskirts'
 	menu_off = 0
@@ -429,8 +430,8 @@ if $ARGS[0] = 'forest_center':
 
 	$loc = 'gadforest'
 	$loc_arg = 'forest_center'
+	$region = 'gad_forest'
 	$location_type = 'secluded'
-
 	$menu_loc = 'gadforest'
 	$menu_arg = 'forest_center'
 	menu_off = 0

+ 1 - 0
locations/gadukino.qsrc

@@ -4,6 +4,7 @@
 if $ARGS[0] = '':
 	$loc = 'gadukino'
 	$loc_arg = ''
+	$region = 'gad_village'
 	$location_type = 'public_outdoors'
 	CLOSE ALL
 	gs 'gadukino_event', 'sound'

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 153 - 151
locations/gdksex.qsrc


+ 1 - 0
locations/glake.qsrc

@@ -4,6 +4,7 @@ CLOSE ALL
 if sound = 0:PLAY 'sound/lakeshore1.mp3', 30
 $loc = 'gLake'
 $loc_arg = ''
+$region = 'pav_lake'
 $menu_loc = 'glake'
 $menu_arg = ''
 $locclass = 'beach'

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 180 - 180
locations/hookup.qsrc


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 172 - 167
locations/hookup_after.qsrc


+ 114 - 114
locations/hookup_morning.qsrc

@@ -58,10 +58,10 @@ if $ARGS[0] = 'late_for_school':
 		
 		if hookup['continuation'] = 0:hookup['continuation'] = rand(0,2)
 		if hookup['continuation'] = 0:
-			'"Hey, where''re you going?" <<$npc_firstname[$npclastsaved]>> says, turning over and squinting at you with sleepy eyes. "What''s the rush?"'
+			'"Hey, where''re you going?" <<$npc_firstname[$boy]>> says, turning over and squinting at you with sleepy eyes. "What''s the rush?"'
 			act'I need to be somewhere!':
 				cla & *nl
-				'"I''m gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
+				'"I''m gonna be late for something!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
 				act'Leave':gs'hookup_after','exit'
 			end
 			
@@ -69,9 +69,9 @@ if $ARGS[0] = 'late_for_school':
 				cla & *nl
 				if PCloStyle2 = 4:
 					!! you were wearing your school uniform last night
-					'"I need to go! I''m going to be late for school!" you huff out. You quickly check your uniform one last time, making sure everything''s in place. It''s a bit wrinkled from laying in a pile all night, but it''ll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
+					'"I need to go! I''m going to be late for school!" you huff out. You quickly check your uniform one last time, making sure everything''s in place. It''s a bit wrinkled from laying in a pile all night, but it''ll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
 				else
-					'"I need to go! I''m going to be late for school!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
+					'"I need to go! I''m going to be late for school!" you huff out. With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
 				end
 				act'Leave':gs'hookup_after','exit'
 			end
@@ -92,20 +92,20 @@ if $ARGS[0] = 'late_for_school':
 		if hookup['continuation'] > 0:
 			act'I don''t have time for this!':
 				cla & *clr
-				$npc_apt_bedroom[$npclastsaved]
+				$npc_apt_bedroom[$boy]
 				'"I really don''t have time for this right now! Gotta go!"'
 				if PCloStyle2 = 4:
 					!! you were wearing your school uniform last night
-					'You quickly check your uniform one last time, making sure everything''s in place. It''s a bit wrinkled from laying in a pile all night, but it''ll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
+					'You quickly check your uniform one last time, making sure everything''s in place. It''s a bit wrinkled from laying in a pile all night, but it''ll have to do in a pinch. Not even saying goodbye, you rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
 				else
-					'With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$npclastsaved]>> and your night together behind you.'
+					'With one last quick check, you make sure all your clothes are in place and rush out the door, leaving <<$npc_firstname[$boy]>> and your night together behind you.'
 				end
 				act'Leave':gt'hookup_after','exit'
 			end
 			
 			act'<i>Sure!Callme!</i>':
 				cla & *clr
-				$npc_apt_bedroom[$npclastsaved]
+				$npc_apt_bedroom[$boy]
 				'"Uhh, sure!"'
 				'<i>Found it!</i> You grab your purse from where it slipped under the bed. Standing back up, you pull a pen from it and frantically scribble your number down on a piece of paper you found while you were looking around.'
 				if hookup['continuation'] = 1:
@@ -123,14 +123,14 @@ end
 if $ARGS[0] = 'wakeup':
 !!{	if npc_earlyriser = 1:
 		!! he woke up before you
-		if npc_generous[$npclastsaved] = 1 and npc_apt_type[$npclastsaved] ! 1:
+		if npc_generous[$boy] = 1 and npc_apt_type[$boy] ! 1:
 			!! breakfast in bed
 			hookup['b_i_b'] = 1
 			'You wake up, blearily blinking and slightly confused, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
-			if npc_apt_type[$npclastsaved] = 2:
+			if npc_apt_type[$boy] = 2:
 				'Slowly, you realize you smell food.'
 			else
-				'You start when the door opens and <<$npc_firstname[$npclastsaved]>> walks in holding a tray.'
+				'You start when the door opens and <<$npc_firstname[$boy]>> walks in holding a tray.'
 				'"Sorry about that," he grins. "You were still sleeping so I didn''t want to wake you up. I made breakfast."'
 			end
 			
@@ -148,11 +148,11 @@ if $ARGS[0] = 'wakeup':
 			end
 		else
 			'You wake up, blearily blinking and slightly confused, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
-			if npc_apt_type[$npclastsaved] = 1:
+			if npc_apt_type[$boy] = 1:
 				'It''s a... dorm room...?'
-			elseif npc_apt_type[$npclastsaved] = 2:
+			elseif npc_apt_type[$boy] = 2:
 				'He''s in the shower'
-			elseif npc_apt_type[$npclastsaved] = 3:
+			elseif npc_apt_type[$boy] = 3:
 				'He''s in the shower and you can hear it through the wall'
 			else
 				'You''re alone'
@@ -244,7 +244,7 @@ if $ARGS[0] = 'wakeup':
 				end
 			end
 		end
-		if npc_apt_type[$npclastsaved] > 2:
+		if npc_apt_type[$boy] > 2:
 			act'Put your underwear on':
 			
 			end
@@ -255,15 +255,15 @@ if $ARGS[0] = 'wakeup':
 			
 		end
 	else}
-		'Turning over, you see <<$npc_firstname[$npclastsaved]>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.'
+		'Turning over, you see <<$npc_firstname[$boy]>> laying next to you. He stirs as well and rolls over to face you, prying open his eyes.'
 		'"Mornin''," he mumbles. "You just wake up too?"'
 		'"Yeah," you mumble back.'
 		act'I need coffee':
 			cla & *clr
-			$npc_apt_bedroom[$npclastsaved]
+			$npc_apt_bedroom[$boy]
 			hookup['coffee'] = 1
 			'"I could really use a cup of coffee," you say.'
-			if npc_apt_type[$npclastsaved] > 2:
+			if npc_apt_type[$boy] > 2:
 				!! if not a studio or a dorm
 				'"Me too. I have some in the kitchen if you wanna come with."'
 				act'Sure':
@@ -271,16 +271,16 @@ if $ARGS[0] = 'wakeup':
 					'<center><video autoplay loop src="images/shared/romance/misc/nude_walk1.mp4"></video></center>'
 					'"Sure, lead the way."'
 					'You climb out of bed, not bothering to get dressed as you follow him. You already spent the night naked with him, what''s a cup of coffee longer?'
-					if npc_apt_spare[$npclastsaved] = 1:
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a desk with a monitor and a keyboard on top.</a> <i>Bit of a gamer huh?</i> you think to yourself, strutting past.'
+					if npc_apt_spare[$boy] = 1:
+						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$boy]''">a desk with a monitor and a keyboard on top.</a> <i>Bit of a gamer huh?</i> you think to yourself, strutting past.'
 						*nl
-						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
-					elseif npc_apt_spare[$npclastsaved] = 2:
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$npclastsaved]''">a room filled with various exercise equipment.</a> <i>Likes to work out huh?</i> you think to yourself, strutting past.'
+						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$boy]>> is already filling the pot with water.'
+					elseif npc_apt_spare[$boy] = 2:
+						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. Inside another room, you find <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_spare[$boy]''">a room filled with various exercise equipment.</a> <i>Likes to work out huh?</i> you think to yourself, strutting past.'
 						*nl
-						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
+						'After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$boy]>> is already filling the pot with water.'
 					else
-						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$npclastsaved]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$npclastsaved]>>''s body, instead of what the room looked like. After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$npclastsaved]>> is already filling the pot with water.'
+						'You can''t help but peek into the other rooms as you pass. Through one door is the <a href="exec:gs ''shortgs'',''img msg'',''$npc_apt_living[$boy]''">living room</a> you passed through last night from the front door. The memory is somewhat hazy as you mostly remember focusing on <<$npc_firstname[$boy]>>''s body, instead of what the room looked like. After your snooping, you quickly continue onward into the kitchen where <<$npc_firstname[$boy]>> is already filling the pot with water.'
 					end
 					
 					act'Wait':gt'hookup_morning','coffee'
@@ -288,7 +288,7 @@ if $ARGS[0] = 'wakeup':
 				
 				act'I''ll catch up (get dressed first)':
 					cla & *clr
-					$npc_apt_bedroom[$npclastsaved]
+					$npc_apt_bedroom[$boy]
 					'"Sounds good, but I''ll catch up. I think I''d like to avoid any accidents with hot drinks and bare skin," you smirk.'
 					'"Yeah that''s a good idea," he agrees. Reaching down, he pulls on a pair of shorts before stepping out of the room. "Just come out whenever you''re ready."'
 					'"I will," you reply as the door clicks shut behind him.'
@@ -298,7 +298,7 @@ if $ARGS[0] = 'wakeup':
 						gs'clothing','wear_last_worn'
 						gs'underwear','wear'
 						gs'stat'
-						'Grabbing your own clothes, you pull them on, smoothing out the wrinkles as best you can from where they were strewn across the floor last night before leaving to join <<$npc_firstname[$npclastsaved]>> in the kitchen.'
+						'Grabbing your own clothes, you pull them on, smoothing out the wrinkles as best you can from where they were strewn across the floor last night before leaving to join <<$npc_firstname[$boy]>> in the kitchen.'
 						act'Continue':gt'hookup_morning','coffee'
 					end
 				end
@@ -308,8 +308,8 @@ if $ARGS[0] = 'wakeup':
 				'"Me too. Let me just get the pot going." Getting up from the bed, he steps across his tiny room to his little kitchen and starts rifling through cupboards, pulling out various coffee paraphernalia.'
 				act'Wait in bed':
 					cla & *clr
-					$npc_apt_bedroom[$npclastsaved]
-					'You cuddle up in the sheets, savoring their warmth and waiting while the coffee brews. A few minutes later, <<$npc_firstname[$npclastsaved]>> pours two cups, bringing one over to you.'
+					$npc_apt_bedroom[$boy]
+					'You cuddle up in the sheets, savoring their warmth and waiting while the coffee brews. A few minutes later, <<$npc_firstname[$boy]>> pours two cups, bringing one over to you.'
 					'"Here you go."'
 					'"Thanks," you smile, taking the cup from him and bringing it to your lips.'
 					act'Focus on the coffee':
@@ -338,7 +338,7 @@ if $ARGS[0] = 'wakeup':
 						'You make small talk while drinking coffee.'
 						act'Time to get going':
 							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
+							$npc_apt_bedroom[$boy]
 							'"That was great," you sigh. "But I should get going."'
 							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
 							act'Get dressed':gt'hookup_morning','morning_leave'
@@ -355,19 +355,19 @@ if $ARGS[0] = 'wakeup':
 					'<center><video autoplay loop src="images/pc/activities/misc/dress_1.mp4"></video></center>'
 					'While the coffee brews, you haul yourself out of bed and pick up your clothes from where you threw them last night. You frown, noticing they''re a bit wrinkled, but it''s not like you cared much about hanging it up last night or anything like that. Whatever, nothing you can do about it now.'
 					*nl
-					'By the time you''ve pulled them on, the coffee is done and <<$npc_firstname[$npclastsaved]>> pours two cups, handing one to you.'
+					'By the time you''ve pulled them on, the coffee is done and <<$npc_firstname[$boy]>> pours two cups, handing one to you.'
 					'"Thanks," you smile, taking it gratefully.'
 					act'Drink':
 						cla & *clr
 						minut += 2
 						gs 'beverage','coffee'
-						$npc_apt_bedroom[$npclastsaved]
+						$npc_apt_bedroom[$boy]
 						'It''s cheap stuff, but caffeine is caffeine and you drink it greedily, savoring every gulp. Within a couple minutes, the mug is empty.'
 						act'Time to get going':
 							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
+							$npc_apt_bedroom[$boy]
 							'"That was great," you sigh. "But I should get going."'
-							'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
+							'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 							act'Gather your things':gt'hookup_morning','morning_leave'
 							
 							gs'hookup_morning','later_dressed'
@@ -378,11 +378,11 @@ if $ARGS[0] = 'wakeup':
 						cla & *clr
 						minut += 2
 						gs 'beverage','coffee'
-						$npc_apt_bedroom[$npclastsaved]
+						$npc_apt_bedroom[$boy]
 						'You make small talk while drinking coffee.'
 						act'Time to get going':
 							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
+							$npc_apt_bedroom[$boy]
 							'"That was great," you sigh. "But I should get going."'
 							'Hauling yourself to your feet, you clamber out of bed and start picking your clothes up from where you threw them on the floor last night.'
 							act'Gather your things':gt'hookup_morning','morning_leave'
@@ -403,11 +403,11 @@ end
 
 if $ARGS[0] = 'shower':
 	hookup['morning_shower'] = 1
-	$npc_apt_bathroom[$npclastsaved]
-	if npc_apt_type[$npclastsaved] > 2:
+	$npc_apt_bathroom[$boy]
+	if npc_apt_type[$boy] > 2:
 		'"Actually, do you mind if I borrow your shower?"'
 		'"Yeah, go ahead. You can catch up when you''re done."'
-		'"Thanks," you smile gratefully as he leaves the room. Hauling yourself out of the bed, you duck out the door yourself, finding <<$npc_firstname[$npclastsaved]>>''s bathroom in the hallway and hop in the shower.'
+		'"Thanks," you smile gratefully as he leaves the room. Hauling yourself out of the bed, you duck out the door yourself, finding <<$npc_firstname[$boy]>>''s bathroom in the hallway and hop in the shower.'
 	else
 		'"Mind if I borrow your shower?" you ask, glancing towards the bathroom door of his small apartment.'
 		'"Yeah, go ahead."'
@@ -418,11 +418,11 @@ if $ARGS[0] = 'shower':
 		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
 		minut += 10
 		shampoo += 1
-		'You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<$npc_firstname[$npclastsaved]>>''s shampoo and start scrubbing your hair, washing it out shortly after.'
+		'You twist the faucet and hot water comes rushing out, sighing in pleasure as it pours over your skin. <i>That feels so nice...</i> After enjoying it for a little while, you borrow <<$npc_firstname[$boy]>>''s shampoo and start scrubbing your hair, washing it out shortly after.'
 		dynamic $showerdin
 		*nl
 		'Figuring you''ve used enough of his water, you turn off the tap and step out.'
-		if hookup['coffee'] = 1 and npc_apt_type[$npclastsaved] > 2:
+		if hookup['coffee'] = 1 and npc_apt_type[$boy] > 2:
 			act'Go to the kitchen':gt'hookup_morning','coffee'
 
 			act'Go get dressed':
@@ -431,7 +431,7 @@ if $ARGS[0] = 'shower':
 				gs'clothing','wear_last_worn'
 				gs'underwear','wear'
 				gs'stat'
-				'Heading back to <<$npc_firstname[$npclastsaved]>>''s room, you pick up your clothes off the floor and tug them on over your wet hair before leaving again to join him in the kitchen.'
+				'Heading back to <<$npc_firstname[$boy]>>''s room, you pick up your clothes off the floor and tug them on over your wet hair before leaving again to join him in the kitchen.'
 				act'Go to the kitchen':gt'hookup_morning','coffee'
 			end
 		elseif hookup['coffee'] = 1:
@@ -444,7 +444,7 @@ if $ARGS[0] = 'shower':
 				gs'underwear','wear'
 				gs'stat'
 				'Stepping out of the bathroom, you''re immediately hit by the smell of cooked food.'
-				'"Coffee''s done," <<$npc_firstname[$npclastsaved]>> says, gesturing to his side where the pot is filled black liquid. "Help yourself when you''re ready. I thought I''d fry up some eggs while you were in there."'
+				'"Coffee''s done," <<$npc_firstname[$boy]>> says, gesturing to his side where the pot is filled black liquid. "Help yourself when you''re ready. I thought I''d fry up some eggs while you were in there."'
 				'"Thanks," you say, beginning to pick up your clothes. "I''m just going to get dressed first. Don''t want any accidents."'
 				'"Yeah sure. Help yourself when you''re ready."'
 				'You tug your clothes on, frowning at the wrinkles on them. Well, that''s going to happen when you throw your clothes on the ground rushing to get into somebody''s pants.'
@@ -452,15 +452,15 @@ if $ARGS[0] = 'shower':
 					cla & *clr
 					minut += 2
 					gs 'beverage','coffee'
-					$npc_apt_bedroom[$npclastsaved]
+					$npc_apt_bedroom[$boy]
 					'You grab a mug and fill it up, drinking greedily. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
 					'"No breakfast for you?"'
 					'"Coffee is all I need," you smile back.'
 					act'Time to get going':
 						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
+						$npc_apt_bedroom[$boy]
 						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
+						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 						act'Gather your things':gt'hookup_morning','morning_leave'
 						
 						gs'hookup_morning','later'
@@ -470,7 +470,7 @@ if $ARGS[0] = 'shower':
 				act'Have breakfast together':gt'hookup_morning','eggs'
 			end
 		elseif hookup['b_i_b'] = 1:
-			act'Join <<$npc_firstname[$npclastsaved]>> for breakfast':gt'hookup_morning','breakfast'
+			act'Join <<$npc_firstname[$boy]>> for breakfast':gt'hookup_morning','breakfast'
 			
 			act'Get dressed':
 				cla & *clr
@@ -478,12 +478,12 @@ if $ARGS[0] = 'shower':
 				gs'clothing','wear_last_worn'
 				gs'underwear','wear'
 				gs'stat'
-				if npc_apt_type[$npclastsaved] > 2:
-					'Feeling refreshed, you leave the bathroom and head back to <<$npc_firstname[$npclastsaved]>>''s room to tug on your clothes.'
-					act'Skip out on <<$npc_firstname[$npclastsaved]>>':
+				if npc_apt_type[$boy] > 2:
+					'Feeling refreshed, you leave the bathroom and head back to <<$npc_firstname[$boy]>>''s room to tug on your clothes.'
+					act'Skip out on <<$npc_firstname[$boy]>>':
 						cla & *clr
-						$npc_apt_hall
-						'While you''re at it, you grab the rest of your things and head straight for the door. You pass by the kitchen on the way and <<$npc_firstname[$npclastsaved]>> watches you with confusion.'
+						$npc_apt_hall[$boy]
+						'While you''re at it, you grab the rest of your things and head straight for the door. You pass by the kitchen on the way and <<$npc_firstname[$boy]>> watches you with confusion.'
 						'"Hey! Where''re you going? You''re not staying for breakfast?"'
 						'"Sorry, I really can''t stay."'
 						'"Wait but-"'
@@ -500,7 +500,7 @@ if $ARGS[0] = 'shower':
 					'"So, gonna join me for breakfast then?"'
 					act'Nope, gotta go (skip out)':
 						cla & *clr
-						$npc_apt_bedroom[$npclastsaved]
+						$npc_apt_bedroom[$boy]
 						'"Nope, gotta go."'
 						'"You sure? I-"'
 						'"Nah, I''m good." Grabbing the rest of your things, you pop open the door and waggle your fingers at him. "Toodles!" and shut the door behind you.'
@@ -512,13 +512,13 @@ if $ARGS[0] = 'shower':
 						cla & *clr
 						minut += 2
 						gs 'beverage','coffee'
-						$npc_apt_bedroom[$npclastsaved]
+						$npc_apt_bedroom[$boy]
 						'"Just coffee for me," you smile. Grabbing a mug, you fill it up with coffee and enjoy a long sip. It''s cheap stuff, but caffeine is caffeine and you savor every gulp. Within a couple minutes, the mug is empty.'
 						act'Time to get going':
 							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
+							$npc_apt_bedroom[$boy]
 							'"That was great," you sigh. "But I should get going."'
-							'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
+							'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 							act'Gather your things':gt'hookup_morning','morning_leave'
 							
 							gs'hookup_morning','later' 
@@ -532,8 +532,8 @@ if $ARGS[0] = 'shower':
 		else
 			act'Dry off':
 				cla & *clr
-				$npc_apt_bedroom[$npclastsaved]
-				'You step out of the bathroom and see <<$npc_firstname[$npclastsaved]>> still laying in bed.'
+				$npc_apt_bedroom[$boy]
+				'You step out of the bathroom and see <<$npc_firstname[$boy]>> still laying in bed.'
 				'"Love that view," he smirks, shamelessly ogling your moist naked body.'
 				'"Thanks, I really needed that," you smile back. "I should really get going though."'
 				act'Get dressed':gt'hookup_morning','morning_leave'
@@ -552,7 +552,7 @@ if $ARGS[0] = 'hangover':
 		act'I need coffee':
 			cla & *nl
 			'"I desperately need coffee," you wince, rubbing your brow as if will somehow make your blindingly painful headache go away.'
-			'"Me too." <<$npc_firstname[$npclastsaved]>> says, seemingly in the same state.'
+			'"Me too." <<$npc_firstname[$boy]>> says, seemingly in the same state.'
 			
 		end
 		
@@ -574,7 +574,7 @@ if $ARGS[0] = 'hangover':
 		act'I''m so hungover':
 			cla & *clr
 			hookup['im_hungover'] = 1
-			$npc_apt_bedroom[$npclastsaved]
+			$npc_apt_bedroom[$boy]
 			'"I''m so hungover right now," you groan.'
 			'"Same..."'
 		end
@@ -591,17 +591,17 @@ if $ARGS[0] = 'explore':
 		
 		
 	end
-	if npc_apt_type[$npclastsaved] = 3:		
+	if npc_apt_type[$boy] = 3:		
 		'End up in the kitchen'
 		
-	elseif npc_apt_type[$npclastsaved] = 4:
+	elseif npc_apt_type[$boy] = 4:
 		
 		'Peek into a bunch of rooms, get naked surprised by roommates.'
 		
-	elseif npc_apt_type[$npclastsaved] = 5:
+	elseif npc_apt_type[$boy] = 5:
 		'Peek into a bunch of rooms, end up in the kitchen.'
 		
-	elseif npc_apt_type[$npclastsaved] = 6:
+	elseif npc_apt_type[$boy] = 6:
 		'Peek into a bunch of rooms, they''re very high quality.'
 	end
 	
@@ -617,11 +617,11 @@ if $ARGS[0] = 'kitchen':
 		else
 		
 		end
-		if npc_apt_type[$npclastsaved] = 1:
+		if npc_apt_type[$boy] = 1:
 			!! studio apartment
-			'<<$npc_firstname[$npclastsaved]>> wakes up'
+			'<<$npc_firstname[$boy]>> wakes up'
 		else
-			'<<$npc_firstname[$npclastsaved]>> comes out'
+			'<<$npc_firstname[$boy]>> comes out'
 		end
 	end
 	
@@ -634,11 +634,11 @@ if $ARGS[0] = 'kitchen':
 		else
 		
 		end
-		if npc_apt_type[$npclastsaved] = 1:
+		if npc_apt_type[$boy] = 1:
 			!! studio apartment
-			'<<$npc_firstname[$npclastsaved]>> wakes up'
+			'<<$npc_firstname[$boy]>> wakes up'
 		else
-			'<<$npc_firstname[$npclastsaved]>> comes out'
+			'<<$npc_firstname[$boy]>> comes out'
 		end
 		
 	end
@@ -652,8 +652,8 @@ if $ARGS[0] = 'kitchen':
 		else
 			'You cook breakfast normally.'
 		end
-		if npc_apt_type[$npclastsaved] = 4 and hookup['explore'] ! 1:
-			'<<$npc_firstname[$npclastsaved]>>''s roommates come out'
+		if npc_apt_type[$boy] = 4 and hookup['explore'] ! 1:
+			'<<$npc_firstname[$boy]>>''s roommates come out'
 			act'Shriek':
 			
 			
@@ -664,11 +664,11 @@ if $ARGS[0] = 'kitchen':
 			
 			end
 		else
-			if npc_apt_type[$npclastsaved] = 1:
+			if npc_apt_type[$boy] = 1:
 				!! studio apartment
-				'<<$npc_firstname[$npclastsaved]>> wakes up'
+				'<<$npc_firstname[$boy]>> wakes up'
 			else
-				'<<$npc_firstname[$npclastsaved]>> comes out'
+				'<<$npc_firstname[$boy]>> comes out'
 			end
 			'"Made us breakfast"'
 			act'Eat together':
@@ -705,18 +705,18 @@ end
 
 
 if $ARGS[0] = 'coffee':
-	if npc_apt_type[$npclastsaved] > 2:
+	if npc_apt_type[$boy] > 2:
 		!! not a studio or dorm
 		$npc_apt_kitchen
 		if hookup['morning_shower'] = 1:
 			'As you wander towards the kitchen, you sniff the air, detecting something more than just coffee.'
 			'"That smells nice," you say, entering the room.'
 			if $clothingworntype = 'nude':
-				'"Yeah," <<$npc_firstname[$npclastsaved]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eg-"'
+				'"Yeah," <<$npc_firstname[$boy]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eg-"'
 				'He stops mid sentence when he sees you standing there naked, hair still wet from the shower. You smirk at his stare.'
 				'"Thanks."'
 			else
-				'"Yeah," <<$npc_firstname[$npclastsaved]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eggs in the meantime. Coffee''s already done if you want to pour yourself a cup."'
+				'"Yeah," <<$npc_firstname[$boy]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eggs in the meantime. Coffee''s already done if you want to pour yourself a cup."'
 				'"Thanks."'
 			end
 			act'Just have coffee':
@@ -736,11 +736,11 @@ if $ARGS[0] = 'coffee':
 					if $clothingworntype = 'nude':
 						'<center><img <<$set_imgh>> src="images/shared/romance/misc/nude_kitchen1.jpg"></center>'
 						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and head back to his room to get dressed.'
+						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and head back to his room to get dressed.'
 					else
 						$npc_apt_kitchen
 						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
+						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 					end
 					act'Gather your things':gt'hookup_morning','morning_leave'
 					
@@ -752,7 +752,7 @@ if $ARGS[0] = 'coffee':
 		else
 			minut += 5
 			if $clothingworntype = 'nude':
-				'You follow <<$npc_firstname[$npclastsaved]>> to the kitchen and sit down at his table, waiting patiently while he pulls coffee paraphernalia from his cupboards and begins brewing. A few minutes later, he hands you a steaming cup of joe, which you gratefully accept.'
+				'You follow <<$npc_firstname[$boy]>> to the kitchen and sit down at his table, waiting patiently while he pulls coffee paraphernalia from his cupboards and begins brewing. A few minutes later, he hands you a steaming cup of joe, which you gratefully accept.'
 			else
 				'You step into the kitchen and are immediately hit by the wonderful smell of coffee.'
 				'"Hey, you''re just in time. Pot just finished brewing." He pours a cup and hands it to you, which you gratefully accept.'
@@ -772,11 +772,11 @@ if $ARGS[0] = 'coffee':
 					cla & *nl
 					if $clothingworntype = 'nude':
 						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and head back to his room to get dressed.'
+						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and head back to his room to get dressed.'
 						act'Get dressed':gt'hookup_morning','morning_leave'
 					else
 						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
+						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 						act'Gather your things':gt'hookup_morning','morning_leave'
 					end
 				end
@@ -797,11 +797,11 @@ if $ARGS[0] = 'coffee':
 					cla & *nl
 					if $clothingworntype = 'nude':
 						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and head back to his room to get dressed.'
+						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and head back to his room to get dressed.'
 						act'Get dressed':gt'hookup_morning','morning_leave'
 					else
 						'"That was great," you sigh. "But I should get going."'
-						'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
+						'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 						act'Gather your things':gt'hookup_morning','morning_leave'
 					end
 				end
@@ -813,7 +813,7 @@ if $ARGS[0] = 'coffee':
 		if hookup['morning_shower'] = 1 and $clothingworntype = 'nude':
 			'Stepping out of the bathroom, you''re immediately hit by the smell of cooked food.'
 			'"That smells nice," you say, stepping out into the room.'
-			'"Yeah," <<$npc_firstname[$npclastsaved]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eggs."'
+			'"Yeah," <<$npc_firstname[$boy]>> says, turning to face you. "Since you were going to be a little while, I thought I''d make some eggs."'
 			'Ignoring your clothes and the eggs, you head straight to the coffee pot, grabbing a mug and filling it to the brim.'
 			act'Just coffee':
 				cla & *clr
@@ -827,7 +827,7 @@ if $ARGS[0] = 'coffee':
 					cla & *clr
 					$npc_apt_kitchen
 					'"That was great," you sigh. "But I should get going."'
-					'You put the empty mug in <<$npc_firstname[$npclastsaved]>>''s sink and turn around to grab your stuff.'
+					'You put the empty mug in <<$npc_firstname[$boy]>>''s sink and turn around to grab your stuff.'
 					act'Gather your things':gt'hookup_morning','morning_leave'
 					
 					gs'hookup_morning','later'
@@ -847,13 +847,13 @@ if $ARGS[0] = 'eggs':
 		'The two of you enjoy your eggs and coffee together. The coffee is cheap, the eggs are alright, but the company is pleasant as you chit-chat about nothing. Soon enough, your cups are empty and your plates are clean.'
 		act'I should go':
 			cla & *nl
-			'"Well, I should probably get going," you say, standing up and putting your dishes in the sink. You head back to <<$npc_firstname[$npclastsaved]>>''s bedroom, with him following along behind.'
+			'"Well, I should probably get going," you say, standing up and putting your dishes in the sink. You head back to <<$npc_firstname[$boy]>>''s bedroom, with him following along behind.'
 			act'Get dressed':gt'hookup_morning','morning_leave'
 		end
 	else
-		if npc_apt_type[$npclastsaved] = 1:
+		if npc_apt_type[$boy] = 1:
 			$npc_apt_kitchen
-		elseif npc_apt_type[$npclastsaved] = 2:
+		elseif npc_apt_type[$boy] = 2:
 			$npc_apt_kitchen
 		else
 			$npc_apt_kitchen
@@ -884,19 +884,19 @@ if $ARGS[0] = 'morning_leave':
 		if hookup['dress'] = 1:
 			'You pick up your dress off the floor, pulling your head through it and down over your shoulders.'
 			if hookup['continuation'] > 0:
-				'"I had a great time last night," <<$npc_firstname[$npclastsaved]>> says, watching you.'
+				'"I had a great time last night," <<$npc_firstname[$boy]>> says, watching you.'
 				$hookup['reaction'] = 'pulling your dress all the way down and smoothing out the skirt.'
 			end
 		elseif PCloSkirt > 0:
 			'You pick your skirt off the floor, pulling it up your legs and over your hips.'
 			if hookup['continuation'] > 0:
-				'"I had a great time last night," <<$npc_firstname[$npclastsaved]>> says, watching you dress.'
+				'"I had a great time last night," <<$npc_firstname[$boy]>> says, watching you dress.'
 				$hookup['reaction'] = 'pulling your top down over shoulders and tugging it past your breasts and all the way down.'
 			end
 		else
 			'You pick your pants off the floor, putting your legs through and tugging it up over your hips.'
 			if hookup['continuation'] > 0:
-				'"I had a great time last night," <<$npc_firstname[$npclastsaved]>> says, watching you dress.'
+				'"I had a great time last night," <<$npc_firstname[$boy]>> says, watching you dress.'
 				$hookup['reaction'] = 'pulling your top down over shoulders and tugging it past your breasts and all the way down.'
 			end
 		end
@@ -908,10 +908,10 @@ if $ARGS[0] = 'morning_leave':
 			gs'hookup_morning','later_nude'
 		end
 	else
-		$npc_apt_bedroom[$npclastsaved]
+		$npc_apt_bedroom[$boy]
 		'Stooping down next to the bed, you find your purse on the floor and scoop it up before heading towards the exit.'
 		if hookup['continuation'] > 0:
-			'"You know," <<$npc_firstname[$npclastsaved]>> says, leaning against the door frame. "I had a great time last night."'
+			'"You know," <<$npc_firstname[$boy]>> says, leaning against the door frame. "I had a great time last night."'
 			gs'hookup_morning','continuation_reponse1'
 		else
 			gs'hookup_morning','later_dressed'
@@ -961,8 +961,8 @@ if $ARGS[0] = 'continuation_reponse3':
 				'"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.'
 			elseif hookup['continuation'] = 2:
-				'"Oh. Uhh, well..." <<$npc_firstname[$npclastsaved]>> 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[$npclastsaved]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+				'"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.'
 			end
 			gs'hookup_after','dress'
 		else
@@ -970,9 +970,9 @@ if $ARGS[0] = 'continuation_reponse3':
 			if hookup['continuation'] = 1:
 				'"Whatever, your loss," he shrugs.'
 				'"Pfft-! Yeah, sure," you snigger back, turning towards the door. "Still, maybe we''ll run into each other again or something. See you."'
-				'With a half-hearted goodbye, you open the door and leave <<$npc_firstname[$npclastsaved]>>''s apartment.'
+				'With a half-hearted goodbye, you open the door and leave <<$npc_firstname[$boy]>>''s apartment.'
 			elseif hookup['continuation'] = 2:
-				'"Oh. Uhh, well..." <<$npc_firstname[$npclastsaved]>> trails off and you''re left in an extremely uncomfortable silence.'
+				'"Oh. Uhh, well..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence.'
 				'<i>Well this is awkward...</i> you think to yourself as you turn towards the door.'
 				'"I guess I''ll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.'
 			end
@@ -982,7 +982,7 @@ if $ARGS[0] = 'continuation_reponse3':
 	
 	act'Sure':
 		cla & *clr
-		$npc_apt_hall
+		$npc_apt_hall[$boy]
 		if $clothingworntype = 'nude':
 			if hookup['continuation'] = 1:
 				!! npc_QW = 1
@@ -1019,7 +1019,7 @@ if $ARGS[0] = 'continuation_reponse3':
 			end
 			gs'hookup_after','dress'
 		else
-			$npc_apt_hall
+			$npc_apt_hall[$boy]
 			if hookup['continuation'] = 1:
 				!! npc_QW = 1
 				'"Sure, sounds fun," you smile.'
@@ -1060,17 +1060,17 @@ if $ARGS[0] = 'continuation_reponse3':
 	if hookup['continuation'] = 2:
 		act'I''m not up for anything serious':
 			cla & *clr
-			$npc_apt_hall
+			$npc_apt_hall[$boy]
 			'"I''m not looking for anything serious right now."'
 			act'Sorry':
 				cla & *nl
 				'"Sorry..."'
 				if $clothingworntype = 'nude':
 					gs'hookup_after','dress'
-					'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$npclastsaved]>> 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[$npclastsaved]>> a strained smile and wave goodbye, quickly striding towards the door to escape.'
+					'"Oh. Uhh, well, it''s fine I guess..." <<$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.'
 				else
-					'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$npclastsaved]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
+					'"Oh. Uhh, well, it''s fine I guess..." <<$npc_firstname[$boy]>> trails off and you''re left in an extremely uncomfortable silence while you get dressed in front of him.'
 					'<i>Well this is awkward...</i> you think to yourself as you turn towards the door.'
 					'"I guess I''ll see you later then... or... well... not..." There''s another awkward silence. Not knowing what else to do, you just open the door and close it behind you without another word.'
 				end
@@ -1082,25 +1082,25 @@ if $ARGS[0] = 'continuation_reponse3':
 				cla & *nl
 				'"If it''s just a hookup," you continue. "or something like last night, I wouldn''t mind getting together for some fun, but I''m just not interested in dating anybody."'
 				if rand(1,10) > 7:
-					'"Well... If it means I can see you again, then sure I guess." <<$npc_firstname[$npclastsaved]>> 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[$boy]>> 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?"'
-					'"If I need some relief," you say with a shrug. You wave an awkward goodbye, you head out the door and out of <<$npc_firstname[$npclastsaved]>>''s apartment.'
+					'"If I need some relief," you say with a shrug. You wave an awkward goodbye, you head out the door and out of <<$npc_firstname[$boy]>>''s apartment.'
 					act'Leave':gt'hookup_after','exit'
 				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."'
 					act'Taken aback':
 						cla & *clr
-						$npc_apt_hall
+						$npc_apt_hall[$boy]
 						'You blink in surprise, recoiling slightly at his words. That response really wasn''t what you saw coming. After all, what guy just gives up free access to sex?'
-						'"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[$npclastsaved]>> a strained smile and wave goodbye, quickly striding towards out the door.'
+						'"Uhh well, uhh... Alright... Guess I won''t see you later then..." you respond awkwardly. After giving yourself a once over, you give <<$npc_firstname[$boy]>> a strained smile and wave goodbye, quickly striding towards out the door.'
 						act'Leave':gt'hookup_after','exit'
 					end
 					
 					act'It''s to be expected':
 						cla & *clr
-						$npc_apt_hall
+						$npc_apt_hall[$boy]
 						'You nod to yourself, admittedly a little bit wistfully. 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.'
-						'"Well, guess I won''t see you around then so... Bye?" You wave <<$npc_firstname[$npclastsaved]>> goodbye 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.'
+						'"Well, guess I won''t see you around then so... Bye?" You wave <<$npc_firstname[$boy]>> goodbye 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'hookup_after','exit'
 					end
 				end
@@ -1168,7 +1168,7 @@ if $ARGS[0] = 'later_nude':
 			'"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 as you <<$hookup[''reaction2'']>>.'
 			*nl
-			'Once you''re done, you grab your things and leave. <<$npc_firstname[$npclastsaved]>> doesn''t say a word as you close the door behind you.'
+			'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'hookup_after','exit'
 		else
 			'"What, like fuck buddies?"'
@@ -1211,7 +1211,7 @@ if $ARGS[0] = 'later_nude':
 			'"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 as you <<$hookup[''reaction2'']>>. <i>Ugh. Whatever...</i>'
 			*nl
-			'Once you''re done, you grab your things and leave. <<$npc_firstname[$npclastsaved]>> doesn''t say a word as you close the door behind you.'
+			'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'hookup_after','exit'
 		else
 			'"You mean like a date?"'
@@ -1277,7 +1277,7 @@ if $ARGS[0] = 'later_dressed':
 			'"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 as you <<$hookup[''reaction2'']>>. <i>Ugh. Whatever...</i>'
 			*nl
-			'Once you''re done, you grab your things and leave. <<$npc_firstname[$npclastsaved]>> doesn''t say a word as you close the door behind you.'
+			'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'hookup_after','exit'
 		else
 			'For a moment you feel intensely awkward as you wait for his response, but when you turn to look at him he''s smiling.'

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 157 - 157
locations/hookup_sex.qsrc


+ 1 - 0
locations/liam.qsrc

@@ -5,6 +5,7 @@ $loc_arg = ''
 $loc = 'liam'
 $location_type = 'public_outdoors'
 $menu_loc = 'liam'
+$region = 'puskin'
 $menu_arg = ''
 menu_off = 0
 if sound = 0:PLAY 'sound/street.mp3',30

+ 2 - 1
locations/pav_commcenter.qsrc

@@ -13,7 +13,6 @@ if $ARGS[0] ! 'XXX':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/'+iif(DayStage < 4,'dk.jpg','dk_night.jpg')+'"></center>'
 
 	act 'Leave': minut += 2 & gt 'pav_residential'
-	act 'Check the noticeboard': gs 'noticeboard','start'
 
 	if hour >= 20 and hour <= 23 and week >= 5 and week < 7:
 		'The entrance to the community centre is full of young people. The guys are just hanging around smoking and joking while the girls are in small groups, all dressed up and gossiping. You see the bushes moving - Pavlovsks'' famous make out garden.'
@@ -50,6 +49,8 @@ if $ARGS[0] ! 'XXX':
 	if hour >= 8 and hour < 18: act 'Go to the library': gt 'pav_library'
 
 	if hour >= 12 and hour < 20: act 'Go upstairs to the hobby clubs': gt'pav_commclubs'
+	
+	act 'Check the noticeboard': gs 'noticeboard','start'
 
 	if nerd_game['game_day'] = daystart and hour = 19: act 'Wait for game night to start': minut += 60-minut & gt 'pav_library'
 	if nerd_game['game_day'] = daystart and hour = 20: act 'Go up stairs to the hobby clubs and <b>Join nerds</b>': gt 'nerd_game_night', 'game'

+ 1 - 0
locations/pav_commercial.qsrc

@@ -4,6 +4,7 @@ CLOSE ALL
 
 $loc_arg = ''
 $loc = 'pav_commercial'
+$region = 'pav_commercial'
 $location_type = 'public_outdoors'
 $menu_loc = 'pav_commercial'
 $menu_arg = ''

+ 7 - 4
locations/pav_disco.qsrc

@@ -632,6 +632,7 @@ if $ARGS[0] = 'dance_partner':
 	sozboyrand = rand(1,300)
 	if sozboyrand > boynum:
 		gs 'npcgeneratec', 0, 'Stranger', rand((age - 1),(age + 1)), 1
+		gs 'boystat', $npclastgenerated
 		DaPaTipeRand = rand(0,100)
 
 		if DaPaTipeRand < 70:
@@ -683,7 +684,7 @@ if $ARGS[0] = 'dance_partner':
 				$din_disc_dance2 = 'Dancing next to you is a drunk man in a nice suit and expensive shoes.'
 			end
 		end
-		gs 'boystat', $npclastsaved
+		gs 'boystat', $npclastgenerated
 		gs 'boymass', 'A'
 	elseif sozboyrand <= boynum:
 		gt 'pav_disco', 'familiar'
@@ -753,6 +754,7 @@ if $ARGS[0] = 'hookup_aggressive':
 	cla & *clr
 	gs 'fame', 'pav', 'sex', 1
 	gs 'npcpreservec', $npclastgenerated
+	gs 'boystat', $npclastsaved
 	'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 	'"Hey, let''s go back to my place and fuck!"'
 	act 'No thanks':
@@ -803,13 +805,14 @@ end
 if $ARGS[0] = 'hookup_nice':
 	cla & *clr
 	gs 'npcpreservec', $npclastgenerated
+	gs 'boystat', $npclastsaved
 	'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
-	'"Hey," <<$npc_firstname[$npclastsaved]>> says. "I had a really good time dancing with you tonight and I was wondering... would you maybe want to come back to my place? I could get you a drink and maybe..."'
+	'"Hey," <<$npc_firstname[$boy]>> says. "I had a really good time dancing with you tonight and I was wondering... would you maybe want to come back to my place? I could get you a drink and maybe..."'
 	act 'Sorry':
 		cla & *clr
 		'<center><img src="images/locations/pavlovsk/community/disco/outside_talk.jpg"></center>'
 		'"Oh, uhh, I uhh... I don''t know if I''m really up for that. Sorry..."'
-		'"Oh, sure. That''s okay. You don''t have to be sorry." <<$npc_firstname[$npclastsaved]>> says with a hint of disappointment. "Well at least I gave it my best shot. Who knows, maybe I''ll see you here again."'
+		'"Oh, sure. That''s okay. You don''t have to be sorry." <<$npc_firstname[$boy]>> says with a hint of disappointment. "Well at least I gave it my best shot. Who knows, maybe I''ll see you here again."'
 		act 'Leave':gt $loc, $metka
 		act 'Return to the dance':gt 'pav_disco'
 	end
@@ -831,7 +834,7 @@ if $ARGS[0] = 'hookup_nice':
 		'"... fuck?" you ask.'
 		'He looks dumb founded by your words. "Uhh..."'
 		'"Fuck," you repeat. "Wanna go back to your place and fuck? We can skip the drinks too."'
-		'<<$npc_firstname[$npclastsaved]>> seems stunned by your straightforwardness, but eventually answers, "Yes!"'
+		'<<$npc_firstname[$boy]>> seems stunned by your straightforwardness, but eventually answers, "Yes!"'
 		'You lean in to kiss him passionately, and he returns the kiss just as enthusiastically.'
 		'"Great! Lead the way!" you say with a smile after breaking the kiss. The two of you hurry through the streets together to a nearby apartment complex.'
 		gs 'arousal', 'kiss', 5

+ 1 - 0
locations/pav_park.qsrc

@@ -5,6 +5,7 @@ CLOSE ALL
 if $ARGS[0] = 'start':
 	*clr & cla
 	$loc = 'pav_park'
+	$region = 'pav_park'
 	$loc_arg = 'start'
 	$location_type = 'public_outdoors'
 	$menu_loc = 'pav_park'

+ 1 - 0
locations/pav_residential.qsrc

@@ -5,6 +5,7 @@ music_loop = 0
 CLOSE ALL
 $loc_arg = ''
 $loc = 'pav_residential'
+$region = 'pav_residential'
 $menu_loc = 'pav_residential'
 $menu_arg = ''
 menu_off = 0

+ 1 - 1
locations/salon.qsrc

@@ -1610,7 +1610,7 @@ if $ARGS[0] = 'massage':
 		*nl
 		'There is also the <b>magic finger massage</b>, which relaxes you in a different way. Designed to release tension from your body, it will have you moaning for the entire session we''re sure of it. It has very <i>climactic</i> results.'
 		*nl
-		'We also have a <b>throat massage for those who have a bit of an oral fixation. Helps to satisfy the need to suck on something. Comes with a complimentary cocktail or facial, whichever you choose.'
+		'We also have a <b>throat massage</b> for those who have a bit of an oral fixation. Helps to satisfy the need to suck on something. Comes with a complimentary cocktail or facial, whichever you choose.'
 		*nl
 		'We have the <b>hardcore massage</b> and the <b>double hardcore massage</b>. The hardcore massage is there to quite literally pound the stress from your body. Our massage therapists are extremely skilled when it comes to relieving stress in this manner. A double hardcore massage is simply adding one more person. Instead of a single massage therapist, two of them will simultaneously pound you for maximum stress relief.'
 		*nl

+ 56 - 23
locations/stol.qsrc

@@ -262,35 +262,68 @@ if $ARGS[0] = 'bc':
 	gs 'stat'
 	gs 'din_bad'
 	'In the drawer of your desk, you store your birth control.'
-	if prezik + prezikcount + preziksabo > 0:
-		if preziktype = 2 or preziksabo > 0:
-			'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
-		elseif preziktype < 2 and preziksabo = 0:
-			'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
+	act 'Close the drawer':gt $loc, $loc_arg
+	act'Check your condoms':		
+		if prezik + prezikcount + preziksabo > 0:
+			if $locclass = 'bedr':
+				*clr
+				'<center><img <<$set_imgh>> src="images/shared/accessories/birthcontrol/condoms.jpg"></center>'
+			end
+			if preziktype = 2 or preziksabo > 0:
+				'You have <<iif(preziktype = 2, prezikcount, prezikcount+prezik)>> normal, and <<iif(preziktype = 2, prezik+preziksabo, preziksabo)>> sabotaged <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
+			elseif preziktype < 2 and preziksabo = 0:
+				'You have <<prezik+prezikcount>> <a href="exec:dynamic $din_Table_Condom_Menu"><b>condoms.</b></a>'
+			end
+			*nl
+		else
+			if $locclass = 'bedr':
+				*clr
+				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/drawer_empty.jpg"></center>'
+			end
+			'You are out of condoms.'
 		end
-		*nl
-	else
-		'You are out of condoms.'
 	end
-	if tabletki > 0 and pillsleft[ptype] > 0:
-		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
-	elseif tabletki	= 0 and pillsleft[ptype] > 0:
-		'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> left.</b>'
-	elseif tabletki > 0 and pillsleft[ptype] = 0:
-		'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a>.'
-	else
-		'You are out of birth control pills.'
+	
+	act'Check your birth control pills':
+		if tabletki > 0 or pillsleft[ptype] > 0:
+			if $locclass = 'bedr':
+				*clr
+				'<center><img <<$set_imgh>> src="images/shared/accessories/birthcontrol/bc_pills.jpg"></center>'
+			end
+			if tabletki > 0 and pillsleft[ptype] > 0:
+				'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> and <<pillsleft[ptype]>> pills left in your opened package.</b>'
+			elseif tabletki	= 0 and pillsleft[ptype] > 0:
+				'You have <<pillsleft[ptype]>> <a href="exec:dynamic $d_tabletkiedt">birth control pills</a> left.</b>'
+			elseif tabletki > 0 and pillsleft[ptype] = 0:
+				'You have <<tabletki>> unopened packages of <a href="exec:dynamic $d_tabletkiedt">birth control pills</a>.'
+			end
+		else
+			if $locclass = 'bedr':
+				*clr
+				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/drawer_empty.jpg"></center>'
+			end
+			'You are out of birth control pills.'
+		end
 	end
-	if morning_after_pill > 0:
-		if morning_after_pill = 1:
-			'You have one <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pill</a>.'
+	act'Check your morning after pills':
+		if morning_after_pill > 0:
+			if $locclass = 'bedr':
+				*clr
+				'<center><img <<$set_imgh>> src="images/shared/accessories/birthcontrol/morning_after_pill.jpg"></center>'
+			end
+			if morning_after_pill = 1:
+				'You have a <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pill</a> hidden in the back corner of the drawer.'
+			else
+				'You have <b><<birth_control[''morning_after'']>></b> <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pills</a> stacked in the back corner of the drawer.'
+			end
 		else
-			'You have <b><<birth_control[''morning_after'']>></b> <a href="exec:gs''medical_din'',''morning_after_pill''">morning after pills</a>.'
+			if $locclass = 'bedr':
+				*clr
+				'<center><img <<$set_imgh>> src="images/shared/home/bedroom/drawer_empty.jpg"></center>'
+			end
+			'You have no morning after pills.'
 		end
-	else
-		'You have no morning after pills.'
 	end
-	act 'Close the drawer':gt $loc, $loc_arg
 end
 
 --- stol ---------------------------------

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels