[fixed] lover preferences not properly working because they got deleted. Moved the cleanup to the end

locations/boylove.qsrc

@@ -1,8 +1,5 @@
 # boylove
 
-dynamic $npc_preferences[$npcID]
-
-
 if $ARGS[0] = 'hair':
 	if npc_pref_values['hair_color_black'] > 0:
 		if func('pcs_has_attr', 'hair_color_black'):
@@ -115,8 +112,4 @@ if $ARGS[0] = 'tits':
 end
 
 
-killvar '$npc_pref_traits'
-killvar 'npc_pref_values'
-
-
 --- boylove ---------------------------------

locations/lover_likes.qsrc

@@ -1,9 +1,7 @@
 # lover_likes
 
-dynamic $npc_preferences[$npcID]
 gs 'lover_pref'
 
-
 if $ARGS[0] = 'clotTypePrefTmp':
 	if npc_pref_values['clothes_style_wealthy'] > 0:
 		if func('pcs_has_attr', 'clothes_style_wealthy'):
@@ -1050,9 +1048,6 @@ if $ARGS[0] = 'compliance':
 	end
 end
 
-
-killvar '$npc_pref_traits'
-killvar 'npc_pref_values'
 killvar 'll_temp_rand'
 killvar 'll_temp_max'
 

locations/lover_meet.qsrc

@@ -6,6 +6,7 @@ if $ARGS[0] = 'start':
 	minut += 15
 
 	gs 'npcStat', $ARGS[1]
+	dynamic $npc_preferences[$npcID]
 
 	npc_meetday[$npcID] = 0
 	npc_dates[$npcID] += 1
@@ -181,8 +182,8 @@ if $ARGS[0] = 'start':
 				end
 				'<<$npcdesc>> takes a closer look at you and says, "What is wrong with your lips? They are very sore. Is that genital herpes? I better go, I do not want to get infected. I''m sorry, goodbye."'
 				pcs_mood -= 20
-				gt 'homes_properties', 'go_home'
-				exit
+				gt 'lover_meet', 'go_home'
+
 			elseif venera < 4 and cumloc[11] = 0 and (cumloc[6] = 0 and cumloc[7] = 0):
 				if npc_gentle[$npcID] = 1:
 					npc_rel[$npcID] += 1
@@ -231,14 +232,14 @@ if $ARGS[0] = 'start':
 					end
 					'<<$Xec>> notices the sperm on your face, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$Xe>> then pushes you out of <<$Xyr>> face. "We are through, I don''t want to see your face again!'
 					pcs_mood -= 20
-					gt 'homes_properties', 'go_home'
-					exit
+					gt 'lover_meet', 'go_home'
+
 				elseif (cumloc[6] = 1 or cumloc[7] = 1):
 					npc_rel[$npcID] += 1
 					'<<$Xec>> notices the sperm on your ass, "<<$pcs_firstname>>! What the...?! You dirty whore!", <<$Xe>> then pushes you away. "We are through, I don''t want to see your face again!'
 					pcs_mood -= 20
-					gt 'homes_properties', 'go_home'
-					exit
+					gt 'lover_meet', 'go_home'
+
 				end
 			end
 
@@ -321,8 +322,8 @@ if $ARGS[0] = 'start':
 						end
 						'<<$Xec>> notices the sperm on your face, "<<$pcs_firstname>>! What the...?! You dirty whore!", <<$Xe>> then pushes you out of <<$Xyr>> face. "We are through, I don''t want to see your face again!'
 						pcs_mood -= 20
-						gt 'homes_properties', 'go_home'
-						exit
+						gt 'lover_meet', 'go_home'
+
 					elseif (cumloc[6] = 1 or cumloc[7] = 1):
 						if npc_gender[$npcID] = 0 or npc_gender[$npcID] = 3:
 							gs 'lover', 'remove_boyfriend', $npcID
@@ -331,8 +332,7 @@ if $ARGS[0] = 'start':
 						end
 						'<<$Xec>> notices the sperm on your ass, "<<$pcs_firstname>>! What the...?! You dirty whore!", <<$Xe>> then pushes you away. "We are through, I don''t want to see your face again!'
 						pcs_mood -= 20
