lock li07 jumphole

remove correct jumphole in li01
comment debug jumphole
2025-08-15 22:46:07 -05:00 · 2025-08-15 22:45:54 -05:00 · 2025-08-15 22:09:34 -05:00 · 2025-08-15 22:06:23 -05:00 · 2025-08-15 22:06:14 -05:00 · 2025-08-15 22:05:57 -05:00
11 changed files with 709 additions and 450 deletions
--- a/DATA/MISSIONS/ENCOUNTERS/area_battleships.ini
+++ b/DATA/MISSIONS/ENCOUNTERS/area_battleships.ini
@@ -2,13 +2,13 @@
 ship_by_class = 1, 1, battleships
 pilot_job = assault_leader_job
 make_class = wanderer
-ship_by_class = 2, 2, CRUISERS, -3
+ship_by_class = 0, 2, CRUISERS, -3
 pilot_job = assault_job
 make_class = wanderer
-ship_by_class = 3, 3, sc_fighters, -6
+ship_by_class = 0, 3, sc_fighters, -6
 pilot_job = assault_job
 make_class = wanderer
-ship_by_class = 3, 3, sc_fighters, -6
+ship_by_class = 0, 3, sc_fighters, -6
 pilot_job = assault_job
 make_class = wanderer
 formation_by_class = battleships
@@ -20,7 +20,7 @@ times_to_create = infinite


 [EncounterFormation]
-ship_by_class = 3, 3, battleships
+ship_by_class = 1, 3, battleships
 pilot_job = assault_leader_job
 make_class = wanderer
 formation_by_class = battleships
@@ -34,10 +34,10 @@ times_to_create = infinite
 ship_by_class = 1, 1, battleships
 pilot_job = assault_leader_job
 make_class = wanderer
-ship_by_class = 4, 4, sc_fighters, -6
+ship_by_class = 0, 4, sc_fighters, -6
 pilot_job = assault_job
 make_class = wanderer
-ship_by_class = 4, 4, sc_fighters, -6
+ship_by_class = 0, 4, sc_fighters, -6
 pilot_job = assault_job
 make_class = wanderer
 formation_by_class = battleships
--- a/DATA/MISSIONS/ENCOUNTERS/area_cruisers.ini
+++ b/DATA/MISSIONS/ENCOUNTERS/area_cruisers.ini
@@ -1,7 +1,7 @@
 [EncounterFormation]
 ship_by_class = 1, 1, CRUISERS
 pilot_job = assault_leader_job
-ship_by_class = 1, 4, sc_fighters, -3
+ship_by_class = 0, 4, sc_fighters, -3
 pilot_job = assault_job
 make_class = wanderer
 formation_by_class = CRUISERS
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -46050,6 +46050,11 @@ 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
@@ -46093,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

@@ -46133,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]
@@ -46170,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
@@ -46231,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
@@ -46258,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
@@ -46298,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
@@ -46338,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

@@ -46380,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
@@ -46427,6 +46264,11 @@ 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
@@ -46436,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
@@ -46559,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
@@ -46655,6 +46437,11 @@ 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
@@ -46669,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
@@ -46743,6 +46500,11 @@ faction = li_p_grp
 weight = 1
 offers_missions = false

+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
 [MVendor]
 num_offers = 0, 0

@@ -46757,6 +46519,11 @@ faction = li_p_grp
 weight = 1
 offers_missions = false

+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
 [MVendor]
 num_offers = 0, 0

@@ -46771,5 +46538,10 @@ faction = li_p_grp
 weight = 1
 offers_missions = false

+[BaseFaction]
+faction = li_n_grp
+weight = 1
+offers_missions = false
+
 [MVendor]
 num_offers = 0, 0
