Add Planet Las Vegas Mooring Fixture Reputation

Two identical Nevada Jumpgate Entries are overlapping in the California System

DATA/AUDIO/arc_sounds.ini

@@ -0,0 +1,470 @@
+; REM Story Arc Audio Entries
+
+[Sound]
+nickname = dx_REM_0101_Trent
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_trent01.wav
+
+[Sound]
+nickname = dx_REM_0102_Trent
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_trent02.wav
+
+[Sound]
+nickname = dx_REM_0201_Trent
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_trent0201.wav
+
+; Alright. So what's the Plan?
+
+[Sound]
+nickname = dx_REM_0101_Harrison
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_harrison01.wav
+
+[Sound]
+nickname = dx_REM_0102_Harrison
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_harrison02.wav
+
+[Sound]
+nickname = dx_REM_0103_Harrison
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_harrison03.wav
+
+[Sound]
+nickname = dx_REM_0201_Harrison
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_harrison0201.wav
+
+; Don't worry, Trent. Just let me handle all the conversation
+
+[Sound]
+nickname = dx_REM_0201_Junker
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_Junker0201.wav
+
+; Don't move! State your business.
+
+[Sound]
+nickname = dx_REM_0202_Harrison
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_harrison0202.wav
+
+; My name is Harrison. I am one of Liberty's newest diplomats.  My task is to define the conditions for the new tax agreement
+
+[Sound]
+nickname = dx_REM_0202_Junker
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_Junker0202.wav
+
+; Welcome to Rochester
+
+[Sound]
+nickname = dx_REM_0203_Junker
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_Junker0203.wav
+
+; Thanks for your combat assistance, but the Junkers don't not accept any regulations
+
+[Sound]
+nickname = dx_REM_0204_Junker
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_Junker0204.wav
+
+; We like to get along with everybody around here, as an independent faction of scrap collectors.
+
+[Sound]
+nickname = dx_REM_0203_Harrison
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_harrison0203.wav
+
+; I completely understand your concerns about these new regulations.
+
+[Sound]
+nickname = dx_REM_0204_Harrison
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_harrison0204.wav
+
+; But the situation is complicated. The Xenos are becoming stronger, and without any assistance, the Junkers could be at risk.
+
+[Sound]
+nickname = dx_sm13_0004_li_news
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\dx_sm13_0004_li_news.wav
+
+[Sound]
+nickname = dx_REM_0101_Sinclair
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_sinclair01.wav
+
+[Sound]
+nickname = dx_REM_0101_King
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Story_Arcs\story_king01.wav
+
+; Tutorial
+
+[Sound]
+nickname = dx_REM_0101_Tutorial_King01
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\tutorials\king_tutorial1.wav
+
+[Sound]
+nickname = dx_REM_0101_Tutorial_King02
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\tutorials\king_tutorial2.wav
+
+[Sound]
+nickname = dx_REM_0101_Tutorial_King03
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\tutorials\king_tutorial3.wav
+
+[Sound]
+nickname = dx_REM_0101_Tutorial_King04
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\tutorials\king_tutorial4.wav
+
+[Sound]
+nickname = dx_REM_0101_Tutorial_King05
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\tutorials\king_tutorial5.wav
+
+; The Rebus
+
+[Sound]
+nickname = dx_REM_0101_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\The_Rebus.wav
+
+[Sound]
+nickname = dx_REM_0103_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_LSF.wav
+
+[Sound]
+nickname = dx_REM_0104_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_greetings.wav
+
+[Sound]
+nickname = dx_REM_0105_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_appreicate.wav
+
+[Sound]
+nickname = dx_REM_0201_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_topic.wav
+
+[Sound]
+nickname = dx_REM_0202_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_Order.wav
+
+[Sound]
+nickname = dx_REM_0203_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_difficult.wav
+
+[Sound]
+nickname = dx_REM_0204_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_efforts.wav
+
+[Sound]
+nickname = dx_REM_0205_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_offers.wav
+
+[Sound]
+nickname = dx_REM_0206_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_imagine.wav
+
+[Sound]
+nickname = dx_REM_0207_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_welcomesyou.wav
+
+[Sound]
+nickname = dx_REM_0208_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_informations.wav
+
+[Sound]
+nickname = dx_REM_0209_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_contact.wav
+
+[Sound]
+nickname = dx_REM_0210_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_nexttime.wav
+
+[Sound]
+nickname = dx_REM_0301_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_senses.wav
+
+[Sound]
+nickname = dx_REM_0302_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_ready.wav
+
+[Sound]
+nickname = dx_REM_0303_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_network.wav
+
+[Sound]
+nickname = dx_REM_0304_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_voices.wav
+
+[Sound]
+nickname = dx_REM_0305_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_correct.wav
+
+[Sound]
+nickname = dx_REM_0401_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_introduce.wav
+
+[Sound]
+nickname = dx_REM_0402_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_BD_GC.wav
+
+[Sound]
+nickname = dx_REM_0501_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_senses.wav
+
+[Sound]
+nickname = dx_REM_0502_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_edo.wav
+
+[Sound]
+nickname = dx_REM_0601_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\Rebus_aachenfeld.wav
+
+[Sound]
+nickname = dx_REM_0701_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\Rebus_espionage.wav
+
+[Sound]
+nickname = dx_REM_0702_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\Rebus_evidence.wav
+
+[Sound]
+nickname = dx_REM_0703_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_source.wav
+
+[Sound]
+nickname = dx_REM_0704_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_attention.wav
+
+
+; Trent Kusari
+[Sound]
+nickname = dx_s080x_0101_trent
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Trent\Trent_Kusari.wav
+
+; Priest Kusari
+[Sound]
+nickname = dx_s080x_0101_priest
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Priest\dx_s080x_0101_priest_explain.wav
+
+[Sound]
+nickname = dx_s080x_0102_priest2
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Priest\dx_s080x_0102_priest_sakura.wav
+
+[Sound]
+nickname = dx_s080x_0103_priest3
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Priest\dx_s080x_0103_priest_emperor.wav
+
+[Sound]
+nickname = dx_s080x_0104_priest4
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Priest\dx_s080x_0104_priest_girl.wav
+
+; Jonner & Blix
+
+[Sound]
+nickname = dx_s081x_0000_jonner
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jonner\dx_s081x_0000_jonner_sir.wav
+
+[Sound]
+nickname = dx_s081x_0101_jonner
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jonner\dx_s081x_0101_jonner_journey.wav
+
+[Sound]
+nickname = dx_s081x_0102_jonner
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jonner\dx_s081x_0102_jonner_coordinates.wav
+
+[Sound]
+nickname = dx_s081x_0103_jonner
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jonner\dx_s081x_0103_jonner_information.wav
+
+[Sound]
+nickname = dx_s081x_0104_jonner
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jonner\dx_s081x_0104_jonner_friend.wav
+
+[Sound]
+nickname = dx_s081x_0105_jonner
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jonner\dx_s081x_0105_jonner_answers.wav
+
+[Sound]
+nickname = dx_s081x_0105_jonner_dummy
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Jonner\dx_s081x_0105_jonner_answers.wav
+
+; Trent
+
+nickname = dx_REM_s062x_0201_trent
+type = voice
+is_2d = true
+attenuation = 0
+file = AUDIO\DIALOGUE\TRENT\dx_s062x_0201_trent.wav 

DATA/AUDIO/story_sounds.ini

@@ -7082,289 +7082,3 @@ type = voice
 is_2d = true
 attenuation = 0
 file = Audio\Rem_Audio\Juni\0xB9C36A42_fem.wav
-
-
-
-
-
-
-
-
-
-
-
-; REM Story Arc Audio Entries
-
-[Sound]
-nickname = dx_REM_0101_Trent
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_trent01.wav
-
-[Sound]
-nickname = dx_REM_0102_Trent
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_trent02.wav
-
-[Sound]
-nickname = dx_REM_0201_Trent
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_trent0201.wav
-
-; Alright. So what's the Plan?
-
-
-[Sound]
-nickname = dx_REM_0101_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison01.wav
-
-[Sound]
-nickname = dx_REM_0102_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison02.wav
-
-[Sound]
-nickname = dx_REM_0103_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison03.wav
-
-[Sound]
-nickname = dx_REM_0201_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0201.wav
-
-; Don't worry, Trent. Just let me handle all the conversation
-
-[Sound]
-nickname = dx_REM_0201_Junker
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_Junker0201.wav
-
-; Don't move! State your business.
-
-[Sound]
-nickname = dx_REM_0202_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0202.wav
-
-; My name is Harrison. I am one of Liberty's newest diplomats.  My task is to define the conditions for the new tax agreement
-
-[Sound]
-nickname = dx_REM_0202_Junker
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_Junker0202.wav
-
-; Welcome to Rochester
-
-[Sound]
-nickname = dx_REM_0203_Junker
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_Junker0203.wav
-
-; Thanks for your combat assistance, but the Junkers don't not accept any regulations
-
-[Sound]
-nickname = dx_REM_0204_Junker
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_Junker0204.wav
-
-; We like to get along with everybody around here, as an independent faction of scrap collectors.
-
-[Sound]
-nickname = dx_REM_0203_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0203.wav
-
-; I completely understand your concerns about these new regulations.
-
-[Sound]
-nickname = dx_REM_0204_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0204.wav
-
-; But the situation is complicated. The Xenos are becoming stronger, and without any assistance, the Junkers could be at risk.
-
-[Sound]
-nickname = dx_REM_0205_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0205.wav
-
-; The taxation is meant to protect you and streamline operations.
-
-[Sound]
-nickname = dx_REM_0206_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0206.wav
-
-; Think of it as a way to formalize your status. If we can establish a reasonable tax structure, we can guarantee your safety from the Xenos and provide you access to resources that minght be otherwise cut off.
-
-[Sound]
-nickname = dx_REM_0205_Junker
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_Junker0205.wav
-
-; Resources? You mean the ones we lose access to because you take half our income in taxes?
-
-[Sound]
-nickname = dx_REM_0207_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0207.wav
-
-; What if we structured it differently? A tiered tax plan based on your scrapping profits.
-
-[Sound]
-nickname = dx_REM_0208_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0208.wav
-
-; How about starting with 2% ?
-
-[Sound]
-nickname = dx_REM_0209_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0209.wav
-
-; We can work together to create a tax system that doesn't weaken your operations.
-
-[Sound]
-nickname = dx_REM_0210_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0210.wav
-
-; And in exchange for your cooperation, we will collaborate on tech-sharing, providing you with upgraded defenses against any criminal threat.
-
-[Sound]
-nickname = dx_REM_0211_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0211.wav
-
-; The Junkers would pay a modest tax that would steadily increase based on gross income, while Liberty promised development grants to improve salvage operations."
-
-[Sound]
-nickname = dx_REM_0206_Junker
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_Junker0206.wav
-
-; Alright, Harrison. You've got your deal. But remember, if Liberty thinks about overstepping its boundaries, you'll find us hard to deal with.
-
-[Sound]
-nickname = dx_REM_0212_Harrison
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_harrison0212.wav
-
-; Agreed. This partnership will put us both in a stronger position.
-
-
-[Sound]
-nickname = dx_sm13_0004_li_news
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\dx_sm13_0004_li_news.wav
-
-[Sound]
-nickname = dx_REM_0101_Sinclair
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_sinclair01.wav
-
-[Sound]
-nickname = dx_REM_0101_King
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Story_Arcs\story_king01.wav
-
-
-; The Rebus
-
-[Sound]
-nickname = dx_REM_0101_Rebus
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Rebus\The_Rebus.wav
-
-[Sound]
-nickname = dx_REM_0103_Rebus
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Rebus\TheRebus_LSF.wav
-
-[Sound]
-nickname = dx_REM_0201_Rebus
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Rebus\TheRebus_Order.wav
-
-[Sound]
-nickname = dx_REM_0301_Rebus
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Rebus\TheRebus_network.wav
-
-[Sound]
-nickname = dx_REM_0402_Rebus
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Rebus\TheRebus_edo.wav
-
-[Sound]
-nickname = dx_REM_0501_Rebus
-type = voice
-is_2d = true
-attenuation = 0
-file = Audio\Rem_Audio\Rebus\TheRebus_BD_GC.wav

DATA/EQUIPMENT/goods.ini

@@ -2832,6 +2832,8 @@ combinable = false
 
 ; Mission Items
 
+; Chronos Relic
+
 [Good]
 nickname = chronos_relic
 equipment = chronos_relic
@@ -2840,6 +2842,8 @@ category = equipment
 price = 3000
 combinable = false
 
