diff --git a/DATA/MISSIONS/M13/m13.ini b/DATA/MISSIONS/M13/m13.ini index 6ba9d294..3cae1a3b 100644 --- a/DATA/MISSIONS/M13/m13.ini +++ b/DATA/MISSIONS/M13/m13.ini @@ -2559,11 +2559,6 @@ Act_SetNNObj = goto_westpoint ;============================================================================================================================ ; REM begin -[NNObjective] -nickname = test1 -state = HIDDEN -type = navmarker, Li01, 21880, 21800, -33267, 0, -28810 - [Trigger] nickname = jacobi_westpoint Cnd_SpaceEnter = no_params @@ -2666,8 +2661,6 @@ type = ids, 600000 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 @@ -2715,12 +2708,36 @@ 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_ActTrig = jacobi_alaska_tradelane Act_ActTrig = jacobi_alaska_end +[Trigger] +nickname = jacobi_alaska_tradelane +Cnd_DistVec = inside, Player, 45741, 0, 6895, 1500 +Act_SetNNObj = alaska_mine_field_entrance +Act_ActTrig = jacobi_alaska_gate + +[Trigger] +nickname = jacobi_alaska_gate +Cnd_DistVec = inside, Player, 64894, 0, 18160, 1500 +Act_NNPath = 600006, 600006, Li01_to_Li05, Li01 + +[NNObjective] +nickname = alaska_mine_field_entrance +state = HIDDEN +type = navmarker, Li01, 21880, 64894, 0, 18160 + +[NNObjective] +nickname = goto_alaska +state = HIDDEN +type = rep_inst, Li01, 600004, 1, -34074, 0, 27771, Li01_Trade_Lane_Ring_179 + [Trigger] nickname = jacobi_alaska_end Cnd_SystemEnter = Li05 Act_ActTrig = jacobi_alaska_end2 +Act_SetNNObj = cruiser_debris1 [MsnSolar] nickname = li_cruiser_debris_frnt_sm1 @@ -2735,6 +2752,11 @@ label = hostile_platform1 radius = 0 visit = UNKNOWABLE +[NNObjective] +nickname = cruiser_debris1 +state = HIDDEN +type = rep_inst, Li05, 600024, 1, 68000, 0, 33000, li_cruiser_debris_frnt_sm1 + [MsnSolar] nickname = li_cruiser_debris_frnt_sm2 string_id = 216121 @@ -2748,6 +2770,11 @@ label = hostile_platform1 radius = 0 visit = UNKNOWABLE +[NNObjective] +nickname = cruiser_debris2 +state = HIDDEN +type = rep_inst, Li05, 600024, 1, 70000, 0, 3200, li_cruiser_debris_frnt_sm2 + [ObjList] nickname = rogues_attack SetLifetime = 100 @@ -2807,6 +2834,7 @@ 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 [Trigger] nickname = cruiser_debris_destroyed2 @@ -2819,13 +2847,19 @@ Act_ActTrig = cruiser_debris_destroyed3 [Trigger] nickname = cruiser_debris_destroyed3 system = Li05 +Cnd_Timer = 5 Act_SpawnShip = Rogues1, rogues_attack, 70500, 0, 31500 +Act_SetNNObj = rogues_spawn1 Act_ActTrig = rem_space_rogues_destroyed Act_ActTrig = cruiser_debris_rogues_encounter_comm +[NNObjective] +nickname = rogues_spawn1 +state = HIDDEN +type = navmarker, Li05, 600007, 600007, 70500, 0, 31500 + ; TEST nickname = cruiser_debris_rogues_encounter_comm -;Cnd_DistVec = inside, Player, -35763, 1000, -25450, 3000 Cnd_DistVec = inside, Player, 70500, 0, 31500, 3000 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 diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua index ce6e5a30..6a0e9276 100644 --- a/EXE/REM/Lua/Infocards.lua +++ b/EXE/REM/Lua/Infocards.lua @@ -890,6 +890,10 @@ 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(600004, "Dock on Tradelane") +rem.AddInfoCard(600005, "Fly to the Destination Point") +rem.AddInfoCard(600006, "Dock on Alaska Jumpgate") +rem.AddInfoCard(600007, "Fly to the Destination Point") rem.AddInfoCard(600017, "Junkers") rem.AddInfoCard(600018, "President Jacobi")