--- a/DATA/SOLAR/ASTEROIDS/li02_sierra_ice_asteroid_field.ini
+++ b/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
--- a/DATA/UNIVERSE/SYSTEMS/LI01/li01.ini
+++ b/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
--- a/DATA/UNIVERSE/SYSTEMS/LI02/li02.ini
+++ b/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
--- a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
@@ -251,7 +251,7 @@ relief_time = 0
 [zone]
 nickname = Zone_LI06_planet_1_ring
 pos = 47728, 0, -16603
-rotate = 0, 0, 0
+rotate = 160.03, 27.87, -158.959
 shape = ring
 size = 2500, 200, 200
 sort = 0.000000
@@ -264,13 +264,12 @@ ids_info = 66141
 behavior = NOTHING
 pilot = pilot_solar_easy
 dock_with = LI06_01_Base
-pos = 47021.332, 139.437, -16046.870    
-rotate = -14.588, -56, 1.334
+pos = 46830.766, 8.715, -16394.025  
+rotate = 1.775, -77.686, 0.161
 reputation = li_lsf_grp
 difficulty_level = 1
 space_costume = li_manhattan_bartender_head, li_manhattan_bartender_body
 voice = pilot_f_ill_m02
-reputation = li_lsf_grp

 [Object]
 nickname = LI06_docking_fixture_0
@@ -280,8 +279,8 @@ ids_info = 66489
 behavior = NOTHING
 dock_with = LI06_01_Base
 base = LI06_01_Base
-pos = 47034.9, 370.42, -16056.84
-rotate = -14.588, -56, 1.334
+pos = 46825.613, 259.057, -16393.086
+rotate = -1.263, -82.294, 2.335
 ;endregion

 ;region - The Ranch
@@ -1138,22 +1137,22 @@ goto = Li02, Li02_to_LI06, gate_tunnel_bretonia
 ;endregion

 ;region - jumpholes
-[Object]
-nickname = li06_jumphole_entry
-pos = 38242, 0, 50388
-archetype = jumphole
-ids_name = 260622
-ids_info = 466011
-goto = li01, li01_li06_jumphole, gate_tunnel_bretonia
+; [Object]
+; nickname = li06_jumphole_entry
+; pos = 38242, 0, 50388
+; archetype = jumphole
+; ids_name = 260622
+; ids_info = 466011
+; goto = li01, li01_li06_jumphole, gate_tunnel_bretonia

-[Zone]
-nickname = zone_li06_jumphole_entry
-pos = 38215, 0, 50385
-shape = sphere
-size = 2000
-property_flags = 131072
-visit = 128
-sort = 99
+; [Zone]
+; nickname = zone_li06_jumphole_entry
+; pos = 38215, 0, 50385
+; shape = sphere
+; size = 2000
+; property_flags = 131072
+; visit = 128
+; sort = 99

 [Object]
 nickname = LI06_to_Li01_hole
@@ -1277,13 +1276,6 @@ 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
@@ -1362,7 +1354,6 @@ encounter = tradelane_trade_transport, 4, 0.330000
 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
@@ -1401,7 +1392,6 @@ encounter = tradelane_trade_transport, 4, 0.330000
 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_04
@@ -1440,7 +1430,100 @@ encounter = tradelane_trade_transport, 4, 0.330000
 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_06