+; Hellios Shard
+
 [Good]
 nickname = hellios_shard
 equipment = hellios_shard
@@ -2848,6 +2852,8 @@ category = equipment
 price = 3000
 combinable = false
 
+; Athena Orb
+
 [Good]
 nickname = athena_orb
 equipment = athena_orb
@@ -2856,6 +2862,76 @@ category = equipment
 price = 3000
 combinable = false
 
+; Emergency Action Documents
+
+[Good]
+nickname = emergency_action_documents_liberty
+equipment = emergency_action_documents_liberty
+item_icon = Equipment\models\commodities\nn_icons\sm_documents_liberty.3db
+category = equipment
+price = 3000
+combinable = false
+
+; Fragment Data (Liberty)
+
+[Good]
+nickname = fragment_data_liberty
+equipment = fragment_data_liberty
+item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
+category = equipment
+price = 3000
+combinable = false
+
+; Genealogical Certificate
+
+[Good]
+nickname = genealogical_certificate_kusari
+equipment = genealogical_certificate_kusari
+item_icon = Equipment\models\commodities\nn_icons\sm_gene_cert_kusari.3db
+category = equipment
+price = 3000
+combinable = false
+
+; Fragment Data (Kusari)
+
+[Good]
+nickname = fragment_data_kusari
+equipment = fragment_data_kusari
+item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
+category = equipment
+price = 3000
+combinable = false
+
+; Rheinland Military Black Box
+
+[Good]
+nickname = military_black_box_rheinland
+equipment = military_black_box_rheinland
+item_icon = Equipment\models\commodities\nn_icons\sm_black_box_rheinland.3db
+category = equipment
+price = 3000
+combinable = false
+
+; Fragment Data (Rheinland)
+
+[Good]
+nickname = fragment_data_rheinland
+equipment = fragment_data_rheinland
+item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
+category = equipment
+price = 3000
+combinable = false
+
+; Fragment Data (Bretonia)
+
+[Good]
+nickname = fragment_data_bretonia
+equipment = fragment_data_bretonia
+item_icon = Equipment\models\commodities\nn_icons\sm_fragment_data.3db
+category = equipment
+price = 3000
+combinable = false
+
 ;; bh_elite3
 
 [Good]

DATA/EQUIPMENT/select_equip.ini

@@ -2325,6 +2325,8 @@ decay_per_second = 0
 volume = 0
 hit_pts = 250
 
+; Athena Orb
+
 [Commodity]
 nickname = athena_orb
 ids_name = 329902
@@ -2336,6 +2338,100 @@ decay_per_second = 0
 volume = 0
 hit_pts = 250
 
+; Emergency Action Documents
+
+[Commodity]
+nickname = emergency_action_documents_liberty
+ids_name = 290000
+ids_info = 290001
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
+; Fragment Data (Liberty)
+
+[Commodity]
+nickname = fragment_data_liberty
+ids_name = 290010
+ids_info = 290011
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
+
+; Genealogical Certificate
+
+[Commodity]
+nickname = genealogical_certificate_kusari
+ids_name = 290100
+ids_info = 290101
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
+; Fragment Data (Kusari)
+
+[Commodity]
+nickname = fragment_data_kusari
+ids_name = 290110
+ids_info = 290111
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
+
+; Rheinland Military Black Box
+
+[Commodity]
+nickname = military_black_box_rheinland
+ids_name = 290200
+ids_info = 290201
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
+; Fragment Data (Rheinland)
+
+[Commodity]
+nickname = fragment_data_rheinland
+ids_name = 290210
+ids_info = 290211
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
+
+; Fragment Data (Bretonia)
+
+[Commodity]
+nickname = fragment_data_bretonia
+ids_name = 290310
+ids_info = 290311
+units_per_container = 1
+pod_appearance = cargopod_blue
+loot_appearance = lootcrate_blue
+decay_per_second = 0
+volume = 0
+hit_pts = 250
+
 [TradeLane]
 nickname = basic_trade_lane_eq
 tl_ship_enter = basic_tl_ship_enter

DATA/MISSIONS/ENCOUNTERS/area_battleships.ini

@@ -0,0 +1,53 @@
+[EncounterFormation]
+ship_by_class = 1, 1, battleships
+pilot_job = assault_leader_job
+make_class = wanderer
+ship_by_class = 0, 2, CRUISERS, -3
+pilot_job = assault_job
+make_class = wanderer
+ship_by_class = 0, 3, sc_fighters, -6
+pilot_job = assault_job
+make_class = wanderer
+ship_by_class = 0, 3, sc_fighters, -6
+pilot_job = assault_job
+make_class = wanderer
+formation_by_class = battleships
+behavior = wander
+arrival = all, -object_all
+allow_simultaneous_creation = yes
+zone_creation_distance = 0
+times_to_create = infinite
+
+
+[EncounterFormation]
+ship_by_class = 1, 3, battleships
+pilot_job = assault_leader_job
+make_class = wanderer
+formation_by_class = battleships
+behavior = wander
+arrival = all, -object_all
+allow_simultaneous_creation = yes
+zone_creation_distance = 0
+times_to_create = infinite
+
+[EncounterFormation]
+ship_by_class = 1, 1, battleships
+pilot_job = assault_leader_job
+make_class = wanderer
+ship_by_class = 0, 4, sc_fighters, -6
+pilot_job = assault_job
+make_class = wanderer
+ship_by_class = 0, 4, sc_fighters, -6
+pilot_job = assault_job
+make_class = wanderer
+formation_by_class = battleships
+behavior = wander
+arrival = all, -object_all
+allow_simultaneous_creation = yes
+zone_creation_distance = 0
+times_to_create = infinite
+
+[Creation]
+permutation = 0, 3
+permutation = 1, 1
+permutation = 2, 2

DATA/MISSIONS/ENCOUNTERS/area_cruisers.ini

@@ -0,0 +1,16 @@
+[EncounterFormation]
+ship_by_class = 1, 1, CRUISERS
+pilot_job = assault_leader_job
+ship_by_class = 0, 4, sc_fighters, -3
+pilot_job = assault_job
+make_class = wanderer
+formation_by_class = CRUISERS
+behavior = wander
+arrival = all, -object_all
+allow_simultaneous_creation = yes
+zone_creation_distance = 0
+times_to_create = infinite
+
+[Creation]
+permutation = 0, 3
+

DATA/MISSIONS/faction_prop.ini

@@ -13,6 +13,7 @@ npc_ship = li_n_li_elite_d8
 npc_ship = li_n_li_elite_d9
 npc_ship = li_n_li_elite_d10
 npc_ship = li_n_li_elite_d11-19
+npc_ship = li_n_or_elite_d11-19
 npc_ship = li_n_cruiser_d22
 npc_ship = li_n_dreadnought_d25
 voice = pilot_f_mil_m01
@@ -49,6 +50,8 @@ scan_for_cargo = commodity_cardamine, 2
 scan_announce = true
 scan_chance = 0.3
 formation = fighters, fighter_li_n
+formation = CRUISERS, cruiser_li_n
+formation = battleships, cruiser3_li_n
 
 [FactionProps]
 affiliation = li_lsf_grp

DATA/MISSIONS/formations.ini

@@ -875,8 +875,8 @@ pl_pos = 0, 50, 275
 [Formation]
 nickname = cruiser3_li_n
 pos = 0, 0, 0
-pos = 100, 0, 300
+pos = 150, 0, 300
-pos = -100, 0, 300
+pos = -150, 0, 300
 pos = -55, 50, 188
 pos = 55, 50, 189
 pos = -110, 60, 225

DATA/MISSIONS/mbases.ini

@@ -46050,6 +46050,16 @@ offers_missions =
 mission_type = DestroyMission, 0.112387, 0.351002, 20
 npc = LI0601_lpolice_001_m
 
+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = gd_z_grp
+weight = 1
+offers_missions = false
+
 [BaseFaction]
 faction = co_ti_grp
 weight = 64
@@ -46088,28 +46098,6 @@ bribe = co_ni_grp, 10000, 16100
 bribe = co_ss_grp, 10000, 16100
 bribe = co_vr_grp, 10000, 16100
 bribe = gd_bh_grp, 10000, 16101
-rumor = base_0_rank, mission_end, 2, 131924
-rumor = base_0_rank, mission_end, 3, 131925
-rumor = base_0_rank, mission_end, 2, 131926
-rumor = base_0_rank, mission_end, 3, 131927
-rumorknowdb = li02_to_li04_hole
-rumor = base_0_rank, mission_end, 2, 131928
-rumor = base_0_rank, mission_end, 3, 131929
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393596
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393597
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393480
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393483
 know = 251644, 252612, 6000, 2
 knowdb = li02_to_li04_hole
 
@@ -46128,28 +46116,6 @@ bribe = co_be_grp, 10000, 16100
 bribe = co_nws_grp, 10000, 16100
 bribe = co_ti_grp, 10000, 16100
 bribe = gd_bh_grp, 10000, 16101
-rumor = base_0_rank, mission_end, 2, 131924
-rumor = base_0_rank, mission_end, 3, 131925
-rumor = base_0_rank, mission_end, 2, 131926
-rumor = base_0_rank, mission_end, 3, 131927
-rumorknowdb = li02_to_li04_hole
-rumor = base_0_rank, mission_end, 2, 131928
-rumor = base_0_rank, mission_end, 3, 131929
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393596
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393597
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393481
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393484
 accessory = prop_neuralnet_B_right
 
 [GF_NPC]
@@ -46165,29 +46131,6 @@ bribe = co_be_grp, 10000, 16100
 bribe = co_nws_grp, 10000, 16100
 bribe = co_ss_grp, 10000, 16100
 bribe = co_ti_grp, 10000, 16101
-rumor = base_0_rank, mission_end, 1, 131933
-rumor = base_0_rank, mission_end, 2, 131934
-rumor = base_0_rank, mission_end, 1, 131935
-rumor = base_0_rank, mission_end, 2, 131936
-rumor = base_0_rank, mission_end, 1, 131937
-rumor = base_0_rank, mission_end, 2, 131938
-rumor = base_0_rank, mission_end, 1, 131939
-rumor = base_0_rank, mission_end, 2, 131941
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393596
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393597
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393482
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393485
 
 [GF_NPC]
 nickname = LI0601_fix_ship
@@ -46226,21 +46169,6 @@ bribe = co_alg_grp, 10000, 16100
 bribe = co_be_grp, 10000, 16100
 bribe = co_ni_grp, 10000, 16100
 bribe = gd_bh_grp, 10000, 16100
-rumor = base_0_rank, mission_end, 1, 131930
-rumor = base_0_rank, mission_end, 1, 131931
-rumor = base_0_rank, mission_end, 1, 131932
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393596
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393486
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393384
 
 [GF_NPC]
 nickname = LI0601_planetform_001_m
@@ -46253,30 +46181,6 @@ affiliation = co_ti_grp
 voice = rvp101
 misn = DestroyMission, 0.112387, 0.351002
 room = bar
-rumor = base_0_rank, mission_end, 1, 131933
-rumor = base_0_rank, mission_end, 2, 131934
-rumor = base_0_rank, mission_end, 1, 131935
-rumor = base_0_rank, mission_end, 2, 131936
-rumor = base_0_rank, mission_end, 1, 131937
-rumor = base_0_rank, mission_end, 2, 131938
-rumor = base_0_rank, mission_end, 1, 131939
-rumor = base_0_rank, mission_end, 2, 131940
-rumor = base_0_rank, mission_end, 2, 131941
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393596
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393597
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393487
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393483
 know = 251654, 253753, 1500, 1
 knowdb = br01_05
 know = 251719, 253754, 600, 1
@@ -46293,30 +46197,6 @@ affiliation = co_ti_grp
 voice = rvp101
 misn = DestroyMission, 0.112387, 0.351002
 room = bar
-rumor = base_0_rank, mission_end, 1, 131933
-rumor = base_0_rank, mission_end, 2, 131934
-rumor = base_0_rank, mission_end, 1, 131935
-rumor = base_0_rank, mission_end, 2, 131936
-rumor = base_0_rank, mission_end, 1, 131937
-rumor = base_0_rank, mission_end, 2, 131938
-rumor = base_0_rank, mission_end, 1, 131939
-rumor = base_0_rank, mission_end, 2, 131940
-rumor = base_0_rank, mission_end, 2, 131941
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393596
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393597
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393488
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393484
 know = 251681, 253755, 2500, 1
 knowdb = br06_04
 know = 251704, 253756, 3500, 1
