0.4.0.0 b597

This commit is contained in:
vbawol 2016-09-04 23:32:38 -05:00
parent 1a77c8ee13
commit e817f1e2e5
60 changed files with 26 additions and 21 deletions

View File

@ -12,9 +12,6 @@
Github:
https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_code/compile/EPOCH_LootIT.sqf
*/
//[[[cog import generate_private_arrays ]]]
private ["_cam"];
//[[[end]]]
if (!isNull _this) then {
[_this,player,Epoch_personalToken] remoteExec ["EPOCH_server_lootContainer",2];

View File

@ -94,7 +94,7 @@ if !(_target isEqualTo player) then {
if (random 1 < _bloodpChance) then {
EPOCH_playerBloodP = (EPOCH_playerBloodP + (_bloodpAmount + (EPOCH_playerBloodP - 100))) min 190;
if !(_ppEffect isEqualTo []) then {
_ppEffect spawn EPOCH_fnc_spawnEffects;
[_ppEffect] spawn EPOCH_fnc_spawnEffects;
};
};
if (random 1 < _fatigueChance) then {

View File

@ -0,0 +1,2 @@
// fix strings to bool
_this apply {if (_x isEqualType "true") then {_x isEqualTo "true"} else {_x}}

View File

@ -21,9 +21,8 @@
//[[[cog import generate_private_arrays ]]]
private ["_firstArray","_fx","_handle","_handles"];
//[[[end]]]
params [["_ppEffects",[]] ];
params [["_ppEffects",[],[[]] ] ];
_handles = [];
_firstArray = true;
{
_fx = _x;
if (_fx isEqualType []) then {
@ -32,22 +31,22 @@ _firstArray = true;
} else {
{
if !(_x isEqualTo []) then {
if (_firstArray) then {
if (count _x == 4) then {
_x params ["_type","_proi","_effect","_speed"];
_handle = [_type,_proi] call epoch_postProcessCreate;
_handles pushBack _handle;
[_handle, _speed, _effect] call epoch_postprocessAdjust;
[_handle, _speed, _effect, true] call epoch_postprocessAdjust;
} else {
_x params ["_handle","_effect","_speed"];
[_handles select _forEachIndex, _speed, _effect] call epoch_postprocessAdjust;
_x params ["_effect","_speed"];
[_handles select _forEachIndex, _speed, _effect, true] call epoch_postprocessAdjust;
};
};
} forEach _fx;
};
_firstArray = false;
};
} else {
// sleep
if (_fx isEqualType 0) then {
uiSleep _fx;
};
};
} forEach _ppEffects;

View File

@ -26,10 +26,16 @@
dynamicBlur >> [0]
colorInversion >> [0,0,0]
*/
params [["_handle",666],["_animSpeed",666],["_effect",[]]];
params [["_handle",666],["_animSpeed",666],["_effect",[]],["_fixBool",false]];
//needed because PPs have variable array sizes
if ((_handle isEqualTo 666) || (_animSpeed isEqualTo 666) || (_effect isEqualTo [])) exitWith {hint "Wrong PPAdjust input"; false};
// fix any strings to bool
if (_fixBool) then {
_effect = _effect call EPOCH_fnc_arrayStringToBool;
diag_log str(_handle, _animSpeed, _effect]);
};
_handle ppEffectEnable true;
_handle ppEffectAdjust _effect;
_handle ppEffectCommit _animSpeed;

View File

@ -127,6 +127,7 @@ class CfgClientFunctions
class fnc_vectorDivide {};
class giveAttributes {};
class fnc_spawnEffects {};
class fnc_arrayStringToBool {};
};
class environment
{

View File

@ -1 +1 @@
build=589;
build=597;

View File

@ -1 +1 @@
build=589;
build=597;

View File

@ -1 +1 @@
build=589;
build=597;

View File

@ -1 +1 @@
build=589;
build=597;

View File

@ -1 +1 @@
589
597