lock li07 jumphole

change radiation zones
move hazard buoys
move wrecks

.gitignore

@@ -0,0 +1,9 @@
+EXE/FLAR.log
+EXE/ReShade.*
+EXE/REM/LOGS/client_log_*
+EXE/REM/Lua/DYNAMIC/config.lua
+SAVE/PerfOptions.ini
+SAVE/WindowSettings.ini
+SAVE/Accts/SinglePlayer/Restart.fl
+SAVE/Accts/SinglePlayer/AutoSave.fl
+SAVE/Accts/SinglePlayer/nostory.fl

DATA/AUDIO/story_sounds.ini

@@ -7323,3 +7323,48 @@ type = voice
 is_2d = true
 attenuation = 0
 file = Audio\Rem_Audio\Story_Arcs\story_king01.wav
+
+
+; The Rebus
+
+[Sound]
+nickname = dx_REM_0101_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\The_Rebus.wav
+
+[Sound]
+nickname = dx_REM_0103_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_LSF.wav
+
+[Sound]
+nickname = dx_REM_0201_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_Order.wav
+
+[Sound]
+nickname = dx_REM_0301_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_network.wav
+
+[Sound]
+nickname = dx_REM_0402_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_edo.wav
+
+[Sound]
+nickname = dx_REM_0501_Rebus
+type = voice
+is_2d = true
+attenuation = 0
+file = Audio\Rem_Audio\Rebus\TheRebus_BD_GC.wav

DATA/CHARACTERS/bodyparts.ini

@@ -397,6 +397,10 @@ mesh = characters\bodies\pl_female1_peasant_body_bust.dfm
 nickname = pl_female2_peasant_body_bust
 mesh = characters\bodies\pl_female2_peasant_body_bust.dfm
 
+[Body]
+nickname = pl_female1_rebus_peasant_body_bust
+mesh = characters\bodies\pl_female1_rebus_peasant_body_bust.dfm
+
 [DetailSwitchTable]
 switch = 100, 999999
 
@@ -835,6 +839,10 @@ mesh = characters\heads\rh_newscaster_head_gen_hat.dfm
 nickname = pl_female4_head_helmet
 mesh = characters\heads\pl_female4_head_helmet.dfm
 
+[Head]
+nickname = sh_female2_rebus_head
+mesh = characters\heads\sh_female2_rebus_head.dfm
+
 [DetailSwitchTable]
 switch = 100, 999999
 
@@ -901,6 +909,15 @@ mesh = characters\hands\femalehandright_black.dfm
 nickname = female_hand_left_black
 mesh = characters\hands\femalehandleft_black.dfm
 
+[RightHand]
+nickname = rebus_female_hand_right
+mesh = characters\hands\rebus_femalehandright.dfm
+
+[LeftHand]
+nickname = rebus_female_hand_left
+mesh = characters\hands\rebus_femalehandleft.dfm
+
+
 [Accessory]
 nickname = prop_neuralnet_A
 mesh = characters\props\prop_neuralnet_A.3db

DATA/CHARACTERS/costumes.ini

@@ -1068,3 +1068,9 @@ body = robot_body_e
 righthand = robot_hand_right
 lefthand = robot_hand_left
 
+[Costume]
+nickname = sh_female2_rebus
+head = sh_female2_rebus_head
+body = pl_female1_rebus_peasant_body_bust
+righthand = rebus_female_hand_right
+lefthand = rebus_female_hand_left

DATA/CHARACTERS/newcharacter.ini

@@ -13,7 +13,7 @@ strid_name = 11051
 strid_desc = 11551
 ship =  li_fighter
 loadout = li_fighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = li_freighter_trent_law
@@ -21,7 +21,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = li_freighter
 loadout = li_freighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = li_fighter_trent_unlaw
@@ -29,7 +29,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = pi_fighter
 loadout = li_fighter_starter_loadout02
-money = 20000
+money = 50000
 
 [Package]
 nickname = li_freighter_trent_unlaw
@@ -37,7 +37,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = pi_freighter
 loadout = li_freighter_starter_loadout02
-money = 20000
+money = 50000
 
 
 ; Rheinland
@@ -47,7 +47,7 @@ strid_name = 11051
 strid_desc = 11551
 ship =  rh_fighter
 loadout = rh_fighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = rh_freighter_trent_law