+pos = 22020, 0, -18316
+rotate = 0, -11, 0
+shape = ELLIPSOID
+size = 20947, 26987, 26987
+comment = Vegas <-> Cascadia Pop
+sort = 51
+toughness = 15
+density = 8
+repop_time = 25
+max_battle_size = 8
+pop_type = Background
+relief_time = 35
+population_additive = false
+faction_weight = fc_lr_grp, 1
+faction_weight = li_p_grp, 1
+faction_weight = gd_bh_grp, 1
+encounter = area_assault, 15, 0.400000
+faction = fc_lr_grp, 0.800000
+encounter = area_defend, 15, 0.400000
+faction = li_p_grp, 0.800000
+encounter = area_bh_defend, 15, 0.200000
+faction = gd_bh_grp, 0.800000
+
+[Zone]
+nickname = Zone_LI06_pop_ambient_07
+pos = -23895, 0, -31345
+rotate = 0, -3, 0
+shape = ELLIPSOID
+size = 16208, 26305, 26305
+comment = Vegas <-> Cascadia + Ranch Pop
+sort = 51
+toughness = 15
+density = 8
+repop_time = 25
+max_battle_size = 8
+pop_type = Background
+relief_time = 35
+population_additive = false
+faction_weight = fc_lr_grp, 1
+faction_weight = li_p_grp, 1
+faction_weight = gd_bh_grp, 1
+encounter = area_assault, 15, 0.400000
+faction = fc_lr_grp, 0.800000
+encounter = area_defend, 15, 0.400000
+faction = li_p_grp, 0.800000
+encounter = area_bh_defend, 15, 0.200000
+faction = gd_bh_grp, 0.800000
+
+[Zone]
+nickname = Zone_LI06_pop_ambient_08
+pos = -27615, 0, 27820
+rotate = 0, -57, 0
+shape = ELLIPSOID
+size = 28342, 15145, 15145
+comment = Ranch Criminal Pop
+sort = 51
+toughness = 15
+density = 8
+repop_time = 25
+max_battle_size = 8
+pop_type = Background
+relief_time = 35
+population_additive = True
+faction_weight = fc_lr_grp, 1
+faction_weight = li_p_grp, 1
+faction_weight = gd_bh_grp, 1
+encounter = area_assault, 15, 0.400000
+faction = fc_lr_grp, 0.800000
+encounter = area_defend, 15, 0.400000
+faction = li_p_grp, 0.800000
+encounter = area_bh_defend, 15, 0.200000
+faction = gd_bh_grp, 0.800000
+
+[Zone]
+nickname = Zone_LI06_pop_ambient_09
+pos = 5953, 0, 19937
+rotate = 0, 0, 0
+shape = SPHERE
+size = 14082
+comment = Ambient Pop
+sort = 51
+toughness = 4
+density = 3
+repop_time = 25
+max_battle_size = 4
+pop_type = Background
+relief_time = 35
+population_additive = false
+faction_weight = li_p_grp, 20
+encounter = area_defend, 4, 1.000000
+faction = li_p_grp, 0.800000
 ;endregion

 ;region - tradelane population
@@ -1483,7 +1566,6 @@ encounter = tradelane_trade_transport, 4, 0.330000
 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_02
@@ -1524,7 +1606,6 @@ encounter = tradelane_trade_transport, 4, 0.330000
 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
@@ -1543,8 +1624,6 @@ 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
@@ -1565,7 +1644,6 @@ encounter = tradelane_trade_transport, 4, 0.330000
 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_04
@@ -1606,7 +1684,6 @@ encounter = tradelane_trade_transport, 4, 0.330000
 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_05
@@ -1645,7 +1722,6 @@ encounter = tradelane_trade_transport, 4, 0.330000
 faction = co_vr_grp, 0.100000
 faction = co_alg_grp, 0.200000
 faction = co_me_grp, 0.200000
-faction = co_nws_grp, 0.200000
 ;endregion

 ;region - Hoover Station
@@ -1859,98 +1935,6 @@ density_restriction = 4, unlawfuls
 encounter = patrolp_gov_patrol, 4, 0.800000
 faction = li_p_grp, 1.000000