-						gt 'homes_properties', 'go_home'
-						exit
+						gt 'lover_meet', 'go_home'
 					end
 				end
 			end
@@ -401,8 +401,8 @@ if $ARGS[0] = 'start':
 					end
 					'<<$Xec>> notices the sperm on your face, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$Xe>> then pushes you out of <<$Xyr>> face. "We are through, I don''t want to see your face again!'
 					pcs_mood -= 20
-					gt 'homes_properties', 'go_home'
-					exit
+					gt 'lover_meet', 'go_home'
+
 				elseif cumloc[6]+cumloc[7] > 0:
 					if npc_gender[$npcID] = 0 or npc_gender[$npcID] = 3:
 						gs 'lover', 'remove_boyfriend', $npcID
@@ -411,8 +411,8 @@ if $ARGS[0] = 'start':
 					end
 					'<<$Xec>> notices the sperm on your ass, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$Xe>> then pushes you away. "We are through, I don''t want to see your face again!'
 					pcs_mood -= 20
-					gt 'homes_properties', 'go_home'
-					exit
+					gt 'lover_meet', 'go_home'
+
 				elseif cumloc[12] > 0:
 					if npc_gender[$npcID] = 0 or npc_gender[$npcID] = 3:
 						gs 'lover', 'remove_boyfriend', $npcID
@@ -421,8 +421,7 @@ if $ARGS[0] = 'start':
 					end
 					'<<$Xec>> realizes your mouth smells like sperm, "H-Hey- <<$pcs_firstname>>! What the...?! You dirty whore!", <<$Xe>> then pushes you away. "We are through, I don''t want to see your face again!"'
 					pcs_mood -= 20
-					gt 'homes_properties', 'go_home'
-					exit
+					gt 'lover_meet', 'go_home'
 				end
 			end
 
@@ -513,7 +512,7 @@ if $ARGS[0] = 'actions':
 					npc_rel[$npcID] -= rand(1, 2)
 					'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 					'<<$npcdesc>> realizes you will not give in this situation, and walks away mumbling to <<$Xemself>>.'
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 			else
 				act 'I like my <<$lover_meet["ChangeName"]>> just the way it is (<font color="red"><<will_cost>> Willpower</font>)':'<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -615,26 +614,24 @@ if $ARGS[0] = 'actions':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 				'<<$npcdesc>> suggest you and <<$Xem>> drink a beer in the stairwell.'
+
 				act 'Sorry, but I need to go':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
-				act 'Go with <<$Xem>>':gt 'podezdM', 'start'
+
+				act 'Go with <<$Xem>>': gt 'lover_meet', 'go_stairwell_date'
 			elseif randchan = 2 or npc_gender[$npcID] = 1:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 				'<<$npcdesc>> suggests that you take a walk in the park.'
+
 				act 'Sorry, but I need to go':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 
-				act 'Go with <<$Xem>>':
-					if npc_gender[$npcID] = 0: gt 'parkM', 'start'
-					if npc_gender[$npcID] = 1: $telsob = '<<$npcdesc>>' & gt 'parksvid'
-				end
+				act 'Go with <<$Xem>>': gs 'lover_meet', 'go_park_date'
 			end
 		elseif npc_finance[$npcID] = 1:
 			*clr & cla
@@ -748,6 +745,7 @@ if $ARGS[0] = 'actions':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 					'"Erm... Nothing..."'
+
 					act '"Well then..."': xgt 'lover_meet', 'actions'
 				end
 			elseif randchan = 1:
@@ -756,45 +754,33 @@ if $ARGS[0] = 'actions':
 				'<<$npcdesc>> suggests that you go to the movies.'
 
 				act 'Sorry, but I need to go':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 
-				act 'Go with <<$Xem>>':
-					if npc_gender[$npcID] = 0: gt 'kinoM', 'start'
-					if npc_gender[$npcID] = 1: $telsob = '<<$npcdesc>>' & gt 'kinosvid'
-				end
+				act 'Go with <<$Xem>>': gt 'lover_meet', 'go_movie_date'
 			elseif randchan = 2:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 				'<<$npcdesc>> suggest that you take a walk in the park'
 
 				act 'Sorry, but I need to go':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 
