checkpoint changes for li06 and li07

2025-07-30 13:25:21 -05:00
parent 67e0c8b6f8
commit a48de1b7d1
18 changed files with 1779 additions and 654 deletions
--- 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
--- 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
--- a/DATA/SOLAR/NEBULA/li06_nebula.ini
+++ 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
--- 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
--- 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
--- 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
--- 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
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_03_Base.ini
+++ 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
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_bar.ini
+++ 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
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck.ini
+++ 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
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_deck2.ini
+++ 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
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_03_shipdealer.ini
+++ 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
--- a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
--- 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
--- 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