-[Zone]
-nickname = Zone_LI06_path_zoners01
-pos = 43926, 0, 8098
-rotate = -90, 2, 0
-shape = CYLINDER
-size = 750, 4254
-sort = 99
-toughness = 16
-density = 5
-repop_time = 30
-max_battle_size = 6
-pop_type = trade_path
-relief_time = 20
-path_label = zoners_01, 1
-usage = trade
-mission_eligible = false
-faction_weight = gd_z_grp, 10
-density_restriction = 1, patroller
-density_restriction = 1, police_patroller
-density_restriction = 1, pirate_patroller
-encounter = tradep_trade_freighter_pirate, 16, 0.200000
-faction = gd_z_grp, 1.000000
-
-[Zone]
-nickname = Zone_LI06_path_zoners02
-pos = 44826, 0, -4293
-rotate = -90, -5, 0
-shape = CYLINDER
-size = 750, 20622
-sort = 99
-toughness = 16
-density = 5
-repop_time = 30
-max_battle_size = 6
-pop_type = trade_path
-relief_time = 20
-path_label = zoners_01, 2
-usage = trade
-mission_eligible = false
-faction_weight = gd_z_grp, 10
-density_restriction = 1, patroller
-density_restriction = 1, police_patroller
-density_restriction = 1, pirate_patroller
-encounter = tradep_trade_freighter_pirate, 16, 0.200000
-faction = gd_z_grp, 1.000000
-
-[Zone]
-nickname = Zone_LI06_path_zoners03
-pos = 45204, 0, -4241
-rotate = 90, 5, 180
-shape = CYLINDER
-size = 750, 20630
-sort = 99
-toughness = 16
-density = 5
-repop_time = 30
-max_battle_size = 4
-pop_type = trade_path
-relief_time = 20
-path_label = zoners_02, 1
-usage = trade
-mission_eligible = false
-faction_weight = gd_z_grp, 10
-density_restriction = 1, patroller
-density_restriction = 1, police_patroller
-density_restriction = 1, pirate_patroller
-encounter = tradep_trade_freighter_pirate, 16, 0.200000
-faction = gd_z_grp, 1.000000
-
-[Zone]
-nickname = Zone_LI06_path_zoners04
-pos = 44291, 0, 8163
-rotate = 90, -2, 180
-shape = CYLINDER
-size = 750, 4284
-sort = 99
-toughness = 16
-density = 5
-repop_time = 30
-max_battle_size = 4
-pop_type = trade_path
-relief_time = 20
-path_label = zoners_02, 2
-usage = trade
-mission_eligible = false
-faction_weight = gd_z_grp, 10
-density_restriction = 1, patroller
-density_restriction = 1, police_patroller
-density_restriction = 1, pirate_patroller
-encounter = tradep_trade_freighter_pirate, 16, 0.200000
-faction = gd_z_grp, 1.000000
-
 [Zone]
 nickname = Zone_LI06_path_lanehackers01
 pos = 46351, 0, 13589
@@ -2052,50 +2036,444 @@ encounter = patrolp_pirate_patrol, 3, 0.800000
 faction = fc_j_grp, 1.000000

 [Zone]
-nickname = Zone_LI06_path_zoners05
+nickname = Zone_LI06_path_libertynavy17
 pos = -37051, 0, 6974
 rotate = 90, 4, 180
 shape = CYLINDER
 size = 750, 5249
 sort = 99
-toughness = 16
+toughness = 12
 density = 5
 repop_time = 30
 max_battle_size = 4
-pop_type = trade_path
+pop_type = field_patrol
 relief_time = 20
-path_label = zoners_03, 1
-usage = trade
+path_label = libertynavy_04, 1
+usage = patrol
 mission_eligible = false
-faction_weight = gd_z_grp, 10
-density_restriction = 1, patroller
-density_restriction = 1, police_patroller
-density_restriction = 1, pirate_patroller
-encounter = tradep_trade_freighter_pirate, 16, 0.800000
-faction = gd_z_grp, 1.000000
+faction_weight = li_n_grp, 10
+encounter = patrolp_assault, 11, 0.800000
+faction = li_n_grp, 1.000000

 [Zone]
-nickname = Zone_LI06_path_zoners06
+nickname = Zone_LI06_path_libertynavy18
 pos = -23865, 0, 16019
 rotate = 90, -64, 180
 shape = CYLINDER
 size = 750, 29731
 sort = 99