@@ -46333,30 +46213,6 @@ affiliation = co_ti_grp
 voice = rvp131
 misn = DestroyMission, 0.112387, 0.351002
 room = bar
-rumor = base_0_rank, mission_end, 1, 131933
-rumor = base_0_rank, mission_end, 2, 131934
-rumor = base_0_rank, mission_end, 1, 131935
-rumor = base_0_rank, mission_end, 2, 131936
-rumor = base_0_rank, mission_end, 1, 131937
-rumor = base_0_rank, mission_end, 2, 131938
-rumor = base_0_rank, mission_end, 1, 131939
-rumor = base_0_rank, mission_end, 2, 131940
-rumor = base_0_rank, mission_end, 2, 131941
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393596
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393597
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393489
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393485
 know = 251659, 253757, 1000, 1
 knowdb = br02_02
 
@@ -46375,20 +46231,6 @@ bribe = co_hsp_grp, 10000, 16100
 bribe = co_ni_grp, 10000, 16100
 bribe = co_ss_grp, 10000, 16101
 bribe = co_ti_grp, 10000, 16100
-rumor = base_0_rank, mission_end, 1, 131942
-rumor = base_0_rank, mission_end, 2, 131943
-rumor = base_0_rank, mission_end, 1, 131944
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393592
-rumor_type2 = mission_03_accepted, mission_03_accepted, 1, 393593
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393595
-rumor_type2 = mission_03_accepted, freetime_03_04, 1, 393597
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393490
 
 [MRoom]
 nickname = bar
@@ -46417,6 +46259,16 @@ weight = 64
 offers_missions = true
 mission_type = DestroyMission, 0.000000, 0.112387, 100
 
+[BaseFaction]
+faction = li_p_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
 [GF_NPC]
 nickname = LI0602_fix_bartender
 body = li_bartender_body
@@ -46426,39 +46278,7 @@ righthand = benchmark_male_hand_right
 individual_name = 244617
 affiliation = co_os_grp
 voice = rvp101
-rumor = base_0_rank, mission_end, 1, 131309
+
-rumor = base_0_rank, mission_end, 1, 131311
-rumor = base_0_rank, mission_end, 1, 131312
-rumor = base_0_rank, mission_end, 1, 131313
-rumor = base_0_rank, mission_end, 1, 131314
-rumor = base_0_rank, mission_end, 1, 131319
-rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
-rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
-rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
-rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
-rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
-rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393581
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393583
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393484
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393383
-rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
 
 [GF_NPC]
 nickname = LI0602_fix_ship
@@ -46517,6 +46337,26 @@ weight = 23
 offers_missions = true
 mission_type = DestroyMission, 0.000000, 0.112387, 100
 
+[BaseFaction]
+faction = fc_lh_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = fc_lr_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = fc_ou_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = fc_j_grp
+weight = 1
+offers_missions = false
+
 [GF_NPC]
 nickname = LI0603_fix_bartender
 body = pi_pirate8_body
@@ -46529,35 +46369,7 @@ voice = rvp101
 bribe = fc_j_grp, 10000, 16100
 bribe = fc_lr_grp, 10000, 16101
 bribe = fc_ou_grp, 10000, 16100
-rumor = base_0_rank, mission_end, 1, 131131
+
-rumor = base_0_rank, mission_end, 2, 131132
-rumor = base_0_rank, mission_end, 2, 131133
-rumor = base_0_rank, mission_end, 2, 131134
-rumor = base_0_rank, mission_end, 2, 131135
-rumor = base_0_rank, mission_end, 3, 131136
-rumor = base_0_rank, mission_end, 3, 131137
-rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
-rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
-rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
-rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
-rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
-rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
-rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
-rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
-rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
-rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
-rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393342
-rumor_type2 = base_0_rank, mission_04_loaded, 1, 393427
-rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
 
 [GF_NPC]
 nickname = LI0603_fix_ship
@@ -46604,3 +46416,132 @@ fixture = LI0603_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors
 nickname = ShipDealer
 character_density = 2
 fixture = LI0603_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
+
+[MBase]
+nickname = LI06_04_Base
+local_faction = li_lsf_grp
+diff = 2
+msg_id_prefix = gcs_refer_base_LI06_04_Base
+
+[MVendor]
+num_offers = 2, 4
+
+[BaseFaction]
+faction = li_lsf_grp
+weight = 40
+mission_type = DestroyMission, 0.000000, 0.112387, 100
+offers_missions = true
+
+[BaseFaction]
+faction = li_p_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = gd_z_grp
+weight = 1
+offers_missions = false
+
+[GF_NPC]
+nickname = LI0604_fix_bartender
+body = li_bartender_body
+head = li_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244624
+affiliation = li_lsf_grp
+voice = rvp101
+
+
+[GF_NPC]
+nickname = LI0604_fix_trader
+body = li_male_elite_body
+head = rh_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244625
+affiliation = li_lsf_grp
+voice = rvp111
+
+[GF_NPC]
+nickname = LI0604_fix_weaponsdealer
+body = li_male_elite_body
+head = rh_hassler_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244626
+affiliation = li_lsf_grp
+voice = rvp101
+
+[MRoom]
+nickname = bar
+character_density = 6
+fixture = LI0604_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+
+[MRoom]
+nickname = Deck
+character_density = 2
+fixture = LI0604_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = LI0604_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MBase]
+nickname = LI06_05_Base
+local_faction = li_lsf_grp
+diff = 2
+msg_id_prefix = gcs_refer_base_LI06_05_Base
+
+[BaseFaction]
+faction = li_p_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
+[MVendor]
+num_offers = 0, 0
+
+[MBase]
+nickname = LI06_06_Base
+local_faction = li_lsf_grp
+diff = 1
+msg_id_prefix = gcs_refer_base_LI06_06_Base
+
+[BaseFaction]
+faction = li_p_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
+[MVendor]
+num_offers = 0, 0
+
+[MBase]
+nickname = LI06_07_Base
+local_faction = li_n_grp
+diff = 2
+msg_id_prefix = gcs_refer_base_LI06_07_Base
+
+[BaseFaction]
+faction = li_p_grp
+weight = 1
+offers_missions = false
+
+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
+[MVendor]
+num_offers = 0, 0

DATA/MISSIONS/npcships.ini

@@ -168,13 +168,22 @@ pilot = pilot_military_ace
 state_graph = FIGHTER
 npc_class = lawful, class_fighter, d11, d12, d13, d14, d15, d16, d17, d18, d19
 
+[NPCShipArch]
+nickname = li_n_or_elite_d11-19
+loadout = MSN12_Order_Heavy_Fighter
+level = d11
+ship_archetype = or_elite
+pilot = heavy_fighter_default
+state_graph = FIGHTER
+npc_class = lawful, class_fighter, d11, d12, d13, d14, d15, d16, d17, d18, d19
+
 [NPCShipArch]
 nickname = li_n_cruiser_d22
 loadout = li_n_li_cruiser
 level = d22
 ship_archetype = li_cruiser
 pilot = cruiser_default
-state_graph = CRUISER
+state_graph = FIGHTER
 npc_class = lawful, CRUISER, d22
 
 [NPCShipArch]
@@ -182,7 +191,7 @@ nickname = li_n_dreadnought_d25
 loadout = li_n_li_dreadnought
 level = d25
 ship_archetype = li_dreadnought
-pilot = cruiser_default
+pilot = battleship_default
 state_graph = CRUISER
 npc_class = lawful, battleship, d25
 
@@ -3681,7 +3690,7 @@ npc_class = unlawful, class_battleship, d19
 
 [NPCShipArch]
 nickname = event_jack_o_lantern
-loadout = event_jack_o'lantern_load
+loadout = event_jack_o_lantern_load
 level = d19
 ship_archetype = jack_o_lantern
 pilot = MSN13_Nomad_Fighter

DATA/MISSIONS/shipclasses.ini

@@ -313,6 +313,14 @@ member = d18
 nickname = diff19
 member = d19
 
+[ShipClass]
+nickname = diff22
+member = d22
+
+[ShipClass]
+nickname = diff25
+member = d25
+
 [ShipClass]
 nickname = sc_fighters
 member = class_fighter
@@ -353,6 +361,14 @@ member = class_gunboat
 nickname = sc_cruisers
 member = class_cruiser
 
+[ShipClass]
+nickname = cruisers
+member = CRUISER
+
+[ShipClass]
+nickname = battleships
+member = battleship
+
 ; REM
 
 [ShipClass]

DATA/SHIPS/loadouts.ini

@@ -10344,7 +10344,7 @@ equip = shield01_mark05_lf, HpShield01
 equip = ge_s_thruster_01, HpThruster01
 equip = rh_gun01_mark02, HpWeapon01
 equip = rh_gun01_mark02, HpWeapon02
-equip = rh_gun02_mark02, HpWeapon03
+equip = rh_gun02_mark01, HpWeapon03
 equip = rh_gun02_mark01, HpWeapon04
 equip = cruise_disruptor01_mark01, HpTorpedo01
 cargo = cruise_disruptor01_mark01_ammo, 5
@@ -10685,7 +10685,7 @@ cargo = commodity_nomad_power_cell, 1
 ; Jack O'Lantern Loadout
 
 [Loadout]
-nickname = event_jack_o'lantern_load
+nickname = event_jack_o_lantern_load
 archetype = jack_o_lantern
 equip = ge_nf_engine_01
 equip = infinite_power

DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini

@@ -32,6 +32,14 @@ exclusion = Zone_LI06_Tradelane_02
 exclude_billboards = 1
 exclude_dynamic_asteroids = 1
 
+exclusion = Zone_LI06_Tradelane_04
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_Tradelane_05
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
 exclusion = Zone_LI06_to_Li02
 exclude_billboards = 1
 exclude_dynamic_asteroids = 1
@@ -52,6 +60,18 @@ exclusion = Zone_LI06_pop_ambient_02
 exclude_billboards = 1
 exclude_dynamic_asteroids = 1
 
+exclusion = Zone_LI06_pop_ambient_03
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_to_Iw04_hole
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_to_LI07_hole
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
 [DynamicAsteroids]
 asteroid = DAsteroid_lava02
 count = 20

DATA/SOLAR/ASTEROIDS/li02_sierra_ice_asteroid_field.ini

@@ -18,6 +18,13 @@ exclusion = ZONE_Li02_vignette1_exclusion
 exclusion = ZONE_Li02_vignette5_exclusion
 exclusion = ZONE_Li02_vignette7_exclusion
 exclusion = ZONE_Li02_vignette9_exclusion
+exclusion = Zone_Li02_Tradelane_01
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+exclusion = Zone_Li02_pop_ambient_01
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+exclude_asteroids = 1
 
 [Cube]
 asteroid = ice_asteroid30, 0.2, 0.8, 0.3, 45, 20, 0

DATA/UNIVERSE/SYSTEMS/KU05/BASES/ROOMS/ku05_02_deck.ini

@@ -8,6 +8,7 @@ ambient = ambience_deck_space_larger
 
 [PlayerShipPlacement]
 name = X/Shipcentre/01
+landing_script = Scripts\Bases\ainu_deck_land_01.thn
 
 [Camera]
 name = Camera_0

DATA/UNIVERSE/SYSTEMS/KU06/BASES/ROOMS/ku06_01_cityscape.ini

@@ -12,7 +12,7 @@ name = Camera_0
 
 [PlayerShipPlacement]
 name = X/Shipcentre/01
-landing_script = Scripts\Bases\bw_02_cityscape_land_01.thn
+landing_script = Scripts\Bases\kyoto_02_cityscape_land_01.thn
 launching_script = Scripts\Bases\bw_02_cityscape_launch_01.thn
 
 [Hotspot]

DATA/UNIVERSE/SYSTEMS/LI01/li01.ini

@@ -10859,23 +10859,23 @@ Archetype = universal_shipping_billboard
 ;rotate = 0, -155, 0
 ;Archetype = westpoint_billboard
 
-[Object]
+; [Object]
-nickname = li01_li06_jumphole
+; nickname = li01_li06_jumphole
-pos = -33270, 0, -28039 
+; pos = -33270, 0, -28039 
-archetype = jumphole
+; archetype = jumphole
-ids_name = 460098
+; ids_name = 460098
-ids_info = 466021
+; ids_info = 466021
-goto = li06, li06_jumphole_entry
+; goto = li06, li06_jumphole_entry
 
