[fixed] original hookup setup situations now correctly send to the new files

locations/dateM.qsrc

@@ -109,7 +109,8 @@ if $ARGS[0] = 'start':
 					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
+					!! act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_start'
 				end
 			end
 		end
@@ -182,7 +183,7 @@ if $ARGS[0] = 'start':
 					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
 				end
 			end
 		end
@@ -246,7 +247,7 @@ if $ARGS[0] = 'start':
 					elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 						gs 'fame', 'pav', 'sex', 2
 					end
-					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+					act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
 				end
 			end
 		end
@@ -320,7 +321,7 @@ if $ARGS[0] = 'start':
 				elseif $region = 'pav' or $region = 'pav_park' or $region = 'pav':
 					gs 'fame', 'pav', 'sex', 2
 				end
-				act 'Go to his place':$hookup['pickup'] = 'street' & gt 'hookup', 'start'
+				act 'Go to his place':$hookup['pickup'] = 'street' & gt 'sex_ev_start', 'hookup_npc_home_start'
 			end
 		end
 	end

locations/pav_disco.qsrc

@@ -645,7 +645,7 @@ if $ARGS[0] = 'dance_partner':
 	!!the creation of a partner to dance
 	sozboyrand = rand(1,300)
 	if sozboyrand > boynum:
-		gs 'npcgeneratec', 0, 'Stranger', rand((age - 1),(age + 1)), 1
+		gs 'npcgeneratec', 0, 'guy from the disco', rand((age - 1),(age + 1)), 1
 		gs 'boystat', $npclastgenerated
 		DaPaTipeRand = rand(0,100)
 
@@ -879,7 +879,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		gs 'arousal', 'kiss', 5
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Go to his place':gt 'hookup', 'start'
+		act 'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 	end
 	
 	act 'That sounds great':
@@ -891,7 +891,7 @@ if $ARGS[0] = 'hookup_aggressive':
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Go to his place':gt 'hookup', 'start'
+		act 'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 	end
 end
 
@@ -927,7 +927,7 @@ if $ARGS[0] = 'hookup_nice':
 		'"Great! So, shall we..."'
 		'You follow him back to his home in nearby apartment complex, flirting in innuendos along the way. By the time you get there, you''ve both forgotten about the drinks.'
 		gs 'stat'
-		act 'Go to his place':gt 'hookup', 'start'
+		act 'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 	end
 	
 	act 'Want to fuck?':
@@ -940,7 +940,7 @@ if $ARGS[0] = 'hookup_nice':
 		'<<$npc_firstname[$boy]>> seems stunned by your straightforwardness, but eventually answers, "Yes!"'
 		'"Great! Lead the way!" you grin. The two of you hurry through the streets together to a nearby apartment complex.'
 		gs 'stat'
-		act 'Go to his place':gt 'hookup', 'start'
+		act 'Go to his place':gt 'sex_ev_start', 'hookup_npc_home_start'
 	end
 end