lock li07 jumphole

DATA/MISSIONS/ENCOUNTERS/area_battleships.ini

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

DATA/MISSIONS/ENCOUNTERS/area_cruisers.ini

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

DATA/MISSIONS/faction_prop.ini

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

DATA/MISSIONS/formations.ini

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

DATA/MISSIONS/mbases.ini

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

DATA/MISSIONS/npcships.ini

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

DATA/MISSIONS/shipclasses.ini

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

DATA/SOLAR/ASTEROIDS/li02_sierra_ice_asteroid_field.ini

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

DATA/UNIVERSE/SYSTEMS/LI01/li01.ini

@@ -10859,23 +10859,23 @@ Archetype = universal_shipping_billboard
 ;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
+; [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
+; [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

DATA/UNIVERSE/SYSTEMS/LI02/li02.ini

@@ -6761,7 +6761,7 @@ rotate = 0, -2, 0
 archetype = Trade_Lane_Ring
 ids_name = 0
 ids_info = 66170
-tradelane_space_name = 458758
+tradelane_space_name = 450003
 behavior = NOTHING
 difficulty_level = 1
 loadout = trade_lane_ring_br_01
@@ -6775,7 +6775,7 @@ rotate = 0, -2, 0
 shape = BOX
 size = 1598, 1598, 29903
 comment = Tradelane Pop
-property_flags = 196608
+property_flags = 131072
 lane_id = 1
 tradelane_down = 35
 sort = 51
@@ -6789,8 +6789,6 @@ faction_weight = li_lsf_grp, 1
 faction_weight = li_p_grp, 1
 faction_weight = co_me_grp, 7
 faction_weight = co_hsp_grp, 7
-faction_weight = co_ni_grp, 7
-faction_weight = co_os_grp, 7
 faction_weight = co_ss_grp, 7
 faction_weight = co_alg_grp, 7
 faction_weight = li_n_grp, 1
@@ -6800,8 +6798,6 @@ faction = li_p_grp, 0.100000
 encounter = tradelane_trade_freighter, 4, 0.400000
 faction = co_me_grp, 0.100000
 faction = co_hsp_grp, 0.100000
-faction = co_ni_grp, 0.400000
-faction = co_os_grp, 0.200000
 faction = co_ss_grp, 0.050000
 faction = co_alg_grp, 0.050000
 encounter = tradelane_trade_transport, 4, 0.400000
@@ -6816,7 +6812,7 @@ rotate = 0, 0, 0
 shape = SPHERE
 size = 2700
 comment = Jumpgate to Nevada
-property_flags = 196608
+property_flags = 131072
 sort = 51
 toughness = 2
 density = 10
@@ -6853,12 +6849,3 @@ faction = co_nws_grp, 0.150000
 faction = co_ni_grp, 0.150000
 faction = co_ss_grp, 0.150000
 faction = co_vr_grp, 0.120000
-
-[Zone]
-nickname = Zone_Li02_vignette_01_exclusion
-pos = 26601, 0, -54646
-shape = SPHERE
-size = 2880
-property_flags = 131072
-visit = 128
-sort = 99.500000

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

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

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

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

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

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

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

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

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

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

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

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

DATA/UNIVERSE/universe.ini

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

DATA/initialworld - server.ini

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

DATA/initialworld.ini

@@ -34,6 +34,8 @@ locked_gate = 2578962883	; Rh04_to_Rh02_holeb
 ; Mission 11
 locked_gate = 2444625543	; Li01a_to_Li01b_hole
 locked_gate = 2980035276	; Li01b_to_Li01a_hole
+;REM
+locked_gate = 2255762306    ; LI06_to_LI07_hole
 npc_locked_gate = 3080351366	; Br05_to_br04_hole
 npc_locked_gate = 2749302404	; Br04_to_br05_hole
 npc_locked_gate = 2384076422	; Br03_to_br04_hole

EXE/REM/Lua/Infocards.lua

@@ -24,6 +24,7 @@ rem.AddInfoCard(264756, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JU
 rem.AddInfoCard(450000, "Nevada")
 rem.AddInfoCard(450001, "California -> Nevada")
 rem.AddInfoCard(450002, "Nevada -> California")
+rem.AddInfoCard(450003, "Nevada Jump Gate")
 rem.AddInfoCard(450010, "Planet Las Vegas")
 rem.AddInfoCard(450011, "Planet Las Vegas Docking Ring")
 rem.AddInfoCard(450020, "Planet Reno")
@@ -34,6 +35,8 @@ rem.AddInfoCard(450040, "The Ranch")
 rem.AddInfoCard(450045, "Primm Station")
 rem.AddInfoCard(450050, "Mojave Dust Cloud")
 rem.AddInfoCard(450051, "Death Valley Dust Storm")
+rem.AddInfoCard(450055, "Paradise Valley Station")
+rem.AddInfoCard(450060, "Battleship Henderson")
 rem.AddInfoCard(460000, "Nevada Jump Hole")
 rem.AddInfoCard(460098, "Nevada Jump Hole")
 rem.AddInfoCard(460099, "Cascadia Jump Hole")