From 204602f2923d23dd842e14a59946bee7f984ca4e Mon Sep 17 00:00:00 2001 From: "C.S. Melis" Date: Sat, 15 Jan 2022 19:51:28 +0100 Subject: [PATCH] Apply vanilla compatibility hotfixes --- CHANGELOG.md | 1 + DATA/SHIPS/loadouts_special.ini | 28 ++++++++++++++++++++++++++++ DATA/SHIPS/loadouts_utility.ini | 4 ++++ DATA/UNIVERSE/SYSTEMS/BW02/bw02.ini | 2 +- DATA/UNIVERSE/SYSTEMS/BW05/bw05.ini | 2 +- 5 files changed, 35 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae6c2ce..5d36519 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -112,6 +112,7 @@ - Fixed uneven edges in HD main menu Freelancer logos - Set the mine detonation distance to 8 (mitigates the mine collision bug) - Added missing audio files from JFLP v1.25; fixes some incorrect NPC chatter +- Applied several vanilla compatibility hotfixes (prevents crashes when playing on vanilla servers) - Dropped support for installations via Freelancer Mod Manager diff --git a/DATA/SHIPS/loadouts_special.ini b/DATA/SHIPS/loadouts_special.ini index bd9a818..78c314e 100644 --- a/DATA/SHIPS/loadouts_special.ini +++ b/DATA/SHIPS/loadouts_special.ini @@ -397,6 +397,8 @@ nickname = or_osiris archetype = or_osiris equip = infinite_power equip = ge_s_scanner_02 +equip = weapon_platform_tower1 ;ge_s_tractor_01 +equip = weapon_platform_tower1 ;ge_lb_engine_01 equip = sfx_rumble_battleship equip = cloak_osiris, HpCloak01 equip = li_battleship_turret01, HpTurret_O1_01 @@ -522,7 +524,9 @@ nickname = MSN09_Kusari_Battleship archetype = ku_battleship equip = ge_s_scanner_02 equip = infinite_power +equip = weapon_platform_tower1 ;ge_s_tractor_01 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_kb_engine_01 equip = ku_battleship_turret01, HpTurret_K1_01 equip = ku_battleship_turret01, HpTurret_K1_02 equip = ku_battleship_turret01, HpTurret_K1_03 @@ -718,6 +722,7 @@ archetype = li_dreadnought equip = infinite_power equip = ge_s_scanner_02 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_lbd_engine_01 equip = li_battleship_turret01, HpTurret_L1_01 equip = li_battleship_turret02, HpTurret_L2_01 equip = li_battleship_turret03, HpTurret_L3_01 @@ -765,6 +770,7 @@ archetype = li_dreadnought equip = infinite_power equip = ge_s_scanner_02 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_lbd_engine_01 equip = MSN_battleship_armor equip = li_battleship_turret01, HpTurret_L1_01 equip = li_battleship_turret02, HpTurret_L2_01 @@ -885,6 +891,8 @@ nickname = MSN10_Battleship_Osiris archetype = or_osiris equip = infinite_power equip = ge_s_scanner_02 +equip = weapon_platform_tower1 ;ge_s_tractor_01 +equip = weapon_platform_tower1 ;ge_lb_engine_01 equip = sfx_rumble_battleship equip = cloak_osiris, HpCloak01 equip = li_battleship_turret01, HpTurret_O1_01 @@ -901,6 +909,8 @@ nickname = MSN11_Osirus archetype = or_osiris equip = infinite_power equip = ge_s_scanner_02 +equip = weapon_platform_tower1 ;ge_s_tractor_01 +equip = weapon_platform_tower1 ;ge_lb_engine_01 equip = sfx_rumble_battleship equip = cloak_osiris, HpCloak01 equip = li_battleship_turret01, HpTurret_O1_01 @@ -958,6 +968,7 @@ equip = rh_battleship_turret04, HpTurret_R4_04 equip = rh_battleship_turret04, HpTurret_R4_05 equip = rh_battleship_turret04, HpTurret_R4_06 equip = rh_battleship_turret04, HpTurret_R4_07 +equip = weapon_platform_tower1 ;ge_rb_engine_01 equip = SlowLargeYellow, HpRunningLight03 equip = SlowLargeYellow, HpRunningLight04 equip = SlowLargeYellow, HpRunningLight08 @@ -992,6 +1003,7 @@ equip = rh_battleship_turret04, HpTurret_R4_04 equip = rh_battleship_turret04, HpTurret_R4_05 equip = rh_battleship_turret04, HpTurret_R4_06 equip = rh_battleship_turret04, HpTurret_R4_07 +equip = weapon_platform_tower1 ;ge_rb_engine_01 equip = SlowLargeYellow, HpRunningLight03 equip = SlowLargeYellow, HpRunningLight04 equip = SlowLargeYellow, HpRunningLight08 @@ -1027,6 +1039,7 @@ equip = rh_battleship_turret04, HpTurret_R4_04 equip = rh_battleship_turret04, HpTurret_R4_05 equip = rh_battleship_turret04, HpTurret_R4_06 equip = rh_battleship_turret04, HpTurret_R4_07 +equip = weapon_platform_tower1 ;ge_rb_engine_01 equip = SlowLargeYellow, HpRunningLight03 equip = SlowLargeYellow, HpRunningLight04 equip = SlowLargeYellow, HpRunningLight08 @@ -1532,6 +1545,8 @@ nickname = br_battleship_br_01 archetype = br_battleship equip = infinite_power equip = ge_s_scanner_02 +equip = weapon_platform_tower1 ;ge_s_tractor_01 +equip = weapon_platform_tower1 ;ge_bb_engine_01 equip = sfx_rumble_battleship equip = br_battleship_turret01, HpTurret_B1_01 equip = br_battleship_turret01, HpTurret_B1_02 @@ -1558,6 +1573,8 @@ nickname = br_battleship_co_01 archetype = br_battleship equip = infinite_power equip = ge_s_scanner_02 +equip = weapon_platform_tower1 ;ge_s_tractor_01 +equip = weapon_platform_tower1 ;ge_bb_engine_01 equip = sfx_rumble_battleship equip = br_battleship_turret01, HpTurret_B1_01 equip = br_battleship_turret01, HpTurret_B1_02 @@ -1584,7 +1601,9 @@ nickname = ku_battleship_ku_01 archetype = ku_battleship equip = ge_s_scanner_02 equip = infinite_power +equip = weapon_platform_tower1 ;ge_s_tractor_01 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_kb_engine_01 equip = ku_battleship_turret01, HpTurret_K1_01 equip = ku_battleship_turret01, HpTurret_K1_02 equip = ku_battleship_turret01, HpTurret_K1_03 @@ -1617,6 +1636,7 @@ archetype = li_dreadnought equip = infinite_power equip = ge_s_scanner_02 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_lbd_engine_01 equip = li_battleship_turret01, HpTurret_L1_01 equip = li_battleship_turret01, HpTurret_L2_01 equip = li_battleship_turret03, HpTurret_L3_01 @@ -1640,6 +1660,7 @@ archetype = li_dreadnought equip = infinite_power equip = ge_s_scanner_02 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_lbd_engine_01 equip = li_battleship_turret01, HpTurret_L1_01 equip = li_battleship_turret01, HpTurret_L2_01 equip = li_battleship_turret03, HpTurret_L3_01 @@ -1684,6 +1705,7 @@ equip = rh_battleship_turret04, HpTurret_R4_04 equip = rh_battleship_turret04, HpTurret_R4_05 equip = rh_battleship_turret04, HpTurret_R4_06 equip = rh_battleship_turret04, HpTurret_R4_07 +equip = weapon_platform_tower1 ;ge_rb_engine_01 equip = SlowLargeYellow, HpRunningLight03 equip = SlowLargeYellow, HpRunningLight04 equip = SlowLargeYellow, HpRunningLight08 @@ -1695,6 +1717,8 @@ nickname = rm_b_battleship_br_01 archetype = br_battleship equip = infinite_power equip = ge_s_scanner_02 +equip = weapon_platform_tower1 ;ge_s_tractor_01 +equip = weapon_platform_tower1 ;ge_bb_engine_01 equip = sfx_rumble_battleship equip = br_battleship_turret01, HpTurret_B1_01 equip = br_battleship_turret01, HpTurret_B1_02 @@ -1722,7 +1746,9 @@ nickname = rm_k_battleship_ku_01 archetype = ku_battleship equip = ge_s_scanner_02 equip = infinite_power +equip = weapon_platform_tower1 ;ge_s_tractor_01 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_kb_engine_01 equip = ku_battleship_turret01, HpTurret_K1_01 equip = ku_battleship_turret01, HpTurret_K1_02 equip = ku_battleship_turret01, HpTurret_K1_03 @@ -1756,6 +1782,7 @@ archetype = li_dreadnought equip = infinite_power equip = ge_s_scanner_02 equip = sfx_rumble_battleship +equip = weapon_platform_tower1 ;ge_lbd_engine_01 equip = li_battleship_turret01, HpTurret_L1_01 equip = li_battleship_turret01, HpTurret_L2_01 equip = li_battleship_turret03, HpTurret_L3_01 @@ -1802,6 +1829,7 @@ equip = rh_battleship_turret04, HpTurret_R4_05 equip = rh_battleship_turret04, HpTurret_R4_06 equip = rh_battleship_turret04, HpTurret_R4_07 equip = armor_scale_0 +equip = weapon_platform_tower1 ;ge_rb_engine_01 equip = SlowLargeYellow, HpRunningLight03 equip = SlowLargeYellow, HpRunningLight04 equip = SlowLargeYellow, HpRunningLight08 diff --git a/DATA/SHIPS/loadouts_utility.ini b/DATA/SHIPS/loadouts_utility.ini index 26fa3bc..9c03285 100644 --- a/DATA/SHIPS/loadouts_utility.ini +++ b/DATA/SHIPS/loadouts_utility.ini @@ -1264,7 +1264,9 @@ nickname = ge_liner_co_01 archetype = ge_liner equip = ge_s_scanner_02 equip = infinite_power +equip = weapon_platform_tower1 ;ge_s_tractor_01 equip = sfx_rumble_liner +equip = weapon_platform_tower1 ;ge_lnr_engine_01 equip = co_liner_turret01, HpTurret_Liner_01 equip = co_liner_turret01, HpTurret_Liner_02 equip = co_liner_turret01, HpTurret_Liner_03 @@ -1287,6 +1289,7 @@ archetype = ge_miner equip = infinite_power equip = ge_s_scanner_02 equip = sfx_rumble_ut_miner +equip = weapon_platform_tower1 ;ge_mnr_engine_01 equip = co_miner_turret01, HpTurret_U1_01 equip = co_miner_turret01, HpTurret_U1_02 equip = co_miner_turret01, HpTurret_U1_03 @@ -1313,6 +1316,7 @@ archetype = ge_miner equip = infinite_power equip = ge_s_scanner_02 equip = sfx_rumble_ut_miner +equip = weapon_platform_tower1 ;ge_mnr_engine_01 equip = co_miner_turret01, HpTurret_U1_01 equip = co_miner_turret01, HpTurret_U1_02 equip = co_miner_turret01, HpTurret_U1_03 diff --git a/DATA/UNIVERSE/SYSTEMS/BW02/bw02.ini b/DATA/UNIVERSE/SYSTEMS/BW02/bw02.ini index 6c56eba..df0835d 100644 --- a/DATA/UNIVERSE/SYSTEMS/BW02/bw02.ini +++ b/DATA/UNIVERSE/SYSTEMS/BW02/bw02.ini @@ -82,7 +82,7 @@ type = DIRECTIONAL direction = 0.259161, -0.431934, 0.863868 [Object] -nickname = Bw02_02 +nickname = Bw02_02_Base ids_name = 196696 pos = 11560, 0, -4979 archetype = miningbase_small_ice diff --git a/DATA/UNIVERSE/SYSTEMS/BW05/bw05.ini b/DATA/UNIVERSE/SYSTEMS/BW05/bw05.ini index 32e1c76..37a924a 100644 --- a/DATA/UNIVERSE/SYSTEMS/BW05/bw05.ini +++ b/DATA/UNIVERSE/SYSTEMS/BW05/bw05.ini @@ -279,7 +279,7 @@ visit = 128 sort = 99 [Object] -nickname = Bw05_03 +nickname = Bw05_03_Base ids_name = 196704 pos = -23313, 0, 10714 Archetype = space_port_dmg