Cleanup & fix interaction conditions

This commit is contained in:
BaerMitUmlaut 2016-02-29 00:34:14 +01:00
parent f85a886b83
commit 11a66d98e2
2 changed files with 10 additions and 10 deletions

View File

@ -17,14 +17,16 @@
#include "script_component.hpp"
params ["_unit", "_vehicle"];
private ["_deployedRopes", "_config"];
private ["_config", "_enabled", "_deploymentStage"];
_deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
_config = configFile >> "CfgVehicles" >> typeOf _vehicle;
_enabled = getNumber (_config >> QGVAR(enabled));
_deploymentStage = _vehicle getVariable [QGVAR(deploymentStage), 0];
((driver _vehicle != _unit) &&
(driver _vehicle != _unit) &&
{getPos _vehicle select 2 > 2} &&
{_enabled == 1 || {_enabled == 2 && {!(isNull (_vehicle getVariable [QGVAR(FRIES), objNull]))}}} &&
{
((_vehicle getVariable [QGVAR(deploymentStage), 0]) == 2) ||
{!(isText (_config >> QGVAR(onPrepare))) && {(_vehicle getVariable [QGVAR(deploymentStage), 0]) == 0}}
} &&
{getPos _vehicle select 2 > 2})
(_deploymentStage == 0 && {getText (_config >> QGVAR(onPrepare)) == ""}) ||
{_deploymentStage == 2 && {getText (_config >> QGVAR(onPrepare)) != ""}}
}

View File

@ -16,10 +16,8 @@
#include "script_component.hpp"
params ["_vehicle"];
private ["_deployedRopes", "_config"];
_deployedRopes = _vehicle getVariable [QGVAR(deployedRopes), []];
_config = configFile >> "CfgVehicles" >> typeOf _vehicle;
private _config = configFile >> "CfgVehicles" >> typeOf _vehicle;
(isNumber (_config >> QGVAR(enabled)) &&
{(getNumber (_config >> QGVAR(enabled)) == 1) || {!(isNull (_vehicle getVariable [QGVAR(FRIES), objNull]))}} &&