diff --git a/DATA/MISSIONS/M13/m13.ini b/DATA/MISSIONS/M13/m13.ini
index 3cae1a3b..0a19e8bc 100644
--- a/DATA/MISSIONS/M13/m13.ini
+++ b/DATA/MISSIONS/M13/m13.ini
@@ -2670,7 +2670,8 @@ type = rep_inst, Li01, 600002, 1, -35488, -300, 28321, Li01_09
[NNObjective]
nickname = goto_westpoint4
state = HIDDEN
-type = ids, 600003
+type = rep_inst, Li01, 600003, 1, -35488, -300, 28321, Li01_09
+;type = ids, 600003
[Trigger]
nickname = jacobi_westpoint2
@@ -2708,14 +2709,38 @@ Act_ActTrig = jacobi_westpoint_end2
nickname = jacobi_westpoint_end2
Cnd_Timer = 10
Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0001_jacobi, -1, br_darcy_head, br_darcy_body
-Act_SetNNObj = goto_alaska
+;Act_SetNNObj = goto_alaska
+Act_NNPath = 21880, 21880, Li01_Trade_Lane_Ring_179, Li01
Act_ActTrig = jacobi_alaska_tradelane
+Act_ActTrig = tradelane_alaska_entered
Act_ActTrig = jacobi_alaska_end
+[Trigger]
+nickname = tradelane_alaska_entered
+Cnd_TLEntered = Player, Li01_Trade_Lane_Ring_179, Li01_Trade_Lane_Ring_180
+Act_NNPath = 21880, 21880, Li01_Trade_Lane_Ring_190, Li01
+
+[MsnSolar]
+nickname = waypoint1
+string_id = 10903
+faction = fc_n_grp
+system = Li01
+position = 64894, 0, 18160
+;archetype = gas_collector
+;loadout = gas_collector
+;position = -16575.4, -28.6535, 13567.6
+archetype = waypoint
+;loadout = dyson_city_platform
+label = waypoint_label
+radius = 0
+
[Trigger]
nickname = jacobi_alaska_tradelane
Cnd_DistVec = inside, Player, 45741, 0, 6895, 1500
-Act_SetNNObj = alaska_mine_field_entrance
+;Act_SetNNObj = alaska_mine_field_entrance
+Act_SpawnSolar = waypoint1
+Act_NNPath = 600006, 600006, waypoint1, Li01
+;Act_NNPath = 600006, 600006, Li01_to_Li05, Li01
Act_ActTrig = jacobi_alaska_gate
[Trigger]
@@ -2737,7 +2762,8 @@ type = rep_inst, Li01, 600004, 1, -34074, 0, 27771, Li01_Trade_Lane_Ring_179
nickname = jacobi_alaska_end
Cnd_SystemEnter = Li05
Act_ActTrig = jacobi_alaska_end2
-Act_SetNNObj = cruiser_debris1
+;Act_SetNNObj = cruiser_debris1
+Act_NNPath = 600006, 600006, li_cruiser_debris_frnt_sm1, Li05
[MsnSolar]
nickname = li_cruiser_debris_frnt_sm1
@@ -2818,8 +2844,7 @@ Act_ActTrig = cruiser_debris_mark1
[Trigger]
nickname = cruiser_debris_mark1
Cnd_CommComplete = dx_m14_0002_jacobi
-Act_MarkObj = Li01_to_Li05, 1
-;Act_MarkObj = li_cruiser_debris_frnt_sm1, 1
+Act_MarkObj = li_cruiser_debris_frnt_sm1, 1
[Trigger]
nickname = cruiser_debris_destroyed1
@@ -2834,22 +2859,40 @@ Act_ActTrig = cruiser_debris_mark2
nickname = cruiser_debris_mark2
Cnd_CommComplete = dx_m14_0003_jacobi
Act_MarkObj = li_cruiser_debris_frnt_sm2, 1
-Act_SetNNObj = cruiser_debris2
+Act_NNPath = 600006, 600006, li_cruiser_debris_frnt_sm2, Li05
+Act_MarkObj = li_cruiser_debris_frnt_sm2, 1
[Trigger]
nickname = cruiser_debris_destroyed2
system = Li05
Cnd_Destroyed = li_cruiser_debris_frnt_sm2, 1, ALL
+Act_SpawnSolar = waypoint2
Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0004_jacobi, -1, br_darcy_head, br_darcy_body
Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0005_jacobi, -1, br_darcy_head, br_darcy_body
Act_ActTrig = cruiser_debris_destroyed3
+[MsnSolar]
+nickname = waypoint2
+string_id = 10903
+faction = fc_n_grp
+system = Li05
+position = 74500, 0, 31500
+;archetype = gas_collector
+;loadout = gas_collector
+;position = -16575.4, -28.6535, 13567.6
+archetype = waypoint
+;loadout = dyson_city_platform
+label = waypoint_label
+radius = 0
+
[Trigger]
nickname = cruiser_debris_destroyed3
system = Li05
Cnd_Timer = 5
-Act_SpawnShip = Rogues1, rogues_attack, 70500, 0, 31500
-Act_SetNNObj = rogues_spawn1
+Act_SpawnShip = Rogues1, rogues_attack, 74500, 0, 31500
+;Act_NNPath = 600006, 600006, rogues_wave1, Li05
+;Act_SetNNObj = rogues_spawn1
+Act_NNPath = 600006, 600006, waypoint2, Li05
Act_ActTrig = rem_space_rogues_destroyed
Act_ActTrig = cruiser_debris_rogues_encounter_comm
@@ -2859,8 +2902,10 @@ state = HIDDEN
type = navmarker, Li05, 600007, 600007, 70500, 0, 31500
; TEST
+[Trigger]
nickname = cruiser_debris_rogues_encounter_comm
-Cnd_DistVec = inside, Player, 70500, 0, 31500, 3000
+system = Li05
+Cnd_DistVec = inside, Player, 74500, 0, 31500, 2000
Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0006_jacobi, -1, br_darcy_head, br_darcy_body
Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0007_jacobi, -1, br_darcy_head, br_darcy_body
@@ -2875,7 +2920,33 @@ Act_ActTrig = rem_space_rogues_loot
nickname = rem_space_rogues_loot
Cnd_LootAcquired = walker_audio_log1, Player
Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0008_jacobi, -1, br_darcy_head, br_darcy_body
+Act_NNPath = 600006, 600006, Li05_to_Li01, Li05
Act_ActTrig = jacobi_westpoint_end3
+Act_ActTrig = rem_space_rogues_loot_waypoint
+
+[MsnSolar]
+nickname = waypoint1_1
+string_id = 10903
+faction = fc_n_grp
+system = Li01
+position = 74020, 0, 14572
+archetype = waypoint
+label = waypoint_label
+radius = 0
+
+[Trigger]
+nickname = rem_space_rogues_loot_waypoint
+Cnd_SystemEnter = Li01
+Act_SpawnSolar = waypoint1_1
+Act_AdjAcct = 2000000
+Act_NNPath = 600006, 600006, waypoint1_1, Li01
+Act_ActTrig = rem_space_rogues_loot_waypoint2
+
+[Trigger]
+nickname = rem_space_rogues_loot_waypoint2
+Cnd_DistVec = inside, Player, 74020, 0, 14572, 3000
+Act_NNPath = 600006, 600006, Li01_09, li01_09
+
[Trigger]
nickname = jacobi_westpoint_end3
@@ -2968,6 +3039,8 @@ Act_SetNNObj = mlog_meetking
nickname = rem_space_harrison03
system = Li01
Cnd_LaunchComplete = Player
+Act_SpawnSolar = waypoint3
+Act_NNPath = 600006, 600006, waypoint3, Li01
Act_ActTrig = rem_space_harrison03_test4
[ObjList]
@@ -3114,6 +3187,20 @@ system = Li03
Cnd_Destroyed = pirate_transmitter1, 1, ALL
Act_SpawnLoot = liberty_fragment_data
+[MsnSolar]
+nickname = waypoint3
+string_id = 10903
+faction = fc_n_grp
+system = Li05
+position = -30763, 0, -60916
+;archetype = gas_collector
+;loadout = gas_collector
+;position = -16575.4, -28.6535, 13567.6
+archetype = waypoint
+;loadout = dyson_city_platform
+label = waypoint_label
+radius = 0
+
[Trigger]
nickname = rem_space_harrison03_test5
Cnd_DistVec = inside, Player, -30763, 0, -60916, 5000
@@ -3161,12 +3248,97 @@ Cnd_RTCDone = missions\REM_ARCs\m014a_s004x_li01_01_nrml.ini
Act_Popupdialog = 600030, 600036, CLOSE
Act_ActTrig = rem_undock1_harrison04
+[MsnSolar]
+nickname = waypoint4
+string_id = 10903
+faction = fc_n_grp
+system = Li05
+position = -39424, 0, -30534
+;archetype = gas_collector
+;loadout = gas_collector
+;position = -16575.4, -28.6535, 13567.6
+archetype = waypoint
+;loadout = dyson_city_platform
+label = waypoint_label
+radius = 0
+
+[MsnSolar]
+nickname = waypoint5
+string_id = 10903
+faction = fc_n_grp
+system = Li05
+position = -32816, -300, 29451
+;archetype = gas_collector
+;loadout = gas_collector
+;position = -16575.4, -28.6535, 13567.6
+archetype = waypoint
+;loadout = dyson_city_platform
+label = waypoint_label
+radius = 0
+
+[MsnSolar]
+nickname = waypoint6
+string_id = 10903
+faction = fc_n_grp
+system = Li05
+position = -18951, -300, 34452
+;archetype = gas_collector
+;loadout = gas_collector
+;position = -16575.4, -28.6535, 13567.6
+archetype = waypoint
+;loadout = dyson_city_platform
+label = waypoint_label
+radius = 0
+
[Trigger]
nickname = rem_undock1_harrison04
system = Li01
;Cnd_SpaceEnter = Li01
Cnd_BaseExit = li13_01_base
+Act_SpawnSolar = waypoint4
+Act_SpawnSolar = waypoint5
+Act_SpawnSolar = waypoint6
+Act_NNPath = 600007, 600007, waypoint4, Li01
Act_ActTrig = rem_space_harrison05
+Act_ActTrig = rem_tradelane1_harrison01
+Act_ActTrig = rem_tradelane2_harrison02
+
+
+[Trigger]
+nickname = rem_tradelane2_harrison02
+Cnd_DistVec = inside, Player, -39424, 0, -30534, 3000
+Act_NNPath = 600004, 600004, Li01_Trade_Lane_Ring_147, Li01
+Act_ActTrig = rem_tradelane1_harrison01
+
+[Trigger]
+nickname = rem_tradelane1_harrison01
+;system = Li01
+Cnd_TLEntered = Player, Li01_Trade_Lane_Ring_147, Li01_Trade_Lane_Ring_148
+Act_NNPath = 600007, 600007, Li01_Trade_Lane_Ring_154, Li01
+Act_ActTrig = rem_tradelane1_harrison02
+
+;Waypoint 4 NNPATH
+[Trigger]
+nickname = rem_tradelane1_harrison02
+;system = Li01
+Cnd_DistVec = inside, Player, -35542, 0, 26621, 3000
+Act_AdjAcct = 2000000
+Act_NNPath = 600007, 600007, waypoint5, Li01
+Act_ActTrig = rem_tradelane1_harrison03
+
+;Waypoint 5 NNPATH
+[Trigger]
+nickname = rem_tradelane1_harrison03
+Cnd_DistVec = inside, Player, -32816, -300, 29451, 2000
+Act_NNPath = 600007, 600007, waypoint6, Li01
+Act_ActTrig = rem_tradelane1_harrison04
+
+;Waypoint 6 NNPATH
+[Trigger]
+nickname = rem_tradelane1_harrison04
+Cnd_DistVec = inside, Player, -18951, -300, 34452, 2000
+Act_NNPath = 600006, 600006, Li01_12, Li01
+;HALLO
[Trigger]
nickname = rem_space_harrison05
diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua
index 6a0e9276..39c902fd 100644
--- a/EXE/REM/Lua/Infocards.lua
+++ b/EXE/REM/Lua/Infocards.lua
@@ -900,13 +900,13 @@ rem.AddInfoCard(600018, "President Jacobi")
rem.AddInfoCard(600019, "The Rebus")
-- Exploration Arc I - West Point (West Point - Li01_09_Base)
rem.AddInfoCard(600020, "Exploration Arc - West Point ")
-rem.AddInfoCard(600021, [[Mission 01: Walker's RemembrenceMarcus Walker died when the Liberty Cruiser LNS Utah breaks a blockade at Zone 21. He sacrificed himself to help Jun'ko Zane and Edison Trent escape from the Alaska System.President Jacobi says that she has a reliable source saying that an audio-log from Markus Walker exists. My task is to find the cruiser debris on Zone 21 and extract the audio-log and transmit it to West Point academy.Objectives:- Inverstigate the LNS Utah wreckage.- Find and transmit the audio log to West Point.]])
+rem.AddInfoCard(600021, [[Mission 01: Walker's RemembrenceMarcus Walker died when the Liberty Cruiser LNS Utah breaks a blockade at Zone 21. He sacrificed himself to help Jun'ko Zane and Edison Trent escape from the Alaska System.President Jacobi says that she has a reliable source saying that an audio-log from Markus Walker exists. The task is to find the cruiser debris on Zone 21 and extract the audio-log and transmit it to West Point academy.Objectives:- Inverstigate the LNS Utah wreckage.- Find and transmit the audio log to West Point.]])
rem.AddInfoCard(600022, "Find Walker’s Audio Log")
rem.AddInfoCard(600023, "Fly to Zone 21 in the Alaska System")
rem.AddInfoCard(600024, "Destroy the Cruiser's debris")
rem.AddInfoCard(600025, "Tractor in the Audio Log")
rem.AddInfoCard(600026, "Deliver the log to West Point Academy")
-rem.AddInfoCard(600027, [[>Mission 01: Walker's RemembrenceStatus: Mission accomplishedThe success of this mission and the sourcing of informations, was probably more important than it appeared. It's an unusal behaviour that the Liberty Rogues engaged on that mission because of this insignificant audio-log.An investigation with the Neural-Net found some encrypted files hidden in some trace loops. There's no way to get on these informations, unless you have the key, but maybe President Jacobi knows more about this.So talking with President Jacobi once more in the West Point Academy Bar is the next step on the list.]])
+rem.AddInfoCard(600027, [[Mission 01: Walker's RemembrenceStatus: Mission accomplishedThe success of this mission and the sourcing of informations, was probably more important than it appeared. It's an unusal behaviour that the Liberty Rogues engaged on that mission because of this insignificant audio-log.An investigation with the Neural-Net found some encrypted files hidden in some trace loops. There's no way to get on these informations, unless you have the key to unlock the files.The current situation is a dead-end, so let's get into space for another mission.]])
rem.AddInfoCard(600028, "Enter the West Point Academy Bar")
rem.AddInfoCard(600029, "Launch into Space")