diff --git a/SQF/dayz_code/actions/pzombie/pz_vision.sqf b/SQF/dayz_code/actions/pzombie/pz_vision.sqf index 166040c59..6d3a1118c 100644 --- a/SQF/dayz_code/actions/pzombie/pz_vision.sqf +++ b/SQF/dayz_code/actions/pzombie/pz_vision.sqf @@ -15,8 +15,7 @@ _NV = player getvariable ["NV", ["OFF", 0.1]]; _NVOn = (_NV select 0); _OldAperture = (_NV select 1); -if(_NVOn == "ON") -exitwith +if(_NVOn == "ON") exitwith { setaperture -1; ppEffectDestroy ppColor; @@ -28,7 +27,6 @@ exitwith ppEffectDestroy ppColor; ppEffectDestroy ppBlur; - ppColor = ppEffectCreate ["ColorCorrections", 1999]; ppColor ppEffectEnable true; ppColor ppEffectAdjust [1, 1, 0, _NV1, _NV2, _NV3]; @@ -40,16 +38,13 @@ ppInversion ppEffectEnable false; ppInversion ppEffectAdjust [1,1,1]; ppInversion ppEffectCommit 0; */ - -diag_log format ["DEBUG: Aperture : %1 First %2 Second %3 Third %4", _OldAperture, _NV1,_NV2,_NV3]; - +//diag_log format ["DEBUG: Aperture : %1 First %2 Second %3 Third %4", _OldAperture, _NV1,_NV2,_NV3]; ppBlur = ppEffectCreate ["dynamicBlur", 505]; ppBlur ppEffectEnable true; ppBlur ppEffectAdjust [.2]; ppBlur ppEffectCommit 0; - aperture = 0.0001; while { aperture < _oldAperture } do { @@ -58,13 +53,9 @@ while { aperture < _oldAperture } do sleep 0.001; }; - - player setVariable ["NV", ["ON", _oldAperture]]; player setVariable ["NV1",_NV1]; player setVariable ["NV2",_NV2]; player setVariable ["NV3",_NV3]; - s_pz_player2 = player addAction ["Vision", "\z\addons\dayz_code\actions\pzombie\pz_vision.sqf", [], 0, false, true, "nightVision", "_this == _target"]; -exit; \ No newline at end of file diff --git a/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf b/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf index e10b5f6a4..1d12aa35c 100644 --- a/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf +++ b/SQF/dayz_code/actions/pzombie/pz_vision_rbg1.sqf @@ -5,7 +5,6 @@ _caller = _this select 1; _id = _this select 2; // _gen removeAction _id; - // array from tweaking settings _new = _this select 3; @@ -13,9 +12,7 @@ _NVx = _new select 0; // get first rbg + m _NV = player getvariable [_NVx,[0.0, 0.0, 0.0, 0.0]]; - _increase = (_new select 1); - _index = 0; { _NV set [_index,(_NV select _index) + _x]; @@ -45,11 +42,9 @@ if(_NVOn == "ON") then { ppColor ppEffectAdjust [1, 1, 0, _NV1, _NV2, _NV3]; ppColor ppEffectCommit 0; - diag_log format ["DEBUG: Aperture : %1 First %2 Second %3 Third %4", _newap, _NV1,_NV2,_NV3]; + //diag_log format ["DEBUG: Aperture : %1 First %2 Second %3 Third %4", _newap, _NV1,_NV2,_NV3]; player setVariable ["NV", ["OFF", _newap]]; } else { player setVariable ["NV", ["ON", _newap]]; }; - -exit; \ No newline at end of file diff --git a/SQF/dayz_code/actions/tame_dog.sqf b/SQF/dayz_code/actions/tame_dog.sqf index 38af0c45e..29e904f84 100644 --- a/SQF/dayz_code/actions/tame_dog.sqf +++ b/SQF/dayz_code/actions/tame_dog.sqf @@ -3,9 +3,7 @@ Author: Kane "Alby" Stone Expanded to allow all meats as input by: [VB]AWOL - DayZ Epoch - Description: - Allows a player to tame/domesticate a dog. - Script is applied to object via addAction. + Description: Allows a player to tame/domesticate a dog. Script is applied to object via addAction. Variables: _target = Object that action is attached too. @@ -46,7 +44,7 @@ if(_removed == _countIn) then { _animalID = _dog getVariable "fsm_handle"; _animalID setFSMVariable ["_isTamed", true]; sleep 1; - diag_log format["DEBUG: %1, id: %2 [%3]",_dog,_animalID,completedFSM _animalID]; + //diag_log format["DEBUG: %1, id: %2 [%3]",_dog,_animalID,completedFSM _animalID]; if (!moveToCompleted _dog) then { _dog moveTo (position _dog); }; diff --git a/SQF/dayz_code/compile/fnc_MapEventHandler.sqf b/SQF/dayz_code/compile/fnc_MapEventHandler.sqf index d880e630d..9a0b4cd38 100644 --- a/SQF/dayz_code/compile/fnc_MapEventHandler.sqf +++ b/SQF/dayz_code/compile/fnc_MapEventHandler.sqf @@ -2,28 +2,19 @@ private ["_markerstr","_class","_name","_type","_position","_radiusA","_radiusB" if ("ItemMap_Debug" in items player) then { // _world = toUpper(worldName); - _maptype = ["NameCityCapital","NameCity","NameVillage","NameLocal"]; - _config = configFile >> "CfgWorlds" >> worldName >> "Names"; - + _maptype = ["NameCityCapital","NameCity","NameVillage","NameLocal"]; _config = configFile >> "CfgWorlds" >> worldName >> "Names"; for "_i" from 0 to (count _config -1) do { - _class = _config select _i; //Returns a conif - _name = getText (_class >> "name"); - _type = getText (_class >> "type"); - _position = getArray (_class >> "position"); - _radiusA = getNumber (_class >> "radiusA"); - _radiusB = getNumber (_class >> "radiusB"); - - + _class = _config select _i; //Returns a conif _name = getText (_class >> "name"); _type = getText (_class >> "type"); _position = getArray (_class >> "position"); _radiusA = getNumber (_class >> "radiusA"); _radiusB = getNumber (_class >> "radiusB"); if (_type in _maptype) then { diag_log(format["Config Type, Name: %1 / Type: %2 / Position: %3, Passed",_name,_type,_position]); - // _rnd = random 1; - // _chance = 0.6; - // if (_rnd < _chance) then { - _markerstr = createMarkerLocal ["markername_" +str (_name), _position]; - _markerstr setMarkerTextLocal _name; - _markerstr setMarkerColorLocal "ColorGreen"; - _markerstr setMarkerShapeLocal "ELLIPSE"; - _markerstr setMarkerBrushLocal "Grid"; + // _rnd = random 1; + // _chance = 0.6; + // if (_rnd < _chance) then { + _markerstr = createMarkerLocal ["markername_" +str (_name), _position]; + _markerstr setMarkerTextLocal _name; + _markerstr setMarkerColorLocal "ColorGreen"; + _markerstr setMarkerShapeLocal "ELLIPSE"; + _markerstr setMarkerBrushLocal "Grid"; _markerstr setMarkerSizeLocal [_radiusA, _radiusB]; // }; };