Add M13 Clearings & Westpoint Waypoints

DATA/MISSIONS/M13/m13.ini

@@ -2422,7 +2422,7 @@ Act_DeactTrig = nomads_5
 Act_DisableEnc = se_nomads_5
 Act_LightFuse = Nomad_City, fuse_dyson_city_wormhole_start
 Act_StartDialog = endgame_dialog
-Act_SetNNObj = null
+;Act_SetNNObj = null
 Act_RandomPop = false
 
 [Trigger]
@@ -2552,13 +2552,132 @@ Act_ActTrig = the_end_end
 nickname = the_end_end
 Cnd_True = no_params
 Act_ActTrig = jacobi_westpoint
+Act_SetNNObj = goto_westpoint
 ;Act_ChangeState = SUCCEED
 
+
+;============================================================================================================================
 ; REM begin
+
+[NNObjective]
+nickname = test1
+state = HIDDEN
+type = navmarker, Li01, 21880, 21800, -33267, 0, -28810
+
 [Trigger]
 nickname = jacobi_westpoint
 Cnd_SpaceEnter = no_params
+;Act_SetNNObj = null
 Act_ActTrig = jacobi_westpoint2
+Act_ActTrig = m13_clearing
+
+[NNObjective]
+nickname = test2
+state = HIDDEN
+type = rep_inst, Li01, 21875, 24875, -33356, 0, -25834, Li01_Trade_Lane_Ring_146
+;type = rep_inst, Li01, 21835, 24835, -35488, -300, 28321, Li01_09
+;type = navmarker, Li01, 21835, 24835, -33356, 0, -25834
+
+[Trigger]
+nickname = m13_clearing
+Cnd_True = no_params
+Act_Destroy = platform1
+Act_Destroy = platform2
+Act_Destroy = platform3
+Act_Destroy = platform4
+Act_Destroy = platform5
+Act_Destroy = platform6
+Act_Destroy = platform7
+Act_Destroy = platform8
+Act_Destroy = platform9
+Act_Destroy = platform10
+Act_Destroy = platform11
+Act_Destroy = platform12
+Act_Destroy = platform13
+Act_Destroy = platform14
+Act_Destroy = platform15
+Act_Destroy = final_generator1
+Act_Destroy = final_generator2
+Act_Destroy = final_generator3
+Act_Destroy = final_generator4
+Act_Destroy = final_generator5
+Act_Destroy = juni, SILENT
+Act_Destroy = king, SILENT
+Act_Destroy = Orillion, SILENT
+Act_Destroy = VanClaussn, SILENT
+Act_Destroy = AlphaWing, SILENT
+Act_Destroy = BetaWing, SILENT
+Act_Destroy = GammaWing, SILENT
+Act_Destroy = order_wing1, SILENT
+Act_GiveObjList = GammaWing, die
+Act_Jumper = GammaWing, false
+Act_GiveObjList = AlphaWing, die
+Act_Jumper = BetaWing, false
+Act_GiveObjList = BetaWing, die
+Act_Jumper = BetaWing, false
+Act_GiveObjList = order_wing1, die
+Act_Jumper = order_wing1, false
+Act_DeactTrig = take_off
+Act_DeactTrig = goto_hole_key
+Act_DeactTrig = entering_st03
+Act_DeactTrig = inside_sphere
+Act_DeactTrig = entering_st03b
+Act_RpopAttClamp = true
+Act_RandomPop = true
+Act_HostileClamp = true
+Act_PlayerCanTradelane = true
+Act_GCSClamp = false
+Act_NagClamp = true
+Act_PlayerEnemyClamp = 3, 4
+Act_RpopTLAttacksEnabled = true
+Act_ActTrig = m13_clearing2
+Act_RemoveRTC = missions\m13\M013_s076xb_Li01_01_nrml.ini
+
+[NNObjective]
+nickname = mlog_meettransports
+state = HIDDEN
+type = ids, 21845
+
+[Trigger]
+nickname = m13_clearing2
+system = Li01
+Cnd_Timer = 12
+Act_AdjAcct = 12345
+Act_SetNNObj = goto_westpoint2
+Act_ActTrig = tradelane_westpoint
+
+[Trigger]
+nickname = tradelane_westpoint
+Cnd_TLEntered = Player, Li01_Trade_Lane_Ring_147, Li01_Trade_Lane_Ring_148
+Act_SetNNObj = goto_westpoint3
+Act_ActTrig = tradelane_westpoint2
+
+[Trigger]
+nickname = tradelane_westpoint2
+Cnd_DistVec = inside, Player, -35488, -300, 28321, 1500
+Act_SetNNObj = goto_westpoint4
+
+[NNObjective]
+nickname = goto_westpoint
+state = HIDDEN
+type = ids, 600000
+
+[NNObjective]
+nickname = goto_westpoint2
+state = HIDDEN
+type = rep_inst, Li01, 600001, 1, -33356, 0, -25834, Li01_Trade_Lane_Ring_147
+;type = rep_inst, Li01, 21840, 24840, -28267, 0, -30104, Li01_Trade_Lane_Ring_146
+;type = navmarker, Li01, 22085, -33356, 0, -25834
+
+[NNObjective]
+nickname = goto_westpoint3
+state = HIDDEN
+type = rep_inst, Li01, 600002, 1, -35488, -300, 28321, Li01_09
+
+[NNObjective]
+nickname = goto_westpoint4
+state = HIDDEN
+type = ids, 600003
 
 [Trigger]
 nickname = jacobi_westpoint2