-[Zone]
+; [Zone]
-nickname = zone_li01_li06_jumphole
+; nickname = zone_li01_li06_jumphole
-pos = -33270, 0, -28039 
+; pos = -33270, 0, -28039 
-shape = sphere
+; shape = sphere
-size = 2000
+; size = 2000
-property_flags = 131072
+; property_flags = 131072
-visit = 128
+; visit = 128
-sort = 99
+; sort = 99
-goto = li06, li06_jumphole_entry
+; goto = li06, li06_jumphole_entry
 
 [Object]
 nickname = Li01_to_LI06_hole

DATA/UNIVERSE/SYSTEMS/LI02/li02.ini

@@ -6332,267 +6332,6 @@ nickname = ast_ice_broken01
 pos = 0, 0, -50000
 archetype = ast_ice_broken01
 
-[Object]
-nickname = Li02_to_LI06
-ids_name = 458756
-pos = 26705, 0, -54709
-rotate = 0, 140, 0
-archetype = jumpgate
-msg_id_prefix = gcs_refer_system_LI06
-jump_effect = jump_effect_bretonia
-ids_info = 66145
-reputation = li_lsf_grp
-behavior = NOTHING
-difficulty_level = 7
-loadout = jumpgate_br_02
-pilot = pilot_solar_easiest
-goto = LI06, LI06_to_Li02, gate_tunnel_bretonia
-
-[zone]
-nickname = Zone_Li02_to_LI06
-pos = 26706, 0, -54708
-shape = SPHERE
-size = 1000
-property_flags = 131072
-visit = 128
-sort = 0
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_6
-ids_name = 260613
-pos = 25958, 0, -21608
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_5
-reputation = li_p_grp
-tradelane_space_name = 261120
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_5
-ids_name = 260613
-pos = 32314, 0, -25590
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_4
-next_ring = Li02_Trade_Lane_Ring_6
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_4
-ids_name = 260613
-pos = 38670, 0, -29571
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_3
-next_ring = Li02_Trade_Lane_Ring_5
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 4
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hardest
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_3
-ids_name = 260613
-pos = 45026, 0, -33553
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_2
-next_ring = Li02_Trade_Lane_Ring_4
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_2
-ids_name = 260613
-pos = 51381, 0, -37535
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_1
-next_ring = Li02_Trade_Lane_Ring_3
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 4
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hardest
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_1
-ids_name = 260613
-pos = 57737, 0, -41516
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-next_ring = Li02_Trade_Lane_Ring_2
-reputation = li_p_grp
-tradelane_space_name = 261663
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_01
-reputation = li_lsf_grp
-pos = 25270, 0, -23215
-rotate = 0, -2, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-tradelane_space_name = 261120
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-next_ring = Li02_Trade_Lane_Ring_02
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_02
-reputation = li_lsf_grp
-pos = 25680, 0, -33007
-rotate = 0, -2, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-prev_ring = Li02_Trade_Lane_Ring_01
-next_ring = Li02_Trade_Lane_Ring_03
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_03
-reputation = li_lsf_grp
-pos = 26090, 0, -42800
-rotate = 0, -2, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-prev_ring = Li02_Trade_Lane_Ring_02
-next_ring = Li02_Trade_Lane_Ring_04
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_04
-reputation = li_lsf_grp
-pos = 26500, 0, -52593
-rotate = 0, -2, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-tradelane_space_name = 458758
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-prev_ring = Li02_Trade_Lane_Ring_03
-
-[Zone]
-nickname = Zone_Li02_Tradelane_01
-pos = 25885, 0, -37904
-rotate = 0, -2, 0
-shape = BOX
-size = 1598, 1598, 29903
-comment = Tradelane Pop
-property_flags = 196608
-lane_id = 1
-tradelane_down = 35
-sort = 51
-toughness = 4
-density = 3
-repop_time = 25
-max_battle_size = 4
-pop_type = major_tradelane
-relief_time = 35
-faction_weight = li_lsf_grp, 1
-faction_weight = li_p_grp, 1
-faction_weight = co_me_grp, 7
-faction_weight = co_hsp_grp, 7
-faction_weight = co_ni_grp, 7
-faction_weight = co_os_grp, 7
-faction_weight = co_ss_grp, 7
-faction_weight = co_alg_grp, 7
-faction_weight = li_n_grp, 1
-encounter = tradelane_trade_armored, 4, 0.100000
-faction = li_lsf_grp, 0.100000
-faction = li_p_grp, 0.100000
-encounter = tradelane_trade_freighter, 4, 0.400000
-faction = co_me_grp, 0.100000
-faction = co_hsp_grp, 0.100000
-faction = co_ni_grp, 0.400000
-faction = co_os_grp, 0.200000
-faction = co_ss_grp, 0.050000
-faction = co_alg_grp, 0.050000
-encounter = tradelane_trade_transport, 4, 0.400000
-faction = co_me_grp, 0.100000
-encounter = tradelane_armored_prisoner, 4, 0.100000
-faction = li_n_grp, 0.100000
-
-[Zone]
-nickname = Zone_Li02_pop_ambient_01
-pos = 26601, 0, -54646
-rotate = 0, 0, 0
-shape = SPHERE
-size = 2700
-comment = Jumpgate to Nevada
-property_flags = 196608
-sort = 51
-toughness = 2
-density = 10
-repop_time = 10
-max_battle_size = 4
-pop_type = jumpgate
-relief_time = 15
-population_additive = false
-faction_weight = li_n_grp, 5
-faction_weight = li_p_grp, 7
-faction_weight = li_p_grp_prisoners, 4
-faction_weight = co_alg_grp, 10
-faction_weight = co_be_grp, 10
-faction_weight = co_hsp_grp, 10
-faction_weight = co_nws_grp, 10
-faction_weight = co_ni_grp, 10
-faction_weight = co_ss_grp, 10
-faction_weight = co_vr_grp, 8
-density_restriction = 4, unlawfuls
-encounter = area_defend, 2, 0.080000
-faction = li_n_grp, 0.420000
-faction = li_p_grp, 0.580000
-encounter = area_armored_prisoner, 2, 0.020000
-faction = li_p_grp, 1.000000
-encounter = area_trade_freighter, 2, 0.110000
-faction = co_hsp_grp, 0.360000
-faction = co_ss_grp, 0.360000
-faction = co_vr_grp, 0.290000
-encounter = area_trade_transport, 2, 0.130000
-faction = co_alg_grp, 0.150000
-faction = co_be_grp, 0.150000
-faction = co_hsp_grp, 0.150000
-faction = co_nws_grp, 0.150000
-faction = co_ni_grp, 0.150000
-faction = co_ss_grp, 0.150000
-faction = co_vr_grp, 0.120000
-
 [Object]
 nickname = Li02_to_LI06
 ids_name = 450001
@@ -6618,96 +6357,6 @@ property_flags = 131072
 visit = 128
 sort = 0
 
-[Object]
-nickname = Li02_Trade_Lane_Ring_6
-ids_name = 260613
-pos = 25958, 0, -21608
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_5
-reputation = li_p_grp
-tradelane_space_name = 261120
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_5
-ids_name = 260613
-pos = 32314, 0, -25590
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_4
-next_ring = Li02_Trade_Lane_Ring_6
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_4
-ids_name = 260613
-pos = 38670, 0, -29571
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_3
-next_ring = Li02_Trade_Lane_Ring_5
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 4
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hardest
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_3
-ids_name = 260613
-pos = 45026, 0, -33553
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_2
-next_ring = Li02_Trade_Lane_Ring_4
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_2
-ids_name = 260613
-pos = 51381, 0, -37535
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-prev_ring = Li02_Trade_Lane_Ring_1
-next_ring = Li02_Trade_Lane_Ring_3
-reputation = li_p_grp
-behavior = NOTHING
-difficulty_level = 4
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hardest
-
-[Object]
-nickname = Li02_Trade_Lane_Ring_1
-ids_name = 260613
-pos = 57737, 0, -41516
-rotate = 0, 122, 0
-Archetype = Trade_Lane_Ring
-ids_info = 66170
-next_ring = Li02_Trade_Lane_Ring_2
-reputation = li_p_grp
-tradelane_space_name = 261663
-behavior = NOTHING
-difficulty_level = 3
-loadout = trade_lane_ring_li_01
-pilot = pilot_solar_hard
-
 [Object]
 nickname = Li02_Trade_Lane_Ring_01
 reputation = li_lsf_grp
@@ -6761,7 +6410,7 @@ rotate = 0, -2, 0
 archetype = Trade_Lane_Ring
 ids_name = 0
 ids_info = 66170
-tradelane_space_name = 458758
+tradelane_space_name = 450003
 behavior = NOTHING
 difficulty_level = 1
 loadout = trade_lane_ring_br_01
@@ -6775,7 +6424,7 @@ rotate = 0, -2, 0
 shape = BOX
 size = 1598, 1598, 29903
 comment = Tradelane Pop
-property_flags = 196608
+property_flags = 131072
 lane_id = 1
 tradelane_down = 35
 sort = 51
@@ -6789,8 +6438,6 @@ faction_weight = li_lsf_grp, 1
 faction_weight = li_p_grp, 1
 faction_weight = co_me_grp, 7
 faction_weight = co_hsp_grp, 7
-faction_weight = co_ni_grp, 7
-faction_weight = co_os_grp, 7
 faction_weight = co_ss_grp, 7
 faction_weight = co_alg_grp, 7
 faction_weight = li_n_grp, 1
@@ -6800,8 +6447,6 @@ faction = li_p_grp, 0.100000
 encounter = tradelane_trade_freighter, 4, 0.400000
 faction = co_me_grp, 0.100000
 faction = co_hsp_grp, 0.100000
-faction = co_ni_grp, 0.400000
-faction = co_os_grp, 0.200000
 faction = co_ss_grp, 0.050000
 faction = co_alg_grp, 0.050000
 encounter = tradelane_trade_transport, 4, 0.400000
@@ -6816,7 +6461,7 @@ rotate = 0, 0, 0
 shape = SPHERE
 size = 2700
 comment = Jumpgate to Nevada
-property_flags = 196608
+property_flags = 131072
 sort = 51
 toughness = 2
 density = 10
@@ -6853,12 +6498,3 @@ faction = co_nws_grp, 0.150000
 faction = co_ni_grp, 0.150000
 faction = co_ss_grp, 0.150000
 faction = co_vr_grp, 0.120000
-
-[Zone]
-nickname = Zone_Li02_vignette_01_exclusion
-pos = 26601, 0, -54646
-shape = SPHERE
-size = 2880
-property_flags = 131072
-visit = 128
-sort = 99.500000

DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_05_Base.ini

@@ -0,0 +1,11 @@
+[BaseInfo]
+nickname = LI06_05_Base
+start_room = Deck
+
+[Room]
+nickname = bar
+file = Universe\Systems\LI06\Bases\Rooms\LI06_05_bar.ini
+
+[Room]
+nickname = Deck
+file = Universe\Systems\LI06\Bases\Rooms\LI06_05_deck.ini

DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_06_Base.ini

@@ -0,0 +1,11 @@
+[BaseInfo]
+nickname = LI06_06_Base
+start_room = Bar
+
+[Room]
+nickname = Bar
+file = Universe\Systems\LI06\Bases\Rooms\LI06_06_bar.ini
+
+[Room]
+nickname = Deck
+file = Universe\Systems\LI06\Bases\Rooms\LI06_06_deck.ini

DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_07_Base.ini

@@ -0,0 +1,11 @@
+[BaseInfo]
+nickname = LI06_07_Base
+start_room = Deck
+
+[Room]
+nickname = bar
+file = Universe\Systems\LI06\Bases\Rooms\LI06_07_bar.ini
+
+[Room]
+nickname = Deck
+file = Universe\Systems\LI06\Bases\Rooms\LI06_07_deck.ini

DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_bar.ini

@@ -0,0 +1,27 @@
+[Room_Info]
+set_script = Scripts\Bases\Li_09_bar_hardpoint_s020x.thn
+scene = all, ambient, Scripts\Bases\Li_09_bar_ambi_int_s020x.thn
+
+[Room_Sound]
+ambient = ambience_deck_space_smaller
+
+[CharacterPlacement]
+name = Zg/PC/Player/01/A/Stand
+start_script = Scripts\Bases\li_09_bar_enter_01.thn
+
+[Camera]
+name = Camera_0
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar
+
+[Hotspot]
+name = IDS_HOTSPOT_NEWSVENDOR
+behavior = NewsVendor

DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_05_deck.ini

@@ -0,0 +1,23 @@
+[Room_Info]
+set_script = Scripts\Bases\Li_08_Deck_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\Li_08_Deck_ambi_int_01.thn
+animation = Sc_loop
+
+[Room_Sound]
+ambient = ambience_deck_space_smaller
+
+[PlayerShipPlacement]
+name = X/Shipcentre/01
+
+[Camera]
+name = Camera_0
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar

DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_bar.ini

@@ -0,0 +1,29 @@
+[Room_Info]
+set_script = Scripts\Bases\Li_07_bar_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\Li_07_bar_ambi_int_01.thn
+animation = Sc_loop
+
+[Room_Sound]
+music = music_bar_li05
+ambient = ambience_bar_space
+
+[Camera]
+name = Camera_0
+
+[CharacterPlacement]
+name = Zg/PC/Player/01/A/Stand
+start_script = scripts\bases\Li_07_bar_enter_01.thn
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar
+
+[Hotspot]
+name = IDS_HOTSPOT_NEWSVENDOR
+behavior = NewsVendor

DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_deck.ini

@@ -0,0 +1,92 @@
+[Room_Info]
+set_script = Scripts\Bases\Li_07_Deck_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\Li_07_Deck_ambi_int_01.thn
+animation = Sc_loop
+
+[Room_Sound]
+ambient = ambience_deck_space_larger
+
+[PlayerShipPlacement]
+name = X/Shipcentre/01
+
+[Camera]
+name = Camera_0
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar
+
+[FlashlightSet]
+icolor = 0, 155, 255
+scale = 0.250000
+gap = 0.000000
+blink = 0.000000
+endpause = 0.000000
+hardpoint = HpLightA01
+hardpoint = HpLightA02
+hardpoint = HpLightA03
+hardpoint = HpLightA04
+hardpoint = HpLightA05
+hardpoint = HpLightA06
+hardpoint = HpLightA07
+hardpoint = HpLightA08
+hardpoint = HpLightA09
+hardpoint = HpLightA10
+hardpoint = HpLightA11
+hardpoint = HpLightA12
+hardpoint = HpLightA13
+hardpoint = HpLightA14
+hardpoint = HpLightA15
+hardpoint = HpLightA16
+hardpoint = HpLightA17
+hardpoint = HpLightA18
+hardpoint = HpLightA19
+hardpoint = HpLightA20
+hardpoint = HpLightA21
+hardpoint = HpLightA22
+hardpoint = HpLightA23
+hardpoint = HpLightA24
+hardpoint = HpLightA25
+hardpoint = HpLightA26
+hardpoint = HpLightA27
+hardpoint = HpLightA28
+hardpoint = HpLightB21
+hardpoint = HpLightB22
+hardpoint = HpLightB23
+hardpoint = HpLightB24
+hardpoint = HpLightB25
+hardpoint = HpLightB26
+
+[FlashlightSet]
+icolor = 255, 255, 55
+scale = 0.250000
+gap = 0.000000
+blink = 0.050000
+endpause = 0.000000
+numlights = 26
+hardpoint = HpLightB01
+hardpoint = HpLightB02
+hardpoint = HpLightB03
+hardpoint = HpLightB04
+hardpoint = HpLightB05
+hardpoint = HpLightB06
+hardpoint = HpLightB07
+hardpoint = HpLightB08
+hardpoint = HpLightB09
+hardpoint = HpLightB10
+hardpoint = HpLightB11
+hardpoint = HpLightB12
+hardpoint = HpLightB13
+hardpoint = HpLightB14
+hardpoint = HpLightB15
+hardpoint = HpLightB16
+hardpoint = HpLightB17
+hardpoint = HpLightB18
+hardpoint = HpLightB19
+hardpoint = HpLightB20

DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_bar.ini

@@ -0,0 +1,27 @@
+[Room_Info]
+set_script = Scripts\Bases\Li_09_bar_hardpoint_s020x.thn
+scene = all, ambient, Scripts\Bases\Li_09_bar_ambi_int_s020x.thn
+
+[Room_Sound]
+ambient = ambience_deck_space_smaller
+
+[CharacterPlacement]
+name = Zg/PC/Player/01/A/Stand
+start_script = Scripts\Bases\li_09_bar_enter_01.thn
+
+[Camera]
+name = Camera_0
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar
+
+[Hotspot]
+name = IDS_HOTSPOT_NEWSVENDOR
+behavior = NewsVendor

DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_07_deck.ini

@@ -0,0 +1,23 @@
+[Room_Info]
+set_script = Scripts\Bases\Li_08_Deck_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\Li_08_Deck_ambi_int_01.thn
+animation = Sc_loop
+
+[Room_Sound]
+ambient = ambience_deck_space_smaller
+
+[PlayerShipPlacement]
+name = X/Shipcentre/01
+
+[Camera]
+name = Camera_0
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar

DATA/UNIVERSE/universe.ini

@@ -1758,6 +1758,27 @@ strid_name = 0
 file = UNIVERSE\SYSTEMS\LI06\Bases\LI06_04_Base.ini
 BGCS_base_run_by = W02bF33
 
+[Base]
+nickname = LI06_05_Base
+system = LI06
+strid_name = 0
+file = Universe\Systems\LI06\Bases\LI06_05_Base.ini
+BGCS_base_run_by = W02bF33
+
+[Base]
+nickname = LI06_06_Base
+system = LI06
+strid_name = 0
+file = Universe\Systems\LI06\Bases\LI06_06_Base.ini
+BGCS_base_run_by = W02bF33
+
+[Base]
+nickname = LI06_07_Base
+system = LI06
+strid_name = 0
+file = Universe\Systems\LI06\Bases\LI06_07_Base.ini
+BGCS_base_run_by = W02bF33
+
 [system]
 nickname = Li01
 file = Systems\Li01\Li01.ini
@@ -2298,7 +2319,7 @@ pos = 6, 8
 visit = 1
 strid_name = 450000
 ids_info = 66106
-NavMapScale = 2
+NavMapScale = 1.82
 msg_id_prefix = gcs_refer_system_LI06
 
 [system]

DATA/initialworld - server.ini

@@ -1,4 +1,8 @@
 ;@#Group File
+[locked_gates]
+;REM
+locked_gate = 2255762306    ; LI06_to_LI07_hole
+locked_gate = 2452708224    ; LI07_to_LI06_hole
 
 [Group]
 nickname = li_n_grp

DATA/initialworld.ini

@@ -34,6 +34,18 @@ locked_gate = 2578962883	; Rh04_to_Rh02_holeb
 ; Mission 11
 locked_gate = 2444625543	; Li01a_to_Li01b_hole
 locked_gate = 2980035276	; Li01b_to_Li01a_hole
+;REM
+locked_gate = 2255762306    ; LI06_to_LI07_hole
+locked_gate = 2452708224    ; LI07_to_LI06_hole
+locked_gate = 2255205261    ; LI06_to_Li01_hole
+locked_gate = 2880514944    ; Li01_to_LI06_hole
+locked_gate = 2258374277    ; LI06_to_Iw04_hole
+locked_gate = 2242568072    ; Iw04_to_LI06_hole
+locked_gate = 2833956363    ; Li02_to_LI06
+locked_gate = 2826578443    ; LI06_to_Li02
+
+
+
 npc_locked_gate = 3080351366	; Br05_to_br04_hole
 npc_locked_gate = 2749302404	; Br04_to_br05_hole
 npc_locked_gate = 2384076422	; Br03_to_br04_hole

EXE/REM/Lua/DYNAMIC/config.lua

@@ -2,8 +2,8 @@
 
 -- DATE Settings
 
-setglobal('day_gen', "01")
+setglobal('day_gen', "31")
-setglobal('months_gen', "January")
+setglobal('months_gen', "July")
 
 -- DEBUG Settings
 
@@ -12,7 +12,9 @@ setglobal('gcs_state', "off")
 -- CHARACTER Settings
 
 setglobal('char_gen', "trent")
-setglobal('gcs_voice', "trent")
+setglobal('voice_gen', "Trent")
+setglobal('dx_gen', "trent")
+setglobal('body_gen', "MLBODY")
 setglobal('anm_gen', "stand")
 
 -- MISSIONS Settings
@@ -21,8 +23,14 @@ setglobal('manhattan_gen', "origin")
 setglobal('rochester_gen', "origin")
 setglobal('westpoint_gen', "origin")
 setglobal('buffalo_gen', "origin")
+setglobal('kyoto_gen', "origin")
+setglobal('ainu_gen', "origin")
+setglobal('arranmore_gen', "origin")
+setglobal('vogtland_gen', "origin")
+setglobal('newberlin_gen', "origin")
 setglobal('toledo_gen', "origin")
 
+
 -- CAMERA_0 Settings
 
 setglobal('li01_city_posX_gen', "59.65879")
@@ -58,6 +66,30 @@ setglobal('li01_city_farplane_gen', "7000")
 --			farplane = 7000
 -- 			pos = { 59.65879, 56.31464, 97.57275 }
 
+-- Function to create global variables for dx Voice lines
+dxsnd = function(snd_id)
+	local sndvar = "dx_" .. tostring(snd_id) .. "_" .. tostring(dx_gen)
+	setglobal(snd_id, sndvar)
+end
+
+-- Function to create global variables for dx Voice lines
+vdxsnd = function(snd_id)
+	local sndvar = "dx_" .. tostring(snd_id) .. "_" .. tostring(voice_gen)
+	setglobal(snd_id, sndvar)
+end
+
+-- Function to create global variables for VoiceProfile lines
+vpsnd = function(snd_id)
+	local sndvar = "VoiceProfile_$BGCS_" .. tostring(voice_gen) .. "_" .. tostring(snd_id)
+	setglobal(snd_id, sndvar)
+end
+
+-- Function to create global variables for Body lines
+scanm = function(anm_id)
+	local anmvar = "Sc_" .. tostring(body_gen) .. "_" .. tostring(anm_id)
+	setglobal(anm_id, anmvar)
+end
+
 -- This Config File effecting Character Animation References, Planet & Station Enviorments and Mission Cutscenes.
 -- Files in DATA\SCRIPTS GCS, BASES and EXTRAS using these defined globals.
 -- Included with dofile('..\\EXE\\REM\\Lua\\DYNAMIC\\config.lua') in .thn scripts.

EXE/REM/Lua/Infocards.lua

