diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..6dd020ea
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+EXE/FLAR.log
+EXE/ReShade.*
+EXE/REM/LOGS/client_log_*
+EXE/REM/Lua/DYNAMIC/config.lua
+SAVE/PerfOptions.ini
+SAVE/WindowSettings.ini
+SAVE/Accts/SinglePlayer/Restart.fl
+SAVE/Accts/SinglePlayer/AutoSave.fl
+SAVE/Accts/SinglePlayer/nostory.fl
\ No newline at end of file
diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 291de428..1c4d7ea3 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -46501,3 +46501,106 @@ character_density = 3
fixture = LI0602_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
fixture = LI0602_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
fixture = LI0602_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MBase]
+nickname = LI06_03_Base
+local_faction = gd_z_grp
+diff = 4
+msg_id_prefix = gcs_refer_base_LI06_03_Base
+
+[MVendor]
+num_offers = 2, 4
+
+[BaseFaction]
+faction = gd_z_grp
+weight = 23
+offers_missions = true
+mission_type = DestroyMission, 0.000000, 0.112387, 100
+
+[GF_NPC]
+nickname = LI0603_fix_bartender
+body = pi_pirate8_body
+head = br_sales_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244639
+affiliation = gd_z_grp
+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
+body = pi_pirate8_body
+head = pi_pirate3_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 245175
+affiliation = gd_z_grp
+voice = rvp106
+
+[GF_NPC]
+nickname = LI0603_fix_trader
+body = pi_pirate8_body
+head = pi_pirate2_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244640
+affiliation = gd_z_grp
+voice = rvp101
+
+[GF_NPC]
+nickname = LI0603_fix_weaponsdealer
+body = pi_pirate8_body
+head = pi_pirate4_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244641
+affiliation = gd_z_grp
+voice = rvp106
+
+[MRoom]
+nickname = bar
+character_density = 5
+fixture = LI0603_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+
+[MRoom]
+nickname = Deck
+character_density = 2
+fixture = LI0603_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = LI0603_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MRoom]
+nickname = ShipDealer
+character_density = 2
+fixture = LI0603_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
\ No newline at end of file
diff --git a/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini b/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini
index 630005e0..c624cc9a 100644
--- a/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini
+++ b/DATA/SOLAR/ASTEROIDS/LI06_mojavedustcloud_01.ini
@@ -5,14 +5,57 @@ file = solar\asteroids\rock_shapes.ini
cube_size = 400
fill_dist = 1800
tint_field = 255, 255, 255
-empty_cube_frequency = 1.000000
+empty_cube_frequency = 0.15
[properties]
flag = rock_objects
-flag = Object_density_low
+flag = object_density_high
+flag = populated
+flag = collision
[Cube]
-asteroid = rock_asteroid30, 0.600000, 0.200000, -0.200000, 35, 10, 20
+asteroid = rock_asteroid60, 0.7, 0.2, -0.2, 180, 10, 20
+asteroid = rock_asteroid30, -0.3, -0.3, 0.8, 85, 0, 185
+asteroid = rock_asteroid90, -0.2, -0.1, -0.6, 105, 160, 25
+asteroid = lava02_asteroid60, -0.7, 0.4, -0.4, 75, 30, 70
+
+[Exclusion Zones]
+exclusion = Zone_LI06_Tradelane_01
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_Tradelane_03
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_Tradelane_02
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_to_Li02
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_pop_ambient_01
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_dustcloud_storm_01
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+exclusion = Zone_LI06_dustcloud_storm_02
+exclude_billboards = 1
+exclude_dynamic_asteroids = 1
+
+[DynamicAsteroids]
+asteroid = DAsteroid_lava02
+count = 20
+placement_radius = 150
+placement_offset = 90
+max_velocity = 10
+max_angular_velocity = 2
+color_shift = 1, 0.5, 0
[Band]
render_parts = 6
@@ -41,7 +84,4 @@ placement_radius = 500.000000
placement_offset = 90.000000
max_velocity = 15.000000
max_angular_velocity = 3.000000
-color_shift = 0.500000, 0.500000, 0.500000
-
-[FlExplorer]
-template = solar\asteroids\hi01_mahon_dust_field.ini
+color_shift = 0.500000, 0.500000, 0.500000
\ No newline at end of file
diff --git a/DATA/SOLAR/NEBULA/li06_nebula.ini b/DATA/SOLAR/NEBULA/li06_nebula.ini
new file mode 100644
index 00000000..c0e81741
--- /dev/null
+++ b/DATA/SOLAR/NEBULA/li06_nebula.ini
@@ -0,0 +1,56 @@
+[TexturePanels]
+file = solar\nebula\generic_shapes.ini
+
+[Fog]
+fog_enabled = 1
+near = 600
+distance = 1300
+color = 186, 145, 101
+
+[properties]
+flag = nebula
+
+[Exterior]
+shape = generic_exterior1
+shape = generic_exterior2
+shape = generic_exterior3
+shape = generic_exterior4
+shape_weights = 1, 1, 1, 1
+fill_shape = nebula_circle2
+plane_slices = 3
+bit_radius = 8000
+bit_radius_random_variation = 0.2
+min_bits = 5
+max_bits = 10
+move_bit_percent = 0.6
+equator_bias = 0.4
+color = 180, 120, 70
+
+[NebulaLight]
+ambient = 140, 90, 50
+sun_burnthrough_intensity = 0.4
+sun_burnthrough_scaler = 1.4
+
+[Clouds]
+max_distance = 400
+puff_count = 12
+puff_radius = 110
+puff_colora = 160, 100, 60
+puff_colorb = 210, 150, 100
+puff_max_alpha = 0.6
+puff_shape = generic_cloud1
+puff_shape = generic_cloud2
+puff_shape = generic_cloud3
+puff_shape = generic_cloud4
+puff_weights = 1, 1, 1, 1
+puff_drift = 1
+near_fade_distance = 100, 250
+lightning_intensity = 1
+lightning_color = 60, 50, 40
+lightning_gap = 22
+lightning_duration = 0.5
+
+[BackgroundLightning]
+duration = 0.4
+gap = 5
+color = 255, 225, 120
diff --git a/DATA/UNIVERSE/SYSTEMS/IW04/iw04.ini b/DATA/UNIVERSE/SYSTEMS/IW04/iw04.ini
index dee69978..68cf0dbc 100644
--- a/DATA/UNIVERSE/SYSTEMS/IW04/iw04.ini
+++ b/DATA/UNIVERSE/SYSTEMS/IW04/iw04.ini
@@ -2216,3 +2216,23 @@ property_flags = 131072
visit = 128
sort = 99.5
+[Object]
+nickname = Iw04_to_LI06_hole
+ids_name = 460098
+pos = 30311, 0, -12339
+rotate = 0, 140, 0
+archetype = jumphole_light
+msg_id_prefix = gcs_refer_system_LI06
+jump_effect = jump_effect_hole
+ids_info = 66146
+visit = 0
+goto = LI06, LI06_to_Iw04_hole, gate_tunnel_bretonia
+
+[zone]
+nickname = Zone_Iw04_to_LI06_hole
+pos = 30312, 0, -12338
+shape = SPHERE
+size = 1000
+property_flags = 131072
+visit = 128
+sort = 0
\ No newline at end of file
diff --git a/DATA/UNIVERSE/SYSTEMS/LI01/li01.ini b/DATA/UNIVERSE/SYSTEMS/LI01/li01.ini
index 523235c9..3e78c93b 100644
--- a/DATA/UNIVERSE/SYSTEMS/LI01/li01.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI01/li01.ini
@@ -10858,3 +10858,42 @@ Archetype = universal_shipping_billboard
;pos = -35388, -200, 28251
;rotate = 0, -155, 0
;Archetype = westpoint_billboard
+
+[Object]
+nickname = li01_li06_jumphole
+pos = -33270, 0, -28039
+archetype = jumphole
+ids_name = 460098
+ids_info = 466021
+goto = li06, li06_jumphole_entry
+
+[Zone]
+nickname = zone_li01_li06_jumphole
+pos = -33270, 0, -28039
+shape = sphere
+size = 2000
+property_flags = 131072
+visit = 128
+sort = 99
+goto = li06, li06_jumphole_entry
+
+[Object]
+nickname = Li01_to_LI06_hole
+ids_name = 460098
+pos = 536, 0, 40236
+rotate = 0, 140, 0
+archetype = jumphole_orange
+msg_id_prefix = gcs_refer_system_LI06
+jump_effect = jump_effect_hole
+ids_info = 66146
+visit = 0
+goto = LI06, LI06_to_Li01_hole, gate_tunnel_bretonia
+
+[zone]
+nickname = Zone_Li01_to_LI06_hole
+pos = 537, 0, 40237
+shape = SPHERE
+size = 1000
+property_flags = 131072
+visit = 128
+sort = 0
\ No newline at end of file
diff --git a/DATA/UNIVERSE/SYSTEMS/LI02/li02.ini b/DATA/UNIVERSE/SYSTEMS/LI02/li02.ini
index 16a74a3c..9e828835 100644
--- a/DATA/UNIVERSE/SYSTEMS/LI02/li02.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI02/li02.ini
@@ -6593,3 +6593,272 @@ 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
+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 = 2000
+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
+
+[Zone]
+nickname = Zone_Li02_vignette_01_exclusion
+pos = 26601, 0, -54646
+shape = SPHERE
+size = 2880
+property_flags = 131072
+visit = 128
+sort = 99.500000
\ No newline at end of file
diff --git a/DATA/UNIVERSE/SYSTEMS/LI07/LI07.ini b/DATA/UNIVERSE/SYSTEMS/LI07/LI07.ini
index a29cccae..4e71ae52 100644
--- a/DATA/UNIVERSE/SYSTEMS/LI07/LI07.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI07/LI07.ini
@@ -7,8 +7,8 @@ file = universe\heavens\shapes.ini
[Music]
space = music_li_space
-danger = music_li_danger
-battle = music_li_battle
+danger = music_bw_danger
+battle = music_iw_battle
[Dust]
spacedust = Dust
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini
new file mode 100644
index 00000000..0f739fc9
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini
@@ -0,0 +1,19 @@
+[BaseInfo]
+nickname = LI06_03_Base
+start_room = Bar
+
+[Room]
+nickname = Bar
+file = Universe\Systems\LI06\Bases\Rooms\LI06_03_bar.ini
+
+[Room]
+nickname = Deck
+file = Universe\Systems\LI06\Bases\Rooms\LI06_03_deck.ini
+
+[Room]
+nickname = Deck2
+file = Universe\Systems\LI06\Bases\Rooms\LI06_03_deck2.ini
+
+[Room]
+nickname = ShipDealer
+file = Universe\Systems\LI06\Bases\Rooms\LI06_03_shipdealer.ini
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini
new file mode 100644
index 00000000..487e8b55
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini
@@ -0,0 +1,52 @@
+[Room_Info]
+set_script = scripts\bases\li_09_Bar_hardpoint_R6.thn
+scene = ambient, scripts\bases\li_09_bar_ambi_Li01_12.thn
+scene = ambient, scripts\bases\Ambi_Terrain_Static_Badlands.thn
+scene = ambient, scripts\bases\Ambi_Terrain_Dynamic_Badlands.thn
+scene = ambient, scripts\bases\Ambi_Lightning.thn
+
+[Room_Sound]
+music = music_bar_generic07
+ambient = ambience_bar_space
+
+[Camera]
+name = Camera_0
+
+[CharacterPlacement]
+name = Zg/PC/Player/01/A/Stand
+start_script = Scripts\Bases\br_08_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_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_HOTSPOT_NEWSVENDOR
+behavior = NewsVendor
+
+[Hotspot]
+name = IDS_HOTSPOT_MISSIONVENDOR
+behavior = MissionVendor
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini
new file mode 100644
index 00000000..ad3117cc
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini
@@ -0,0 +1,177 @@
+[Room_Info]
+scene = all, ambient, Scripts\Bases\br_05_Deck_ambi_int_01.thn
+set_script = Scripts\Bases\br_05_Deck_hardpoint_01.thn
+
+[Spiels]
+CommodityDealer = manhattan_commodity_spiel
+EquipmentDealer = manhattan_equipment_spiel
+
+[Room_Sound]
+ambient = ambience_deck_space_larger
+
+[CharacterPlacement]
+name = Zg/PC/Player/01/A/Stand
+
+[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
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = VirtualRoom
+room_switch = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = VirtualRoom
+room_switch = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_NN_REPAIR_YOUR_SHIP
+behavior = Repair
+virtual_room = Deck
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+virtual_room = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER
+behavior = StartDealer
+state_read = 2
+state_send = 1
+virtual_room = Trader
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+virtual_room = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER
+behavior = StartEquipDealer
+state_read = 2
+state_send = 1
+virtual_room = Equipment
+
+[Hotspot]
+name = IDS_EQUIPMENT_ROOM_RIGHT
+behavior = MoveRight
+state_read = 2
+state_send = 1
+virtual_room = Equipment
+
+[Hotspot]
+name = IDS_NN_REPAIR_YOUR_SHIP
+behavior = Repair
+virtual_room = Equipment
+
+[FlashlightSet]
+icolor = 255, 200, 100
+scale = 0.500000
+gap = 0.000000
+blink = 0.050000
+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 = HpLightA29
+hardpoint = HpLightA30
+hardpoint = HpLightB15
+hardpoint = HpLightB16
+hardpoint = HpLightB17
+hardpoint = HpLightB18
+hardpoint = HpLightB19
+hardpoint = HpLightB20
+hardpoint = HpLightB21
+hardpoint = HpLightB22
+hardpoint = HpLightB23
+hardpoint = HpLightB24
+hardpoint = HpLightB25
+hardpoint = HpLightB26
+
+[FlashlightSet]
+icolor = 200, 255, 50
+scale = 0.500000
+gap = 0.000000
+blink = 0.000000
+endpause = 0.000000
+hardpoint = HpLightA31
+hardpoint = HpLightA32
+hardpoint = HpLightA33
+hardpoint = HpLightA34
+hardpoint = HpLightA35
+hardpoint = HpLightA36
+hardpoint = HpLightA37
+hardpoint = HpLightA38
+hardpoint = HpLightA39
+hardpoint = HpLightA40
+
+[FlashlightSet]
+icolor = 100, 200, 200
+scale = 0.500000
+gap = 0.000000
+blink = 0.000000
+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
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini
new file mode 100644
index 00000000..250eea9e
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini
@@ -0,0 +1,110 @@
+[Room_Info]
+scene = all, ambient, Scripts\Bases\br_05_Deck_ambi_int_01.thn
+set_script = Scripts\Bases\br_05_Deck_hardpoint_01.thn
+
+[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 = 255, 200, 100
+scale = 0.500000
+gap = 0.000000
+blink = 0.050000
+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 = HpLightA29
+hardpoint = HpLightA30
+hardpoint = HpLightB15
+hardpoint = HpLightB16
+hardpoint = HpLightB17
+hardpoint = HpLightB18
+hardpoint = HpLightB19
+hardpoint = HpLightB20
+hardpoint = HpLightB21
+hardpoint = HpLightB22
+hardpoint = HpLightB23
+hardpoint = HpLightB24
+hardpoint = HpLightB25
+hardpoint = HpLightB26
+
+[FlashlightSet]
+icolor = 200, 255, 50
+scale = 0.500000
+gap = 0.000000
+blink = 0.000000
+endpause = 0.000000
+hardpoint = HpLightA31
+hardpoint = HpLightA32
+hardpoint = HpLightA33
+hardpoint = HpLightA34
+hardpoint = HpLightA35
+hardpoint = HpLightA36
+hardpoint = HpLightA37
+hardpoint = HpLightA38
+hardpoint = HpLightA39
+hardpoint = HpLightA40
+
+[FlashlightSet]
+icolor = 100, 200, 200
+scale = 0.500000
+gap = 0.000000
+blink = 0.000000
+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
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini
new file mode 100644
index 00000000..8e3fabc0
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini
@@ -0,0 +1,58 @@
+[Room_Info]
+set_script = Scripts\Bases\li_06_Deck_hardpoint_SDlr.thn
+scene = all, ambient, Scripts\Bases\Li_06_Deck_ambi_int_01.thn
+
+[Spiels]
+ShipDealer = manhattan_ship_spiel
+
+[Camera]
+name = Camera_0
+
+[Room_Sound]
+ambient = ambience_shipbuy
+
+[ForSaleShipPlacement]
+name = X/Shipcentre/01
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_NN_REPAIR_YOUR_SHIP
+behavior = Repair
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER
+behavior = StartShipDealer
+state_read = 2
+state_send = 1
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
index bb94dd0c..e0613ae4 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
@@ -1,7 +1,148 @@
[SystemInfo]
+nickname = li06
space_color = 0, 0, 0
local_faction = li_n_grp
+[EncounterParameters]
+nickname = tradelane_armored_prisoner
+filename = missions\encounters\tradelane_armored_prisoner.ini
+
+[EncounterParameters]
+nickname = tradelane_trade_armored
+filename = missions\encounters\tradelane_trade_armored.ini
+
+[EncounterParameters]
+nickname = tradelane_trade_freighter
+filename = missions\encounters\tradelane_trade_freighter.ini
+
+[EncounterParameters]
+nickname = tradelane_trade_transport
+filename = missions\encounters\tradelane_trade_transport.ini
+
+[EncounterParameters]
+nickname = area_scout
+filename = missions\encounters\area_scout.ini
+
+[EncounterParameters]
+nickname = area_bh_scout
+filename = missions\encounters\area_bh_scout.ini
+
+[EncounterParameters]
+nickname = area_defend
+filename = missions\encounters\area_defend.ini
+
+[EncounterParameters]
+nickname = area_bh_defend
+filename = missions\encounters\area_bh_defend.ini
+
+[EncounterParameters]
+nickname = patrolp_gov_patrol
+filename = missions\encounters\patrolp_gov_patrol.ini
+
+[EncounterParameters]
+nickname = patrolp_pirate_patrol
+filename = missions\encounters\patrolp_pirate_patrol.ini
+
+[EncounterParameters]
+nickname = patrolp_bh_patrol
+filename = missions\encounters\patrolp_bh_patrol.ini
+
+[EncounterParameters]
+nickname = area_assault
+filename = missions\encounters\area_assault.ini
+
+[EncounterParameters]
+nickname = area_bh_assault
+filename = missions\encounters\area_bh_assault.ini
+
+[EncounterParameters]
+nickname = patrolp_assault
+filename = missions\encounters\patrolp_assault.ini
+
+[EncounterParameters]
+nickname = patrolp_bh_assault
+filename = missions\encounters\patrolp_bh_assault.ini
+
+[EncounterParameters]
+nickname = area_armored_prisoner
+filename = missions\encounters\area_armored_prisoner.ini
+
+[EncounterParameters]
+nickname = tradep_armored_prisoner
+filename = missions\encounters\tradep_armored_prisoner.ini
+
+[EncounterParameters]
+nickname = area_trade_freighter
+filename = missions\encounters\area_trade_freighter.ini
+
+[EncounterParameters]
+nickname = area_trade_transport
+filename = missions\encounters\area_trade_transport.ini
+
+[EncounterParameters]
+nickname = area_trade_armored
+filename = missions\encounters\area_trade_armored.ini
+
+[EncounterParameters]
+nickname = area_trade_freighter_pirate
+filename = missions\encounters\area_trade_freighter_pirate.ini
+
+[EncounterParameters]
+nickname = tradep_trade_freighter
+filename = missions\encounters\tradep_trade_freighter.ini
+
+[EncounterParameters]
+nickname = tradep_trade_transport
+filename = missions\encounters\tradep_trade_transport.ini
+
+[EncounterParameters]
+nickname = tradep_trade_armored
+filename = missions\encounters\tradep_trade_armored.ini
+
+[EncounterParameters]
+nickname = tradep_trade_freighter_pirate
+filename = missions\encounters\tradep_trade_freighter_pirate.ini
+
+[EncounterParameters]
+nickname = area_trade_trader
+filename = missions\encounters\area_trade_trader.ini
+
+[EncounterParameters]
+nickname = area_trade_smuggler
+filename = missions\encounters\area_trade_smuggler.ini
+
+[EncounterParameters]
+nickname = tradep_trade_trader
+filename = missions\encounters\tradep_trade_trader.ini
+
+[EncounterParameters]
+nickname = tradep_trade_smuggler
+filename = missions\encounters\tradep_trade_smuggler.ini
+
+[EncounterParameters]
+nickname = area_scavenger
+filename = missions\encounters\area_scavenger.ini
+
+[EncounterParameters]
+nickname = area_trade_freighter_smuggler
+filename = missions\encounters\area_trade_freighter_smuggler.ini
+
+[EncounterParameters]
+nickname = tradep_trade_freighter_smuggler
+filename = missions\encounters\tradep_trade_freighter_smuggler.ini
+
+[EncounterParameters]
+nickname = area_lifter
+filename = missions\encounters\area_lifter.ini
+
+[EncounterParameters]
+nickname = area_repair
+filename = missions\encounters\area_repair.ini
+
+[EncounterParameters]
+nickname = miningp_scavenger
+filename = missions\encounters\miningp_scavenger.ini
+
[TexturePanels]
file = universe\heavens\shapes.ini
@@ -17,8 +158,16 @@ spacedust = Dust
file = solar\asteroids\LI06_mojavedustcloud_01.ini
zone = Zone_LI06_mojavedustcloud_01
+[Nebula]
+file = solar\nebula\li06_nebula.ini
+zone = Zone_LI06_dustcloud_storm_01
+
+[Nebula]
+file = solar\nebula\li06_nebula.ini
+zone = Zone_LI06_dustcloud_storm_02
+
[Ambient]
-color = 60, 20, 10
+color = 50, 50, 50
[Background]
basic_stars = solar\starsphere\starsphere_stars_basic.cmp
@@ -27,15 +176,15 @@ nebulae = solar\starsphere\starsphere_li03.cmp
[LightSource]
nickname = LI06_system_light
-pos = 0, 0, 0
-color = 253, 230, 180
+pos = 0.000000, 0.000000, 0.000000
+color = 255, 225, 120
range = 160000
type = DIRECTIONAL
atten_curve = DYNAMIC_DIRECTION
[zone]
nickname = LI06_Sun1_death
-pos = 631, 0, 0
+pos = 1072, 0, 536
shape = SPHERE
size = 5000
damage = 100000
@@ -45,19 +194,19 @@ relief_time = 0
[Object]
nickname = LI06_Sun1
-ids_name = 0
-pos = 631, 0, 0
-ambient_color = 255, 255, 255
+ids_name = 261010
+pos = 1072, 0, 536
+ambient_color = 255, 225, 120
archetype = sun_2000
star = med_yellow_sun
atmosphere_range = 6500
-burn_color = 255, 255, 255
+burn_color = 255, 225, 120
ids_info = 66162
[Object]
nickname = LI06_to_Li02
-ids_name = 458757
-pos = 75108, 0, 115502
+ids_name = 450002
+pos = 37596, 0, 49964
rotate = 0, 38, 0
archetype = jumpgate
msg_id_prefix = gcs_refer_system_Li02
@@ -72,21 +221,50 @@ goto = Li02, Li02_to_LI06, gate_tunnel_bretonia
[zone]
nickname = Zone_LI06_to_Li02
-pos = 75109, 0, 115503
+pos = 37724, 0, 50092
shape = SPHERE
size = 2500
property_flags = 131072
visit = 128
sort = 0
+toughness = 4
+density = 3
+repop_time = 25
+max_battle_size = 4
+pop_type = jumpgate
+relief_time = 35
+population_additive = true
+density_restriction = 4, unlawfuls
+encounter = area_defend, 1, 0.060000
+faction = li_p_grp, 1
+encounter = area_armored_prisoner, 1, 0.020000
+faction = li_p_grp, 1
+encounter = area_trade_freighter, 1, 0.090000
+faction = co_hsp_grp, 0.360000
+faction = co_ss_grp, 0.360000
+faction = co_vr_grp, 0.290000
+encounter = area_trade_transport, 1, 0.150000
+faction = co_alg_grp, 0.100000
+faction = co_be_grp, 0.100000
+faction = co_hsp_grp, 0.100000
+faction = co_kt_grp, 0.100000
+faction = co_nws_grp, 0.100000
+faction = co_ni_grp, 0.100000
+faction = co_rs_grp, 0.100000
+faction = co_shi_grp, 0.100000
+faction = co_ss_grp, 0.100000
+faction = co_vr_grp, 0.080000
+encounter = area_trade_armored, 1, 0.030000
+faction = co_os_grp, 1
[Object]
nickname = LI06_planet_1
-ids_name = 458754
+ids_name = 450010
spin = 0.000000, 0.000000, 0.000000
rotate = 0, 0, 0
-pos = 125600, 0, 8836
+pos = 46674, 0, -15021
archetype = planet_desert_800
-atmosphere_range = 3500
+atmosphere_range = 1500
burn_color = 255, 222, 160
ids_info = 66069
ring = Zone_LI06_planet_1_ring, solar\rings\lava.ini
@@ -95,9 +273,9 @@ reputation = li_lsf_grp
[zone]
nickname = LI06_planet_1_death
-pos = 125600, 0, 8836
+pos = 46674, 0, -15021
shape = SPHERE
-size = 3400
+size = 1200
damage = 5000
sort = 99.500000
density = 0
@@ -105,21 +283,21 @@ relief_time = 0
[zone]
nickname = Zone_LI06_planet_1_ring
-pos = 125600, 0, 8836
+pos = 46674, 0, -15021
rotate = 0, 0, 0
shape = ring
-size = 5000, 200, 200
+size = 2500, 200, 200
sort = 0.000000
[Object]
nickname = LI06_01_dock_ring
-ids_name = 458755
+ids_name = 450011
archetype = dock_ring
ids_info = 66141
behavior = NOTHING
pilot = pilot_solar_easy
dock_with = LI06_01_Base
-pos = 122050, 0, 8835
+pos = 45500, -200, -14559
rotate = 0, -90, 0
reputation = li_lsf_grp
difficulty_level = 1
@@ -135,12 +313,12 @@ ids_info = 66489
behavior = NOTHING
dock_with = LI06_01_Base
base = LI06_01_Base
-pos = 122050, 350, 8835
+pos = 45500, 0, -14559
rotate = 0, -90, 0
[Object]
nickname = LI06_02
-pos = -5049, 0, 35976
+pos = -9120, 0, 22264
ids_info = 65713
behavior = NOTHING
pilot = pilot_solar_easy
@@ -149,7 +327,7 @@ base = LI06_02_Base
reputation = co_os_grp
rotate = 0, 0, 0
archetype = outpost
-ids_name = 458754
+ids_name = 450040
loadout = trading_outpost_li_01
difficulty_level = 1
space_costume = benchmark_female_head, benchmark_female_body
@@ -157,16 +335,15 @@ voice = pilot_c_ill_m02b
[Zone]
nickname = Zone_LI06_mojavedustcloud_01
-ids_name = 458757
-pos = -631, 0, -1262
-rotate = 0, 0, 0
+ids_name = 450050
+pos = 0.000000, 0.000000, 0.000000
shape = SPHERE
-size = 159052
-property_flags = 129
+size = 100000
+property_flags = 68
ids_info = 0
-visit = 36
-spacedust = dust
-spacedust_maxparticles = 50
+visit = 0
+spacedust = attractdust
+spacedust_maxparticles = 60
comment = Mojave Dust Cloud
sort = 20
toughness = 6
@@ -175,132 +352,176 @@ repop_time = 20
max_battle_size = 4
pop_type = lootable_field
relief_time = 35
+damage = 0
+interference = 0.000000
+
+[zone]
+nickname = LI06_planet_2_death
+pos = -46362, 0, -44122
+shape = SPHERE
+size = 1600
+damage = 10000
+sort = 99.500000
+density = 0
+relief_time = 0
+
+[zone]
+nickname = Zone_LI06_planet_2_ring
+pos = -46362, 0, -44122
+rotate = 0, 0, 0
+shape = ring
+size = 5000, 200, 200
+sort = 0.000000
+
+[Zone]
+nickname = Zone_LI06_pop_ambient_01
+pos = -9120, 0, 22264
+rotate = 0, 0, 0
+shape = SPHERE
+size = 3342
+comment = Ranch Pop + Exclusion
+sort = 51
+toughness = 4
+density = 30
+repop_time = 1
+max_battle_size = 25
+pop_type = li_lsf_grp, base_cluster_law
+relief_time = 5
+population_additive = true
+property_flags = 131072
+sort = 1
+toughness = 1
+density = 12
+repop_time = 10
+max_battle_size = 8
+pop_type = li_p_grp, base_cluster_law
+relief_time = 10
+density_restriction = 4, unlawfuls
+encounter = area_defend, 1, 0.200000
+faction = li_p_grp, 1
+encounter = area_bh_defend, 1, 0.200000
+faction = gd_bh_grp, 1
+encounter = area_armored_prisoner, 1, 0.020000
+faction = li_p_grp, 1
+encounter = area_trade_freighter, 1, 0.200000
+faction = co_hsp_grp, 0.260000
+faction = co_me_grp, 0.260000
+faction = co_ss_grp, 0.260000
+faction = co_vr_grp, 0.210000
+encounter = area_trade_transport, 1, 0.200000
+faction = co_be_grp, 0.100000
+faction = co_hsp_grp, 0.100000
+faction = co_kt_grp, 0.100000
+faction = co_me_grp, 0.100000
+faction = co_nws_grp, 0.100000
+faction = co_ni_grp, 0.100000
+faction = co_rs_grp, 0.100000
+faction = co_shi_grp, 0.100000
+faction = co_ss_grp, 0.100000
+faction = co_vr_grp, 0.080000
+encounter = area_trade_armored, 1, 0.020000
+faction = co_os_grp, 1
+encounter = area_lifter, 1, 0.030000
+faction = co_me_grp, 0.500000
+faction = co_ss_grp, 0.500000
+encounter = area_repair, 1, 0.030000
+faction = co_me_grp, 0.500000
+faction = co_ss_grp, 0.500000
+
+[Zone]
+nickname = Zone_LI06_dustcloud_storm_01
+pos = 22800, 0, 22264
+ids_name = 450051
+rotate = 0, 45, 0
+shape = BOX
+size = 50000, 8000, 30000
+visit = 1
+property_flags = 32768
+property_fog_color = 70, 45, 30
+spacedust = attractdust
+spacedust_maxparticles = 40
+comment = Dust Storm - Ranch to Planet Vegas
+sort = 19
+toughness = 4
+density = 3
+repop_time = 20
+max_battle_size = 4
+relief_time = 30
+pop_type = Background
+interference = 0.250000
+
+[Zone]
+nickname = Zone_LI06_dustcloud_storm_02
+pos = -30579, 0, -7242
+ids_name = 450051
+rotate = 0, -60, 0
+shape = BOX
+size = 50000, 8000, 30000
+visit = 1
+property_flags = 33348
+property_fog_color = 70, 45, 30
+spacedust = attractdust
+spacedust_maxparticles = 40
+comment = Dust Storm - Ranch to Planet Reno
+sort = 18
+toughness = 4
+density = 3
+repop_time = 20
+max_battle_size = 4
+relief_time = 30
+pop_type = Background
+interference = 0.250000
[Object]
-nickname = LI06_Trade_Lane_Ring_01
-reputation = li_lsf_grp
-pos = -3157, 0, 35534
-rotate = 0, -78, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-tradelane_space_name = 458756
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-next_ring = LI06_Trade_Lane_Ring_02
+nickname = li06_jumphole_entry
+pos = 38242, 0, 50388
+archetype = jumphole
+ids_name = 260622
+ids_info = 466011
+goto = li01, li01_li06_jumphole
+
+[Zone]
+nickname = zone_li06_jumphole_entry
+pos = 38215, 0, 50385
+shape = sphere
+size = 2000
+property_flags = 131072
+visit = 128
+sort = 99
+goto = li01, li01_li06_jumphole
[Object]
-nickname = LI06_Trade_Lane_Ring_02
-reputation = li_lsf_grp
-pos = 4463, 0, 33941
-rotate = 0, -78, 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 = LI06_Trade_Lane_Ring_01
-next_ring = LI06_Trade_Lane_Ring_03
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_03
-reputation = li_lsf_grp
-pos = 12084, 0, 32349
-rotate = 0, -78, 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 = LI06_Trade_Lane_Ring_02
-next_ring = LI06_Trade_Lane_Ring_04
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_04
-reputation = li_lsf_grp
-pos = 19705, 0, 30757
-rotate = 0, -78, 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 = LI06_Trade_Lane_Ring_03
-next_ring = LI06_Trade_Lane_Ring_05
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_05
-reputation = li_lsf_grp
-pos = 27326, 0, 29164
-rotate = 0, -78, 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 = LI06_Trade_Lane_Ring_04
-next_ring = LI06_Trade_Lane_Ring_06
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_06
-reputation = li_lsf_grp
-pos = 34947, 0, 27572
-rotate = 0, -78, 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 = LI06_Trade_Lane_Ring_05
-next_ring = LI06_Trade_Lane_Ring_07
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_07
-reputation = li_lsf_grp
-pos = 42568, 0, 25980
-rotate = 0, -78, 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 = LI06_Trade_Lane_Ring_06
-next_ring = LI06_Trade_Lane_Ring_08
+nickname = LI06_planet_2
+ids_name = 450020
+spin = 0.000000, 0.000000, 0.000000
+rotate = 0, 0, 0
+pos = -46362, 0, -44122
+archetype = planet_desored_1500
+atmosphere_range = 1800
+burn_color = 255, 222, 160
+ids_info = 66069
+ring = Zone_LI06_planet_2_ring, solar\rings\lava.ini
[Object]
nickname = LI06_Trade_Lane_Ring_08
reputation = li_lsf_grp
-pos = 50189, 0, 24387
-rotate = 0, -78, 0
+pos = -7348, 0, 24459
+rotate = 0, -119, 0
archetype = Trade_Lane_Ring
+tradelane_space_name = 450040
ids_name = 0
ids_info = 66170
behavior = NOTHING
difficulty_level = 1
loadout = trade_lane_ring_br_01
pilot = pilot_solar_easiest
-prev_ring = LI06_Trade_Lane_Ring_07
next_ring = LI06_Trade_Lane_Ring_09
[Object]
nickname = LI06_Trade_Lane_Ring_09
reputation = li_lsf_grp
-pos = 57810, 0, 22795
-rotate = 0, -78, 0
+pos = -194, 0, 28568
+rotate = 0, -119, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -314,8 +535,8 @@ next_ring = LI06_Trade_Lane_Ring_10
[Object]
nickname = LI06_Trade_Lane_Ring_10
reputation = li_lsf_grp
-pos = 65431, 0, 21203
-rotate = 0, -78, 0
+pos = 6959, 0, 32677
+rotate = 0, -119, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -329,8 +550,8 @@ next_ring = LI06_Trade_Lane_Ring_11
[Object]
nickname = LI06_Trade_Lane_Ring_11
reputation = li_lsf_grp
-pos = 73052, 0, 19610
-rotate = 0, -78, 0
+pos = 14113, 0, 36786
+rotate = 0, -119, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -344,8 +565,8 @@ next_ring = LI06_Trade_Lane_Ring_12
[Object]
nickname = LI06_Trade_Lane_Ring_12
reputation = li_lsf_grp
-pos = 80673, 0, 18018
-rotate = 0, -78, 0
+pos = 21267, 0, 40895
+rotate = 0, -119, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -359,8 +580,8 @@ next_ring = LI06_Trade_Lane_Ring_13
[Object]
nickname = LI06_Trade_Lane_Ring_13
reputation = li_lsf_grp
-pos = 88294, 0, 16426
-rotate = 0, -78, 0
+pos = 28421, 0, 45004
+rotate = 0, -119, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -374,9 +595,10 @@ next_ring = LI06_Trade_Lane_Ring_14
[Object]
nickname = LI06_Trade_Lane_Ring_14
reputation = li_lsf_grp
-pos = 95915, 0, 14833
-rotate = 0, -78, 0
+pos = 35575, 0, 49114
+rotate = 0, -119, 0
archetype = Trade_Lane_Ring
+tradelane_space_name = 261660
ids_name = 0
ids_info = 66170
behavior = NOTHING
@@ -384,13 +606,75 @@ difficulty_level = 1
loadout = trade_lane_ring_br_01
pilot = pilot_solar_easiest
prev_ring = LI06_Trade_Lane_Ring_13
-next_ring = LI06_Trade_Lane_Ring_15
+
+[Zone]
+nickname = Zone_LI06_Tradelane_01
+pos = 14113, 0, 36786
+rotate = 0, -119, 0
+shape = BOX
+size = 1598, 1598, 50000
+comment = Ranch <-> Cali Jump Gate
+lane_id = 1
+tradelane_down = 35
+sort = 51
+toughness = 4
+density = 6
+repop_time = 5
+max_battle_size = 15
+population_additive = true
+pop_type = major_tradelane
+relief_time = 10
+faction_weight = co_ic_grp, 6
+faction_weight = co_ni_grp, 6
+faction_weight = co_os_grp, 6
+faction_weight = co_rs_grp, 6
+faction_weight = co_me_grp, 6
+faction_weight = co_shi_grp, 6
+faction_weight = co_ss_grp, 6
+faction_weight = gd_z_grp, 6
+faction_weight = co_vr_grp, 6
+faction_weight = co_alg_grp, 6
+faction_weight = co_nws_grp, 6
+encounter = tradelane_trade_armored, 4, 0.330000
+faction = co_ic_grp, 0.100000
+faction = co_ni_grp, 0.250000
+faction = co_os_grp, 0.150000
+faction = co_rs_grp, 0.150000
+faction = co_me_grp, 0.150000
+encounter = tradelane_trade_freighter, 4, 0.330000
+faction = co_ni_grp, 0.100000
+faction = co_os_grp, 0.100000
+faction = co_rs_grp, 0.100000
+faction = co_shi_grp, 0.100000
+faction = co_ss_grp, 0.100000
+faction = gd_z_grp, 0.100000
+encounter = tradelane_trade_transport, 4, 0.330000
+faction = gd_z_grp, 0.100000
+faction = co_vr_grp, 0.100000
+faction = co_alg_grp, 0.200000
+faction = co_me_grp, 0.200000
+faction = co_nws_grp, 0.200000
[Object]
-nickname = LI06_Trade_Lane_Ring_15
+nickname = LI06_Trade_Lane_Ring_01
reputation = li_lsf_grp
-pos = 103536, 0, 13241
-rotate = 0, -78, 0
+pos = -6986, 0, 20775
+rotate = 0, -56, 0
+archetype = Trade_Lane_Ring
+tradelane_space_name = 450040
+ids_name = 0
+ids_info = 66170
+behavior = NOTHING
+difficulty_level = 1
+loadout = trade_lane_ring_br_01
+pilot = pilot_solar_easiest
+next_ring = LI06_Trade_Lane_Ring_02
+
+[Object]
+nickname = LI06_Trade_Lane_Ring_02
+reputation = li_lsf_grp
+pos = -650, 0, 16514
+rotate = 0, -56, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -398,15 +682,106 @@ behavior = NOTHING
difficulty_level = 1
loadout = trade_lane_ring_br_01
pilot = pilot_solar_easiest
-prev_ring = LI06_Trade_Lane_Ring_14
+prev_ring = LI06_Trade_Lane_Ring_01
+next_ring = LI06_Trade_Lane_Ring_03
+
+[Object]
+nickname = LI06_Trade_Lane_Ring_03
+reputation = li_lsf_grp
+pos = 5684, 0, 12253
+rotate = 0, -56, 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 = LI06_Trade_Lane_Ring_02
+next_ring = LI06_Trade_Lane_Ring_04
+
+[Object]
+nickname = LI06_Trade_Lane_Ring_04
+reputation = li_lsf_grp
+pos = 12019, 0, 7992
+rotate = 0, -56, 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 = LI06_Trade_Lane_Ring_03
+next_ring = LI06_Trade_Lane_Ring_05
+
+[Object]
+nickname = LI06_Trade_Lane_Ring_05
+reputation = li_lsf_grp
+pos = 18354, 0, 3731
+rotate = 0, -56, 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 = LI06_Trade_Lane_Ring_04
+next_ring = LI06_Trade_Lane_Ring_06
+
+[Object]
+nickname = LI06_Trade_Lane_Ring_06
+reputation = li_lsf_grp
+pos = 24689, 0, -529
+rotate = 0, -56, 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 = LI06_Trade_Lane_Ring_05
+next_ring = LI06_Trade_Lane_Ring_07
+
+[Object]
+nickname = LI06_Trade_Lane_Ring_07
+reputation = li_lsf_grp
+pos = 31024, 0, -4790
+rotate = 0, -56, 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 = LI06_Trade_Lane_Ring_06
+next_ring = LI06_Trade_Lane_Ring_15
+
+[Object]
+nickname = LI06_Trade_Lane_Ring_15
+reputation = li_lsf_grp
+pos = 37359, 0, -9051
+rotate = 0, -56, 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 = LI06_Trade_Lane_Ring_07
next_ring = LI06_Trade_Lane_Ring_16
[Object]
nickname = LI06_Trade_Lane_Ring_16
reputation = li_lsf_grp
-pos = 111157, 0, 11649
-rotate = 0, -78, 0
+pos = 43695, 0, -13312
+rotate = 0, -56, 0
archetype = Trade_Lane_Ring
+tradelane_space_name = 450010
ids_name = 0
ids_info = 66170
behavior = NOTHING
@@ -414,28 +789,27 @@ difficulty_level = 1
loadout = trade_lane_ring_br_01
pilot = pilot_solar_easiest
prev_ring = LI06_Trade_Lane_Ring_15
-next_ring = LI06_Trade_Lane_Ring_17
[Object]
nickname = LI06_Trade_Lane_Ring_17
reputation = li_lsf_grp
-pos = 118778, 0, 10057
-rotate = 0, -78, 0
+pos = -10761, 0, 20065
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
+tradelane_space_name = 450040
ids_name = 0
ids_info = 66170
-tradelane_space_name = 458754
behavior = NOTHING
difficulty_level = 1
loadout = trade_lane_ring_br_01
pilot = pilot_solar_easiest
-prev_ring = LI06_Trade_Lane_Ring_16
+next_ring = LI06_Trade_Lane_Ring_18
[Object]
nickname = LI06_Trade_Lane_Ring_18
reputation = li_lsf_grp
-pos = 73575, 0, 113695
-rotate = 0, 45, 0
+pos = -14492, 0, 13272
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -443,13 +817,14 @@ behavior = NOTHING
difficulty_level = 1
loadout = trade_lane_ring_br_01
pilot = pilot_solar_easiest
+prev_ring = LI06_Trade_Lane_Ring_17
next_ring = LI06_Trade_Lane_Ring_19
[Object]
nickname = LI06_Trade_Lane_Ring_19
reputation = li_lsf_grp
-pos = 68059, 0, 108295
-rotate = 0, 45, 0
+pos = -18223, 0, 6479
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -463,8 +838,8 @@ next_ring = LI06_Trade_Lane_Ring_20
[Object]
nickname = LI06_Trade_Lane_Ring_20
reputation = li_lsf_grp
-pos = 62543, 0, 102895
-rotate = 0, 45, 0
+pos = -21954, 0, -314
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -478,8 +853,8 @@ next_ring = LI06_Trade_Lane_Ring_21
[Object]
nickname = LI06_Trade_Lane_Ring_21
reputation = li_lsf_grp
-pos = 57028, 0, 97496
-rotate = 0, 45, 0
+pos = -25685, 0, -7107
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -493,8 +868,8 @@ next_ring = LI06_Trade_Lane_Ring_22
[Object]
nickname = LI06_Trade_Lane_Ring_22
reputation = li_lsf_grp
-pos = 51512, 0, 92096
-rotate = 0, 45, 0
+pos = -29417, 0, -13900
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -508,8 +883,8 @@ next_ring = LI06_Trade_Lane_Ring_23
[Object]
nickname = LI06_Trade_Lane_Ring_23
reputation = li_lsf_grp
-pos = 45996, 0, 86696
-rotate = 0, 45, 0
+pos = -33148, 0, -20693
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -523,8 +898,8 @@ next_ring = LI06_Trade_Lane_Ring_24
[Object]
nickname = LI06_Trade_Lane_Ring_24
reputation = li_lsf_grp
-pos = 40481, 0, 81297
-rotate = 0, 45, 0
+pos = -36879, 0, -27486
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -538,8 +913,8 @@ next_ring = LI06_Trade_Lane_Ring_25
[Object]
nickname = LI06_Trade_Lane_Ring_25
reputation = li_lsf_grp
-pos = 34965, 0, 75897
-rotate = 0, 45, 0
+pos = -40610, 0, -34279
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
ids_name = 0
ids_info = 66170
@@ -553,9 +928,10 @@ next_ring = LI06_Trade_Lane_Ring_26
[Object]
nickname = LI06_Trade_Lane_Ring_26
reputation = li_lsf_grp
-pos = 29449, 0, 70497
-rotate = 0, 45, 0
+pos = -44342, 0, -41072
+rotate = 0, 28, 0
archetype = Trade_Lane_Ring
+tradelane_space_name = 450020
ids_name = 0
ids_info = 66170
behavior = NOTHING
@@ -563,434 +939,55 @@ difficulty_level = 1
loadout = trade_lane_ring_br_01
pilot = pilot_solar_easiest
prev_ring = LI06_Trade_Lane_Ring_25
-next_ring = LI06_Trade_Lane_Ring_27
[Object]
-nickname = LI06_Trade_Lane_Ring_27
-reputation = li_lsf_grp
-pos = 23934, 0, 65098
-rotate = 0, 45, 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 = LI06_Trade_Lane_Ring_26
-next_ring = LI06_Trade_Lane_Ring_28
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_28
-reputation = li_lsf_grp
-pos = 18418, 0, 59698
-rotate = 0, 45, 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 = LI06_Trade_Lane_Ring_27
-next_ring = LI06_Trade_Lane_Ring_29
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_29
-reputation = li_lsf_grp
-pos = 12902, 0, 54298
-rotate = 0, 45, 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 = LI06_Trade_Lane_Ring_28
-next_ring = LI06_Trade_Lane_Ring_30
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_30
-reputation = li_lsf_grp
-pos = 7387, 0, 48899
-rotate = 0, 45, 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 = LI06_Trade_Lane_Ring_29
-next_ring = LI06_Trade_Lane_Ring_31
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_31
-reputation = li_lsf_grp
-pos = 1871, 0, 43499
-rotate = 0, 45, 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 = LI06_Trade_Lane_Ring_30
-next_ring = LI06_Trade_Lane_Ring_32
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_32
-reputation = li_lsf_grp
-pos = -3644, 0, 38100
-rotate = 0, 45, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-tradelane_space_name = 458754
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-prev_ring = LI06_Trade_Lane_Ring_31
-
-[Object]
-nickname = LI06_planet_2
-ids_name = 458755
-spin = 0.000000, 0.000000, 0.000000
-rotate = 0, 0, 0
-pos = -92781, 0, -88362
-archetype = planet_desored_1500
-atmosphere_range = 6500
-burn_color = 255, 222, 160
-ids_info = 66069
-ring = Zone_LI06_planet_2_ring, solar\rings\lava.ini
+nickname = LI06_to_Li01_hole
+ids_name = 260622
+pos = 48669, 0, 15476
+rotate = 0, 140, 0
+archetype = jumphole_red
+msg_id_prefix = gcs_refer_system_Li01
+jump_effect = jump_effect_hole
+ids_info = 66146
+visit = 0
+goto = Li01, Li01_to_LI06_hole, gate_tunnel_bretonia
[zone]
-nickname = LI06_planet_2_death
-pos = -92781, 0, -88362
+nickname = Zone_LI06_to_Li01_hole
+pos = 48670, 0, 15477
shape = SPHERE
-size = 3400
-damage = 5000
-sort = 99.500000
-density = 0
-relief_time = 0
+size = 1000
+property_flags = 131072
+visit = 128
+sort = 0
+
+[Object]
+nickname = LI06_to_Iw04_hole
+ids_name = 260611
+pos = -36850, 0, 4259
+rotate = 0, 140, 0
+archetype = jumphole_green
+msg_id_prefix = gcs_refer_system_Iw04
+jump_effect = jump_effect_hole
+ids_info = 66146
+visit = 0
+goto = Iw04, Iw04_to_LI06_hole, gate_tunnel_bretonia
[zone]
-nickname = Zone_LI06_planet_2_ring
-pos = -92781, 0, -88362
-rotate = 0, 0, 0
-shape = ring
-size = 7500, 200, 200
-sort = 0.000000
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_33
-reputation = li_lsf_grp
-pos = -6867, 0, 34471
-rotate = 0, 35, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-tradelane_space_name = 458754
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-next_ring = LI06_Trade_Lane_Ring_34
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_34
-reputation = li_lsf_grp
-pos = -11204, 0, 28311
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_33
-next_ring = LI06_Trade_Lane_Ring_35
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_35
-reputation = li_lsf_grp
-pos = -15541, 0, 22152
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_34
-next_ring = LI06_Trade_Lane_Ring_36
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_36
-reputation = li_lsf_grp
-pos = -19878, 0, 15993
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_35
-next_ring = LI06_Trade_Lane_Ring_37
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_37
-reputation = li_lsf_grp
-pos = -24215, 0, 9834
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_36
-next_ring = LI06_Trade_Lane_Ring_38
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_38
-reputation = li_lsf_grp
-pos = -28552, 0, 3675
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_37
-next_ring = LI06_Trade_Lane_Ring_39
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_39
-reputation = li_lsf_grp
-pos = -32889, 0, -2483
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_38
-next_ring = LI06_Trade_Lane_Ring_40
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_40
-reputation = li_lsf_grp
-pos = -37227, 0, -8642
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_39
-next_ring = LI06_Trade_Lane_Ring_41
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_41
-reputation = li_lsf_grp
-pos = -41564, 0, -14801
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_40
-next_ring = LI06_Trade_Lane_Ring_42
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_42
-reputation = li_lsf_grp
-pos = -45901, 0, -20960
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_41
-next_ring = LI06_Trade_Lane_Ring_43
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_43
-reputation = li_lsf_grp
-pos = -50238, 0, -27120
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_42
-next_ring = LI06_Trade_Lane_Ring_44
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_44
-reputation = li_lsf_grp
-pos = -54575, 0, -33279
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_43
-next_ring = LI06_Trade_Lane_Ring_45
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_45
-reputation = li_lsf_grp
-pos = -58912, 0, -39438
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_44
-next_ring = LI06_Trade_Lane_Ring_46
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_46
-reputation = li_lsf_grp
-pos = -63250, 0, -45597
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_45
-next_ring = LI06_Trade_Lane_Ring_47
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_47
-reputation = li_lsf_grp
-pos = -67587, 0, -51756
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_46
-next_ring = LI06_Trade_Lane_Ring_48
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_48
-reputation = li_lsf_grp
-pos = -71924, 0, -57915
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_47
-next_ring = LI06_Trade_Lane_Ring_49
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_49
-reputation = li_lsf_grp
-pos = -76261, 0, -64074
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_48
-next_ring = LI06_Trade_Lane_Ring_50
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_50
-reputation = li_lsf_grp
-pos = -80598, 0, -70233
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_49
-next_ring = LI06_Trade_Lane_Ring_51
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_51
-reputation = li_lsf_grp
-pos = -84935, 0, -76392
-rotate = 0, 35, 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 = LI06_Trade_Lane_Ring_50
-next_ring = LI06_Trade_Lane_Ring_52
-
-[Object]
-nickname = LI06_Trade_Lane_Ring_52
-reputation = li_lsf_grp
-pos = -89273, 0, -82552
-rotate = 0, 35, 0
-archetype = Trade_Lane_Ring
-ids_name = 0
-ids_info = 66170
-tradelane_space_name = 458755
-behavior = NOTHING
-difficulty_level = 1
-loadout = trade_lane_ring_br_01
-pilot = pilot_solar_easiest
-prev_ring = LI06_Trade_Lane_Ring_51
+nickname = Zone_LI06_to_Iw04_hole
+pos = -36849, 0, 4260
+shape = SPHERE
+size = 1000
+property_flags = 131072
+visit = 128
+sort = 0
[Object]
nickname = LI06_to_LI07_hole
-ids_name = 458756
-pos = -10729, 0, -142643
+ids_name = 524290
+pos = -2656, 0, -27093
rotate = 0, 140, 0
-archetype = jumphole_orange
+archetype = jumphole_green
msg_id_prefix = gcs_refer_system_LI07
jump_effect = jump_effect_hole
ids_info = 66146
@@ -999,37 +996,20 @@ goto = LI07, LI07_to_LI06_hole, gate_tunnel_bretonia
[zone]
nickname = Zone_LI06_to_LI07_hole
-pos = -10728, 0, -142642
+pos = -2655, 0, -27092
shape = SPHERE
size = 1000
property_flags = 131072
visit = 128
sort = 0
-[Zone]
-nickname = Zone_LI06_Tradelane_01
-pos = 34965, 0, 75897
-rotate = 0, 45, 0
-shape = BOX
-size = 1598, 1598, 108561
-comment = Nevada -> Ranch Tradelane Pop
-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
-
[Zone]
nickname = Zone_LI06_Tradelane_02
-pos = -48070, 0, -24040
-rotate = 0, 35, 0
+pos = 18354, 0, 3731
+rotate = 0, -56, 0
shape = BOX
-size = 1598, 1598, 143626
-comment = Ranch -> Reno Tradelane Pop
+size = 1598, 1598, 61577
+comment = Tradelane Pop
lane_id = 2
tradelane_down = 35
sort = 51
@@ -1037,16 +1017,47 @@ toughness = 4
density = 3
repop_time = 25
max_battle_size = 4
+population_additive = true
pop_type = major_tradelane
relief_time = 35
+faction_weight = co_ic_grp, 6
+faction_weight = co_ni_grp, 6
+faction_weight = co_os_grp, 6
+faction_weight = co_rs_grp, 6
+faction_weight = co_me_grp, 6
+faction_weight = co_shi_grp, 6
+faction_weight = co_ss_grp, 6
+faction_weight = gd_z_grp, 6
+faction_weight = co_vr_grp, 6
+faction_weight = co_alg_grp, 6
+faction_weight = co_nws_grp, 6
+encounter = tradelane_trade_armored, 4, 0.330000
+faction = co_ic_grp, 0.100000
+faction = co_ni_grp, 0.250000
+faction = co_os_grp, 0.150000
+faction = co_rs_grp, 0.150000
+faction = co_me_grp, 0.150000
+encounter = tradelane_trade_freighter, 4, 0.330000
+faction = co_ni_grp, 0.100000
+faction = co_os_grp, 0.100000
+faction = co_rs_grp, 0.100000
+faction = co_shi_grp, 0.100000
+faction = co_ss_grp, 0.100000
+faction = gd_z_grp, 0.100000
+encounter = tradelane_trade_transport, 4, 0.330000
+faction = gd_z_grp, 0.100000
+faction = co_vr_grp, 0.100000
+faction = co_alg_grp, 0.200000
+faction = co_me_grp, 0.200000
+faction = co_nws_grp, 0.200000
[Zone]
nickname = Zone_LI06_Tradelane_03
-pos = 57810, 0, 22795
-rotate = 0, -78, 0
+pos = -27551, 0, -10503
+rotate = 0, 28, 0
shape = BOX
-size = 1598, 1598, 125068
-comment = Ranch -> Vegas Tradelane Pop
+size = 1598, 1598, 70252
+comment = Ranch <-> Reno
lane_id = 3
tradelane_down = 35
sort = 51
@@ -1054,22 +1065,145 @@ toughness = 4
density = 3
repop_time = 25
max_battle_size = 4
+population_additive = true
pop_type = major_tradelane
relief_time = 35
+faction_weight = co_ic_grp, 6
+faction_weight = co_ni_grp, 6
+faction_weight = co_os_grp, 6
+faction_weight = co_rs_grp, 6
+faction_weight = co_me_grp, 6
+faction_weight = co_shi_grp, 6
+faction_weight = co_ss_grp, 6
+faction_weight = gd_z_grp, 6
+faction_weight = co_vr_grp, 6
+faction_weight = co_alg_grp, 6
+faction_weight = co_nws_grp, 6
+encounter = tradelane_trade_armored, 4, 0.330000
+faction = co_ic_grp, 0.100000
+faction = co_ni_grp, 0.250000
+faction = co_os_grp, 0.150000
+faction = co_rs_grp, 0.150000
+faction = co_me_grp, 0.150000
+encounter = tradelane_trade_freighter, 4, 0.330000
+faction = co_ni_grp, 0.100000
+faction = co_os_grp, 0.100000
+faction = co_rs_grp, 0.100000
+faction = co_shi_grp, 0.100000
+faction = co_ss_grp, 0.100000
+faction = gd_z_grp, 0.100000
+encounter = tradelane_trade_transport, 4, 0.330000
+faction = gd_z_grp, 0.100000
+faction = co_vr_grp, 0.100000
+faction = co_alg_grp, 0.200000
+faction = co_me_grp, 0.200000
+faction = co_nws_grp, 0.200000
[Zone]
-nickname = Zone_LI06_pop_ambient_01
-pos = -5055, 0, 35917
+nickname = Zone_LI06_pop_ambient_02
+pos = -46279, 0, -44205
rotate = 0, 0, 0
shape = SPHERE
-size = 3342
-comment = Ranch Pop + Exclusion
+size = 4802
+comment = Reno Pop
sort = 51
toughness = 4
density = 3
repop_time = 25
max_battle_size = 4
-pop_type = , single_base_law
+pop_type = li_n_grp, single_base_law
relief_time = 35
-population_additive = false
-property_flags = 131072
\ No newline at end of file
+population_additive = true
+faction_weight = co_ic_grp, 6
+faction_weight = co_ni_grp, 6
+faction_weight = co_os_grp, 6
+faction_weight = co_rs_grp, 6
+faction_weight = co_me_grp, 6
+faction_weight = co_shi_grp, 6
+faction_weight = co_ss_grp, 6
+faction_weight = gd_z_grp, 6
+faction_weight = co_vr_grp, 6
+faction_weight = co_alg_grp, 6
+faction_weight = co_nws_grp, 6
+encounter = tradelane_trade_armored, 4, 0.330000
+faction = co_ic_grp, 0.100000
+faction = co_ni_grp, 0.250000
+faction = co_os_grp, 0.150000
+faction = co_rs_grp, 0.150000
+faction = co_me_grp, 0.150000
+encounter = tradelane_trade_freighter, 4, 0.330000
+faction = co_ni_grp, 0.100000
+faction = co_os_grp, 0.100000
+faction = co_rs_grp, 0.100000
+faction = co_shi_grp, 0.100000
+faction = co_ss_grp, 0.100000
+faction = gd_z_grp, 0.100000
+encounter = tradelane_trade_transport, 4, 0.330000
+faction = gd_z_grp, 0.100000
+faction = co_vr_grp, 0.100000
+faction = co_alg_grp, 0.200000
+faction = co_me_grp, 0.200000
+faction = co_nws_grp, 0.200000
+
+[Zone]
+nickname = Zone_LI06_pop_ambient_03
+pos = 46606, 0, -14953
+rotate = 0, 0, 0
+shape = SPHERE
+size = 4693
+comment = Vegas Pop
+sort = 51
+toughness = 4
+density = 3
+repop_time = 25
+max_battle_size = 4
+pop_type = Background
+relief_time = 35
+population_additive = true
+faction_weight = co_ic_grp, 6
+faction_weight = co_ni_grp, 6
+faction_weight = co_os_grp, 6
+faction_weight = co_rs_grp, 6
+faction_weight = co_me_grp, 6
+faction_weight = co_shi_grp, 6
+faction_weight = co_ss_grp, 6
+faction_weight = gd_z_grp, 6
+faction_weight = co_vr_grp, 6
+faction_weight = co_alg_grp, 6
+faction_weight = co_nws_grp, 6
+encounter = tradelane_trade_armored, 4, 0.330000
+faction = co_ic_grp, 0.100000
+faction = co_ni_grp, 0.250000
+faction = co_os_grp, 0.150000
+faction = co_rs_grp, 0.150000
+faction = co_me_grp, 0.150000
+encounter = tradelane_trade_freighter, 4, 0.330000
+faction = co_ni_grp, 0.100000
+faction = co_os_grp, 0.100000
+faction = co_rs_grp, 0.100000
+faction = co_shi_grp, 0.100000
+faction = co_ss_grp, 0.100000
+faction = gd_z_grp, 0.100000
+encounter = tradelane_trade_transport, 4, 0.330000
+faction = gd_z_grp, 0.100000
+faction = co_vr_grp, 0.100000
+faction = co_alg_grp, 0.200000
+faction = co_me_grp, 0.200000
+faction = co_nws_grp, 0.200000
+
+[Object]
+nickname = LI06_03
+pos = 41149, 0, 15390
+ids_info = 65713
+behavior = NOTHING
+pilot = pilot_solar_easy
+dock_with = LI06_03_Base
+base = LI06_03_Base
+reputation = gd_z_grp
+rotate = 0, 0, 0
+archetype = space_freeport01
+ids_name = 524292
+loadout = rm_space_freeport01_li_02
+difficulty_level = 1
+space_costume = benchmark_male_head, benchmark_male_body
+voice = pilot_f_ill_m02a
diff --git a/DATA/UNIVERSE/Territory.ini b/DATA/UNIVERSE/Territory.ini
index 81e13544..89be1c4f 100644
--- a/DATA/UNIVERSE/Territory.ini
+++ b/DATA/UNIVERSE/Territory.ini
@@ -4,7 +4,7 @@ codepage = UTF-8 ; default is ANSI, may be OEM or MAC or number
[;Houses]
house_id = 1249 ; LIBERTY
-systems = Li01-5
+systems = Li01-7
NavMap = 5.66, 10.7
house_id = 1250 ; BRETONIA
diff --git a/DATA/UNIVERSE/universe.ini b/DATA/UNIVERSE/universe.ini
index e5bd82d3..a40cd14c 100644
--- a/DATA/UNIVERSE/universe.ini
+++ b/DATA/UNIVERSE/universe.ini
@@ -1730,6 +1730,20 @@ BGCS_base_run_by = W02bF35
; file = UNIVERSE\SYSTEMS\ST04\Bases\St04_04_Base.ini
; BGCS_base_run_by = W02bF35
+[Base]
+nickname = LI06_01_Base
+system = LI06
+file = UNIVERSE\SYSTEMS\LI06\Bases\LI06_01_Base.ini
+strid_name = 458754
+BGCS_base_run_by = W02bF33
+
+[Base]
+nickname = LI06_02_Base
+system = LI06
+strid_name = 458756
+file = UNIVERSE\SYSTEMS\LI06\Bases\LI06_02_Base.ini
+BGCS_base_run_by = W02bF39
+
[system]
nickname = Li01
file = Systems\Li01\Li01.ini
@@ -2267,10 +2281,10 @@ msg_id_prefix = gcs_refer_system_ST04
nickname = LI06
file = systems\LI06\LI06.ini
pos = 6, 8
-visit = 0
-strid_name = 458754
+visit = 1
+strid_name = 450000
ids_info = 66106
-NavMapScale = 0.850000
+NavMapScale = 2
msg_id_prefix = gcs_refer_system_LI06
[system]
@@ -2278,7 +2292,7 @@ nickname = LI07
file = systems\LI07\LI07.ini
pos = 4, 7
visit = 0
-strid_name = 458755
+strid_name = 460100
ids_info = 66106
-NavMapScale = 1.133333
+NavMapScale = 2
msg_id_prefix = gcs_refer_system_LI07
\ No newline at end of file
diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua
index 234476be..a8cf1923 100644
--- a/EXE/REM/Lua/Infocards.lua
+++ b/EXE/REM/Lua/Infocards.lua
@@ -20,6 +20,26 @@ rem.AddInfoCard(9006, "START")
-- Sensor Probe Info
rem.AddInfoCard(264756, [[Sensor ProbeThe sensor probe is a small, versatile device designed to scan the immediate surroundings for anomalies. Its compact size allows for easy deployment in various environments, making it ideal for scientific research, security applications, and environmental monitoring. The probe is equipped with advanced sensors capable of detecting a wide range of physical, chemical, and biological parameters, providing real-time data and analysis. Its robust design ensures reliable performance in challenging conditions, while its intuitive interface allows for straightforward operation and data interpretation.]])
+-- System Infocards
+rem.AddInfoCard(450000, "Nevada")
+rem.AddInfoCard(450001, "California -> Nevada")
+rem.AddInfoCard(450002, "Nevada -> California")
+rem.AddInfoCard(450010, "Planet Las Vegas")
+rem.AddInfoCard(450011, "Planet Las Vegas Docking Ring")
+rem.AddInfoCard(450020, "Planet Reno")
+rem.AddInfoCard(450021, "Planet Reno Docking Ring")
+rem.AddInfoCard(450030, "Carson Station")
+rem.AddInfoCard(450035, "Hoover Station")
+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(460000, "Nevada Jump Hole")
+rem.AddInfoCard(460098, "Nevada Jump Hole")
+rem.AddInfoCard(460099, "Cascadia Jump Hole")
+rem.AddInfoCard(460100, "Cascadia")
+
+
-- Mission Infocards
-- Story Introducing
@@ -75,9 +95,9 @@ rem.AddInfoCard(459009, [[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..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.Objectives:.- Destroy Liberty's Black Op Strike Force]])
+rem.AddInfoCard(459011, [[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..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..Objectives:.- Destroy Liberty's Black Op Strike Force]])
rem.AddInfoCard(459012, "Destroy Liberty's Black Op Strike Force")
-rem.AddInfoCard(459013, "Fly to Sector C3")
+rem.AddInfoCard(459013, "Fly to Sector C5")
-- Story Arc - Data Fragment (Liberty) (Buffalo Station - Li01_12_Base)
@@ -88,21 +108,28 @@ rem.AddInfoCard(459023, "Fly to Sector B2")
-- Story Arc - Shattered Empire (Kyoto Base - Ku06_01_base)
-rem.AddInfoCard(459100, "Story Arc - Shattered Empire")
-rem.AddInfoCard(459101, [[The Blood Dragons prepare for the next strike against the Edo Shogunate. But before this can happen, a rumor must be investigated..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..Objectives:.- Meet a Kusari Priest at Planet New Tokyo]])
-rem.AddInfoCard(459102, "Meet the Kusari Priest")
-rem.AddInfoCard(459103, "Fly to Planet New Tokyo")
-rem.AddInfoCard(459104, [[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..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.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.Objectives:.- Procure the genealogical certificate]])
-rem.AddInfoCard(459105, "Procure the genealogical certificate")
-rem.AddInfoCard(459106, "Fly to Ainu Depot")
-rem.AddInfoCard(459107, [[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..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..Objectives:Now, that I have everything what I need, I have to bring back the copy to Kyoto Base.- Procure the genealogical certificate]])
-rem.AddInfoCard(459108, "Bring the informations to the Rebus")
-rem.AddInfoCard(459109, "Fly to Kyoto Base")
+rem.AddInfoCard(471100, "Story Arc - Shattered Empire")
+rem.AddInfoCard(471101, [[The Blood Dragons prepare for the next strike against the Edo Shogunate. But before this can happen, a rumor must be investigated..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..Objectives:.- Meet a Kusari Priest at Planet New Tokyo]])
+rem.AddInfoCard(471102, "Meet the Kusari Priest")
+rem.AddInfoCard(471103, "Fly to Planet New Tokyo")
+rem.AddInfoCard(471104, [[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..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.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.Objectives:.- Procure the genealogical certificate]])
+rem.AddInfoCard(471105, "Procure the genealogical certificate")
+rem.AddInfoCard(471106, "Fly to Ainu Depot")
+rem.AddInfoCard(471107, [[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..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..Objectives:Now, that I have everything what I need, I have to bring back the copy to Kyoto Base.- Procure the genealogical certificate]])
+rem.AddInfoCard(471108, "Bring the informations to the Rebus")
+rem.AddInfoCard(471109, "Fly to Kyoto Base")
-- Mission Text Introducing
rem.AddInfoCard(459110, [[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..There could be a trap, but at least I should risk a look.]])
-rem.AddInfoCard(465000, "Mission Result: Success")
+rem.AddInfoCard(480000, "Mission Result: Success")
+
+-- Story Arc - Tutorial Liberty (Planet Manhattan - Li01_01_Base)
+rem.AddInfoCard(475001, "Tutorial - Manhattan (Liberty)")
+rem.AddInfoCard(475002, [[Welcome to the Remnant Freelancer Server, Freelancer!This training module introduces how to customize your HUD and your keyboard controls for your further way in Sirius. King will guide you to the necessary additonal menus and will explain you how to control your ship unless you are a complete newcomer.Once you are ready, close this Menu and launch your ship. Good luck and see you in space!]])
+rem.AddInfoCard(475003, "Launch into Space")
+rem.AddInfoCard(475004, "Follow King's instructions")
+
-- Infocards Bases
diff --git a/EXE/ReShade.ini b/EXE/ReShade.ini
index 1c8d8299..2df10b75 100644
--- a/EXE/ReShade.ini
+++ b/EXE/ReShade.ini
@@ -1,4 +1,4 @@
-[APP]
+[APP]
Force10BitFormat=0
ForceFullscreen=0
ForceResolution=0,0
@@ -7,6 +7,7 @@ ForceWindowed=0
[GENERAL]
EffectSearchPaths=.\reshade-shaders\Shaders,.\reshade-shaders\Shaders
+IntermediateCachePath=C:\Users\Steve\AppData\Local\Temp\ReShade
NoDebugInfo=0
NoEffectCache=0
NoReloadOnInit=0
@@ -14,14 +15,19 @@ 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
@@ -32,31 +38,39 @@ 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
@@ -70,10 +84,12 @@ 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
-