Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converetd all stray tabs to spaces

Browse Source
This commit is contained in:
lambdatiger 2024-01-10 18:51:38 -06:00
parent db195f4b26
commit eef48da6bc
19 changed files with 110 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/frag/functions/fnc_dev_trackObj.sqf
View File

@ -93,7 +93,7 @@ _obj addEventHandler [
]; ];
// Add deflected eventHandler // Add deflected eventHandler
_proj addEventHandler [ _obj addEventHandler [
"Deflected", "Deflected",
{ {
params ["_proj", "_posASL"]; params ["_proj", "_posASL"];

1
addons/frag/functions/fnc_doFrag.sqf
View File

@ -52,7 +52,6 @@ if (_heightAGL < 0.25) then {
_posASL = _posASL vectorAdd [0, 0, 0.25]; _posASL = _posASL vectorAdd [0, 0, 0.25];
}; };
// !*! make holdoff a gvar?
TRACE_3("fnc_doFragTargeted IF", _fragRange, _timeSince, GVAR(fragSimComplexity)); TRACE_3("fnc_doFragTargeted IF", _fragRange, _timeSince, GVAR(fragSimComplexity));
if (_fragRange > 3 && _timeSince > ACE_FRAG_HOLDOFF*1.5 && GVAR(fragSimComplexity) != 1) then { if (_fragRange > 3 && _timeSince > ACE_FRAG_HOLDOFF*1.5 && GVAR(fragSimComplexity) != 1) then {
_maxFrags = _maxFrags - ([_posASL, _fragVel, _fragRange, _maxFrags, _fragTypes, _modFragCount, _shotParents] call FUNC(doFragTargeted)); _maxFrags = _maxFrags - ([_posASL, _fragVel, _fragRange, _maxFrags, _fragTypes, _modFragCount, _shotParents] call FUNC(doFragTargeted));

11
addons/frag/functions/fnc_doSpall.sqf
View File

@ -53,7 +53,7 @@ private _vel = if (alive _projectile) then {
// Find spall speed / fragment // Find spall speed / fragment
private _dV = vectorMagnitude _lVel - vectorMagnitude _vel; private _dV = vectorMagnitude _lVel - vectorMagnitude _vel;
private _caliber = getNumber (configFile >> "cfgAmmo" >> _ammo >> "caliber"); // !*! optimize this later? private _caliber = getNumber (configFile >> "cfgAmmo" >> _ammo >> "caliber");
// scaled momentum change made on caliber-mass assumption ~sqrt(2)/20 * caliber ~= mass // scaled momentum change made on caliber-mass assumption ~sqrt(2)/20 * caliber ~= mass
private _deltaMomentum = 0.0707 * _caliber * sqrt( _dV ) * GVAR(SpallIntensity); private _deltaMomentum = 0.0707 * _caliber * sqrt( _dV ) * GVAR(SpallIntensity);
TRACE_3("found speed",_dV,_caliber,_deltaMomentum); TRACE_3("found speed",_dV,_caliber,_deltaMomentum);
@ -63,20 +63,19 @@ if (_deltaMomentum < 2) exitWith {
}; };
//** start calculating where the spalling should come !*! could be better **//
private _lVelUnit = vectorNormalized _lVel; private _lVelUnit = vectorNormalized _lVel;
private _unitStep = _lVelUnit vectorMultiply 0.05; private _unitStep = _lVelUnit vectorMultiply 0.05;
private _spallPos = +_lPosASL; private _spallPos = +_lPosASL;
if (terrainIntersectASL [_lPosASL vectorAdd _unitStep, _lPosASL]) exitWith {
TRACE_3("terrainIntersect",_lPosASL,_unitStep,_lPosASL);
};
if (120 > acos ((vectorNormalized _lVelUnit) vectorDotProduct _sNorm)) then { if (120 > acos ((vectorNormalized _lVelUnit) vectorDotProduct _sNorm)) then {
_spallPos = _spallPos vectorAdd (_unitStep vectorMultiply 5); _spallPos = _spallPos vectorAdd (_unitStep vectorMultiply 5);
}; };
if (terrainIntersectASL [_lPosASL vectorAdd _unitStep, _lPosASL]) exitWith {
TRACE_3("terrainIntersect",_lPosASL,_unitStep,_lPosASL);
};
//***** Passed all exit withs *****// //***** Passed all exit withs *****//
GVAR(lastSpallTime) = CBA_missionTime; GVAR(lastSpallTime) = CBA_missionTime;

3
addons/frag/functions/fnc_fired.sqf
View File

@ -33,7 +33,8 @@ _shouldFrag params ["_doFrag", "_doSubmunit"];
if (_doFrag) then { if (_doFrag) then {
// wait for frag damage to kill units before spawning fragments // wait for frag damage to kill units before spawning fragments
_projectile addEventHandler ["Explode", { _projectile addEventHandler ["Explode",
{
if (isServer) then { if (isServer) then {
[FUNC(doFrag), [_this]] call CBA_fnc_execNextFrame; [FUNC(doFrag), [_this]] call CBA_fnc_execNextFrame;
} else { } else {

1
addons/frag/initSettings.inc.sqf
View File

@ -25,7 +25,6 @@ private _category = format ["ACE %1", localize LSTRING(Module_DisplayName)];
1 1
] call CBA_fnc_addSetting; ] call CBA_fnc_addSetting;
/// !*! TODO: add stringtable entries
[ [
QGVAR(fragSimComplexity), "LIST", QGVAR(fragSimComplexity), "LIST",
[LSTRING(FragMode), LSTRING(FragMode_Desc)], [LSTRING(FragMode), LSTRING(FragMode_Desc)],