@@ -55,7 +55,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = rh_freighter
 loadout = rh_freighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = rh_fighter_trent_unlaw
@@ -63,7 +63,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = bw_fighter
 loadout = rh_fighter_starter_loadout02
-money = 20000
+money = 50000
 
 [Package]
 nickname = rh_freighter_trent_unlaw
@@ -71,7 +71,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = bw_freighter_t1
 loadout = rh_freighter_starter_loadout02
-money = 20000
+money = 50000
 
 ; Bretonia
 [Package]
@@ -80,7 +80,7 @@ strid_name = 11051
 strid_desc = 11551
 ship =  br_fighter
 loadout = br_fighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = br_freighter_trent_law
@@ -88,7 +88,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = br_freighter
 loadout = br_freighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = br_fighter_trent_unlaw
@@ -96,7 +96,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = pi_fighter
 loadout = br_fighter_starter_loadout02
-money = 20000
+money = 50000
 
 [Package]
 nickname = br_freighter_trent_unlaw
@@ -104,7 +104,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = pi_freighter
 loadout = br_freighter_starter_loadout02
-money = 20000
+money = 50000
 
 ; Kusari
 [Package]
@@ -113,7 +113,7 @@ strid_name = 11051
 strid_desc = 11551
 ship =  ku_fighter
 loadout = ku_fighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = ku_freighter_trent_law
@@ -121,15 +121,15 @@ strid_name = 11051
 strid_desc = 11551
 ship = ku_freighter
 loadout = ku_freighter_starter_loadout01
-money = 20000
+money = 50000
 
 [Package]
 nickname = ku_fighter_trent_unlaw
 strid_name = 11051
 strid_desc = 11551
 ship = ku_fighter
-loadout = ku_fighter_starter_loadout01
-money = 20000
+loadout = ku_fighter_starter_loadout02
+money = 50000
 
 [Package]
 nickname = ku_freighter_trent_unlaw
@@ -137,7 +137,7 @@ strid_name = 11051
 strid_desc = 11551
 ship = ku_freighter
 loadout = ku_freighter_starter_loadout01
-money = 20000
+money = 50000
 
 ; Chars
 

DATA/COCKPITS/ku_gunboat.ini

@@ -1,5 +1,5 @@
 [Cockpit]
-mesh = cockpits\liberty\models\ku_freighter_cockpit.cmp
+mesh = cockpits\kusari\models\ku_freighter_cockpit.cmp
 int_brightness = 0.500000
 head_turn = 30, 10
 

DATA/EQUIPMENT/goods.ini

@@ -3297,7 +3297,7 @@ addon = DockingLightRedSmall, HpDockLight02, 1
 nickname = licr_hull
 category = shiphull
 ship = li_cruiser_player
-price = 5000000
+price = 10000000
 ids_name = 237031
 item_icon = Equipment\models\commodities\nn_icons\li_cruiser.3db
 
@@ -3329,7 +3329,7 @@ addon = SlowLargeBlue, HpRunningLight09
 nickname = rhcr_player_hull
 category = shiphull
 ship = rh_cruiser_player
-price = 5000000
+price = 10000000
 ids_name = 237031
 item_icon = Equipment\models\commodities\nn_icons\transport.3db
 
@@ -3372,9 +3372,9 @@ addon = SlowLargeBlue, HpRunningLight09
 nickname = kugu_hull
 category = shiphull
 ship = ku_gunboat_player
-price = 5000000
+price = 10000000
 ids_name = 237031
-item_icon = Equipment\models\commodities\nn_icons\transport.3db
+item_icon = Equipment\models\commodities\nn_icons\ku_gunship.3db
 
 [Good]
 nickname = kugu_package

DATA/EQUIPMENT/market_commodities.ini

@@ -1452,7 +1452,7 @@ MarketGood = commodity_luxury_consumer_goods, 0, -1, 150, 500, 0, 1
 MarketGood = commodity_cardamine, 0, -1, 0, 0, 1, 2
 MarketGood = commodity_sidearms, 0, -1, 0, 0, 1, 0.55
 MarketGood = commodity_soldiers, 0, -1, 0, 0, 1, 1.100000
