change encounter config for cap ships

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

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

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
@@ -46427,6 +46432,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
@@ -46655,6 +46665,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
@@ -46743,6 +46758,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 +46777,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 +46796,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

DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini

@@ -251,8 +251,8 @@ relief_time = 0
 [zone]
 nickname = Zone_LI06_planet_1_ring
 pos = 47728, 0, -16603
-rotate = 0, 0, 0
-shape = ring
+rotate = 160.03, 27.87, -158.959
+hape = 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
@@ -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
@@ -1441,6 +1433,100 @@ 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
@@ -2096,6 +2182,406 @@ density_restriction = 1, police_patroller
 density_restriction = 1, pirate_patroller
 encounter = tradep_trade_freighter_pirate, 16, 0.800000
 faction = gd_z_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
+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
@@ -2285,3 +2771,112 @@ 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

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]