Cluster fix - LG should be fixed too but weird behaviour

Possible error with LG ammo in TBD Mortars and not here, need to investigate
This commit is contained in:
Sotirios Pupakis
2024-05-31 03:45:27 +02:00
parent 0e7b43250d
commit 95ae949b98
4 changed files with 36 additions and 5 deletions

View File

@@ -24,7 +24,7 @@
#include "..\script_component.hpp"
params ["_arty"];
params ["_arty", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_gunner"];
_arty animateSource ["recoil_rest_source", 0.5, 5];
_arty animateSource ["recoil_barrel_source", 2, 20];
@@ -40,3 +40,36 @@ private _mags = _arty magazinesTurret [0];
_arty animateSource ["magazine_hide_source", 1, true];
_arty animateSource ["magazine_load_source", 0, true];
// Server only - TODO Test and move up
if (!isServer) exitWith {};
// "Temp" fix for cluster and laser guided because BI?
if (_ammo in ["tbd_mortars_105mm_shell_ammo_dpicm" /*"tbd_mortars_105mm_shell_ammo_laser"*/]) then {
// wait 5 seconds to let the ammo get high enough
[{
params ["_projectile"];
if (isNull _projectile) exitWith {};
// Check the height of the projectile
private _pos = getPosATL _projectile;
if (_pos select 2 < 200) exitWith {};
// Start a PFH that will
[{
params ["_projectile", "_handle"];
if (isNull _projectile) exitWith {
[_handle] call CBA_fnc_removePerFrameHandler;
};
// Check the height of the projectile
private _pos = getPosATL _projectile;
if (_pos select 2 < 200) exitWith {
// Trigger the ammo
triggerAmmo _projectile;
[_handle] call CBA_fnc_removePerFrameHandler;
};
},
0,
_projectile] call CBA_fnc_addPerFrameHandler;
}, [_projectile], 5] call CBA_fnc_waitAndExecute;
};

View File

@@ -55,7 +55,6 @@ class CfgVehicles {
gunnergetInAction = "GetInLow";
gunnergetOutAction = "GetOutLow";
weapons[] = {QUOTE(TBD_M119_WEAPON)};
//weapons[] = {"mortar_155mm_AMOS"};
elevationMode = 1;
initCamElev = 20;
minCamElev = -35;
@@ -103,8 +102,7 @@ class CfgVehicles {
memoryPointsGetInGunnerDir = "pos_gunner_dir";
proxyType = "CPGunner";
proxyIndex = 1;
//magazines[] = {};
magazines[] = {"2Rnd_155mm_Mo_Cluster"};
magazines[] = {};
};
};
htMin = 1;

View File

@@ -15,7 +15,7 @@ class CfgWeapons {
QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_HE_CHARGE_MAG_7),
QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_LASER_CHARGE_MAG_7),
QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_SMOKE_CHARGE_MAG_7),
QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_7), "2Rnd_155mm_Mo_Cluster"
QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_1), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_2), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_3), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_4), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_5), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_6), QUOTE(TBD_MORTARS_105mm_ROUND_DPICM_CHARGE_MAG_7)
};
modes[] = {"Single"};
reloadSound[] = {QPATHTOF(TBD_M119\sounds\reload.ogg), 3, 1, 50};