@@ -2584,9 +2703,6 @@ nickname = spawn1
 system = Li01
 Cnd_PopUpDialog = CLOSE
 Act_AdjAcct = 2000000
-;Cnd_SpaceEnter = Li01
-Cnd_SpaceEnter = ANY
-;Cnd_BaseExit = Li01_09_Base
 Act_ActTrig = jacobi_westpoint_end
 
 [Trigger]
@@ -2670,6 +2786,13 @@ Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0002_jacobi, -1, br_dar
 Act_SpawnSolar = li_cruiser_debris_frnt_sm1
 Act_ActTrig = cruiser_debris_destroyed1
 Act_ActTrig = jacobi_westpoint_end3
+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
 
 [Trigger]
 nickname = cruiser_debris_destroyed1
@@ -2678,6 +2801,12 @@ Cnd_Destroyed = li_cruiser_debris_frnt_sm1, 1, ALL
 Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0003_jacobi, -1, br_darcy_head, br_darcy_body
 Act_SpawnSolar = li_cruiser_debris_frnt_sm2
 Act_ActTrig = cruiser_debris_destroyed2
+Act_ActTrig = cruiser_debris_mark2
+
+[Trigger]
+nickname = cruiser_debris_mark2
+Cnd_CommComplete = dx_m14_0003_jacobi 
+Act_MarkObj = li_cruiser_debris_frnt_sm2, 1
 
 [Trigger]
 nickname = cruiser_debris_destroyed2

EXE/REM/Lua/Infocards.lua

@@ -885,6 +885,13 @@ rem.AddInfoCard(520000, "Acc. Tizona del Cid")
 rem.AddInfoCard(520001, "Rapid Tizona del Cid")
 
 -- Single Player
+
+rem.AddInfoCard(600000, "Launch your Ship")
+rem.AddInfoCard(600001, "Dock on Tradelane")
+rem.AddInfoCard(600002, "Fly to Westpoint Military Academy")
+rem.AddInfoCard(600003, "Dock on Westpoint Military Academy")
+
+rem.AddInfoCard(600017, "Junkers")
 rem.AddInfoCard(600018, "President Jacobi")
 rem.AddInfoCard(600019, "The Rebus")
 -- Exploration Arc I - West Point (West Point - Li01_09_Base)