diff --git a/DATA/MISSIONS/M13/m13.ini b/DATA/MISSIONS/M13/m13.ini index 0a19e8bc..d7d0a716 100644 --- a/DATA/MISSIONS/M13/m13.ini +++ b/DATA/MISSIONS/M13/m13.ini @@ -2709,44 +2709,58 @@ 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_NNPath = 21880, 21880, Li01_Trade_Lane_Ring_179, Li01 -Act_ActTrig = jacobi_alaska_tradelane +Act_NNPath = 600004, 600004, Li01_Trade_Lane_Ring_179, Li01 Act_ActTrig = tradelane_alaska_entered Act_ActTrig = jacobi_alaska_end +Act_ActTrig = jacobi_alaska_tradelane1 +Act_ActTrig = jacobi_alaska_gate + +[Trigger] +nickname = jacobi_alaska_tradelane1 +Cnd_DistVec = inside, Player, 50482, 0, 7683, 1500 +Act_ActTrig = jacobi_alaska_tradelane2 +Act_NNPath = 600006, 600006, waypoint1_2, Li01 +Act_Destroy = waypoint1_1, SILENT [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 +;Act_NNPath = 600005, 600005, Li01_Trade_Lane_Ring_190, Li01 +Act_SpawnSolar = waypoint1_1 +Act_SpawnSolar = waypoint1_2 +Act_NNPath = 600006, 600006, waypoint1_1, Li01 +Act_MarkObj = waypoint1_1, 0 [MsnSolar] -nickname = waypoint1 +nickname = waypoint1_1 +string_id = 10903 +faction = fc_n_grp +system = Li01 +position = 50482, 0, 7683 +archetype = waypoint +label = waypoint_label +radius = 0 + +[MsnSolar] +nickname = waypoint1_2 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 +nickname = jacobi_alaska_tradelane2 Cnd_DistVec = inside, Player, 45741, 0, 6895, 1500 -;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 +Act_NNPath = 600006, 600006, waypoint1_1, Li01 [Trigger] nickname = jacobi_alaska_gate Cnd_DistVec = inside, Player, 64894, 0, 18160, 1500 Act_NNPath = 600006, 600006, Li01_to_Li05, Li01 +Act_Destroy = waypoint1_2, SILENT [NNObjective] nickname = alaska_mine_field_entrance @@ -2762,7 +2776,6 @@ 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_NNPath = 600006, 600006, li_cruiser_debris_frnt_sm1, Li05 [MsnSolar] @@ -2778,10 +2791,6 @@ 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 @@ -2923,9 +2932,15 @@ Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0008_jacobi, -1, br_dar Act_NNPath = 600006, 600006, Li05_to_Li01, Li05 Act_ActTrig = jacobi_westpoint_end3 Act_ActTrig = rem_space_rogues_loot_waypoint +Act_ActTrig = rem_space_loot_viginette + +;[Trigger] +;nickname = rem_space_loot_viginette +;Cnd_Timer = 16 +;Line = Player, Player, dx_exp_vignette_walker_sp [MsnSolar] -nickname = waypoint1_1 +nickname = waypoint1_5 string_id = 10903 faction = fc_n_grp system = Li01 @@ -2937,15 +2952,34 @@ radius = 0 [Trigger] nickname = rem_space_rogues_loot_waypoint Cnd_SystemEnter = Li01 -Act_SpawnSolar = waypoint1_1 +Act_SpawnSolar = waypoint1_5 Act_AdjAcct = 2000000 -Act_NNPath = 600006, 600006, waypoint1_1, Li01 +Act_NNPath = 600005, 600005, waypoint1_5, Li01 Act_ActTrig = rem_space_rogues_loot_waypoint2 +Act_ActTrig = rem_space_walker_audio +Act_ActTrig = rem_space_jacobi_ether1 +Act_ActTrig = rem_space_jacobi_ether2 + +[Trigger] +nickname = rem_space_walker_audio +Cnd_Timer = 12 +Act_PlaySoundEffect = dx_exp_vignette_walker_sp + +[Trigger] +nickname = rem_space_jacobi_ether1 +Cnd_Timer = 5 +Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0009_jacobi, -1, br_darcy_head, br_darcy_body + +[Trigger] +nickname = rem_space_jacobi_ether2 +Cnd_Timer = 115 +Act_EtherComm = jacobi_voice_m14, 600018, Player, dx_m14_0010_jacobi, -1, br_darcy_head, br_darcy_body + [Trigger] nickname = rem_space_rogues_loot_waypoint2 Cnd_DistVec = inside, Player, 74020, 0, 14572, 3000 -Act_NNPath = 600006, 600006, Li01_09, li01_09 +Act_NNPath = 600003, 600003, Li01_09, Li01 [Trigger] @@ -3132,7 +3166,6 @@ radius = 0 visit = UNKNOWABLE [MsnLoot] -;nickname = ashcroft_pod nickname = liberty_fragment_data archetype = fragment_data_liberty string_id = 290010 diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua index 39c902fd..d636cec7 100644 --- a/EXE/REM/Lua/Infocards.lua +++ b/EXE/REM/Lua/Infocards.lua @@ -913,7 +913,7 @@ rem.AddInfoCard(600029, "Launch into Space") -- Story Arc I - Tour of Duty (Planet Manhattan - Li01_01_Base) rem.AddInfoCard(600030, "Story Arc I - Manhattan") -rem.AddInfoCard(600031, [[Mission 02: Tour of DutyOnce again, I met diplomat Harrison. He told me that the nomad incident changed the initial situations of the colonies. Political and military permissions are in transition, but also new conflicts arise. Only the highest government authorities know more about the reasons for these structural changes.Liberty's government was considering a new taxation scheme aimed at the Junkers, that would impos tariffs on their scrap businesses in exchange for protection and infrastructure support. Many in the Junker community saw this as another attempt to restrict their hard fought independence.Harrison is asking me, if I can give him an escort to Rochester Base in sector D3 in the New York System. As a new diplomat he needs to arrange an agreement between Liberty and the Junkers.]]) +rem.AddInfoCard(600031, [[Mission 02: Tour of DutyHarrison explains that the nomad incident changed the initial situation of the colonies. Political and military permissions are in transition, but also new conflicts arise. Only the highest government authorities know more about the reasons for these structural changes.Liberty's government was considering a new taxation scheme aimed at the Junkers, that would impos tariffs on their scrap businesses in exchange for protection and infrastructure support. Many in the Junker community saw this as another attempt to restrict their hard fought independence.Harrison is asking giving him an escort to Rochester Base in sector D3 in the New York System. As a new diplomat he needs to arrange an agreement between Liberty and the Junkers..Objectives:- Fly to Rochester Base.- Negotiate an agreement with the Junkers.]]) rem.AddInfoCard(600032, "Negotiate an agreement with the Junkers") rem.AddInfoCard(600033, "Fly to Rochester Base") rem.AddInfoCard(600034, "Eliminate all Xenos")