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

Rework after Comments form esteldunedain

Browse Source
This commit is contained in:
Joko 2015-07-17 21:26:18 +02:00
parent 83e74d848d
commit 41edf3dd38
6 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/overpressure/functions/fnc_cacheOverPressureValues.sqf
View File

@ -29,8 +29,5 @@ if (_damage == 0) then {
_range = getNumber (configFile >> "CfgMagazines" >> _magazine >> QGVAR(range));
};
missionNameSpace setVariable [(QGVAR(Angle) + _magazine),_angle];
missionNameSpace setVariable [(QGVAR(Range) + _magazine),_range];
missionNameSpace setVariable [(QGVAR(Damage) + _magazine),_damage];
missionNameSpace setVariable [(QGVAR(values) + _magazine),[_angle, _range,_damage]];
[_angle,_range,_damage]

13
addons/overpressure/functions/fnc_fireLauncherBackblast.sqf
View File

@ -28,10 +28,15 @@ private ["_position", "_direction"];
_position = getPosASL _projectile;
_direction = [0, 0, 0] vectorDiff (vectorDir _projectile);
private ["_backblastAngle", "_backblastRange", "_backblastDamage"];
_backblastAngle = missionNameSpace getVariable [(QGVAR(Angle) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 0];
_backblastRange = missionNameSpace getVariable [(QGVAR(Range) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 1];
_backblastDamage = missionNameSpace getVariable [(QGVAR(Damage) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 2];
private ["_var","_varName","_backblastAngle", "_backblastRange", "_backblastDamage"];
_varName = (QGVAR(values) + _magazine);
_var = if (isNil _varName) then {
[_weapon,_magazine] call FUNC(cacheOverPressureVales);
} else {
missionNameSpace getVariable _varName;
};
_var params["_backblastAngle","_backblastRange","_backblastDamage"];
// Damage to others
private "_affected";

12
addons/overpressure/functions/fnc_fireOverpressureZone.sqf
View File

@ -28,10 +28,14 @@ private ["_position", "_direction"];
_position = getPosASL _projectile;
_direction = vectorDir _projectile;
private ["_dangerZoneAngle", "_dangerZoneRange", "_dangerZoneDamage"];
_dangerZoneDamage = missionNameSpace getVariable [(QGVAR(Damage) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 2];
_dangerZoneAngle = missionNameSpace getVariable [(QGVAR(Angle) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 0];
_dangerZoneRange = missionNameSpace getVariable [(QGVAR(Damage) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 2];
private ["_var","_dangerZoneAngle", "_dangerZoneRange", "_dangerZoneDamage"];
_varName = (QGVAR(values) + _magazine);
_var = if (isNil _varName) then {
[_weapon,_magazine] call FUNC(cacheOverPressureVales);
} else {
missionNameSpace getVariable _varName;
};
_var params["_dangerZoneAngle","_dangerZoneRange","_dangerZoneDamage"];
// Damage to others
private "_affected";

10
addons/overpressure/functions/fnc_firedEHBB.sqf
View File

@ -15,7 +15,13 @@
* Return value:
* None
*/
if (missionNameSpace getVariable [(QGVAR(Damage) + _this select 1),(([_this select 1,_this select 5] call DFUNC(cacheOverPressureVales)) select 2)]) then {
private ["_var","_varName"];
_varName = (QGVAR(values) + _this select 1);
_var = if (isNil _varName) then {
([_this select 1,_this select 5] call FUNC(cacheOverPressureVales)) select 2;
} else {
(missionNameSpace getVariable _varName) select 2;
};
if (_var > 0) then {
_this call DFUNC(fireLauncherBackblast)
};

9
addons/overpressure/functions/fnc_firedEHOP.sqf
View File

@ -16,6 +16,13 @@
* None
*/
if (missionNameSpace getVariable [(QGVAR(Damage) + _this select 1),(([_this select 1,_this select 5] call DFUNC(cacheOverPressureVales)) select 2)]) then {
private ["_var","_varName"];
_varName = (QGVAR(values) + _this select 1);
_var = if (isNil _varName) then {
([_this select 1,_this select 5] call FUNC(cacheOverPressureVales)) select 2;
} else {
(missionNameSpace getVariable _varName) select 2;
};
if (_var > 0) then {
_this call DFUNC(fireOverpressureZone)
};

12
addons/overpressure/functions/fnc_overpressureDamage.sqf
View File

@ -16,10 +16,14 @@
EXPLODE_4_PVT(_this,_firer,_posASL,_direction,_weapon,_magazine);
private ["_overpressureAngle", "_overpressureRange", "_overpressureDamage"];
_overpressureAngle = missionNameSpace getVariable [(QGVAR(Damage) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 2];
_overpressureRange = missionNameSpace getVariable [(QGVAR(Angle) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 0];
_overpressureDamage = missionNameSpace getVariable [(QGVAR(Damage) + _magazine),([_weapon,_magazine] call FUNC(cacheOverPressureVales)) select 2];
private ["_var","_overpressureAngle", "_overpressureRange", "_overpressureDamage"];
_varName = (QGVAR(values) + _magazine);
_var = if (isNil _varName) then {
[_weapon,_magazine] call FUNC(cacheOverPressureVales);
} else {
missionNameSpace getVariable _varName;
};
_var params["_overpressureAngle","_overpressureRange","_overpressureDamage"];
TRACE_4("Parameters:",_overpressureAngle,_overpressureRange,_overpressureDamage,_weapon);