-				act 'Go with <<$Xem>>':
-					if npc_gender[$npcID] = 0: gt 'parkM', 'start'
-					if npc_gender[$npcID] = 1: $telsob = '<<$npcdesc>>' & gt 'parksvid'
-				end
+				act 'Go with <<$Xem>>': gt 'lover_meet', 'go_park_date'
 			elseif randchan = 3:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 				'<<$npcdesc>> suggests that you go to a cafe.'
 
 				act 'Sorry, but I need to go':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 
-				act 'Go with <<$Xem>>':
-					if npc_gender[$npcID] = 0: gt 'kafeM', 'start'
-					if npc_gender[$npcID] = 1: $telsob = '<<$npcdesc>>' & gt 'kafesvid'
-				end
+				act 'Go with <<$Xem>>': gt 'lover_meet', 'go_cafe_date'
 			end
 		else
 			*clr & cla
@@ -945,76 +931,58 @@ if $ARGS[0] = 'actions':
 				'<<$npcdesc>> suggests that you go to a cafe.'
 
 				act 'Sorry, but I need to leave':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 
-				act 'Go with <<$Xem>>':
-					if npc_gender[$npcID] = 0: gt 'kafeM', 'start'
-					if npc_gender[$npcID] = 1: $telsob = '<<$npcdesc>>' & gt 'kafesvid'
-				end
+				act 'Go with <<$Xem>>': gt 'lover_meet', 'go_cafe_date'
 			elseif randchan = 2:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 				'<<$npcdesc>> suggests that you go to a restaurant.'
 
 				act 'Sorry, but I need to leave':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 
-				act 'Go with <<$Xem>>':
-					if npc_gender[$npcID] = 0: gt 'restoranM', 'start'
-					if npc_gender[$npcID] = 1: $telsob = '<<$npcdesc>>' & gt 'kafesvid'
-				end
+				act 'Go with <<$Xem>>': gt 'lover_meet', 'go_restaurant_date'
 			elseif randchan = 3:
 				*clr & cla
 				'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 				'<<$npcdesc>> suggests that you go to the movies.'
 
 				act 'Sorry, but I need to go':
-					cla
 					npc_rel[$npcID] -= (1 + rand(-npc_gentle[$npcID], npc_rough[$npcID]))
-					gt 'homes_properties', 'go_home'
+					gt 'lover_meet', 'go_home'
 				end
 
-				act 'Go with <<$Xem>>':
-					if npc_gender[$npcID] = 0: gt 'kinoM', 'start'
-					if npc_gender[$npcID] = 1: $telsob = '<<$npcdesc>>' & gt 'kinosvid'
-				end
+				act 'Go with <<$Xem>>': gt 'lover_meet', 'go_movie_date'
 			end
 		end
-
-		killvar '$npc_pref_traits'
-		killvar 'npc_pref_values'
 	end
 	act 'I want to do something today':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="<<$npc_pic[$npcID]>>"></center>'
 		'"What do you want to do?", <<$Xe>> asks'
 		if npc_gender[$npcID] = 0:
-			act '"Let''s go just relax in the stairwell and drink some beer."': gt 'podezdM', 'start'
-			act '"Let''s take a walk in the park"': gt 'parkM', 'start'
-			act '"Let''s go see a movie"': gt 'kinoM', 'start'
-			act '"Let''s go to the cafe."': gt 'kafeM', 'start'
+			act '"Let''s go just relax in the stairwell and drink some beer."': gt 'lover_meet', 'go_stairwell_date'
+			act '"Let''s take a walk in the park"': gt 'lover_meet', 'go_park_date'
+			act '"Let''s go see a movie"': gt 'lover_meet', 'go_movie_date'
+			act '"Let''s go to the cafe."': gt 'lover_meet', 'go_cafe_date'
 		elseif npc_gender[$npcID] = 1:
 			$telsob = '<<$npcdesc>>'
 
 			if month > 5 and temper > 20 and sunWeather = 1:
-				act 'Invite to the park': gt 'parksvid'
+				act 'Invite to the park': gt 'lover_meet', 'go_park_date'
 			end
 
-			act 'Invite to a movie': gt 'kinosvid'
-			act 'Invite to the pool hall': gt 'billsvid'
-			act 'Invite to the cafe': gt 'kafesvid'
-			act 'Invite to the casino': gt 'kazinosvid'
-		end
-		act 'Never mind...':
-			gt 'lover_meet', 'actions'
-			exit
+			act 'Invite to a movie': gt 'lover_meet', 'go_movie_date'
+			act 'Invite to the pool hall': gt 'lover_meet', 'go_pool_hall_date'
+			act 'Invite to the cafe': gt 'lover_meet', 'go_cafe_date'
+			act 'Invite to the casino': gt 'lover_meet', 'go_casino_date'
 		end
+		act 'Never mind...': gt 'lover_meet', 'actions'
 	end
 	act 'I think we should break up...':
 		*clr & cla
@@ -1026,9 +994,79 @@ if $ARGS[0] = 'actions':
 			gs 'lover', 'remove_girlfriend', $npcID
 		end
 
-		act 'Continue': gt 'homes_properties', 'go_home'
+		act 'Continue': gt 'lover_meet', 'go_home'
+	end
+end
+
+
+if $ARGS[0] = 'go_park_date':
+	gs 'lover_meet', 'cleanup'
+	if $npc_gender[$npcID] = 0:
+		gt 'parkM', 'start'
+	else
+		$telsob = '<<$npcdesc>>'
+		gt 'parksvid'
+	end
+end
+
+if $ARGS[0] = 'go_movie_date':
+	gs 'lover_meet', 'cleanup'
+	if $npc_gender[$npcID] = 0:
+		gt 'kinoM', 'start'
+	else
+		$telsob = '<<$npcdesc>>'
+		gt 'kinosvid'
+	end
+end
+
+if $ARGS[0] = 'go_cafe_date':
+	gs 'lover_meet', 'cleanup'
+	if $npc_gender[$npcID] = 0:
+		gt 'kafeM', 'start'
+	else
+		$telsob = '<<$npcdesc>>'
+		gt 'kafesvid'
+	end
+end
+
+if $ARGS[0] = 'go_restaurant_date':
+	gs 'lover_meet', 'cleanup'
+	if $npc_gender[$npcID] = 0:
+		gt 'restoranM', 'start'
+	else
+		$telsob = '<<$npcdesc>>'
+		gt 'kafesvid'
 	end
 end
 
+if $ARGS[0] = 'go_casino_date':
+	gs 'lover_meet', 'cleanup'
+	$telsob = '<<$npcdesc>>'
+	gt 'kazinosvid'
+end
+
+if $ARGS[0] = 'go_pool_hall_date':
+	gs 'lover_meet', 'cleanup'
+	$telsob = '<<$npcdesc>>'
+	gt 'billsvid'
+end
+
+if $ARGS[0] = 'go_stairwell_date':
+	gs 'lover_meet', 'cleanup'
+	gt 'podezdM', 'start'
+end
+
+
+if $ARGS[0] = 'go_home':
+	gs 'lover_meet', 'cleanup'
+	gt 'homes_properties', 'go_home'
+end
+
+if $ARGS[0] = 'cleanup':
+	killvar '$npc_pref_traits'
+	killvar 'npc_pref_values'
+end
+
+
 
 --- lover_meet ---------------------------------

locations/lover_pref.qsrc

@@ -1,9 +1,5 @@
 # lover_pref
 
-dynamic $npc_preferences[$npcID]
-
-
-
 !!0 - 0 to 2, 1 - 3 to 5, 2, 5 to 6
 
 !! These variables will be compared to the player value 'pcs_bmi'.
@@ -532,9 +528,4 @@ if $ARGS[0] = 'check_bmi':
 end
 
 
-
-killvar '$npc_pref_traits'
-killvar 'npc_pref_values'
-
-
 --- lover_pref ---------------------------------