diff --git a/BUILD_INFO.txt b/BUILD_INFO.txt index 53d3b4aa..eecf36d0 100644 --- a/BUILD_INFO.txt +++ b/BUILD_INFO.txt @@ -1,3 +1,14 @@ +REM-Client 6b9c5f61: turret view at the third-person camera distance, all ship tethers matched (64-bit) +date: 2026-11-16T10:45:00+01:00 +source: 6b9c5f61 (main) = d9c88fea plus src/freelancer/Client/space_camera_turret.cpp (TurretCameraComputeView) and docs/re/deviations.md; built from that tree before the commit +change: the turret view hangs back by the same speed look-ahead as the third-person view (speed * 0.05, capped at 300 m/s); with the tethers of all 66 ships with camera_offset set to the third-person eye at rest (HpCockpit + camera_offset, fallback (0, 0, -4)), switching between third-person and turret view no longer moves the camera (issue #40) +files: EXE/Freelancer.exe, DATA/SHIPS/shiparch.ini (cockpit of 21 ships), DATA/COCKPITS/**/*.ini (tether), DATA/COCKPITS/REM/cam_*.ini (21 new) +build: Release|x64 incremental freelancer.vcxproj build succeeded; dependency DLLs not deployed +validation: runtime exe byte-identical to build; tested in single player by the owner with one test save per ship (third-person vs turret view, at rest and in flight); multiplayer NOT tested +runtime: REM-LOCAL uses REM-Mod/EXE directly; restart Freelancer to load +SHA-256 EXE/Freelancer.exe: 00bb4008a431c7b79974239b13e88272ae28cd67887a680e3002221a79e08370 + +Previous deployment record: REM-Client 900ad427: far planets drawn again (rendcomp.dll rebuilt), jump drive arrival kept out of planets (64-bit) date: 2026-11-16T06:30:43+01:00 source: 900ad427 (main, SpClearOfBodies in hud_status_core.cpp; built before its rebase onto 38f2ef68, whose gundll.cpp is no part of these files) plus src/freelancer/Client/space_camera_first.cpp and docs/re/deviations.md as committed in d9c88fea (the cockpit record below); rendcomp.dll from unchanged source diff --git a/DATA/COCKPITS/BRETONIA/b_elite.ini b/DATA/COCKPITS/BRETONIA/b_elite.ini index 0da9b200..f1b57de2 100644 --- a/DATA/COCKPITS/BRETONIA/b_elite.ini +++ b/DATA/COCKPITS/BRETONIA/b_elite.ini @@ -6,7 +6,7 @@ head_turn = 40, 15 [CockpitCamera] [TurretCamera] -tether = 0, 8.977, 40.231 +tether = 0, 8.977, 36.231 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/BRETONIA/b_fighter.ini b/DATA/COCKPITS/BRETONIA/b_fighter.ini index 924941f8..873b19d7 100644 --- a/DATA/COCKPITS/BRETONIA/b_fighter.ini +++ b/DATA/COCKPITS/BRETONIA/b_fighter.ini @@ -6,7 +6,7 @@ head_turn = 40, 50 [CockpitCamera] [TurretCamera] -tether = 0, 8.72, 30.35 +tether = 0, 8.722, 26.357 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/BRETONIA/b_freighter.ini b/DATA/COCKPITS/BRETONIA/b_freighter.ini index f85a78dc..0e1a9db0 100644 --- a/DATA/COCKPITS/BRETONIA/b_freighter.ini +++ b/DATA/COCKPITS/BRETONIA/b_freighter.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0, 13.9134, 49.1701 +tether = 0, 13.913, 45.17 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CIVILIAN/civilian.ini b/DATA/COCKPITS/CIVILIAN/civilian.ini index 59fc6502..e55b2900 100644 --- a/DATA/COCKPITS/CIVILIAN/civilian.ini +++ b/DATA/COCKPITS/CIVILIAN/civilian.ini @@ -6,7 +6,7 @@ head_turn = 35, 15 [CockpitCamera] [TurretCamera] -tether = 0, 13, 46 +tether = 0, 9, 35 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CIVILIAN/civilian_elite.ini b/DATA/COCKPITS/CIVILIAN/civilian_elite.ini index c4f37cc5..c6753d80 100644 --- a/DATA/COCKPITS/CIVILIAN/civilian_elite.ini +++ b/DATA/COCKPITS/CIVILIAN/civilian_elite.ini @@ -6,7 +6,7 @@ head_turn = 35, 15 [CockpitCamera] [TurretCamera] -tether = 0, 12.97, 41.888 +tether = 0, 12.97, 37.889 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CIVILIAN/civilian_fighter.ini b/DATA/COCKPITS/CIVILIAN/civilian_fighter.ini index c4f37cc5..c6753d80 100644 --- a/DATA/COCKPITS/CIVILIAN/civilian_fighter.ini +++ b/DATA/COCKPITS/CIVILIAN/civilian_fighter.ini @@ -6,7 +6,7 @@ head_turn = 35, 15 [CockpitCamera] [TurretCamera] -tether = 0, 12.97, 41.888 +tether = 0, 12.97, 37.889 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CIVILIAN/civilian_vheavy.ini b/DATA/COCKPITS/CIVILIAN/civilian_vheavy.ini index c4f37cc5..c6753d80 100644 --- a/DATA/COCKPITS/CIVILIAN/civilian_vheavy.ini +++ b/DATA/COCKPITS/CIVILIAN/civilian_vheavy.ini @@ -6,7 +6,7 @@ head_turn = 35, 15 [CockpitCamera] [TurretCamera] -tether = 0, 12.97, 41.888 +tether = 0, 12.97, 37.889 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CORSAIR/bw_elite.ini b/DATA/COCKPITS/CORSAIR/bw_elite.ini index 74315395..855b6ff4 100644 --- a/DATA/COCKPITS/CORSAIR/bw_elite.ini +++ b/DATA/COCKPITS/CORSAIR/bw_elite.ini @@ -6,7 +6,7 @@ head_turn = 50, 40 [CockpitCamera] [TurretCamera] -tether = 0, 7.536, 33.491 +tether = 0, 7.537, 29.491 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CORSAIR/bw_elite2.ini b/DATA/COCKPITS/CORSAIR/bw_elite2.ini index de0607c9..2774aef7 100644 --- a/DATA/COCKPITS/CORSAIR/bw_elite2.ini +++ b/DATA/COCKPITS/CORSAIR/bw_elite2.ini @@ -6,7 +6,7 @@ head_turn = 40, 20 [CockpitCamera] [TurretCamera] -tether = 0, 7.536, 33.491 +tether = 0, 10.17, 30.685 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CORSAIR/bw_fighter.ini b/DATA/COCKPITS/CORSAIR/bw_fighter.ini index 9c382be2..1ba93909 100644 --- a/DATA/COCKPITS/CORSAIR/bw_fighter.ini +++ b/DATA/COCKPITS/CORSAIR/bw_fighter.ini @@ -6,7 +6,7 @@ head_turn = 50, 40 [CockpitCamera] [TurretCamera] -tether = 0, 9.536, 33.491 +tether = 0, 9.537, 29.491 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CORSAIR/bw_freighter.ini b/DATA/COCKPITS/CORSAIR/bw_freighter.ini index 808081be..845a8ee4 100644 --- a/DATA/COCKPITS/CORSAIR/bw_freighter.ini +++ b/DATA/COCKPITS/CORSAIR/bw_freighter.ini @@ -6,7 +6,7 @@ head_turn = 50, 40 [CockpitCamera] [TurretCamera] -tether = 0, 11.3695, 39.309 +tether = 0, 11.369, 35.309 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CORSAIR/corsair_elite.ini b/DATA/COCKPITS/CORSAIR/corsair_elite.ini index f7b2b335..a1768fe1 100644 --- a/DATA/COCKPITS/CORSAIR/corsair_elite.ini +++ b/DATA/COCKPITS/CORSAIR/corsair_elite.ini @@ -6,7 +6,7 @@ head_turn = 40, 15 [CockpitCamera] [TurretCamera] -tether = 0, 16.096, 57.76 +tether = 0, 16.096, 53.762 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CORSAIR/corsair_fighter.ini b/DATA/COCKPITS/CORSAIR/corsair_fighter.ini index 5304f5b5..8a06f4f1 100644 --- a/DATA/COCKPITS/CORSAIR/corsair_fighter.ini +++ b/DATA/COCKPITS/CORSAIR/corsair_fighter.ini @@ -6,7 +6,7 @@ head_turn = 50, 40 [CockpitCamera] [TurretCamera] -tether = 0, 13.258, 49.058 +tether = 0, 13.259, 45.058 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/CORSAIR/corsair_freighter.ini b/DATA/COCKPITS/CORSAIR/corsair_freighter.ini index 371352f0..18538207 100644 --- a/DATA/COCKPITS/CORSAIR/corsair_freighter.ini +++ b/DATA/COCKPITS/CORSAIR/corsair_freighter.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0, 12.5988, 47.84 +tether = 0, 12.599, 43.84 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/KUSARI/k_elite.ini b/DATA/COCKPITS/KUSARI/k_elite.ini index fa09f0f4..810fbe17 100644 --- a/DATA/COCKPITS/KUSARI/k_elite.ini +++ b/DATA/COCKPITS/KUSARI/k_elite.ini @@ -7,7 +7,7 @@ head_turn = 40, 15 znear = 1 [TurretCamera] -tether = 0, 6.709, 29.226 +tether = 0, 6.709, 25.226 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/KUSARI/k_fighter.ini b/DATA/COCKPITS/KUSARI/k_fighter.ini index 885c9f03..36df52e2 100644 --- a/DATA/COCKPITS/KUSARI/k_fighter.ini +++ b/DATA/COCKPITS/KUSARI/k_fighter.ini @@ -6,7 +6,7 @@ head_turn = 65, 25 [CockpitCamera] [TurretCamera] -tether = 0, 6.64, 26.18 +tether = 0, 6.642, 22.186 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/KUSARI/k_freighter.ini b/DATA/COCKPITS/KUSARI/k_freighter.ini index 8af19fda..52b0815a 100644 --- a/DATA/COCKPITS/KUSARI/k_freighter.ini +++ b/DATA/COCKPITS/KUSARI/k_freighter.ini @@ -7,7 +7,7 @@ head_turn = 30, 10 znear = 1 [TurretCamera] -tether = 0, 10.129, 40.9442 +tether = 0, 10.129, 36.944 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/KUSARI/pi_elite.ini b/DATA/COCKPITS/KUSARI/pi_elite.ini index d211e380..58d9900c 100644 --- a/DATA/COCKPITS/KUSARI/pi_elite.ini +++ b/DATA/COCKPITS/KUSARI/pi_elite.ini @@ -6,7 +6,7 @@ head_turn = 65, 25 [CockpitCamera] [TurretCamera] -tether = 0, 12.445, 37.365 +tether = 0, 12.445, 33.365 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/KUSARI/pi_elite2.ini b/DATA/COCKPITS/KUSARI/pi_elite2.ini index fc0ec0f3..b47acc11 100644 --- a/DATA/COCKPITS/KUSARI/pi_elite2.ini +++ b/DATA/COCKPITS/KUSARI/pi_elite2.ini @@ -6,7 +6,7 @@ head_turn = 65, 25 [CockpitCamera] [TurretCamera] -tether = 0, 16.096, 57.76 +tether = 0, 12.445, 31.365 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/KUSARI/pi_fighter.ini b/DATA/COCKPITS/KUSARI/pi_fighter.ini index 413a2047..b13df54e 100644 --- a/DATA/COCKPITS/KUSARI/pi_fighter.ini +++ b/DATA/COCKPITS/KUSARI/pi_fighter.ini @@ -6,7 +6,7 @@ head_turn = 65, 25 [CockpitCamera] [TurretCamera] -tether = 0, 10.445, 39.369 +tether = 0, 10.445, 31.365 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/LIBERTY/bh_elite.ini b/DATA/COCKPITS/LIBERTY/bh_elite.ini index c7546e82..e555a8d2 100644 --- a/DATA/COCKPITS/LIBERTY/bh_elite.ini +++ b/DATA/COCKPITS/LIBERTY/bh_elite.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0, 8.577, 33.039 +tether = 0, 8.577, 29.039 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/LIBERTY/bh_elite2.ini b/DATA/COCKPITS/LIBERTY/bh_elite2.ini index c7546e82..a1184a5c 100644 --- a/DATA/COCKPITS/LIBERTY/bh_elite2.ini +++ b/DATA/COCKPITS/LIBERTY/bh_elite2.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0, 8.577, 33.039 +tether = 0, 10.577, 31.039 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/LIBERTY/bh_fighter.ini b/DATA/COCKPITS/LIBERTY/bh_fighter.ini index 8c716805..3ab4ec35 100644 --- a/DATA/COCKPITS/LIBERTY/bh_fighter.ini +++ b/DATA/COCKPITS/LIBERTY/bh_fighter.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0, 9, 33 +tether = 0, 10.577, 29.039 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/LIBERTY/l_elite.ini b/DATA/COCKPITS/LIBERTY/l_elite.ini index a1d43acf..81bbd715 100644 --- a/DATA/COCKPITS/LIBERTY/l_elite.ini +++ b/DATA/COCKPITS/LIBERTY/l_elite.ini @@ -6,7 +6,7 @@ head_turn = 40, 15 [CockpitCamera] [TurretCamera] -tether = 0, 8, 32.5 +tether = 0, 8, 28.5 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/LIBERTY/l_fighter.ini b/DATA/COCKPITS/LIBERTY/l_fighter.ini index c39fd62b..959ead41 100644 --- a/DATA/COCKPITS/LIBERTY/l_fighter.ini +++ b/DATA/COCKPITS/LIBERTY/l_fighter.ini @@ -6,7 +6,7 @@ head_turn = 50, 40 [CockpitCamera] [TurretCamera] -tether = 0, 5.78, 22.874 +tether = 0, 5.78, 18.874 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/LIBERTY/l_freighter.ini b/DATA/COCKPITS/LIBERTY/l_freighter.ini index deeea23f..2721174c 100644 --- a/DATA/COCKPITS/LIBERTY/l_freighter.ini +++ b/DATA/COCKPITS/LIBERTY/l_freighter.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0, 11, 39 +tether = 0, 11, 35 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/LIBERTY/or_elite.ini b/DATA/COCKPITS/LIBERTY/or_elite.ini index 10fa4aaf..3b0dbbdb 100644 --- a/DATA/COCKPITS/LIBERTY/or_elite.ini +++ b/DATA/COCKPITS/LIBERTY/or_elite.ini @@ -6,7 +6,7 @@ head_turn = 40, 15 [CockpitCamera] [TurretCamera] -tether = 0, 10.929, 43.423 +tether = 0, 10.929, 39.423 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/NOMAD/no2_fighter.ini b/DATA/COCKPITS/NOMAD/no2_fighter.ini index a0c45f4f..46004c3e 100644 --- a/DATA/COCKPITS/NOMAD/no2_fighter.ini +++ b/DATA/COCKPITS/NOMAD/no2_fighter.ini @@ -6,7 +6,7 @@ head_turn = 50, 40 [CockpitCamera] [TurretCamera] -tether = 0, 9.536, 33.491 +tether = 0, 10, 38.75 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/REM/bh_elite3.ini b/DATA/COCKPITS/REM/bh_elite3.ini index 8f1bf2bc..e6b465b1 100644 --- a/DATA/COCKPITS/REM/bh_elite3.ini +++ b/DATA/COCKPITS/REM/bh_elite3.ini @@ -6,7 +6,7 @@ head_turn = 40, 15 [CockpitCamera] [TurretCamera] -tether = 0, 8, 30.76 +tether = 0, 10.892, 28.612 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 \ No newline at end of file diff --git a/DATA/COCKPITS/REM/cam_bh_freighter.ini b/DATA/COCKPITS/REM/cam_bh_freighter.ini new file mode 100644 index 00000000..c9c94bc6 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_bh_freighter.ini @@ -0,0 +1,16 @@ +[Cockpit] +mesh = cockpits\bretonia\models\br_elite_cockpit.cmp +int_brightness = 0.500000 +head_turn = 40, 50 + +[CockpitCamera] + + +[TurretCamera] +tether = 0, 45, 124 +yaw_rotate_speed = 2.250000 +pitch_rotate_speed = 1.500000 +accel_speed = 5 + +[RearViewCamera] +view_position = 0, 20, 150 \ No newline at end of file diff --git a/DATA/COCKPITS/REM/cam_bw_freighter_t1.ini b/DATA/COCKPITS/REM/cam_bw_freighter_t1.ini new file mode 100644 index 00000000..696a505f --- /dev/null +++ b/DATA/COCKPITS/REM/cam_bw_freighter_t1.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\corsair\models\co_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 10, 31 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_cv02_heavy_fighter.ini b/DATA/COCKPITS/REM/cam_cv02_heavy_fighter.ini new file mode 100644 index 00000000..b5992d3a --- /dev/null +++ b/DATA/COCKPITS/REM/cam_cv02_heavy_fighter.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\civilian\models\cv_cockpit.cmp +int_brightness = 0.5 +head_turn = 35, 15 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 13, 38 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_ge_drone.ini b/DATA/COCKPITS/REM/cam_ge_drone.ini new file mode 100644 index 00000000..bf006201 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_ge_drone.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\liberty\models\li_fighter_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 13, 41.2 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_ge_rem_csv.ini b/DATA/COCKPITS/REM/cam_ge_rem_csv.ini new file mode 100644 index 00000000..3b51cc47 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_ge_rem_csv.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\rheinland\models\rh_freighter_cockpit.cmp +int_brightness = 0.5 +head_turn = 30, 10 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 10, 32 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_ge_transport_player.ini b/DATA/COCKPITS/REM/cam_ge_transport_player.ini new file mode 100644 index 00000000..e12c7891 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_ge_transport_player.ini @@ -0,0 +1,16 @@ +[Cockpit] +mesh = cockpits\bretonia\models\br_elite_cockpit.cmp +int_brightness = 0.500000 +head_turn = 40, 50 + +[CockpitCamera] + + +[TurretCamera] +tether = 0, 40, 166 +yaw_rotate_speed = 2.250000 +pitch_rotate_speed = 1.500000 +accel_speed = 5 + +[RearViewCamera] +view_position = 0, 20, 150 \ No newline at end of file diff --git a/DATA/COCKPITS/REM/cam_ku_blooddragon.ini b/DATA/COCKPITS/REM/cam_ku_blooddragon.ini new file mode 100644 index 00000000..58043d54 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_ku_blooddragon.ini @@ -0,0 +1,17 @@ +[Cockpit] +mesh = cockpits\kusari\models\ku_elite_cockpit.cmp +int_brightness = 0.5 +head_turn = 40, 15 + +[CockpitCamera] +znear = 1 + +[TurretCamera] +tether = 0, 7.209, 20.226 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + +[RearViewCamera] +view_position = 0, 5, 20 + diff --git a/DATA/COCKPITS/REM/cam_ku_dragon.ini b/DATA/COCKPITS/REM/cam_ku_dragon.ini new file mode 100644 index 00000000..58043d54 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_ku_dragon.ini @@ -0,0 +1,17 @@ +[Cockpit] +mesh = cockpits\kusari\models\ku_elite_cockpit.cmp +int_brightness = 0.5 +head_turn = 40, 15 + +[CockpitCamera] +znear = 1 + +[TurretCamera] +tether = 0, 7.209, 20.226 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + +[RearViewCamera] +view_position = 0, 5, 20 + diff --git a/DATA/COCKPITS/REM/cam_li_dreadnought.ini b/DATA/COCKPITS/REM/cam_li_dreadnought.ini new file mode 100644 index 00000000..5597ca73 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_li_dreadnought.ini @@ -0,0 +1,15 @@ +[Cockpit] +mesh = cockpits\liberty\models\li_freighter_cockpit.cmp +int_brightness = 0.500000 +head_turn = 30, 10 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 28, 496 +yaw_rotate_speed = 2.000000 +pitch_rotate_speed = 1.500000 +accel_speed = 5 + +[RearViewCamera] +view_position = 0, 25, 170 \ No newline at end of file diff --git a/DATA/COCKPITS/REM/cam_li_elite2.ini b/DATA/COCKPITS/REM/cam_li_elite2.ini new file mode 100644 index 00000000..91bcb5b7 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_li_elite2.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\liberty\models\li_elite_cockpit.cmp +int_brightness = 0.5 +head_turn = 40, 15 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 6, 23.5 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_li_elite3.ini b/DATA/COCKPITS/REM/cam_li_elite3.ini new file mode 100644 index 00000000..0e2c2398 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_li_elite3.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\liberty\models\li_elite_cockpit.cmp +int_brightness = 0.5 +head_turn = 40, 15 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 11, 35.5 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_li_fighter_indestr.ini b/DATA/COCKPITS/REM/cam_li_fighter_indestr.ini new file mode 100644 index 00000000..1b91fea3 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_li_fighter_indestr.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\liberty\models\li_fighter_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 5.78, 25.874 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_li_fighter_king.ini b/DATA/COCKPITS/REM/cam_li_fighter_king.ini new file mode 100644 index 00000000..1b91fea3 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_li_fighter_king.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\liberty\models\li_fighter_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 5.78, 25.874 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_artillery.ini b/DATA/COCKPITS/REM/cam_no2_artillery.ini new file mode 100644 index 00000000..e0e90dde --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_artillery.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 130, 970 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_battleship.ini b/DATA/COCKPITS/REM/cam_no2_battleship.ini new file mode 100644 index 00000000..de0019e7 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_battleship.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 60, 515 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_bomber.ini b/DATA/COCKPITS/REM/cam_no2_bomber.ini new file mode 100644 index 00000000..5542fd2c --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_bomber.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 12, 41 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_boss.ini b/DATA/COCKPITS/REM/cam_no2_boss.ini new file mode 100644 index 00000000..16afc7c9 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_boss.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 1500, 6996 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_cruiser.ini b/DATA/COCKPITS/REM/cam_no2_cruiser.ini new file mode 100644 index 00000000..2a7d0d97 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_cruiser.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 50, 190 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_elite.ini b/DATA/COCKPITS/REM/cam_no2_elite.ini new file mode 100644 index 00000000..a860466f --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_elite.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 12, 42.5 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_gunboat.ini b/DATA/COCKPITS/REM/cam_no2_gunboat.ini new file mode 100644 index 00000000..4103fa5f --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_gunboat.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 35, 106 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/cam_no2_gunship.ini b/DATA/COCKPITS/REM/cam_no2_gunship.ini new file mode 100644 index 00000000..63b0be48 --- /dev/null +++ b/DATA/COCKPITS/REM/cam_no2_gunship.ini @@ -0,0 +1,13 @@ +[Cockpit] +mesh = cockpits\nomad\models\no2_cockpit.cmp +int_brightness = 0.5 +head_turn = 50, 40 + +[CockpitCamera] + +[TurretCamera] +tether = 0, 35, 146 +yaw_rotate_speed = 2 +pitch_rotate_speed = 1.5 +accel_speed = 5 + diff --git a/DATA/COCKPITS/REM/starflier_civilian.ini b/DATA/COCKPITS/REM/starflier_civilian.ini index 6c7d7a62..901c8dc6 100644 --- a/DATA/COCKPITS/REM/starflier_civilian.ini +++ b/DATA/COCKPITS/REM/starflier_civilian.ini @@ -6,7 +6,7 @@ head_turn = 35, 15 [CockpitCamera] [TurretCamera] -tether = 0, 13, 46 +tether = 0, 13, 42 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/RHEINLAND/r_elite.ini b/DATA/COCKPITS/RHEINLAND/r_elite.ini index 41cdc060..d219f479 100644 --- a/DATA/COCKPITS/RHEINLAND/r_elite.ini +++ b/DATA/COCKPITS/RHEINLAND/r_elite.ini @@ -6,7 +6,7 @@ head_turn = 45, 10 [CockpitCamera] [TurretCamera] -tether = 0, 10.33, 39.819 +tether = 0, 10.33, 35.819 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/RHEINLAND/r_fighter.ini b/DATA/COCKPITS/RHEINLAND/r_fighter.ini index 6641936b..72088828 100644 --- a/DATA/COCKPITS/RHEINLAND/r_fighter.ini +++ b/DATA/COCKPITS/RHEINLAND/r_fighter.ini @@ -6,7 +6,7 @@ head_turn = 60, 20 [CockpitCamera] [TurretCamera] -tether = 0, 9.24, 32.4158 +tether = 0, 9.241, 28.416 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/RHEINLAND/r_freighter.ini b/DATA/COCKPITS/RHEINLAND/r_freighter.ini index a4020142..4573e0fc 100644 --- a/DATA/COCKPITS/RHEINLAND/r_freighter.ini +++ b/DATA/COCKPITS/RHEINLAND/r_freighter.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0, 13, 46 +tether = 0, 13, 42 yaw_rotate_speed = 2 pitch_rotate_speed = 1.5 accel_speed = 5 diff --git a/DATA/COCKPITS/ha_transport.ini b/DATA/COCKPITS/ha_transport.ini index 7eb8ad96..299df081 100644 --- a/DATA/COCKPITS/ha_transport.ini +++ b/DATA/COCKPITS/ha_transport.ini @@ -7,7 +7,7 @@ head_turn = 30, 10 [TurretCamera] -tether = 0.000000, 18, 75 +tether = 0, 16, 61 yaw_rotate_speed = 2.250000 pitch_rotate_speed = 1.500000 accel_speed = 5 diff --git a/DATA/COCKPITS/hc_transport.ini b/DATA/COCKPITS/hc_transport.ini index 68f2c816..9c069854 100644 --- a/DATA/COCKPITS/hc_transport.ini +++ b/DATA/COCKPITS/hc_transport.ini @@ -7,7 +7,7 @@ head_turn = 40, 50 [TurretCamera] -tether = 0.000000, 40, 180 +tether = 0, 45, 176 yaw_rotate_speed = 2.250000 pitch_rotate_speed = 1.500000 accel_speed = 5 diff --git a/DATA/COCKPITS/heavylifter.ini b/DATA/COCKPITS/heavylifter.ini index 3069869b..0997cd21 100644 --- a/DATA/COCKPITS/heavylifter.ini +++ b/DATA/COCKPITS/heavylifter.ini @@ -7,7 +7,7 @@ head_turn = 40, 50 [TurretCamera] -tether = 0.000000, 20, 140 +tether = 0, 40, 146 yaw_rotate_speed = 2.250000 pitch_rotate_speed = 1.500000 accel_speed = 5 diff --git a/DATA/COCKPITS/ku_gunboat.ini b/DATA/COCKPITS/ku_gunboat.ini index 50dfbce3..e427ab62 100644 --- a/DATA/COCKPITS/ku_gunboat.ini +++ b/DATA/COCKPITS/ku_gunboat.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0.000000, 40, 180 +tether = 0, 31.838, 147.67 yaw_rotate_speed = 2.000000 pitch_rotate_speed = 1.500000 accel_speed = 5 diff --git a/DATA/COCKPITS/li_cruiser.ini b/DATA/COCKPITS/li_cruiser.ini index e46dda54..8405b47e 100644 --- a/DATA/COCKPITS/li_cruiser.ini +++ b/DATA/COCKPITS/li_cruiser.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0.000000, 40, 220 +tether = 0, 28, 196 yaw_rotate_speed = 2.000000 pitch_rotate_speed = 1.500000 accel_speed = 5 diff --git a/DATA/COCKPITS/repairship.ini b/DATA/COCKPITS/repairship.ini index 846f97df..febfd5e1 100644 --- a/DATA/COCKPITS/repairship.ini +++ b/DATA/COCKPITS/repairship.ini @@ -7,7 +7,7 @@ head_turn = 40, 50 [TurretCamera] -tether = 0.000000, 10, 67 +tether = 0, 12, 63 yaw_rotate_speed = 2.250000 pitch_rotate_speed = 1.500000 accel_speed = 5 diff --git a/DATA/COCKPITS/rh_cruiser.ini b/DATA/COCKPITS/rh_cruiser.ini index 877890b4..91540ba6 100644 --- a/DATA/COCKPITS/rh_cruiser.ini +++ b/DATA/COCKPITS/rh_cruiser.ini @@ -6,7 +6,7 @@ head_turn = 30, 10 [CockpitCamera] [TurretCamera] -tether = 0.000000, 40, 300 +tether = 0, 45, 196 yaw_rotate_speed = 2.000000 pitch_rotate_speed = 1.500000 accel_speed = 5 diff --git a/DATA/SHIPS/shiparch.ini b/DATA/SHIPS/shiparch.ini index 21919504..5483ec8b 100644 --- a/DATA/SHIPS/shiparch.ini +++ b/DATA/SHIPS/shiparch.ini @@ -322,7 +322,7 @@ DA_archetype = ships\liberty\li_elite2\li_elite2.cmp material_library = ships\liberty\li_playerships.mat material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\liberty\l_elite.ini +cockpit = cockpits\REM\cam_li_elite2.ini pilot_mesh = generic_pilot mass = 150 hold_size = 50 @@ -745,7 +745,7 @@ HP_bay_surface = HpBayDoor01 HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source num_exhaust_nozzles = 1 -cockpit = cockpits\li_cruiser.ini +cockpit = cockpits\REM\cam_li_dreadnought.ini camera_offset = 28, 500 camera_angular_acceleration = 0.100000 camera_horizontal_turn_angle = 8 @@ -2234,7 +2234,7 @@ DA_archetype = ships\kusari\ku_blood_dragon\ku_dragon.cmp material_library = ships\kusari\ku_blood_dragon.mat material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\kusari\k_elite.ini +cockpit = cockpits\REM\cam_ku_dragon.ini pilot_mesh = generic_pilot mass = 150 nanobot_limit = 58 @@ -8111,7 +8111,7 @@ DA_archetype = ships\liberty\li_fighter\li_fighter.cmp material_library = ships\liberty\li_playerships.mat material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\liberty\l_fighter.ini +cockpit = cockpits\REM\cam_li_fighter_indestr.ini pilot_mesh = generic_pilot explosion_arch = explosion_li_fighter surface_hit_effects = 0, small_hull_hit_light01, small_hull_hit_light02, small_hull_hit_light03 @@ -8182,7 +8182,7 @@ DA_archetype = ships\liberty\li_fighter\li_fighter.cmp material_library = ships\liberty\li_playerships.mat material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\liberty\l_fighter.ini +cockpit = cockpits\REM\cam_li_fighter_king.ini pilot_mesh = generic_pilot explosion_arch = explosion_li_fighter surface_hit_effects = 0, small_hull_hit_light01, small_hull_hit_light02, small_hull_hit_light03 @@ -8906,7 +8906,7 @@ camera_horizontal_turn_angle = 20 camera_vertical_turn_up_angle = 5 camera_vertical_turn_down_angle = 20 camera_turn_look_ahead_slerp_amount = 1.000000 -cockpit = cockpits\rheinland\r_freighter.ini +cockpit = cockpits\REM\cam_ge_rem_csv.ini steering_torque = 33000.000000, 33000.000000, 230000.000000 angular_drag = 41000.000000, 41000.000000, 141000.000000 rotation_inertia = 8400.000000, 8400.000000, 8400.000000 @@ -8942,7 +8942,7 @@ DA_archetype = ships\kusari\ku_blood_dragon\ku_dragon.cmp material_library = ships\kusari\ku_blood_dragon.mat material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\kusari\k_elite.ini +cockpit = cockpits\REM\cam_ku_blooddragon.ini pilot_mesh = generic_pilot mass = 150.000000 linear_drag = 1.000000 @@ -9205,7 +9205,7 @@ camera_horizontal_turn_angle = 23 camera_vertical_turn_up_angle = 5 camera_vertical_turn_down_angle = 30 camera_turn_look_ahead_slerp_amount = 1.000000 -cockpit = cockpits\hc_transport.ini +cockpit = cockpits\REM\cam_ge_transport_player.ini ; Orca @@ -9256,7 +9256,7 @@ camera_horizontal_turn_angle = 23 camera_vertical_turn_up_angle = 5 camera_vertical_turn_down_angle = 30 camera_turn_look_ahead_slerp_amount = 1.000000 -cockpit = cockpits\hc_transport.ini +cockpit = cockpits\REM\cam_bh_freighter.ini hp_type = hp_fighter_engine_special_10, HpDrive01 hp_type = hp_freighter_power_special_10, HpPower01 hp_type = hp_rem_module01, HpVelocity @@ -9281,7 +9281,7 @@ DA_archetype = Ships\border_world\bw_freighter_t1\bw_freighter_t1.cmp material_library = Ships\border_world\bw_freighter_t1\bw_freighter_t1.cmp material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\corsair\bw_freighter.ini +cockpit = cockpits\REM\cam_bw_freighter_t1.ini pilot_mesh = generic_pilot nanobot_limit = 32 shield_battery_limit = 32 @@ -9728,7 +9728,7 @@ HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source01 num_exhaust_nozzles = 1 hit_pts = 15000 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_elite.ini camera_offset = 12, 50 camera_angular_acceleration = 0.05 camera_horizontal_turn_angle = 17 @@ -9777,7 +9777,7 @@ HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source01 num_exhaust_nozzles = 1 hit_pts = 22000 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_bomber.ini camera_offset = 12, 50 camera_angular_acceleration = 0.05 camera_horizontal_turn_angle = 17 @@ -9827,7 +9827,7 @@ HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source01 num_exhaust_nozzles = 1 hit_pts = 65300 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_gunship.ini camera_offset = 35, 150 camera_angular_acceleration = 0.010000 camera_horizontal_turn_angle = 10 @@ -9877,7 +9877,7 @@ HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source01 num_exhaust_nozzles = 1 hit_pts = 65300 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_gunboat.ini camera_offset = 35, 150 camera_angular_acceleration = 0.010000 camera_horizontal_turn_angle = 10 @@ -9926,7 +9926,7 @@ HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source01 num_exhaust_nozzles = 1 hit_pts = 65300 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_cruiser.ini camera_offset = 50, 280 camera_angular_acceleration = 0.01 camera_horizontal_turn_angle = 15 @@ -9974,7 +9974,7 @@ HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source01 num_exhaust_nozzles = 1 hit_pts = 120300 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_battleship.ini camera_offset = 60, 750 camera_angular_acceleration = 0.005 camera_horizontal_turn_angle = 10 @@ -10020,7 +10020,7 @@ HP_bay_external = HpBayDoor02 HP_tractor_source = HpTractor_Source01 num_exhaust_nozzles = 1 hit_pts = 120300 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_artillery.ini camera_offset = 130, 1500 camera_angular_acceleration = 0.005 camera_horizontal_turn_angle = 10 @@ -10067,7 +10067,7 @@ HP_bay_external = HpMount HP_tractor_source = HpMount num_exhaust_nozzles = 1 hit_pts = 800000 -cockpit = cockpits\nomad\no2_fighter.ini +cockpit = cockpits\REM\cam_no2_boss.ini camera_offset = 1500, 7000 camera_angular_acceleration = 0.005 camera_horizontal_turn_angle = 10 @@ -10096,7 +10096,7 @@ DA_archetype = ships\liberty\li_elite2\li_elite2.cmp material_library = ships\liberty\li_playerships.mat material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\liberty\l_elite.ini +cockpit = cockpits\REM\cam_li_elite3.ini pilot_mesh = generic_pilot nanobot_limit = 61 shield_battery_limit = 61 @@ -10214,7 +10214,7 @@ DA_archetype = ships\civilian\CV02_ELITE\cv02_heavy_fighter.cmp material_library = ships\civilian\CV02_ELITE\cv02_heavy_fighter.cmp material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\civilian\civilian_vheavy.ini +cockpit = cockpits\REM\cam_cv02_heavy_fighter.ini pilot_mesh = generic_pilot nanobot_limit = 61 shield_battery_limit = 61 @@ -10499,7 +10499,7 @@ DA_archetype = ships\drones\drone.cmp material_library = ships\drones\drone.cmp material_library = fx\envmapbasic.mat envmap_material = envmapbasic -cockpit = cockpits\liberty\l_fighter.ini +cockpit = cockpits\REM\cam_ge_drone.ini pilot_mesh = generic_pilot nanobot_limit = 63 shield_battery_limit = 63 diff --git a/EXE/Freelancer.exe b/EXE/Freelancer.exe index f76bacaa..2242a4c2 100755 Binary files a/EXE/Freelancer.exe and b/EXE/Freelancer.exe differ