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

Clean some cook off code

Browse Source 
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
This commit is contained in:
SilentSpike 2016-11-06 12:24:00 +00:00 committed by Glowbal
parent 5976415b0d
commit 27cc4ed7c0
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/cookoff/CfgEden.hpp
View File

@ -11,7 +11,7 @@ class Cfg3DEN {
tooltip = CSTRING(enable_tooltip);
expression = QUOTE(if !(_value) then {_this setVariable [ARR_3('%s',_value,true)];};);
typeName = "BOOL";
condition = "objectVehicle + objectHasInventoryCargo";
condition = "objectHasInventoryCargo";
defaultValue = "(true)"; // fix pbo project preprocessing bug
};
};

10
addons/cookoff/functions/fnc_detonateAmmunition.sqf
View File

@ -37,7 +37,7 @@ if (_amountOfMagazines > 0) exitWith {
_timeBetweenAmmoDetonation = _timeBetweenAmmoDetonation max 0.1;
private _ammo = getText (configFile >> "CfgMagazines" >> _magazineClassname >> "ammo");
private _ammoCfg = (configFile >> "CfgAmmo" >> _ammo);
private _ammoCfg = configFile >> "CfgAmmo" >> _ammo;
private _speedOfAmmo = getNumber (configFile >> "CfgMagazines" >> _magazineClassname >> "initSpeed");
private _simulationTime = getNumber (_ammoCfg >> "simulation");
@ -53,8 +53,8 @@ if (_amountOfMagazines > 0) exitWith {
if (_spawnPos select 2 < 0) then {
_spawnPos set [2, 0];
};
private _projectile = _ammo createVehicle [0,0,0];
_projectile setPos _spawnPos;
private _projectile = createVehicle [_ammo, _spawnPos, [], 0, "CAN_COLLIDE"];
if (_flyAway) then {
private _vectorAmmo = [(-1 + (random 2)), (-1 + (random 2)), -0.2 + (random 1)];
private _velVec = _vectorAmmo vectorMultiply _speed;
@ -99,7 +99,7 @@ if (_amountOfMagazines > 0) exitWith {
[_vehicle, _ammo, _speed, random 1 < 0.3] call _spawnProjectile;
} else {
"ACE_ammoExplosionLarge" createvehicle (_vehicle modelToWorld _effect2pos);
createvehicle ["ACE_ammoExplosionLarge", (_vehicle modelToWorld _effect2pos), [], 0 , "CAN_COLLIDE"];
};
};
if (toLower _simType in ["shotdirectionalbomb", "shotmine"]) then {
@ -114,7 +114,7 @@ if (_amountOfMagazines > 0) exitWith {
if (_ammo != "") then {
[_vehicle, _ammo, 0, false] call _spawnProjectile;
} else {
"SmallSecondary" createvehicle (_vehicle modelToWorld _effect2pos);
createvehicle ["SmallSecondary", (_vehicle modelToWorld _effect2pos), [], 0 , "CAN_COLLIDE"];
};
};
};

2
addons/cookoff/functions/fnc_secondaryExplosions.sqf
View File

@ -44,7 +44,7 @@ private _fnc_secondaryExplosion = {
private _position = _vehicle modelToWorld (_vehicle selectionPosition "destructionEffect2");
// these CfgAmmo objects are always global
"SmallSecondary" createVehicle _position;
createVehicle ["SmallSecondary", _position, [], 0, "CAN_COLLIDE"];
DEC(_amount);