-MarketGood = commodity_candycane, 0, -1, 150, 500, 0, 1.100000
+;MarketGood = commodity_candycane, 0, -1, 150, 500, 0, 1.100000
 
 
 

DATA/EQUIPMENT/misc_equip.ini

@@ -90,8 +90,8 @@ volume = 0
 mass = 10
 DA_archetype = equipment\models\hardware\li_fusion_reactor.3db
 material_library = equipment\models\hardware.mat
-capacity = 2100
-charge_rate = 213
+capacity = 2200
+charge_rate = 225
 thrust_capacity = 1000
 thrust_charge_rate = 100
 lootable = false
@@ -272,8 +272,8 @@ volume = 0
 mass = 10
 DA_archetype = equipment\models\hardware\li_fusion_reactor.3db
 material_library = equipment\models\hardware.mat
-capacity = 2100
-charge_rate = 213
+capacity = 2400
+charge_rate = 245
 thrust_capacity = 1000
 thrust_charge_rate = 100
 lootable = false
@@ -398,8 +398,8 @@ volume = 0
 mass = 10
 DA_archetype = equipment\models\hardware\li_fusion_reactor.3db
 material_library = equipment\models\hardware.mat
-capacity = 2100
-charge_rate = 213
+capacity = 2200
+charge_rate = 225
 thrust_capacity = 1000
 thrust_charge_rate = 100
 lootable = false

DATA/EQUIPMENT/weapon_equip.ini

@@ -456,6 +456,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Lancer Missile
+
 [Motor]
 nickname = missile01_mark04_motor
 lifetime = 2.75
@@ -528,6 +530,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Cannonball Missile
+
 [Motor]
 nickname = missile01_mark05_motor
 lifetime = 2.75
@@ -541,7 +545,7 @@ lifetime = 0, 0
 process = disappear
 strength = 100
 radius = 16
-hull_damage = 4890
+hull_damage = 2690
 energy_damage = 0
 impulse = 0
 
@@ -600,6 +604,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Stalker Missile
+
 [Motor]
 nickname = missile02_mark01_motor
 lifetime = 2.5
@@ -613,7 +619,7 @@ lifetime = 0, 0
 process = disappear
 strength = 100
 radius = 16
-hull_damage = 244.5
+hull_damage = 444.5
 energy_damage = 0
 impulse = 0
 
@@ -672,6 +678,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Windstalker Missile
+
 [Motor]
 nickname = missile02_mark02_motor
 lifetime = 2.5
@@ -685,7 +693,7 @@ lifetime = 0, 0
 process = disappear
 strength = 100
 radius = 16
-hull_damage = 373.5
+hull_damage = 673.5
 energy_damage = 0
 impulse = 0
 
@@ -744,6 +752,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Moonstalker Missile
+
 [Motor]
 nickname = missile02_mark03_motor
 lifetime = 2.5
@@ -757,7 +767,7 @@ lifetime = 0, 0
 process = disappear
 strength = 100
 radius = 16
-hull_damage = 606
+hull_damage = 1002
 energy_damage = 0
 impulse = 0
 
@@ -816,6 +826,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Sunstalker Missile
+
 [Motor]
 nickname = missile02_mark04_motor
 lifetime = 2.5
@@ -829,7 +841,7 @@ lifetime = 0, 0
 process = disappear
 strength = 100
 radius = 16
-hull_damage = 1045.5
+hull_damage = 1900.5
 energy_damage = 0
 impulse = 0
 
@@ -888,6 +900,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Firestalker Missile
+
 [Motor]
 nickname = missile02_mark05_motor
 lifetime = 2.5
@@ -1104,6 +1118,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Neutralizer Missile
+
 [Motor]
 nickname = missile03_mark03_motor
 lifetime = 2.75
@@ -1176,6 +1192,8 @@ turn_rate = 90
 lootable = true
 LODranges = 0, 999999
 
+; Paralyzer Missile
+
 [Motor]
 nickname = missile03_mark04_motor
 lifetime = 2.75
@@ -1190,7 +1208,7 @@ process = disappear
 strength = 100
 radius = 16
 hull_damage = 195.6
-energy_damage = 7824
+energy_damage = 3824
 impulse = 0
 
 [Munition]
@@ -27304,11 +27322,22 @@ lifetime = 7.500000
 accel = 0.0
 delay = 0
 