-toughness = 16
+toughness = 12
 density = 5
 repop_time = 30
 max_battle_size = 4
-pop_type = trade_path
+pop_type = field_patrol
 relief_time = 20
-path_label = zoners_03, 2
-usage = trade
+path_label = libertynavy_04, 2
+usage = patrol
 mission_eligible = false
-faction_weight = gd_z_grp, 10
+faction_weight = li_n_grp, 10
+encounter = patrolp_assault, 11, 0.800000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy01
+pos = -6941, 0, 22891
+rotate = 90, -76, 180
+shape = CYLINDER
+size = 750, 2974
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 1
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
 density_restriction = 1, patroller
 density_restriction = 1, police_patroller
 density_restriction = 1, pirate_patroller
-encounter = tradep_trade_freighter_pirate, 16, 0.800000
-faction = gd_z_grp, 1.000000
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy02
+pos = 5531, 0, 24314
+rotate = 90, -84, 180
+shape = CYLINDER
+size = 750, 22158
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 2
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy03
+pos = 19698, 0, 20013
+rotate = -90, -30, 0
+shape = CYLINDER
+size = 750, 12456
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 3
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy04
+pos = 28815, 0, 13439
+rotate = -90, -78, 0
+shape = CYLINDER
+size = 750, 12190
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 4
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy05
+pos = 38577, 0, 16361
+rotate = 90, -42, 180
+shape = CYLINDER
+size = 750, 11184
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 5
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy06
+pos = 37315, 0, 29244
+rotate = 90, 29, 180
+shape = CYLINDER
+size = 750, 20230
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 6
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy07
+pos = 23701, 0, 33527
+rotate = -90, 62, 0
+shape = CYLINDER
+size = 750, 19336
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 7
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy08
+pos = 3414, 0, 25990
+rotate = -90, 75, 0
+shape = CYLINDER
+size = 750, 24224
+sort = 99
+toughness = 11
+density = 5
+repop_time = 15
+max_battle_size = 6
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_01, 8
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 11, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy09
+pos = 18185, 0, 40725
+rotate = -90, 61, 0
+shape = CYLINDER
+size = 750, 40907
+sort = 99
+toughness = 12
+density = 5
+repop_time = 30
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_02, 1
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy10
+pos = -6116, 0, 37624
+rotate = 90, 43, 180
+shape = CYLINDER
+size = 750, 18663
+sort = 99
+toughness = 12
+density = 5
+repop_time = 30
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_02, 2
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy11
+pos = -5512, 0, 51208
+rotate = 90, -45, 180
+shape = CYLINDER
+size = 750, 19510
+sort = 99
+toughness = 12
+density = 5
+repop_time = 30
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_02, 3
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy12
+pos = 18781, 0, 54386
+rotate = -90, -78, 0
+shape = CYLINDER
+size = 750, 35329
+sort = 99
+toughness = 12
+density = 5
+repop_time = 30
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_02, 4
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy13
+pos = -53372, 0, -30147
+rotate = 90, 30, 180
+shape = CYLINDER
+size = 750, 30092
+sort = 99
+toughness = 12
+density = 5
+repop_time = 15
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_03, 1
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy14
+pos = -56364, 0, -9566
+rotate = 90, -31, 180
+shape = CYLINDER
+size = 750, 17883
+sort = 99
+toughness = 12
+density = 5
+repop_time = 15
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_03, 2
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy15
+pos = -40914, 0, -6383
+rotate = -90, -67, 0
+shape = CYLINDER
+size = 750, 23330
+sort = 99
+toughness = 12
+density = 5
+repop_time = 15
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_03, 3
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
+
+[Zone]
+nickname = Zone_LI06_path_libertynavy16
+pos = -37648, 0, -26882
+rotate = -90, 25, 0
+shape = CYLINDER
+size = 750, 35453
+sort = 99
+toughness = 12
+density = 5
+repop_time = 15
+max_battle_size = 4
+pop_type = field_patrol
+relief_time = 20
+path_label = libertynavy_03, 4
+usage = patrol
+mission_eligible = false
+faction_weight = li_n_grp, 10
+density_restriction = 1, patroller
+density_restriction = 1, police_patroller
+density_restriction = 1, pirate_patroller
+density_restriction = 4, lawfuls
+density_restriction = 4, unlawfuls
+encounter = patrolp_assault, 12, 0.200000
+faction = li_n_grp, 1.000000
 ;endregion

 ;region - wrecks