@@ -24,6 +24,7 @@ rem.AddInfoCard(264756, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JU
 rem.AddInfoCard(450000, "Nevada")
 rem.AddInfoCard(450001, "California -> Nevada")
 rem.AddInfoCard(450002, "Nevada -> California")
+rem.AddInfoCard(450003, "Nevada Jump Gate")
 rem.AddInfoCard(450010, "Planet Las Vegas")
 rem.AddInfoCard(450011, "Planet Las Vegas Docking Ring")
 rem.AddInfoCard(450020, "Planet Reno")
@@ -34,12 +35,13 @@ rem.AddInfoCard(450040, "The Ranch")
 rem.AddInfoCard(450045, "Primm Station")
 rem.AddInfoCard(450050, "Mojave Dust Cloud")
 rem.AddInfoCard(450051, "Death Valley Dust Storm")
+rem.AddInfoCard(450055, "Paradise Valley Station")
+rem.AddInfoCard(450060, "Battleship Henderson")
 rem.AddInfoCard(460000, "Nevada Jump Hole")
 rem.AddInfoCard(460098, "Nevada Jump Hole")
 rem.AddInfoCard(460099, "Cascadia Jump Hole")
 rem.AddInfoCard(460100, "Cascadia")
 
-
 -- Mission Infocards
 
 -- Story Introducing
@@ -85,8 +87,8 @@ rem.AddInfoCard(458793, "Transport Water to California Minor")
 -- Story Arc - Inner Coruption (Buffalo Station - Li01_12_Base)
 
 rem.AddInfoCard(459000, "Story Arc - Inner Coruption")
-rem.AddInfoCard(459001,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>After my arrival on Buffalo Station, I met a female artificial intelligence unit linked with an underground news channel called the Rebus. Revealing the truth about Liberty's intention, it's inner corruption and the lie to cover-up of the impacts of the nomad incident.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Through the complex security communication structure of the Rebus, independent freelancers are always required to gain information data. Getting these documents will certainly have an impact to the further political events and the revelation of Liberty's political agendas.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Destroy Liberty's Black Op Strike Force</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(459001,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>After my arrival on Buffalo Station, I met a female artificial intelligence unit linked with an underground news channel called the Rebus. Revealing the truth about Liberty's intention, it's inner corruption and the lie to cover-up of the impacts of the nomad incident.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Through the complex security communication structure of the Rebus, independent freelancers are always required to gain information data. Getting these documents will certainly have an impact to the further political events and the revelation of Liberty's political agendas.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Obtain the latest emergency action documents from Liberty</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
-rem.AddInfoCard(459002, "Obtain the latest emergency action documents from Liberty")
+rem.AddInfoCard(459002, "Obtain the emergency action documents")
 rem.AddInfoCard(459003, "Fly to Sector D5")
 
 -- Mission Text Introducing 
@@ -95,7 +97,7 @@ rem.AddInfoCard(459009, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JU
 -- Story Arc - Subversive Operation (Buffalo Station - Li01_12_Base)
 
 rem.AddInfoCard(459010, "Story Arc - Subversive Operation")
-rem.AddInfoCard(459011,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>President Jacobi's political power fades away. She is loosing more and more control to the authorities in Liberty. She will not be able to hold on her power for much longer, if she continues to weaken.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Although she does not clearly represent our ideals, President Jacobi was the only hope for a peaceful solution to our conflict with the colonies. That's why we have to launch an attack, the authorities of Liberty won't recover so quickly from this blow. The undercover strike force usually hides in the Detroit Debris Field.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Destroy Liberty's Black Op Strike Force</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(459011,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>President Jacobi's political power fades away. She is loosing more and more control to the authorities in Liberty. She will not be able to hold on her power for much longer, if she continues to weaken.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Although she does not clearly represent our ideals, President Jacobi was the only hope for a peaceful solution to our conflict with the colonies. That's why we have to launch an attack, the authorities of Liberty won't recover so quickly from this blow. The undercover strike force usually hides in the Detroit Debris Field.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Destroy Liberty's Black Op Strike Force</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
 rem.AddInfoCard(459012, "Destroy Liberty's Black Op Strike Force")
 rem.AddInfoCard(459013, "Fly to Sector C5")
 
@@ -109,19 +111,40 @@ rem.AddInfoCard(459023, "Fly to Sector B2")
 -- Story Arc - Shattered Empire (Kyoto Base - Ku06_01_base)
 
 rem.AddInfoCard(471100, "Story Arc - Shattered Empire")
-rem.AddInfoCard(471101,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>The Blood Dragons prepare for the next strike against the Edo Shogunate. But before this can happen, a rumor must be investigated.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>There's an information about a special seven-year-old Kyushu girl that will impact Kusari's future at once. The Rebus pleased you to meet a contact who knows more about the current state.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Meet a Kusari Priest at Planet New Tokyo</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(471101,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>The Blood Dragons prepare for the next strike against the Edo Shogunate. But before this can happen, a rumor must be investigated.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>There's an information about a special seven-year-old Kyushu girl that will impact Kusari's future at once. The Rebus pleased you to meet a contact who knows more about the current state.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Meet a Kusari Priest at Ainu Depot</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
 rem.AddInfoCard(471102, "Meet the Kusari Priest")
-rem.AddInfoCard(471103, "Fly to Planet New Tokyo")
+rem.AddInfoCard(471103, "Fly to Ainu Depot")
-rem.AddInfoCard(471104,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>My Contact was a Kusari Priest who told me a lot about the history of Kusari. The young Emperor's decisions are increasingly influenced by the Edo Shogunate. Thus, his power is becoming more and more insignificant and the turmoil caused by the betrayal of Samura and the Edo Shogunate are steady increasing.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>There's also a new hope, a young girl was brought from the Golden Chrysanthemums to a place of safety among his priesthood in the Tohoku system. She is a descendant of Shogun Hideyoshi, the legitimate heir and the true lord. While nobody knows the exact position of her location and even her existence is not very common, the Rebus knows the Golden Chrysanthemums teached her everything she needs to know to run the country. We need an evidence she is the real descendant of Shogun Hideyoshi so we can influence Kusari's further history. If she is the so-called Hideyoshi descendant then she will fill the power vacuum, once the Edo Shogunate has fallen.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Since we have a good relationship with Golden Chrysanthemums, we will visit Ainu Depot in the Hokkaido system and request a copy of her genealogical certificate.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Procure the genealogical certificate</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(471104,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>My Contact was a Kusari Priest who told me a lot about the history of Kusari. The young Emperor's decisions are increasingly influenced by the Edo Shogunate. Thus, his power is becoming more and more insignificant and the turmoil caused by the betrayal of Samura and the Edo Shogunate are steady increasing.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>There's also a new hope, a young girl was brought from the Golden Chrysanthemums to a place of safety among his priesthood in the Tohoku system. She is a descendant of Shogun Hideyoshi, the legitimate heir and the true lord. While nobody knows the exact position of her location and even her existence is not very common, the Rebus knows the Golden Chrysanthemums teached her everything she needs to know to run the country. The Kusari Priest provided me with evidence that she is the true descendant of Shogun Hideyoshi. If she is the so-called Hideyoshi descendant then she will fill the power vacuum, once the Edo Shogunate has fallen.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Since we have a good relationship with Golden Chrysanthemums, he gave me a copy of her genealogical certificate.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Deliver the genealogical certificate</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
-rem.AddInfoCard(471105, "Procure the genealogical certificate")
+rem.AddInfoCard(471105, "Deliver the informations to the Rebus")
-rem.AddInfoCard(471106, "Fly to Ainu Depot")
+rem.AddInfoCard(471106, "Fly to Kyoto Base")
-rem.AddInfoCard(471107,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>Fortunately, I was able to convince the Golden Chrysanthemums to hand over the data I was looking for. They were somewhat skeptical about revealing such a sensitive information, but they sympathize with the Rebus network.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>I am very curious to see whether this will lead to an agreement between the different Kusari factions or whether it will only exacerbate the situation. Furthermore, I am wonder about the Rebus' motives.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Now, that I have everything what I need, I have to bring back the copy to Kyoto Base.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Procure the genealogical certificate</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(471107,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>Fortunately, I was able to convince the Kusari Priest to hand over a copy of her genealogical certificate and deliver to the Rebus.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>I am very curious to see whether this will lead to an agreement between the different Kusari factions or whether it will only exacerbate the situation. Furthermore, I am wonder about the Rebus' motives.</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
-rem.AddInfoCard(471108, "Bring the informations to the Rebus")
+
-rem.AddInfoCard(471109, "Fly to Kyoto Base")
+rem.AddInfoCard(471100, "Story Arc - Retribution")
+rem.AddInfoCard(471111,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>The Rebus received informations about an heavy assault against Samura. The Blood Dragons and the Golden Chrysanthemums have started an ambush in Kyushu near the Tsushima Depot.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>We assume that the Hogosha going to support Samura Industries, as soon as the attack begins.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Destroy all Hogosha and Samura Industries Vessels.</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(471112, "Join the convoy assault")
+rem.AddInfoCard(471113, "Fly to Kyushu")
+rem.AddInfoCard(471114,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>The Blood Dragons and the Golden Chrysanthemums have accomplished their ambush. This will be a hard hit to Samura and the Hogosha.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>No doubt, the Shogunate's heir will soon meet his end, and he will pay for his betrayal.</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
 
 -- Mission Text Introducing 
 rem.AddInfoCard(459110, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>I received a cryptic message from an unknown contact for a rendezvous on Kyoto Base in the Chugoku System. The message contains also the specific location data for the meeting.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>There could be a trap, but at least I should risk a look.</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
 
+-- Story Arc - The Sabotage (Vogtland Base - Rh05_04_base)
+
+rem.AddInfoCard(471200, "Story Arc - Dangerous Enigma")
+rem.AddInfoCard(471201,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>The Rebus reports that a serious schockwave was registered coming out of the Aachenfeld.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><TEXT>Later, despite Rheinland's denials, they finally admitted that one of their cruisers was indeed destroyed - apparently the work of saboteurs.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Once again Rheinland has blamed the Bundschuh for the destruction. Meet the contacts on Planet on New Berlin to obatin the exact coordinates and investigate the wreckage. </TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Meet a Contact on New Berlin</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(471202, "Meet the agents on New Berlin")
+rem.AddInfoCard(471203, "Fly to New Berlin")
+rem.AddInfoCard(471204,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>Once again, Jonner and Blix crossed my way. They are working for the Rebus and uploaded the coordinates of the wreckage to my Neural Net.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><TEXT>Jonner mentonied that an old friend has been appeared. Once the time has come, I will get more informations about Von Claussen.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><TEXT>Objectives:</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Inverstigate the wreckage.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>- Loot and transmit the black box to Vogtland.</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+rem.AddInfoCard(471205, "Inverstigate the wreckage")
+rem.AddInfoCard(471206, "Fly to F3")
+rem.AddInfoCard(471207,  [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="left"/><TEXT>I investigated the wreckage and delivered the cruiser's black box to Vogtland.</TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT></TEXT><PARA/><JUST loc="left"/><JUST loc="left"/><TEXT>Now, the Rebus will evaluate the black box data to get the informations they are looking for.</TEXT><PARA/><JUST loc="left"/><POP/></RDL>]])
+
+-- Story Arc - Rheinland Assault (Vogtland Base - Rh05_04_base)
+
+rem.AddInfoCard(471210, "Story Arc - Rheinland Assault")
+
+
+
 rem.AddInfoCard(480000, "Mission Result: Success")
 
 -- Story Arc - Tutorial Liberty (Planet Manhattan - Li01_01_Base)
@@ -217,3 +240,58 @@ rem.AddInfoCard(524296, [[<RDL><PUSH/><TEXT> </TEXT><PARA/><TEXT> </TEXT><PARA/>
 -- Jack O'Latern
 rem.AddInfoCard(50021, "Jack O'Latern Event")
 rem.AddInfoCard(50022, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="center"/><TRA data="1" mask="-31" def="-2"/><TEXT>EVENT: </TEXT><TRA data="65281" mask="-31" def="30"/><TEXT>Jack O'Latern</TEXT><PARA/><JUST loc="left"/><TRA data="96" mask="-31" def="-1"/><PARA/><TEXT>Spooky season has arrived in space with the Jack O'Lantern Event! For a limited time, every Kill and Trade Mission will earn you a pumpkin. Collect as many pumpkins as possible and store them in your depot. The player with the most pumpkins at the end of the event will be crowned the Jack O'Lantern Champion and earn exclusive rewards!</TEXT><PARA/><POP/></RDL>]])
+
+-- Emergency Action Documents (Liberty)
+rem.AddInfoCard(290000, "Emergency Action Documents")
+rem.AddInfoCard(290001, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Emergency Action Documents</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>These Documents provide a legal framework for necessary actions—such as asset control, operational interventions, and security measures—to protect Liberty's citizens and preserve stability during crises.</TEXT><PARA/><POP/></RDL>]])
+
+-- Fragment Data (Liberty)
+rem.AddInfoCard(290010, "Fragment Data (Liberty)")
+rem.AddInfoCard(290011, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Fragment Data (Liberty)</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>This Data Fragment is a crucial piece of collected location information about the Rebus. Combine all Data Fragments together will reveal the secret location of the Rebus.</TEXT><PARA/><POP/></RDL>]])
+
+-- Genealogical Certificate
+rem.AddInfoCard(290100, "Genealogical Certificate")
+rem.AddInfoCard(290101, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Genealogical Certificate</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A Genealogical Certificate is an official document that traces an individual's family history and lineage. It provides detailed information about ancestors, including names, birth and death dates, marriage records, and familial relationships. Often used for legal, heritage, or cultural purposes, this certificate helps verify family connections and preserve historical records. I</TEXT><PARA/><POP/></RDL>]])
+
+-- Fragment Data (Kusari)
+rem.AddInfoCard(290110, "Fragment Data (Kusari)")
+rem.AddInfoCard(290111, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Fragment Data (Kusari)</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>This Data Fragment is a crucial piece of collected location information about the Rebus. Combine all Data Fragments together will reveal the secret location of the Rebus.</TEXT><PARA/><POP/></RDL>]])
+
+-- Rheinland Military Black Box (Mission item)
+rem.AddInfoCard(290200, "Rheinland Military Black Box")
+rem.AddInfoCard(290201, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Rheinland Military Black Box</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>The Rheinland Military Black Box is a critical piece of recovered equipment, encased in a durable, blackened shell designed to withstand extreme conditions. It contains vital data and recordings from military operations, offering valuable insights into recent missions and tactical information. Its presence is a key indicator of recent conflict or vessel activity within the area. Handle with care, as the data it holds could be crucial for intelligence and strategic analysis.</TEXT><PARA/><POP/></RDL>]])
+
+-- Fragment Data (Rheinland)
+rem.AddInfoCard(290210, "Fragment Data (Rheinland)")
+rem.AddInfoCard(290211, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Fragment Data (Rheinland)</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>This Data Fragment is a crucial piece of collected location information about the Rebus. Combine all Data Fragments together will reveal the secret location of the Rebus.</TEXT><PARA/><POP/></RDL>]])
+
+-- Fragment Data (Bretonia)
+rem.AddInfoCard(290310, "Fragment Data (Bretonia)")
+rem.AddInfoCard(290311, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Fragment Data (Bretonia)</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>This Data Fragment is a crucial piece of collected location information about the Rebus. Combine all Data Fragments together will reveal the secret location of the Rebus.</TEXT><PARA/><POP/></RDL>]])
+
+-- Infocards Solars
+
+-- Pirate Transmitter
+rem.AddInfoCard(300000, "Pirate Transmitter")
+rem.AddInfoCard(300001, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><TEXT>Equipped with advanced encryption and stealth protocols, the Pirate Transmitter can hijack legitimate signals that all echo the scrambled signal from one ship - The Rebus.</TEXT><PARA/><POP/></RDL>]])
+
+rem.AddInfoCard(300100, "Rheinland Cruiser Wreckage")
+rem.AddInfoCard(300101, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><TEXT>Lootable debris from a Rheinland cruiser, with some pieces containing essential items, making it worth the effort to scavenge. Proceed with caution, as the environment may still pose risks.</TEXT><PARA/><POP/></RDL>]])
+
+
+-- REM NEWS
+
+-- Manhattan News
+
+rem.AddInfoCard(250000, "Liberty Restricts Information Access")
+rem.AddInfoCard(250001, "Government sources report that President Jacobi has ordered new measures against the misinformation campaign conducted by certain pirate factions. Some military officials critize her ineffective response and arrogate for more decisive actions.")
+
+-- Westpoint News
+
+rem.AddInfoCard(250100, "In Memorian to Marcus Walker")
+rem.AddInfoCard(250101, "We would like to extend our farewell to a former staff member of our academy: Marcus Walker - a navy Captain and leader of the former Liberty Attack Group South. He died in a battle against the enemies of the state with dignity, upheld by his idealistic convictions and the loyalty to his region.")
+
+-- New Berlin News
+
+rem.AddInfoCard(251000, "Terror Action against Rheinland")
+rem.AddInfoCard(251001, "Rheinland confirmed that one of their Cruisers was destroyed in the Aachenfeld. The Rheinland authorities suspect the terror-group The Bundschuh to be responsible for the destruction.")

EXE/REM/Lua/LuaMissions.lua

@@ -4,6 +4,122 @@
 -- Triggers: InitState (on mission start), BaseEnter (on docking), SpaceEnter (on launch)
 -- Triggers change the config.lua
 
+-- Tutorial Mission ===
+--rem.mission.arc("Tutorial Liberty")
+rem.mission.create("tutorial") 					            -- Set mission name
+rem.mission.missiontype("flyto")                            -- Set mission type to PVE
+rem.mission.flyto_targetbase("Li01_10_Base")           -- Target base (mission completes when docking here and confirming popup)
+rem.mission.trigger("InitState")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
+rem.mission.startbase("Li01_01_Base") 					    -- Set mission startbase
+rem.mission.thnconfig("manhattan_gen", "arc_tutorial") 		    -- Set THN location and name
+rem.mission.thntime(32)                 				    -- Set THN duration to x seconds
+rem.mission.showpopup(475001, 475002)   				    -- Set infocard IDs for caption and content
+rem.mission.missionmessage("popup", 475003)				    -- Show Mission Message after Popup
+rem.mission.missionmessage("launch", 475004) 			    -- Show Mission Message after launch
+rem.mission.trigger("SpaceEnter")                      -- Trigger: Activates when docking at target base
+rem.mission.thnsave()									    -- Save the thn config
+rem.mission.save()                       				    -- Finalize and save mission to the list
+
+-- Create and configure the first mission
+-- rem.mission.arc("StoryArc1")
+rem.mission.create("rebus_liberty2")                                -- Set mission name
+rem.mission.missiontype("pve")                              -- Set mission type to PVE
+rem.mission.trigger("InitState")                            -- Trigger to setup thnconfig
+rem.mission.startbase("Li01_12_base")                       -- Set mission startbase
+rem.mission.pve_enemyfaction("li_p_grp")                    -- Set Enemy Faction to Xenos
+rem.mission.pve_enemycount(4)                               -- 4 enemies per wave
+rem.mission.pve_wavecount(2)                                -- 2 waves
+rem.mission.pve_spawnmethod("fixed")                        -- NPC spawn Method set to fixed Location
+rem.mission.pve_spawnpos(-50000, 0, 5000)                 -- NPC Spawn Position
+rem.mission.thnconfig("buffalo_gen", "arc_rebus3")          -- Set THN location and name
+rem.mission.thntime(57)                                     -- Set THN duration to 57 seconds
+rem.mission.showpopup(459010, 459011)                       -- Set infocard IDs for caption and content
+rem.mission.missionmessage("popup", 459012)			    	-- Show Mission Message after Popup
+rem.mission.missionmessage("launch", 459013) 
+rem.mission.thnsave()
+--rem.mission.trigger("SpaceEnter")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
+--rem.mission.thnconfig("buffalo_gen", "arc_rebus4")          -- Set THN location and name
+--rem.mission.thntime(20)                                     -- Set THN duration to 20 seconds
+--rem.mission.thnsave()
+rem.mission.save()
+
+-- === Rheinland Rebus Story Arc Mission 1 ===
+-- rem.mission.arc("StoryArc5") 
+rem.mission.create("rebus_rheinland1")                        -- Set mission name
+rem.mission.missiontype("flyto")                       -- Set mission type (pve, trade, flyto)
+rem.mission.flyto_targetbase("Rh01_01_Base")           -- Target base (mission completes when docking here and confirming popup)
+rem.mission.trigger("InitState")                       -- Trigger: Starts immediately on mission acceptance
+rem.mission.startbase("Rh05_04_Base")                  -- Starting base for THN
+rem.mission.thnconfig("vogtland_gen", "arc_rebus1")     -- THN location and name
+rem.mission.thntime(67)                                -- THN duration in seconds
+rem.mission.showpopup(471200, 471201)                  -- Infocard IDs for caption and content
+rem.mission.missionmessage("popup", 471202)            -- Message shown after popup
+rem.mission.missionmessage("launch", 471203)           -- Message shown after launch
+rem.mission.thnsave()                                  -- Save THN configuration
+-- Optional: Second THN entity for SpaceEnter at target base
+rem.mission.trigger("SpaceEnter")                      -- Trigger: Activates when docking at target base
+rem.mission.startbase("Rh01_01_Base")                  -- Target base for THN
+rem.mission.thnconfig("newberlin_gen", "arc_rebus1") -- THN location and name
+rem.mission.thntime(46)                                -- THN duration in seconds
+rem.mission.showpopup(471200, 471204)                  -- Infocard IDs for caption and content
+rem.mission.missionmessage("popup", 471205)            -- Message shown after popup
+rem.mission.missionmessage("launch", 471206) 
+rem.mission.thnsave()                                  -- Save THN configuration
+rem.mission.save()
+
+-- Create and configure the first mission
+-- rem.mission.arc("StoryArc5")
+rem.mission.create("rebus_rheinland2")                                -- Set mission name
+rem.mission.missiontype("pve")                              -- Set mission type to PVE
+rem.mission.trigger("InitState")                            -- Trigger to setup thnconfig
+rem.mission.startbase("Rh05_04_Base")                       -- Set mission startbase
+rem.mission.pve_enemyfaction("rh_p_grp")                    -- Set Enemy Faction to Xenos
+rem.mission.pve_enemycount(4)                               -- 4 enemies per wave
+rem.mission.pve_wavecount(2)                                -- 2 waves
+rem.mission.pve_spawnmethod("fixed")                        -- NPC spawn Method set to fixed Location
+rem.mission.pve_spawnpos(-8877, 0, -24804)                 -- NPC Spawn Position
+rem.mission.thnconfig("vogtland_gen", "arc_rebus3")          -- Set THN location and name
+rem.mission.thntime(57)                                     -- Set THN duration to 57 seconds
+rem.mission.showpopup(471210, 471211)                       -- Set infocard IDs for caption and content
+rem.mission.missionmessage("popup", 471212)			    	-- Show Mission Message after Popup
+rem.mission.missionmessage("launch", 471213) 
+rem.mission.thnsave()
+--rem.mission.trigger("SpaceEnter")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
+--rem.mission.thnconfig("vogtland_gen", "arc_rebus4")          -- Set THN location and name
+--rem.mission.thntime(20)                                     -- Set THN duration to 20 seconds
+--rem.mission.thnsave()
+rem.mission.save()
+
+-- Create and configure the first mission
+-- rem.mission.arc("StoryArc3") 
+rem.mission.create("rebus_kusari1")                                -- Set mission name
+rem.mission.missiontype("flyto")                              -- Set mission type to FlyTo
+rem.mission.flyto_targetbase("Ku05_02_Base")           -- Target base (mission completes when docking here and confirming popup)
+rem.mission.trigger("InitState")                            -- Trigger to setup thnconfig
+rem.mission.startbase("Ku06_01_base")                       -- Set mission startbase
+rem.mission.thnconfig("kyoto_gen", "arc_rebus1")          -- Set THN location and name
+rem.mission.thntime(63)                                     -- Set THN duration to 59 seconds
+rem.mission.showpopup(471100, 471101)                       -- Set infocard IDs for caption and content
+rem.mission.missionmessage("popup", 471102)			    	-- Show Mission Message after Popup
+rem.mission.missionmessage("launch", 471103) 
+rem.mission.thnsave()
+-- Optional: Second THN entity for SpaceEnter at target base
+rem.mission.trigger("SpaceEnter")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
+rem.mission.startbase("ku05_02_base")                       -- Set mission startbase
+rem.mission.thnconfig("ainu_gen", "arc_rebus1")          -- Set THN location and name
+rem.mission.thntime(120)
+rem.mission.showpopup(471100, 471104)                       -- Set infocard IDs for caption and content
+rem.mission.missionmessage("popup", 471105)			    	-- Show Mission Message after Popup
+rem.mission.missionmessage("launch", 471106)
+rem.mission.thnsave()									    -- Save the thn config
+-- rem.mission.startbase("ku05_02_base")                       -- Set mission startbase
+-- rem.mission.thnconfig("kyoto_gen", "arc_rebus2")          -- Set THN location and name
+-- rem.mission.thntime(13)                                     -- Set THN duration to 44 seconds
+-- rem.mission.showpopup(471100, 471107)                       -- Set infocard IDs for caption and content
+-- rem.mission.missionmessage("popup", 480000)			    	-- Show Mission Message after Popup
+-- rem.mission.thnsave()									    -- Save the thn config
+rem.mission.save()
+
 -- === PVE Mission ===
 rem.mission.create("XenoHunt")                          -- Set mission name
 rem.mission.missiontype("pve")                         -- Set mission type (pve, trade, flyto)
@@ -62,6 +178,7 @@ rem.mission.thnsave()                                  -- Save THN configuration
 rem.mission.save()                                     -- Finalize and save mission
 
 -- Create and configure the mission
+rem.mission.arc("StoryArc2")
 rem.mission.create("reunion") 					            -- Set mission name
 rem.mission.missiontype("pve")                              -- Set mission type to PVE
 rem.mission.trigger("InitState")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
@@ -88,6 +205,7 @@ rem.mission.thnsave()									    -- Save the thn config
 rem.mission.save()                       				    -- Finalize and save mission to the list
 
 -- Create and configure the first mission
+rem.mission.arc("StoryArc2")
 rem.mission.create("duty")                                  -- Set mission name
 rem.mission.missiontype("pve")                              -- Set mission type to PVE
 rem.mission.trigger("InitState")                            -- Trigger to setup thnconfig
@@ -108,13 +226,14 @@ rem.mission.startbase("Li01_13_Base") 					    -- Set mission startbase
 rem.mission.thnconfig("rochester_gen", "arc_harrison")	    -- Set THN location and name
 rem.mission.thntime(43)                                     -- Set THN duration to 44 seconds
 rem.mission.showpopup(458760, 458766)                       -- Set infocard IDs for caption and content
-rem.mission.missionmessage("popup", 465000)			    	-- Show Mission Message after Popup
+rem.mission.missionmessage("popup", 480000)			    	-- Show Mission Message after Popup
 rem.mission.thnsave()									    -- Save the thn config
 rem.mission.save()
 
 -- Create and configure the first mission
-rem.mission.create("rebus1")                                -- Set mission name
+rem.mission.arc("StoryArc1") 
-rem.mission.missiontype("pve")                              -- Set mission type to PVE
+rem.mission.create("rebus_liberty1")                                -- Set mission name
+rem.mission.missiontype("flyto")                              -- Set mission type to PVE
 rem.mission.trigger("InitState")                            -- Trigger to setup thnconfig
 rem.mission.startbase("Li01_12_base")                       -- Set mission startbase
 rem.mission.thnconfig("buffalo_gen", "arc_rebus1")          -- Set THN location and name
@@ -125,50 +244,16 @@ rem.mission.missionmessage("launch", 459003)
 rem.mission.thnsave()
 rem.mission.trigger("SpaceEnter")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
 rem.mission.startbase("Li01_12_Base") 					    -- Set mission startbase
-rem.mission.thnconfig("rochester_gen", "arc_rebus2")	    -- Set THN location and name
+rem.mission.thnconfig("buffalo_gen", "arc_rebus2")	    -- Set THN location and name
 rem.mission.thntime(43)                                     -- Set THN duration to 44 seconds
 rem.mission.showpopup(459000, 459004)                       -- Set infocard IDs for caption and content
-rem.mission.missionmessage("popup", 465000)			    	-- Show Mission Message after Popup
+rem.mission.missionmessage("popup", 480000)			    	-- Show Mission Message after Popup
-rem.mission.thnsave()									    -- Save the thn config
-rem.mission.save()
-
--- Create and configure the first mission
-rem.mission.create("rebus2")                                -- Set mission name
-rem.mission.missiontype("flyto")                              -- Set mission type to PVE
-rem.mission.trigger("InitState")                            -- Trigger to setup thnconfig
-rem.mission.startbase("Ku06_01_base")                       -- Set mission startbase
-rem.mission.thnconfig("kyoto_gen", "arc_rebus3")          -- Set THN location and name
-rem.mission.thntime(61)                                     -- Set THN duration to 59 seconds
-rem.mission.showpopup(459100, 459101)                       -- Set infocard IDs for caption and content
-rem.mission.missionmessage("popup", 459102)			    	-- Show Mission Message after Popup
-rem.mission.missionmessage("launch", 459103) 
-rem.mission.thnsave()
-rem.mission.trigger("SpaceEnter")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
-rem.mission.startbase("Ku01_01_base") 					    -- Set mission startbase
-rem.mission.thnconfig("tokyo_gen", "arc_rebus3")	    -- Set THN location and name
-rem.mission.thntime(43)                                     -- Set THN duration to 44 seconds
-rem.mission.showpopup(459100, 459104)                       -- Set infocard IDs for caption and content
-rem.mission.missionmessage("popup", 459105)			    	-- Show Mission Message after Popup
-rem.mission.missionmessage("launch", 459106)
-rem.mission.thnsave()
-rem.mission.trigger("SpaceEnter")						    -- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
-rem.mission.startbase("ku05_02_base")                       -- Set mission startbase
-rem.mission.thnconfig("ainu_gen", "arc_rebus3")          -- Set THN location and name
-rem.mission.thntime(43)
-rem.mission.showpopup(459100, 459107)                       -- Set infocard IDs for caption and content
-rem.mission.missionmessage("popup", 459108)			    	-- Show Mission Message after Popup
-rem.mission.missionmessage("launch", 459109)
-rem.mission.thnsave()									    -- Save the thn config
-rem.mission.startbase("Ku06_01_base")                       -- Set mission startbase
-rem.mission.thnconfig("kyoto_gen", "arc_rebus3")          -- Set THN location and name
-rem.mission.thntime(43)                                     -- Set THN duration to 44 seconds
-rem.mission.showpopup(459100, 459110)                       -- Set infocard IDs for caption and content
-rem.mission.missionmessage("popup", 465000)			    	-- Show Mission Message after Popup
 rem.mission.thnsave()									    -- Save the thn config
 rem.mission.save()
 
 
 -- Create and configure the first mission
+rem.mission.arc("StoryArc20")
 rem.mission.create("relics")                            -- Set mission name
 rem.mission.trigger("InitState")                        -- Trigger to setup thnconfig
 rem.mission.startbase("St01_01_base")                   -- Set mission startbase
@@ -181,5 +266,5 @@ rem.mission.thnsave()									-- Save the thn config
 rem.mission.trigger("SpaceEnter")						-- Trigger to setup thnconfig (InitState, BaseEnter, SpaceEnter)
 rem.mission.startbase("St01_01_base")                   -- Set mission startbase
 rem.mission.showpopup(458780, 458788)                   -- Set infocard IDs for caption and content
-rem.mission.missionmessage("popup", 465000)			    -- Show Mission Message after Popup
+rem.mission.missionmessage("popup", 480000)			    -- Show Mission Message after Popup
 rem.mission.save()

EXE/REM/Lua/luastart.lua

@@ -54,9 +54,17 @@ function modifyLuaConfig(filePath)
         elseif line:find("setglobal%('char_gen',") then
             lines[i] = "setglobal('char_gen', \"trent\")"
 			
-        -- Change gcs_voice to "trent"
+        -- Change voice_gen to "Trent"
-        elseif line:find("setglobal%('gcs_voice',") then
+        elseif line:find("setglobal%('voice_gen',") then
-            lines[i] = "setglobal('gcs_voice', \"trent\")"
+            lines[i] = "setglobal('voice_gen', \"Trent\")"
+			
+        -- Change dx_gen to "trent"
+        elseif line:find("setglobal%('dx_gen',") then
+            lines[i] = "setglobal('dx_gen', \"trent\")"
+			
+        -- Change body_gen to "MLBODY"
+        elseif line:find("setglobal%('body_gen',") then
+            lines[i] = "setglobal('body_gen', \"MLBODY\")"
 			
         -- Change anm_gen to "stand"
         elseif line:find("setglobal%('anm_gen',") then
@@ -72,6 +80,16 @@ function modifyLuaConfig(filePath)
             lines[i] = "setglobal('westpoint_gen', \"origin\")"
 		elseif line:find("setglobal%('buffalo_gen',") then
             lines[i] = "setglobal('buffalo_gen', \"origin\")"
+		elseif line:find("setglobal%('kyoto_gen',") then
+            lines[i] = "setglobal('kyoto_gen', \"origin\")"
+		elseif line:find("setglobal%('ainu_gen',") then
+            lines[i] = "setglobal('ainu_gen', \"origin\")"
+		elseif line:find("setglobal%('arranmore_gen',") then
+            lines[i] = "setglobal('arranmore_gen', \"origin\")"
+		elseif line:find("setglobal%('vogtland_gen',") then
+            lines[i] = "setglobal('vogtland_gen', \"origin\")"
+		elseif line:find("setglobal%('newberlin_gen',") then
+            lines[i] = "setglobal('newberlin_gen', \"origin\")"
         elseif line:find("setglobal%('toledo_gen',") then
             lines[i] = "setglobal('toledo_gen', \"origin\")"
 			

EXE/ReShade.ini

@@ -1,4 +1,4 @@
-[APP]
+[APP]
 Force10BitFormat=0
 ForceFullscreen=0
 ForceResolution=0,0
@@ -7,7 +7,6 @@ ForceWindowed=0
 
 [GENERAL]
 EffectSearchPaths=.\reshade-shaders\Shaders,.\reshade-shaders\Shaders
-IntermediateCachePath=C:\Users\Steve\AppData\Local\Temp\ReShade
 NoDebugInfo=0
 NoEffectCache=0
 NoReloadOnInit=0
@@ -15,19 +14,14 @@ NoReloadOnInitForNonVR=0
 PerformanceMode=0
 PreprocessorDefinitions=RESHADE_DEPTH_LINEARIZATION_FAR_PLANE=1000.0,RESHADE_DEPTH_INPUT_IS_UPSIDE_DOWN=0,RESHADE_DEPTH_INPUT_IS_REVERSED=0,RESHADE_DEPTH_INPUT_IS_LOGARITHMIC=0
 PresetPath=.\ReShadePreset.ini
-PresetShortcutKeys=
-PresetShortcutPaths=
 PresetTransitionDuration=1000
 SkipLoadingDisabledEffects=0
-StartupPresetPath=
 TextureSearchPaths=.\reshade-shaders\Textures,.\reshade-shaders\Textures
 
 [INPUT]
 ForceShortcutModifiers=1
 InputProcessing=2
 KeyEffects=0,0,0,0
-KeyFPS=0,0,0,0
-KeyFrametime=0,0,0,0
 KeyNextPreset=0,0,0,0
 KeyOverlay=36,0,0,0
 KeyPerformanceMode=0,0,0,0
@@ -38,39 +32,31 @@ KeyScreenshot=44,0,0,0
 [OVERLAY]
 AutoSavePreset=1
 ClockFormat=0
-Docking=[Docking][Data]
 FPSPosition=1
-Language=
 NoFontScaling=0
 SaveWindowState=0
 ShowClock=0
 ShowForceLoadEffectsButton=1
 ShowFPS=0
 ShowFrameTime=0
-ShowPresetName=0
-ShowPresetTransitionMessage=1
 ShowScreenshotMessage=1
 TutorialProgress=2
 VariableListHeight=300.000000
 VariableListUseTabs=0
-Window=[Window][Debug##Default],Pos=60,,60,Size=400,,400,Collapsed=0
 
 [SCREENSHOT]
 ClearAlpha=1
 FileFormat=1
 FileNaming=%AppName% %Date% %Time%
-HDRBitDepth=11
 JPEGQuality=100
 PostSaveCommand=
 PostSaveCommandArguments="%TargetPath%"
-PostSaveCommandHideWindow=0
 PostSaveCommandNoWindow=0
 PostSaveCommandWorkingDirectory=.\
 SaveBeforeShot=0
 SaveOverlayShot=0
 SavePath=.\
 SavePresetFile=0
-SoundPath=
 
 [STYLE]
 Alpha=1.000000
@@ -84,12 +70,10 @@ FontSize=13
 FPSScale=1.000000
 FrameRounding=0.000000
 GrabRounding=0.000000
-HdrOverlayBrightness=203.000000
-HdrOverlayOverwriteColorSpaceTo=0
-LatinFont=
 PopupRounding=0.000000
 ScrollbarRounding=0.000000
 StyleIndex=2
 TabRounding=4.000000
 WindowRounding=0.000000
 
+

EXE/freelancer.ini

@@ -18,7 +18,7 @@ AppGUID = {A690F026-26F0-4e57-ACA0-ECF868E48D21}
 ;;;hostname = FLListServer2.dns.corp.microsoft.com   ;GUN server in Austin
 ;;;hostname = 131.107.135.190                        ;GUN server in Redmond
 ;;;hostname = fllistserver.zone.msn.com              ;GUN server in Redmond (DNS entry)
-hostname = gun.fllistserver.com                   ;Alternative GUN server gun.rem-freelancer.moe 
+hostname = gun.rem-freelancer.moe                    ;Alternative GUN server gun.rem-freelancer.moe, gun.fllistserver.com
 port = 2300
 
 [Server]
@@ -88,13 +88,14 @@ DLL = remres.dll ; Dynamic Infocards
       sounds = audio\interface_sounds.ini
       sounds = audio\music.ini
       sounds = audio\story_sounds.ini			;dialogue for the story (except for news broadcasts)
+	  sounds = audio\arc_sounds.ini			;dialogue for the REM Story Arcs
       sounds = audio\gf_sounds.ini			;sound-effects for gameflow - bases, rooms etc.
 ;      sounds = audio\news_sounds.ini			;dialogue for news broadcasts - re-usable PLUS story       CUT on 20021211 MG
       voices = audio\voices_space_male.ini		;dialogue for male NPCs in space (all re-usable)
       voices = audio\voices_space_female.ini		;dialogue for female NPCs in space (all re-usable)
       voices = audio\voices_base_male.ini		;dialogue for male NPCs on bases (all re-usable)
       voices = audio\voices_base_female.ini		;dialogue for female NPCs on bases (all re-usable)
-      voices = audio\voices_recognizable.ini		;all the main characters<EFBFBD> voice profiles (re-usable dialogue only) (must be read in before mission-specific lines)
+      voices = audio\voices_recognizable.ini		;all the main characters’ voice profiles (re-usable dialogue only) (must be read in before mission-specific lines)
       voices = audio\voices_mission01.ini		;dialogue specific to mission 01 (story & special supporting characters only - no reusable dialogue)
       voices = audio\voices_mission02.ini		;dialogue specific to mission 02 (story & special supporting characters only - no reusable dialogue)
       voices = audio\voices_mission03.ini		;dialogue specific to mission 03 (story & special supporting characters only - no reusable dialogue)