+[Explosion]
+nickname = sensor_probe_player_explosion
+effect = li_torpedo01_impact
+lifetime = 0, 0
+process = disappear
+strength = 100
+radius = 10
+hull_damage = 0
+energy_damage = 0
+impulse = 0
+
 [Munition]
 nickname = sensor_probe_player_ammo
 ids_name = 264752
 ids_info = 264756
-explosion_arch = torpedo01_mark01_explosion
+explosion_arch = sensor_probe_player_explosion
 loot_appearance = ammo_crate
 units_per_container = 1
 hp_type = hp_torpedo
@@ -32693,12 +32722,14 @@ LODranges = 0, 999999
 obj = barrel
 LODranges = 0, 999999
 
+; Liberty Cruiser Turret Player
+
 [Munition]
 nickname = li_cruiser_turret01_player_ammo
 hp_type = hp_gun
 requires_ammo = false
 hit_pts = 2
-hull_damage = 440
+hull_damage = 540
 energy_damage = 0
 one_shot_sound = fire_capship
 munition_hit_effect = li_capgun_01_impact
@@ -32744,6 +32775,8 @@ LODranges = 0, 350
 obj = barrel
 LODranges = 0, 400
 
+; Rheinland Cruiser Gun Player
+
 [Munition]
 nickname = rh_battleship_turret03_a_player_ammo
 hp_type = hp_gun
@@ -32796,14 +32829,14 @@ obj = barrel
 LODranges = 0, 1000
 
 
-
+; Rheinland Cruiser Turret Player
 
 [Munition]
 nickname = rh_cruiser_turret01_player_ammo
 hp_type = hp_gun
 requires_ammo = false
 hit_pts = 2
-hull_damage = 320
+hull_damage = 520
 energy_damage = 0
 one_shot_sound = fire_capship_forward_gun
 munition_hit_effect = rh_capgun_01_impact
@@ -33013,7 +33046,7 @@ obj = barrel
 LODranges = 0, 400
 
 
-
+; Battleship Flak Turrets Player
 
 [Motor]
 nickname = li_battleship_flak_turret01_player_motor
@@ -33087,13 +33120,14 @@ LODranges = 0, 450
 obj = barrel
 LODranges = 0, 500
 
+; Kusari Gunboat Turret Player
 
 [Munition]
 nickname = ku_gunboat_turret01_player_ammo
 hp_type = hp_gun
 requires_ammo = false
 hit_pts = 2
-hull_damage = 830
+hull_damage = 730
 energy_damage = 0
 one_shot_sound = fire_capship
 munition_hit_effect = ku_capgun_01_impact
@@ -33119,7 +33153,7 @@ volume = 600
 mass = 10
 damage_per_fire = 0
 power_usage = 0
-refire_delay = 0.500000
+refire_delay = 0.33
 muzzle_velocity = 1222.199951
 toughness = 5.300000
 flash_particle_name = ku_capgun_01_flash

DATA/EQUIPMENT/weapon_good.ini

@@ -90,6 +90,8 @@ price = 373
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Lancer Missile
+
 [Good]
 nickname = missile01_mark04
 equipment = missile01_mark04
@@ -109,10 +111,12 @@ equipment = missile01_mark04_ammo
 shop_archetype = equipment\models\weapons\li_rad_missile.3db
 material_library = equipment\models\li_equip.mat
 category = equipment
-price = 1239.5
+price = 620.5
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Cannonball Missile
+
 [Good]
 nickname = missile01_mark05
 equipment = missile01_mark05
@@ -132,10 +136,12 @@ equipment = missile01_mark05_ammo
 shop_archetype = equipment\models\weapons\li_rad_missile.3db
 material_library = equipment\models\li_equip.mat
 category = equipment
-price = 6024
+price = 1024
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Stalker Missile
+
 [Good]
 nickname = missile02_mark01
 equipment = missile02_mark01
@@ -159,6 +165,8 @@ price = 32.5
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Windstalker Missile
+
 [Good]
 nickname = missile02_mark02
 equipment = missile02_mark02
@@ -205,6 +213,8 @@ price = 485
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Sunstalker Missile
+
 [Good]
 nickname = missile02_mark04
 equipment = missile02_mark04