@@ -2284,4 +2662,113 @@ archetype = depot_toxic_waste
 ids_name = 261161
 ids_info = 66150
 behavior = NOTHING
+;endregion
+
+;region - Mission Encounters
+[Zone]
+nickname = Zone_LI06_destroy_vignette_13
+pos = -22115, 0, -46960
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_14
+pos = 23481, 0, -35268
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_15
+pos = 18902, 0, -10911
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+[Zone]
+nickname = Zone_LI06_destroy_vignette_16
+pos = -20529, 0, -21070
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_17
+pos = -37269, 0, 18254
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_18
+pos = -19466, 0, 37828
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_19
+pos = 9053, 0, 20557
+shape = SPHERE
+size = 10000
+mission_type = unlawful, lawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_01
+pos = 11178, 0, -11843
+shape = SPHERE
+size = 10000
+mission_type = unlawful, lawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_02
+pos = -28613, 0, 27485
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_03
+pos = 30144, 0, -30873
+shape = SPHERE
+size = 10000
+mission_type = lawful, unlawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_04
+pos = 4072, 0, 17468
+shape = SPHERE
+size = 10000
+mission_type = unlawful, lawful
+sort = 99.500000
+vignette_type = field
+
+[Zone]
+nickname = Zone_LI06_destroy_vignette_05
+pos = 5037, 0, 22934
+shape = SPHERE
+size = 10000
+mission_type = unlawful, lawful
+sort = 99.500000
+vignette_type = field
 ;endregion
--- a/DATA/UNIVERSE/universe.ini
+++ b/DATA/UNIVERSE/universe.ini
@@ -2319,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]
--- a/DATA/initialworld
+++ b/DATA/initialworld
@@ -1,4 +1,7 @@
 ;@#Group File
+[locked_gates]
+;REM
+locked_gate = 2255762306    ; LI06_to_LI07_hole

 [Group]
 nickname = li_n_grp
--- a/DATA/initialworld.ini
+++ b/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
--- a/EXE/REM/Lua/Infocards.lua
+++ b/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")
Author	SHA1	Message	Date
Cadacious	488913c289	lock li07 jumphole	2025-08-15 22:46:07 -05:00
Cadacious	6be882026c	remove correct jumphole in li01	2025-08-15 22:45:54 -05:00
Cadacious	463bf3f65c	comment debug jumphole	2025-08-15 22:09:34 -05:00
Cadacious	7785f11c39	new infocard	2025-08-15 22:06:23 -05:00
Cadacious	87d03a8ec6	fix typo	2025-08-15 22:06:14 -05:00
Cadacious	1c5c3cf354	remove syntax errors	2025-08-15 22:05:57 -05:00
Cadacious	f94e993e86	fix exclusion zones in li02	2025-08-15 22:05:39 -05:00
Cadacious	b6ac295da3	fix ctd related to zoner patrol	2025-08-15 21:30:57 -05:00
Cadacious	472fd90fc8	remove tradelane_trade_transport for co_nws_grp to remediate ctd	2025-08-14 22:39:55 -05:00
Cadacious	67e5623d94	remove story rumors copied from origin station	2025-08-14 22:11:36 -05:00
Cadacious	49bcc672c7	change encounter config for cap ships	2025-08-14 20:31:04 -05:00
Cadacious	0b35f5067d	patrols, random mission encounters, more population zones	2025-08-14 20:30:43 -05:00