Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/gschool_detention.qsrc

@@ -444,7 +444,7 @@ if $ARGS[0] = 'strange':
 	*clr & cla
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det.jpg"></center>'
-	'You take out your phone and play around with it for a while. When you look up, you rather bizzarely notice Feofan sitting at the same table as you, hunched over his folder with his arms surrounding it, obviously trying to hide what he''s looking at. You think it''s odd, yet amusing that one of the nerds is in detention. He seems to be very engrossed in what he''s doing and is acting weird. Maybe you should take a peek at what he''s doing? But then again, not minding your own business is at least part of the reason why you''re here in the first place.'
+	'You take out your phone and amuse yourself for a while. When you look up, you rather bizzarely notice Feofan sitting at the same table as you, hunched over his folder with his arms surrounding it, obviously trying to hide what he''s looking at. You think it''s odd, yet amusing that one of the nerds is in detention. He seems to be very engrossed in what he''s doing and is acting weird. Maybe you should take a peek at what he''s doing? But then again, not minding your own business is part of the reason why you''re here in the first place.'
 	act 'Ignore him':
 		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
@@ -457,7 +457,7 @@ if $ARGS[0] = 'strange':
 		*clr & cla
 		'<center><b><font color="maroon">Detention</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det1.jpg"></center>'
-		'Youe curiousity gets the better of you and you get up, quietly circle around behind him and look over his shoulder. You see that he is engrossed in an adult magazine, looking at a picture of a guy fucking a schoolgirl in the ass, "Albina" scrawled on the page with a winky face. As you stare at the porn yourself, he notices your presence, turning to look over his shoulder at you, blushing bright red. He frantically covers the image up with his hands and blurts out "Please don''t tell anyone! Especially not Albina!"'
+		'Your curiousity gets the better of you and you get up, quietly circle around behind him and look over his shoulder. You see that he is engrossed in an adult magazine, looking at a picture of a guy fucking a schoolgirl in the ass, "Albina" scrawled on the page with a winky face. As you stare at the porn yourself, he notices your presence, turning to look over his shoulder at you, blushing bright red. He frantically covers the image up with his hands and blurts out "Please don''t tell anyone! Especially not Albina!"'
 		act 'Ignore it':
 			*clr & cla
 			npc_rel['A152'] += 1
@@ -472,7 +472,7 @@ if $ARGS[0] = 'strange':
 			npc_rel['A152'] -= 3
 			'<center><b><font color="maroon">Detention</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/feofan/sex/school/det1.jpg"></center>'
-			'You call the teacher over and all color leaves Feofan''s face. He pleads with you not to tell on him but when the teacher arrives, you let him know what he was doing. After a bit of arguing, the teacher grabs the magazine from him, looks it over and let''s him know that what got him into detention is nothing compared to the trouble he''s in now. The teacher has Feofan move to a seat near his desk so he can keep an eye on him, then thanks you and leads Feofan to the front of the library.'
+			'You call the teacher over and the color leaves Feofan''s face. He pleads with you not to tell on him but when the teacher arrives, you let him know what he was doing. After a bit of arguing, the teacher grabs the magazine from him, looks it over and lets him know that what got him into detention is nothing compared to the trouble he''s in now. The teacher has Feofan move to a seat near his desk so he can keep an eye on him, then thanks you and leads Feofan to the front of the library.'
 			'As they walk away, Feofan gives you a really dirty look. You spend the rest of the time playing on your phone, occasionally getting dirty looks from him whenever the teacher is not looking.'
 			act 'Go home': gt 'gschool_detention', 'end'
 		end

locations/hookup_after.qsrc

@@ -6,20 +6,21 @@ if $ARGS[0] = 'exit':
 		gs 'underwear', 'wear'
 		gs 'stat'
 	end
-	if npc_QW > 0:gs'lover','add'
+	gs 'boyStat', $npclastgenerated
+	if npc_QW[$boy] > 0:gs'lover','add',$boy
 	killvar 'hookup'
 	minut += 2
 	!! exit should be based on type of apartment and location
-	if temp_location = 1 or npc_residence = 1:
+	if npc_residence[$boy] = 1:
 		!! Pav residential exit
 		gt 'pav_residential'
-	elseif temp_location = 2 or npc_residence = 2:
+	elseif npc_residence[$boy] = 2:
 		!! Student dorms exit
 		gt 'city_island'
-	elseif temp_location = 3 or npc_residence = 3:
+	elseif npc_residence[$boy] = 3:
 		!! St. Petersburg Residential exit
 		gt 'city_residential'
-	elseif temp_location = 4 or npc_residence = 4:
+	elseif npc_residence[$boy] = 4:
 		!! St. Petersburg City Center exit
 		gt 'city_center'
 	end