@@ -224,10 +234,12 @@ equipment = missile02_mark04_ammo
 shop_archetype = equipment\models\weapons\li_rad_missile.3db
 material_library = equipment\models\li_equip.mat
 category = equipment
-price = 1611.5
+price = 811.5
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Firestalker Missile
+
 [Good]
 nickname = missile02_mark05
 equipment = missile02_mark05
@@ -247,7 +259,7 @@ equipment = missile02_mark05_ammo
 shop_archetype = equipment\models\weapons\li_rad_missile.3db
 material_library = equipment\models\li_equip.mat
 category = equipment
-price = 7831
+price = 1831
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
@@ -297,6 +309,8 @@ price = 185.5
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Neutralizer Missile
+
 [Good]
 nickname = missile03_mark03
 equipment = missile03_mark03
@@ -316,10 +330,12 @@ equipment = missile03_mark03_ammo
 shop_archetype = equipment\models\weapons\li_rad_missile.3db
 material_library = equipment\models\li_equip.mat
 category = equipment
-price = 1239.5
+price = 620.5
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Paralyzer Missile
+
 [Good]
 nickname = missile03_mark04
 equipment = missile03_mark04
@@ -339,10 +355,12 @@ equipment = missile03_mark04_ammo
 shop_archetype = equipment\models\weapons\li_rad_missile.3db
 material_library = equipment\models\li_equip.mat
 category = equipment
-price = 7229
+price = 1229
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Wasp Cruise Disruptor
+
 [Good]
 nickname = cruise_disruptor01_mark01
 equipment = cruise_disruptor01_mark01
@@ -366,6 +384,8 @@ price = 91.5
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Hornet Cruise Disruptor
+
 [Good]
 nickname = cruise_disruptor01_mark02
 equipment = cruise_disruptor01_mark02
@@ -389,6 +409,8 @@ price = 2740.5
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_missiles.3db
 combinable = true
 
+; Starkiller Torpedo Launcher
+
 [Good]
 nickname = torpedo01_mark01
 equipment = torpedo01_mark01
@@ -412,6 +434,8 @@ price = 373
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_torpedo.3db
 combinable = true
 
+; Sunslayer Torpedo Launcher
+
 [Good]
 nickname = torpedo01_mark02
 equipment = torpedo01_mark02
@@ -435,6 +459,8 @@ price = 7229
 item_icon = equipment\models\commodities\nn_icons\EQUIPICON_torpedo.3db
 combinable = true
 
+; Drone Mine
+
 [Good]
 nickname = mine01_mark01
 equipment = mine01_mark01
@@ -6584,7 +6610,7 @@ equipment = sensor_probe_player_ammo
 shop_archetype = SOLAR\MISC\scan_sensor.3db
 material_library = SOLAR\solar_mat_misc02.mat
 category = equipment
-price = 50000
+price = 500
 item_icon = equipment\models\commodities\nn_icons\scan_sensor.3db
 combinable = true
 ids_name = 264752

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

@@ -23340,6 +23340,8 @@ character_density = 2
 fixture = ku0102_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
 fixture = ku0102_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
 
+; Yokohama Shipyard
+
 [MBase]
 nickname = Ku01_03_Base
 local_faction = co_shi_grp
@@ -46017,3 +46019,529 @@ fixture = st0301_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_ship
 fixture = st0301_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
 
 ; Omicron Beta 2
+
+
+; Safe Dock
+
+[MBase]
+nickname = Bw11_01_Base
+local_faction = li_n_grp
+diff = 30
+[MVendor]
+num_offers = 0, 0
+
+[MRoom]
+nickname = Deck
+character_density = 3
+
+[MBase]
+nickname = LI06_01_Base
+local_faction = li_lsf_grp
+diff = 3
+msg_id_prefix = gcs_refer_base_LI06_01_Base
+
+[MVendor]
+num_offers = 2, 4
+
+[BaseFaction]
+faction = li_p_grp
+weight = 9
+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
+offers_missions = 
+mission_type = DestroyMission, 0.112387, 0.351002, 40
+npc = LI0601_planetform_001_m
+npc = LI0601_planetform_002_m
+npc = LI0601_planetform_003_m
+
+[BaseFaction]
+faction = co_ss_grp
+weight = 9
+npc = LI0601_universal_001_m
+
+[BaseFaction]
+faction = gd_bh_grp
+weight = 18
+offers_missions = 
+mission_type = DestroyMission, 0.112387, 0.351002, 40
+npc = LI0601_bounty_001_f
+npc = LI0601_bounty_002_m
+
+[GF_NPC]
+nickname = LI0601_bounty_001_f
+body = pl_female2_journeyman_body
+head = sh_female1_head_gen
+lefthand = benchmark_female_hand_left
+righthand = benchmark_female_hand_right
+individual_name = 220154
+affiliation = gd_bh_grp
+voice = rvp501
+misn = DestroyMission, 0.112387, 0.351002
+room = bar
+bribe = co_hsp_grp, 10000, 16100
+bribe = co_ni_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16100
+bribe = co_vr_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16101
+know = 251644, 252612, 6000, 2
+knowdb = li02_to_li04_hole
+
+[GF_NPC]
+nickname = LI0601_bounty_002_m
+body = sh_male2_body
+head = pi_pirate1_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 220155
+affiliation = gd_bh_grp
+voice = rvp101
+misn = DestroyMission, 0.112387, 0.351002
+room = bar
+bribe = co_be_grp, 10000, 16100
+bribe = co_nws_grp, 10000, 16100
+bribe = co_ti_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16101
+accessory = prop_neuralnet_B_right
+
+[GF_NPC]
+nickname = LI0601_fix_bartender
+body = li_bartender_body
+head = rh_bartender_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244652
+affiliation = co_ti_grp
+voice = rvp111
+bribe = co_be_grp, 10000, 16100
+bribe = co_nws_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16100
+bribe = co_ti_grp, 10000, 16101
+
+[GF_NPC]
+nickname = LI0601_fix_ship
+base_appr = Robot_body_c
+individual_name = 244655
+affiliation = co_ti_grp
+voice = rvp003
+
+[GF_NPC]
+nickname = LI0601_fix_trader
+base_appr = Robot_body_a
+individual_name = 244653
+affiliation = co_ti_grp
+voice = rvp003
+
+[GF_NPC]
+nickname = LI0601_fix_weaponsdealer
+base_appr = Robot_body_e
+individual_name = 244654
+affiliation = co_ti_grp
+voice = rvp003
+
+[GF_NPC]
+nickname = LI0601_lpolice_001_m
+body = li_male_guard_body
+head = ge_male3_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 220156
+affiliation = li_p_grp
+voice = rvp111
+misn = DestroyMission, 0.112387, 0.351002
+room = bar
+bribe = li_p_grp, 10000, 16101
+bribe = co_alg_grp, 10000, 16100
+bribe = co_be_grp, 10000, 16100
+bribe = co_ni_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16100
+
+[GF_NPC]
+nickname = LI0601_planetform_001_m
+body = sc_scientist4_body
+head = li_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 220157
+affiliation = co_ti_grp
+voice = rvp101
+misn = DestroyMission, 0.112387, 0.351002
+room = bar
+know = 251654, 253753, 1500, 1
+knowdb = br01_05
+know = 251719, 253754, 600, 1
+knowdb = iw03_01
+
+[GF_NPC]
+nickname = LI0601_planetform_002_m
+body = sc_scientist4_body
+head = pl_male7_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 220158
+affiliation = co_ti_grp
+voice = rvp101
+misn = DestroyMission, 0.112387, 0.351002
+room = bar
+know = 251681, 253755, 2500, 1
+knowdb = br06_04
+know = 251704, 253756, 3500, 1
+knowdb = bw10_01
+
+[GF_NPC]
+nickname = LI0601_planetform_003_m
+body = sc_scientist4_body
+head = pl_male5_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 220159
+affiliation = co_ti_grp
+voice = rvp131
+misn = DestroyMission, 0.112387, 0.351002
+room = bar
+know = 251659, 253757, 1000, 1
+knowdb = br02_02
+
+[GF_NPC]
+nickname = LI0601_universal_001_m
+body = li_tilton_body
+head = li_sales_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 220160
+affiliation = co_ss_grp
+voice = rvp101
+room = bar
+bribe = li_p_grp, 10000, 16100
+bribe = co_hsp_grp, 10000, 16100
+bribe = co_ni_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16101
+bribe = co_ti_grp, 10000, 16100
+
+[MRoom]
+nickname = bar
+character_density = 4
+fixture = LI0601_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+
+[MRoom]
+nickname = Planetscape
+character_density = 3
+fixture = LI0601_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
+fixture = LI0601_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = LI0601_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MBase]
+nickname = LI06_02_Base
+local_faction = co_os_grp
+diff = 1
+msg_id_prefix = gcs_refer_base_LI06_02_Base
+
+[MVendor]
+num_offers = 2, 4
+
+[BaseFaction]
+faction = co_os_grp
+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
+head = br_bartender_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244617
+affiliation = co_os_grp
+voice = rvp101
+
+
+[GF_NPC]
+nickname = LI0602_fix_ship
+body = li_male_elite_body
+head = rh_hassler_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244620
+affiliation = co_os_grp
+voice = rvp111
+
+[GF_NPC]
+nickname = LI0602_fix_trader
+body = li_male_elite_body
+head = ge_male3_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244618
+affiliation = co_os_grp
+voice = rvp101
+
+[GF_NPC]
+nickname = LI0602_fix_weaponsdealer
+body = li_male_elite_body
+head = li_rockford_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244619
+affiliation = co_os_grp
+voice = rvp111
+
+[MRoom]
+nickname = bar
+character_density = 4
+fixture = LI0602_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_bartender_fidget.thn, bartender
+
+[MRoom]
+nickname = Deck
+character_density = 3
+fixture = LI0602_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
+fixture = LI0602_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = LI0602_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MBase]
+nickname = LI06_03_Base
+local_faction = gd_z_grp
+diff = 4
+msg_id_prefix = gcs_refer_base_LI06_03_Base
+
+[MVendor]
+num_offers = 2, 4
+
+[BaseFaction]
+faction = gd_z_grp
+weight = 23
+offers_missions = true
+mission_type = DestroyMission, 0.000000, 0.112387, 100
+
+[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
+head = br_sales_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244639
+affiliation = gd_z_grp
+voice = rvp101
+bribe = fc_j_grp, 10000, 16100
+bribe = fc_lr_grp, 10000, 16101
+bribe = fc_ou_grp, 10000, 16100
+
+
+[GF_NPC]
+nickname = LI0603_fix_ship
+body = pi_pirate8_body
+head = pi_pirate3_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 245175
+affiliation = gd_z_grp
+voice = rvp106
+
+[GF_NPC]
+nickname = LI0603_fix_trader
+body = pi_pirate8_body
+head = pi_pirate2_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244640
+affiliation = gd_z_grp
+voice = rvp101
+
+[GF_NPC]
+nickname = LI0603_fix_weaponsdealer
+body = pi_pirate8_body
+head = pi_pirate4_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244641
+affiliation = gd_z_grp
+voice = rvp106
+
+[MRoom]
+nickname = bar
+character_density = 5
+fixture = LI0603_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+
+[MRoom]
+nickname = Deck
+character_density = 2
+fixture = LI0603_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = LI0603_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MRoom]
+nickname = ShipDealer
+character_density = 2
+fixture = LI0603_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
+
+[MBase]
+nickname = LI06_04_Base
+local_faction = li_lsf_grp
+diff = 2
+msg_id_prefix = gcs_refer_base_LI06_04_Base
+
+[MVendor]
+num_offers = 2, 4
+
+[BaseFaction]
+faction = li_lsf_grp
+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
+head = li_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244624
+affiliation = li_lsf_grp
+voice = rvp101
+
+
+[GF_NPC]
+nickname = LI0604_fix_trader
+body = li_male_elite_body
+head = rh_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244625
+affiliation = li_lsf_grp
+voice = rvp111
+
+[GF_NPC]
+nickname = LI0604_fix_weaponsdealer
+body = li_male_elite_body
+head = rh_hassler_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+individual_name = 244626
+affiliation = li_lsf_grp
+voice = rvp101
+
+[MRoom]
+nickname = bar
+character_density = 6
+fixture = LI0604_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+
+[MRoom]
+nickname = Deck
+character_density = 2
+fixture = LI0604_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = LI0604_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MBase]
+nickname = LI06_05_Base
+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
+
+[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]