diff --git a/CHANGE LOG 1.0.6.txt b/CHANGE LOG 1.0.6.txt index 95995d70f..f6f530a3b 100644 --- a/CHANGE LOG 1.0.6.txt +++ b/CHANGE LOG 1.0.6.txt @@ -40,6 +40,7 @@ - PVDZE_veh_SFuel --> PVCDZ_veh_SetFuel - PVDZE_veh_Update --> PVDZ_obj_Save - usecBandage --> PVCDZ_hlt_Bandage + - usecBleed --> PVDZ_hlt_Bleed - usecBreakLegs --> PVCDZ_plr_Legs - usecEpi --> PVCDZ_hlt_Epi - usecMorphine --> PVCDZ_hlt_Morphine diff --git a/SQF/dayz_code/Configs/RscDisplay/dialog.hpp b/SQF/dayz_code/Configs/RscDisplay/dialog.hpp index defa81878..6ddb06e5e 100644 --- a/SQF/dayz_code/Configs/RscDisplay/dialog.hpp +++ b/SQF/dayz_code/Configs/RscDisplay/dialog.hpp @@ -212,7 +212,7 @@ class TraderDialog y = 0.720064 * safezoneH + safezoneY; w = 0.1287436 * safezoneW; h = 0.055016 * safezoneH; - onButtonClick = "[[],0] call epoch_returnChange; ((ctrlParent (_this select 0)) closeDisplay 9000); cutText [(localize ""STR_EPOCH_PLAYER_307"") , ""PLAIN DOWN""];"; + onButtonClick = "[[],0] call epoch_returnChange; ((ctrlParent (_this select 0)) closeDisplay 9000); cutText [localize ""STR_EPOCH_PLAYER_307"",""PLAIN DOWN""];"; }; class RscTextTraderDialog_1003: RscTextTraderDialog { diff --git a/SQF/dayz_code/NOTE.txt b/SQF/dayz_code/NOTE.txt index bae0769bb..b7b635d9f 100644 --- a/SQF/dayz_code/NOTE.txt +++ b/SQF/dayz_code/NOTE.txt @@ -1,19 +1,9 @@ NEW VAR DZE_HeartBeat USE TO ENABLE HEARTBEAT SOUND WHEN LOOKING AT BANDIT PLAYER (less than -5000 humanity), DISABLED BY DEFAULT -NEW VAR DZE_UseBloodTypes -DZE_UseBloodTypes, OFF by default - Enables blood type system, and disables universal bloodbags. you can readily turn this system off and on - - player_updateGui.sqf -DZE_BloodBags NEEDED ARRAY OF ALL BLOOD BAGS -Create switchable blood system with variable. -Convert (if old system) to ItemBloodbag -DZE_UseBloodTypes - -bloodBagANEG bloodBagAPOS bloodBagBNEG bloodBagBPOS bloodBagONEG bloodBagOPOS -wholeBloodBagANEG wholeBloodBagAPOS wholeBloodBagBNEG wholeBloodBagBPOS wholeBloodBagONEG wholeBloodBagOPOS +Convert traders + loot (if old system) to ItemBloodbag REMOVE TOOL BREAKING, IT'S STUPID diff --git a/SQF/dayz_code/actions/boil.sqf b/SQF/dayz_code/actions/boil.sqf index 0af93ee8d..a507fc4d6 100644 --- a/SQF/dayz_code/actions/boil.sqf +++ b/SQF/dayz_code/actions/boil.sqf @@ -1,6 +1,6 @@ private ["_bottletext","_tin1text","_tin2text","_tintext","_hasbottleitem","_hastinitem","_qty","_dis","_sfx"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_22") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_22","PLAIN DOWN"];}; DZE_ActionInProgress = true; _bottletext = getText (configFile >> "CfgMagazines" >> "ItemWaterBottle" >> "displayName"); diff --git a/SQF/dayz_code/actions/call_zombies.sqf b/SQF/dayz_code/actions/call_zombies.sqf index 4bd67d875..b34b44aa8 100644 --- a/SQF/dayz_code/actions/call_zombies.sqf +++ b/SQF/dayz_code/actions/call_zombies.sqf @@ -20,4 +20,4 @@ uiSleep 3; // allow menu again s_player_callzombies = -1; -// cutText [(localize "STR_EPOCH_ACTIONS_1"), "PLAIN DOWN"]; +// cutText [localize "STR_EPOCH_ACTIONS_1","PLAIN DOWN"]; diff --git a/SQF/dayz_code/actions/cook.sqf b/SQF/dayz_code/actions/cook.sqf index f08a400d7..d60c2ae56 100644 --- a/SQF/dayz_code/actions/cook.sqf +++ b/SQF/dayz_code/actions/cook.sqf @@ -1,6 +1,6 @@ private ["_rawmeat","_cookedmeat","_meat","_meatcooked","_text","_qty","_dis","_sfx"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_23") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_23","PLAIN DOWN"];}; DZE_ActionInProgress = true; //diag_log ("Cook Enabled"); diff --git a/SQF/dayz_code/actions/dog/feed.sqf b/SQF/dayz_code/actions/dog/feed.sqf index cd1bd745f..dc10cf3c0 100644 --- a/SQF/dayz_code/actions/dog/feed.sqf +++ b/SQF/dayz_code/actions/dog/feed.sqf @@ -4,7 +4,7 @@ _handle = _array select 0; _type = _array select 1; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]}; +if (_onLadder) exitWith {cutText [localize "str_player_21","PLAIN DOWN"]}; player playActionNow "PutDown"; diff --git a/SQF/dayz_code/actions/fill_nearestVehicle.sqf b/SQF/dayz_code/actions/fill_nearestVehicle.sqf index 95281703e..dc1c8384c 100644 --- a/SQF/dayz_code/actions/fill_nearestVehicle.sqf +++ b/SQF/dayz_code/actions/fill_nearestVehicle.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_curFuel","_newFuel","_started","_finished","_animState","_isMedic","_abort","_canSize","_configVeh","_capacity","_nameText","_isOk","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle","_isVehicle","_configSrcVeh","_capacitySrc","_nameTextSrc","_isFillok","_curFuelSrc","_newFuelSrc","_vehicleSrc"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_24") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_24","PLAIN DOWN"]}; DZE_ActionInProgress = true; _isVehicle = false; @@ -147,6 +147,6 @@ if(_IsNearVehicle >= 1) then { }; } else { - cutText [(localize "str_epoch_player_27"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_27","PLAIN DOWN"]; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/fill_startGenerator.sqf b/SQF/dayz_code/actions/fill_startGenerator.sqf index aadb4c9aa..86bb25ad2 100644 --- a/SQF/dayz_code/actions/fill_startGenerator.sqf +++ b/SQF/dayz_code/actions/fill_startGenerator.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_soundSource"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_24") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_24","PLAIN DOWN"]}; DZE_ActionInProgress = true; player removeAction s_player_fillgen; @@ -19,7 +19,7 @@ r_doLoop = true; _started = false; _finished = false; -cutText [(localize "str_epoch_player_25"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_25","PLAIN DOWN"]; [player,50,true,(getPosATL player)] spawn player_alertZombies; @@ -46,7 +46,7 @@ if(!_finished) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_26") , "PLAIN DOWN"] + cutText [localize "str_epoch_player_26","PLAIN DOWN"]; }; if (_finished) then { @@ -69,7 +69,7 @@ if (_finished) then { _vehicle setVariable ["GeneratorSound", _soundSource,true]; - cutText [(localize "str_epoch_player_28"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_28","PLAIN DOWN"]; }; } else { @@ -82,7 +82,7 @@ if (_finished) then { _vehicle setVariable ["GeneratorSound", _soundSource,true]; - cutText [(localize "str_epoch_player_28"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_28","PLAIN DOWN"]; }; }; diff --git a/SQF/dayz_code/actions/gather_meat.sqf b/SQF/dayz_code/actions/gather_meat.sqf index ec30eb0ec..c4646c633 100644 --- a/SQF/dayz_code/actions/gather_meat.sqf +++ b/SQF/dayz_code/actions/gather_meat.sqf @@ -1,6 +1,6 @@ private ["_item", "_type", "_hasHarvested", "_config", "_knifeArray", "_PlayerNear", "_isListed", "_activeKnife", "_text", "_dis", "_sfx", "_sharpnessRemaining"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_29") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_29","PLAIN DOWN"];}; DZE_ActionInProgress = true; _item = _this select 3; diff --git a/SQF/dayz_code/actions/gather_zparts.sqf b/SQF/dayz_code/actions/gather_zparts.sqf index 4770391ec..133922e39 100644 --- a/SQF/dayz_code/actions/gather_zparts.sqf +++ b/SQF/dayz_code/actions/gather_zparts.sqf @@ -1,6 +1,6 @@ private ["_item", "_type", "_hasHarvested", "_config", "_knifeArray", "_PlayerNear", "_isListed", "_activeKnife", "_text", "_dis", "_sfx", "_sharpnessRemaining"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_29") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_29","PLAIN DOWN"];}; DZE_ActionInProgress = true; _item = _this select 3; diff --git a/SQF/dayz_code/actions/hotwire_veh.sqf b/SQF/dayz_code/actions/hotwire_veh.sqf index 0ccbc6c1e..00bd4bfce 100644 --- a/SQF/dayz_code/actions/hotwire_veh.sqf +++ b/SQF/dayz_code/actions/hotwire_veh.sqf @@ -1,7 +1,7 @@ private ["_vehicle","_removed"]; _vehicle = _this select 3; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_32") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_32","PLAIN DOWN"];}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; @@ -25,7 +25,7 @@ if (_removed == 1) then { }; }; } else { - cutText [(localize "str_epoch_player_33") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_33","PLAIN DOWN"]; }; }; diff --git a/SQF/dayz_code/actions/jerry_fill.sqf b/SQF/dayz_code/actions/jerry_fill.sqf index 2f961b4a2..d16e1362b 100644 --- a/SQF/dayz_code/actions/jerry_fill.sqf +++ b/SQF/dayz_code/actions/jerry_fill.sqf @@ -1,6 +1,6 @@ private ["_qty","_started","_finished","_animState","_isMedic","_abort","_fillCounter","_dis","_sfx","_displayName","_fuelCans"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_34"), "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_34","PLAIN DOWN"];}; DZE_ActionInProgress = true; player removeAction s_player_fillfuel; @@ -65,7 +65,7 @@ _qty = count _fuelCans; [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_35") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_35","PLAIN DOWN"]; _abort = true; }; diff --git a/SQF/dayz_code/actions/list_playerDeaths.sqf b/SQF/dayz_code/actions/list_playerDeaths.sqf index 7233829ee..fd04ffdc5 100644 --- a/SQF/dayz_code/actions/list_playerDeaths.sqf +++ b/SQF/dayz_code/actions/list_playerDeaths.sqf @@ -9,6 +9,6 @@ if((count PVDZE_plr_DeathBResult) > 0) then { // load death message board ui call EpochDeathBoardLoad; } else { - cutText [(localize "str_epoch_player_36"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_36","PLAIN DOWN"]; PVDZE_plr_DeathBResult = nil; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/list_playerDeathsAlt.sqf b/SQF/dayz_code/actions/list_playerDeathsAlt.sqf index 7221eb555..c94c9ec3e 100644 --- a/SQF/dayz_code/actions/list_playerDeathsAlt.sqf +++ b/SQF/dayz_code/actions/list_playerDeathsAlt.sqf @@ -11,6 +11,6 @@ if((count PVDZE_plr_DeathBResult) > 0) then { // load death message board ui call EpochDeathBoardLoad; } else { - cutText [(localize "str_epoch_player_36"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_36","PLAIN DOWN"]; PVDZE_plr_DeathBResult = nil; }; \ No newline at end of file diff --git a/SQF/dayz_code/actions/lock_veh.sqf b/SQF/dayz_code/actions/lock_veh.sqf index 5a597fb52..d40860529 100644 --- a/SQF/dayz_code/actions/lock_veh.sqf +++ b/SQF/dayz_code/actions/lock_veh.sqf @@ -1,7 +1,7 @@ private["_vehicle"]; _vehicle = _this select 3; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_37") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_37","PLAIN DOWN"];}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; diff --git a/SQF/dayz_code/actions/maintain_area.sqf b/SQF/dayz_code/actions/maintain_area.sqf index 2f7db6f89..3e0213054 100644 --- a/SQF/dayz_code/actions/maintain_area.sqf +++ b/SQF/dayz_code/actions/maintain_area.sqf @@ -1,7 +1,7 @@ //Code developed by Axe Cop - Massiv improvments && performance tunes by Skaronator private ["_missing","_missingQty","_proceed","_itemIn","_countIn","_qty","_num_removed","_uniqueID","_removed","_removed_total","_tobe_removed_total","_obj","_objectID","_objectUID","_classname","_location","_dir","_objectCharacterID","_object","_temp_removed_array","_textMissing","_target","_objectClasses","_range","_objects","_requirements","_count","_cost","_itemText","_option"]; -if (DZE_ActionInProgress) exitWith { cutText [(localize "STR_EPOCH_ACTIONS_2") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "STR_EPOCH_ACTIONS_2","PLAIN DOWN"];}; DZE_ActionInProgress = true; player removeAction s_player_maintain_area; diff --git a/SQF/dayz_code/actions/modular_build.sqf b/SQF/dayz_code/actions/modular_build.sqf index 329f64c01..891dd4c3f 100644 --- a/SQF/dayz_code/actions/modular_build.sqf +++ b/SQF/dayz_code/actions/modular_build.sqf @@ -1,7 +1,7 @@ private ["_classname","_classnametmp","_require","_text","_ghost","_lockable","_requireplot","_isAllowedUnderGround","_offset","_isPole","_isLandFireDZ","_hasRequired","_hasrequireditem","_reason","_buildObject","_location1","_object","_objectHelper","_position","_controls","_cancel","_dir","_cnt","_pos","_distance","_buildables","_onLadder","_vehicle","_inVehicle","_abort","_needNear","_isNear","_needText","_findNearestPoles","_findNearestPole","_IsNearPlot","_canBuildOnPlot","_nearestPole","_ownerID","_friendlies","_missing","_checkMag","_enableGhost","_helperColor","_canDo","_objHDiff","_isOk","_zheightchanged","_zheightdirection","_rotate","_location2","_lastDir","_objectHelperDir","_objectHelperPos","_tmpbuilt","_limit","_proceed","_counter","_dis","_sfx","_started","_finished","_animState","_isMedic","_num_removed","_combinationDisplay","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_combination_1_Display"]; //Check if building already in progress, exit if so. -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_40") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_40","PLAIN DOWN"];}; DZE_ActionInProgress = true; _pos = [player] call FNC_GetPos; @@ -30,10 +30,10 @@ DZE_cancelBuilding = false; call gear_ui_init; closeDialog 1; -if (dayz_isSwimming) exitWith {DZE_ActionInProgress = false;cutText [localize "str_player_26","PLAIN DOWN"];}; -if (_inVehicle) exitWith {DZE_ActionInProgress = false;cutText [(localize "str_epoch_player_42"),"PLAIN DOWN"];}; -if (_onLadder) exitWith {DZE_ActionInProgress = false;cutText [localize "str_player_21","PLAIN DOWN"];}; -if (player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false;cutText [(localize "str_epoch_player_43"),"PLAIN DOWN"];}; +if (dayz_isSwimming) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26","PLAIN DOWN"];}; +if (_inVehicle) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_42","PLAIN DOWN"];}; +if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21","PLAIN DOWN"];}; +if (player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_43","PLAIN DOWN"];}; DZE_buildItem = _this; //This is a magazine! It's global to allow access to it from outside functions @@ -595,7 +595,7 @@ if (_hasrequireditem) then { }; } else { //if magazine was not removed, cancel publish deleteVehicle _tmpbuilt; - cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_46","PLAIN DOWN"]; }; } else { //if player was interrupted, cancel publish and stop build animations @@ -607,7 +607,7 @@ if (_hasrequireditem) then { deleteVehicle _tmpbuilt; - cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_46","PLAIN DOWN"]; }; } else { //cancel build if passed _cancel arg was true or building on roads/trader city diff --git a/SQF/dayz_code/actions/player_addToolbelt.sqf b/SQF/dayz_code/actions/player_addToolbelt.sqf index 95c6e29cb..a0150370a 100644 --- a/SQF/dayz_code/actions/player_addToolbelt.sqf +++ b/SQF/dayz_code/actions/player_addToolbelt.sqf @@ -3,7 +3,7 @@ disableSerialization; _item = _this; _config = configFile >> "cfgWeapons" >> _item; _onBack = dayz_onBack in MeleeWeapons; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_39") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_39","PLAIN DOWN"];}; DZE_ActionInProgress = true; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index 43680abb2..479397cf6 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -4,7 +4,7 @@ */ private ["_location","_pos","_dir","_classname","_item","_hasrequireditem","_missing","_hastoolweapon","_cancel","_reason","_started","_finished","_animState","_isMedic","_dis","_sfx","_hasbuilditem","_tmpbuilt","_onLadder","_isWater","_require","_text","_offset","_IsNearPlot","_isOk","_location1","_location2","_counter","_limit","_proceed","_num_removed","_position","_object","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_findNearestPoles","_findNearestPole","_distance","_classnametmp","_ghost","_isPole","_needText","_lockable","_zheightchanged","_rotate","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_combination_1_Display","_combinationDisplay","_zheightdirection","_abort","_isNear","_need","_needNear","_vehicle","_inVehicle","_requireplot","_objHDiff","_isLandFireDZ","_isTankTrap","_center","_buildables"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_40") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_40","PLAIN DOWN"];}; DZE_ActionInProgress = true; _pos = [player] call FNC_GetPos; @@ -36,9 +36,9 @@ call gear_ui_init; closeDialog 1; if (_isWater) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_26", "PLAIN DOWN"];}; -if (_inVehicle) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_42"), "PLAIN DOWN"];}; +if (_inVehicle) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_42","PLAIN DOWN"];}; if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21", "PLAIN DOWN"];}; -if (player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_43"), "PLAIN DOWN"];}; +if (player getVariable["combattimeout", 0] >= time) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_43","PLAIN DOWN"];}; _item = _this; @@ -215,7 +215,7 @@ if (_hasrequireditem) then { _position = getPosATL _object; - cutText [(localize "str_epoch_player_45"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_45","PLAIN DOWN"]; _objHDiff = 0; @@ -541,7 +541,7 @@ if (_hasrequireditem) then { }; } else { deleteVehicle _tmpbuilt; - cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_46","PLAIN DOWN"]; }; } else { @@ -553,7 +553,7 @@ if (_hasrequireditem) then { deleteVehicle _tmpbuilt; - cutText [(localize "str_epoch_player_46") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_46","PLAIN DOWN"]; }; } else { diff --git a/SQF/dayz_code/actions/player_buildingDowngrade.sqf b/SQF/dayz_code/actions/player_buildingDowngrade.sqf index b13f7874c..8601fc933 100644 --- a/SQF/dayz_code/actions/player_buildingDowngrade.sqf +++ b/SQF/dayz_code/actions/player_buildingDowngrade.sqf @@ -4,7 +4,7 @@ */ private ["_location","_dir","_classname","_text","_object","_objectID","_objectUID","_newclassname","_refund","_obj","_upgrade","_objectCharacterID","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_distance","_needText","_findNearestPoles","_findNearestPole","_IsNearPlot","_i","_invResult","_itemOut","_countOut","_abortInvAdd","_addedItems"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_48") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_48","PLAIN DOWN"];}; DZE_ActionInProgress = true; player removeAction s_player_downgrade_build; @@ -60,7 +60,7 @@ _obj = _this select 3; // Current charID _objectCharacterID = _obj getVariable ["CharacterID","0"]; -if(DZE_Lock_Door != _objectCharacterID) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_49") , "PLAIN DOWN"]; }; +if (DZE_Lock_Door != _objectCharacterID) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_49","PLAIN DOWN"];}; // Find objectID _objectID = _obj getVariable ["ObjectID","0"]; @@ -68,7 +68,7 @@ _objectID = _obj getVariable ["ObjectID","0"]; // Find objectUID _objectUID = _obj getVariable ["ObjectUID","0"]; -if(_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; cutText [(localize "str_epoch_player_50"), "PLAIN DOWN"];}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; cutText [localize "str_epoch_player_50","PLAIN DOWN"];}; // Get classname _classname = typeOf _obj; @@ -155,7 +155,7 @@ if ((count _upgrade) > 0) then { }; } else { - cutText [(localize "str_epoch_player_51"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_51","PLAIN DOWN"]; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_buildingMaint.sqf b/SQF/dayz_code/actions/player_buildingMaint.sqf index 382b13b40..7ad17dc5f 100644 --- a/SQF/dayz_code/actions/player_buildingMaint.sqf +++ b/SQF/dayz_code/actions/player_buildingMaint.sqf @@ -4,7 +4,7 @@ */ private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_requirements","_obj","_upgrade","_objectCharacterID"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_52") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_52","PLAIN DOWN"];}; DZE_ActionInProgress = true; player removeAction s_player_maint_build; @@ -19,7 +19,7 @@ _objectID = _obj getVariable ["ObjectID","0"]; // Find objectUID _objectUID = _obj getVariable ["ObjectUID","0"]; -if(_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_maint_build = -1; cutText [(localize "str_epoch_player_50"), "PLAIN DOWN"];}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_maint_build = -1; cutText [localize "str_epoch_player_50","PLAIN DOWN"];}; // Get classname _classname = typeOf _obj; diff --git a/SQF/dayz_code/actions/player_copyKey.sqf b/SQF/dayz_code/actions/player_copyKey.sqf index 659cdccf0..a75990ae6 100644 --- a/SQF/dayz_code/actions/player_copyKey.sqf +++ b/SQF/dayz_code/actions/player_copyKey.sqf @@ -1,30 +1,30 @@ private ["_item","_config","_pos","_onLadder","_create","_started","_finished","_animState","_isMedic","_num_removed","_text","_haskey","_hastoolweapon","_isNear","_hasTinBar"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_56") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_56","PLAIN DOWN"];}; DZE_ActionInProgress = true; _item = _this; _config = configFile >> "cfgWeapons" >> _item; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_player_21") , "PLAIN DOWN"]}; +if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21","PLAIN DOWN"]}; _text = getText (_config >> "displayName"); _haskey = _this in weapons player; if (!_haskey) exitWith {DZE_ActionInProgress = false; cutText [format[(localize "str_player_30"),_text] , "PLAIN DOWN"]}; _hastoolweapon = "ItemKeyKit" in weapons player; -if (!_hastoolweapon) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_57") , "PLAIN DOWN"]}; +if (!_hastoolweapon) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_57","PLAIN DOWN"]}; _pos = [player] call FNC_GetPos; _isNear = {inflamed _x} count (_pos nearObjects 3); -if(_isNear == 0) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_58") , "PLAIN DOWN"]}; +if (_isNear == 0) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_58","PLAIN DOWN"]}; call gear_ui_init; // require one tin bar per key _hasTinBar = "ItemTinBar" in magazines player; -if(!_hasTinBar) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_59") , "PLAIN DOWN"]}; +if (!_hasTinBar) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_59","PLAIN DOWN"]}; [1,1] call dayz_HungerThirst; player playActionNow "Medic"; @@ -62,7 +62,7 @@ if(_finished) then { _create = _item; _create call player_addDuplicateTool; } else { - cutText [(localize "str_epoch_player_61") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_61","PLAIN DOWN"]; }; } else { r_interrupt = false; @@ -70,6 +70,6 @@ if(_finished) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_61") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_61","PLAIN DOWN"]; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_craftItem.sqf b/SQF/dayz_code/actions/player_craftItem.sqf index 5952c34b1..1b8a2ada8 100644 --- a/SQF/dayz_code/actions/player_craftItem.sqf +++ b/SQF/dayz_code/actions/player_craftItem.sqf @@ -22,7 +22,7 @@ class ItemActions */ private ["_tradeComplete","_onLadder","_canDo","_selectedRecipeOutput","_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_itemOut","_countOut","_started","_finished","_animState","_isMedic","_removed","_tobe_removed_total","_textCreate","_textMissing","_selectedRecipeInput","_selectedRecipeInputStrict","_num_removed","_removed_total","_temp_removed_array","_abort","_waterLevel","_waterLevel_lowest","_reason","_isNear","_missingTools","_hastoolweapon","_selectedRecipeTools","_distance","_crafting","_needNear","_item","_baseClass","_num_removed_weapons","_outputWeapons","_inputWeapons","_randomOutput","_craft_doLoop","_selectedWeapon","_selectedMag","_sfx"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_63") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_63","PLAIN DOWN"];}; DZE_ActionInProgress = true; // This is used to find correct recipe based what itemaction was click allows multiple recipes per item. @@ -119,7 +119,7 @@ if (_canDo) then { // If all parts proceed if (_proceed) then { - cutText [(localize "str_epoch_player_62"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_62","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; player playActionNow "Medic"; @@ -262,7 +262,7 @@ if (_canDo) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_64"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_64","PLAIN DOWN"]; _craft_doLoop = false; }; @@ -278,6 +278,6 @@ if (_canDo) then { }; }; } else { - cutText [(localize "str_epoch_player_64"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_64","PLAIN DOWN"]; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_harvestPlant.sqf b/SQF/dayz_code/actions/player_harvestPlant.sqf index 28fc7074c..a62a8f302 100644 --- a/SQF/dayz_code/actions/player_harvestPlant.sqf +++ b/SQF/dayz_code/actions/player_harvestPlant.sqf @@ -5,7 +5,7 @@ */ private ["_isOk","_i","_objName","_started","_finished","_animState","_isMedic","_proceed","_itemOut","_countOut","_tree","_trees","_findNearestTree","_index","_invResult","_treesOutput","_text"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_72") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_72","PLAIN DOWN"];}; DZE_ActionInProgress = true; // allowed trees list move this later @@ -122,12 +122,12 @@ if (count(_findNearestTree) >= 1) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_73"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_73","PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_74"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_74","PLAIN DOWN"]; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_loadCrate.sqf b/SQF/dayz_code/actions/player_loadCrate.sqf index df3c6e8c8..cab273c58 100644 --- a/SQF/dayz_code/actions/player_loadCrate.sqf +++ b/SQF/dayz_code/actions/player_loadCrate.sqf @@ -1,18 +1,18 @@ private ["_dir","_classname","_b0x1337","_location","_item","_config","_create_raw","_create","_qty","_type","_hasCrate","_hasTool"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_75") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_75","PLAIN DOWN"];}; DZE_ActionInProgress = true; _hasTool = "ItemCrowbar" in items player; if(!_hasTool) exitWith { - cutText [(localize "str_epoch_player_76"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_76","PLAIN DOWN"]; DZE_ActionInProgress = false; }; _item = _this; _hasCrate = _item in magazines player; if (!_hasCrate) exitWith { - cutText [(localize "str_epoch_player_77"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_77","PLAIN DOWN"]; DZE_ActionInProgress = false; }; @@ -63,6 +63,6 @@ player reveal _b0x1337; player action ["Gear", _b0x1337]; -cutText [(localize "str_epoch_player_78"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_78","PLAIN DOWN"]; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_upgrade.sqf b/SQF/dayz_code/actions/player_upgrade.sqf index ac901589c..e8e40ac7c 100644 --- a/SQF/dayz_code/actions/player_upgrade.sqf +++ b/SQF/dayz_code/actions/player_upgrade.sqf @@ -4,7 +4,7 @@ */ private ["_location","_dir","_classname","_missing","_text","_proceed","_num_removed","_object","_missingQty","_itemIn","_countIn","_qty","_removed","_removed_total","_tobe_removed_total","_objectID","_objectUID","_temp_removed_array","_textMissing","_newclassname","_requirements","_obj","_upgrade","_lockable","_combination_1","_combination_2","_combination_3","_combination","_objectCharacterID","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_distance","_needText","_findNearestPoles","_findNearestPole","_IsNearPlot"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_52") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_52","PLAIN DOWN"];}; DZE_ActionInProgress = true; player removeAction s_player_upgrade_build; @@ -64,7 +64,7 @@ _objectID = _obj getVariable ["ObjectID","0"]; // Find objectUID _objectUID = _obj getVariable ["ObjectUID","0"]; -if(_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; cutText [(localize "str_epoch_player_50"), "PLAIN DOWN"];}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_upgrade_build = -1; cutText [localize "str_epoch_player_50","PLAIN DOWN"];}; // Get classname _classname = typeOf _obj; @@ -181,7 +181,7 @@ if ((count _upgrade) > 0) then { }; } else { - cutText [(localize "str_epoch_player_82"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_82","PLAIN DOWN"]; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/player_wearClothes.sqf b/SQF/dayz_code/actions/player_wearClothes.sqf index 31f354a27..8c3dce8de 100644 --- a/SQF/dayz_code/actions/player_wearClothes.sqf +++ b/SQF/dayz_code/actions/player_wearClothes.sqf @@ -6,14 +6,14 @@ private ["_item","_onLadder","_hasclothesitem","_config","_text","_myModel","_it if (_this in DZE_RestrictSkins) exitWith { cutText [format[(localize "str_epoch_player_315"),_this], "PLAIN DOWN"] }; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_83"), "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_83","PLAIN DOWN"]}; DZE_ActionInProgress = true; _item = _this; call gear_ui_init; r_action_count = 0; //reset for strange glitch _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_player_21"), "PLAIN DOWN"]}; +if (_onLadder) exitWith {DZE_ActionInProgress = false; cutText [localize "str_player_21","PLAIN DOWN"]}; _hasclothesitem = _this in magazines player; _config = configFile >> "CfgMagazines"; @@ -21,11 +21,11 @@ _text = getText (_config >> _item >> "displayName"); if (!_hasclothesitem) exitWith { DZE_ActionInProgress = false; cutText [format[(localize "str_player_31"),_text,"wear"] , "PLAIN DOWN"]}; -if (vehicle player != player) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_85"), "PLAIN DOWN"]}; +if (vehicle player != player) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_85","PLAIN DOWN"]}; -//if (!isNull (unitBackpack player)) exitWith { DZE_ActionInProgress = false; cutText [(localize "STR_EPOCH_ACTIONS_9"), "PLAIN DOWN"] }; +//if (!isNull (unitBackpack player)) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_9","PLAIN DOWN"]}; -if ("CSGAS" in (magazines player)) exitWith { DZE_ActionInProgress = false; cutText [(localize "STR_EPOCH_ACTIONS_10"), "PLAIN DOWN"] }; +if ("CSGAS" in (magazines player)) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_10","PLAIN DOWN"]}; _myModel = (typeOf player); _itemNew = "Skin_" + _myModel; @@ -52,7 +52,7 @@ if ( (isClass(_config >> _itemNew)) ) then { }; } else { - cutText [(localize "str_epoch_player_86"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_86","PLAIN DOWN"]; }; }; }; diff --git a/SQF/dayz_code/actions/refuel.sqf b/SQF/dayz_code/actions/refuel.sqf index 72a847d9c..8a4a6e017 100644 --- a/SQF/dayz_code/actions/refuel.sqf +++ b/SQF/dayz_code/actions/refuel.sqf @@ -1,6 +1,6 @@ private["_vehicle","_canSize","_configVeh","_capacity","_nameType","_curFuel","_newFuel","_dis","_sfx","_fueling"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_24") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_24","PLAIN DOWN"]}; DZE_ActionInProgress = true; _vehicle = cursorTarget; diff --git a/SQF/dayz_code/actions/remove.sqf b/SQF/dayz_code/actions/remove.sqf index c616dbcbe..b3f900e70 100644 --- a/SQF/dayz_code/actions/remove.sqf +++ b/SQF/dayz_code/actions/remove.sqf @@ -4,7 +4,7 @@ parameters: _obj */ private ["_activatingPlayer","_obj","_objectID","_objectUID","_started","_finished","_animState","_isMedic","_isOk","_proceed","_counter","_limit","_objType","_sfx","_dis","_itemOut","_countOut","_selectedRemoveOutput","_friendlies","_nearestPole","_ownerID","_refundpart","_isWreck","_findNearestPoles","_findNearestPole","_IsNearPlot","_brokenTool","_removeTool","_isDestructable","_isRemovable","_objOwnerID","_isOwnerOfObj","_preventRefund","_ipos","_item","_radius","_isWreckBuilding","_nameVehicle","_isModular"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_88") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_88","PLAIN DOWN"];}; DZE_ActionInProgress = true; player removeAction s_player_deleteBuild; @@ -17,8 +17,8 @@ _activatingPlayer = player; _objOwnerID = _obj getVariable["CharacterID","0"]; _isOwnerOfObj = (_objOwnerID == dayz_characterID); -if (_obj in DZE_DoorsLocked) exitWith { DZE_ActionInProgress = false; cutText [(localize "STR_EPOCH_ACTIONS_20"), "PLAIN DOWN"];}; -if(_obj getVariable ["GeneratorRunning", false]) exitWith {DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_89"), "PLAIN DOWN"];}; +if (_obj in DZE_DoorsLocked) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_20","PLAIN DOWN"];}; +if (_obj getVariable ["GeneratorRunning", false]) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_89","PLAIN DOWN"];}; _objectID = _obj getVariable ["ObjectID","0"]; _objectUID = _obj getVariable ["ObjectUID","0"]; @@ -75,7 +75,7 @@ cutText [format[(localize "str_epoch_player_162"),_nameVehicle], "PLAIN DOWN"]; if (_isModular) then { //allow previous cutText to show, then show this if modular. - cutText [(localize "STR_EPOCH_ACTIONS_21"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_ACTIONS_21","PLAIN DOWN"]; }; // Alert zombies once. @@ -199,8 +199,8 @@ if (_proceed) then { }; }; - if((count _selectedRemoveOutput) <= 0) then { - cutText [(localize "str_epoch_player_90"), "PLAIN DOWN"]; + if ((count _selectedRemoveOutput) <= 0) then { + cutText [localize "str_epoch_player_90","PLAIN DOWN"]; }; if (_ipos select 2 < 0) then { @@ -236,7 +236,7 @@ if (_proceed) then { player action ["Gear", _item]; }; } else { - cutText [(localize "str_epoch_player_91"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_91","PLAIN DOWN"]; }; } else { diff --git a/SQF/dayz_code/actions/repair.sqf b/SQF/dayz_code/actions/repair.sqf index 659b57a3d..c5eb50bd3 100644 --- a/SQF/dayz_code/actions/repair.sqf +++ b/SQF/dayz_code/actions/repair.sqf @@ -1,5 +1,5 @@ private["_id","_array","_vehicle","_part","_hitpoint","_type","_hasToolbox","_section","_nameType","_namePart","_damage","_selection","_dis","_sfx","_hitpoints","_allFixed"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_92") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_92","PLAIN DOWN"];}; DZE_ActionInProgress = true; _id = _this select 2; diff --git a/SQF/dayz_code/actions/show_dialog.sqf b/SQF/dayz_code/actions/show_dialog.sqf index 91fc1f344..b114562b2 100644 --- a/SQF/dayz_code/actions/show_dialog.sqf +++ b/SQF/dayz_code/actions/show_dialog.sqf @@ -1,8 +1,6 @@ private ["_trader_data", "_dialog"]; -if (DZE_ActionInProgress) exitWith { - cutText [(localize "str_epoch_player_97") , "PLAIN DOWN"]; -}; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_97","PLAIN DOWN"];}; _trader_data = (_this select 3); diff --git a/SQF/dayz_code/actions/stopGenerator.sqf b/SQF/dayz_code/actions/stopGenerator.sqf index 2f4cdf79c..711137c15 100644 --- a/SQF/dayz_code/actions/stopGenerator.sqf +++ b/SQF/dayz_code/actions/stopGenerator.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_soundObject"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_99") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_99","PLAIN DOWN"]}; DZE_ActionInProgress = true; player removeAction s_player_fillgen; @@ -19,7 +19,7 @@ r_doLoop = true; _started = false; _finished = false; -cutText [(localize "str_epoch_player_100"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_100","PLAIN DOWN"]; [player,50,true,(getPosATL player)] spawn player_alertZombies; @@ -46,7 +46,7 @@ if(!_finished) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_26") , "PLAIN DOWN"] + cutText [localize "str_epoch_player_26","PLAIN DOWN"]; }; if (_finished) then { @@ -59,7 +59,7 @@ if (_finished) then { // Stop generator _vehicle setVariable ["GeneratorRunning", false,true]; - cutText [(localize "str_epoch_player_101"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_101","PLAIN DOWN"]; }; diff --git a/SQF/dayz_code/actions/tow_AttachStraps.sqf b/SQF/dayz_code/actions/tow_AttachStraps.sqf index 2b6d0fa63..07950b6b5 100644 --- a/SQF/dayz_code/actions/tow_AttachStraps.sqf +++ b/SQF/dayz_code/actions/tow_AttachStraps.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_abort","_configVeh","_nameText","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle","_towTruck","_towTruckSize","_allowedSize"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_96") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_96","PLAIN DOWN"]}; DZE_ActionInProgress = true; player removeAction s_player_towing; @@ -98,7 +98,7 @@ if(_IsNearVehicle >= 1) then { } else { - cutText [(localize "str_epoch_player_27"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_27","PLAIN DOWN"]; }; DZE_ActionInProgress = false; s_player_towing = -1; \ No newline at end of file diff --git a/SQF/dayz_code/actions/tow_DetachStraps.sqf b/SQF/dayz_code/actions/tow_DetachStraps.sqf index 7b0257c0c..70e7c06c3 100644 --- a/SQF/dayz_code/actions/tow_DetachStraps.sqf +++ b/SQF/dayz_code/actions/tow_DetachStraps.sqf @@ -1,6 +1,6 @@ private ["_vehicle","_started","_finished","_animState","_isMedic","_configVeh","_nameText","_towTruck","_inTow"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_96") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_96","PLAIN DOWN"]}; DZE_ActionInProgress = true; player removeAction s_player_towing; @@ -77,7 +77,7 @@ if(_inTow) then { _towTruck setVariable ["DZEvehicleInTow", objNull, true]; }; } else { - cutText [(localize "str_epoch_player_102"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_102","PLAIN DOWN"]; }; DZE_ActionInProgress = false; s_player_towing = -1; \ No newline at end of file diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf index b267dd00d..e3da5a306 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf @@ -1,12 +1,8 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; -// Test cannot lock while another player is nearby -//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; }; - // [part_out,part_in, qty_out, qty_in, loc]; _activatingPlayer = player; @@ -25,7 +21,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -60,7 +56,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; DZE_ActionInProgress = false; }; @@ -221,7 +217,7 @@ if (_finished) then { cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf index 03a4a1a21..a27d36e45 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle_old.sqf @@ -1,12 +1,8 @@ private ["_veh","_location","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; -// Test cannot lock while another player is nearby -//_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; }; - // [part_out,part_in, qty_out, qty_in, loc]; _activatingPlayer = player; @@ -31,7 +27,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -66,7 +62,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { @@ -175,7 +171,7 @@ if (_qty >= _qty_in) then { cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; }; diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf index 9d2682273..3ee84cbb0 100644 --- a/SQF/dayz_code/actions/trade_any_boat.sqf +++ b/SQF/dayz_code/actions/trade_any_boat.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; }; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -25,7 +25,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -60,7 +60,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; DZE_ActionInProgress = false; }; @@ -161,7 +161,7 @@ if (_finished) then { cutText [format[(localize "STR_EPOCH_ACTIONS_11"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_107"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_107","PLAIN DOWN"]; }; } else { @@ -206,7 +206,7 @@ if (_finished) then { cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_boat_old.sqf b/SQF/dayz_code/actions/trade_any_boat_old.sqf index 9dd80df96..ea301260a 100644 --- a/SQF/dayz_code/actions/trade_any_boat_old.sqf +++ b/SQF/dayz_code/actions/trade_any_boat_old.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_okToSell","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; }; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -32,7 +32,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -67,7 +67,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { @@ -141,7 +141,7 @@ if (_qty >= _qty_in) then { player removeMagazine _keySelected; }; } else { - cutText [(localize "str_epoch_player_107"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_107","PLAIN DOWN"]; }; } else { @@ -168,7 +168,7 @@ if (_qty >= _qty_in) then { cutText [format[(localize "str_epoch_player_181"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf index fcaaab417..6f58df68d 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_temp_keys","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; }; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -25,7 +25,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -60,7 +60,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; DZE_ActionInProgress = false; }; @@ -161,7 +161,7 @@ if (_finished) then { cutText [format[(localize "STR_EPOCH_ACTIONS_11"),_qty_in,_textPartIn,_textPartOut], "PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_107"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_107","PLAIN DOWN"]; }; } else { @@ -252,7 +252,7 @@ if (_finished) then { cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf index cf0407177..9aa50cce7 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_free.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_free.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_canAfford","_trade_total","_total_currency","_return_change","_done"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; }; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -25,7 +25,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -60,7 +60,7 @@ if (!_finished) exitWith { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; DZE_ActionInProgress = false; }; @@ -219,7 +219,7 @@ if (_finished) then { cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; }; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf index fb6e3e107..fb7e9ef0a 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle_old.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle_old.sqf @@ -1,11 +1,11 @@ private ["_veh","_location","_isOk","_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_obj","_objectID","_objectUID","_bos","_started","_finished","_animState","_isMedic","_dir","_helipad","_removed","_keyColor","_keyNumber","_keySelected","_isKeyOK","_config","_damage","_tireDmg","_tires","_okToSell","_hitpoints","_needed","_activatingPlayer","_textPartIn","_textPartOut","_traderID","_playerNear"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; // Test cannot lock while another player is nearby //_playerNear = {isPlayer _x} count (player nearEntities ["CAManBase", 12]) > 1; -//if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_104") , "PLAIN DOWN"]; }; +//if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_104","PLAIN DOWN"];}; // [part_out,part_in, qty_out, qty_in, loc]; @@ -36,7 +36,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -71,7 +71,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { @@ -147,7 +147,7 @@ if (_qty >= _qty_in) then { player removeMagazine _keySelected; }; } else { - cutText [(localize "str_epoch_player_107"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_107","PLAIN DOWN"]; }; } else { @@ -201,7 +201,7 @@ if (_qty >= _qty_in) then { cutText [format[(localize "str_epoch_player_182"),_textPartIn] , "PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; }; diff --git a/SQF/dayz_code/actions/trade_backpacks.sqf b/SQF/dayz_code/actions/trade_backpacks.sqf index ee2cf7601..97fb4123e 100644 --- a/SQF/dayz_code/actions/trade_backpacks.sqf +++ b/SQF/dayz_code/actions/trade_backpacks.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_class","_started","_finished","_animState","_isMedic","_num_removed","_needed","_activatingPlayer","_buy_o_sell","_textPartIn","_textPartOut","_traderID"]; // [part_out,part_in, qty_out, qty_in,]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -22,7 +22,7 @@ if(_buy_o_sell == "sell") then { _bos = 1; }; -cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_105","PLAIN DOWN"]; // force animation player playActionNow "Medic"; @@ -58,7 +58,7 @@ if (!_finished) exitWith { player playActionNow "stop"; }; DZE_ActionInProgress = false; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { diff --git a/SQF/dayz_code/actions/trade_backpacks_old.sqf b/SQF/dayz_code/actions/trade_backpacks_old.sqf index af440fa22..4de44a52a 100644 --- a/SQF/dayz_code/actions/trade_backpacks_old.sqf +++ b/SQF/dayz_code/actions/trade_backpacks_old.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_bos","_bag","_class","_started","_finished","_animState","_isMedic","_num_removed","_needed","_activatingPlayer","_buy_o_sell","_textPartIn","_textPartOut","_traderID"]; // [part_out,part_in, qty_out, qty_in,]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -30,7 +30,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -65,7 +65,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { diff --git a/SQF/dayz_code/actions/trade_items.sqf b/SQF/dayz_code/actions/trade_items.sqf index e08f3b651..0ee3503cb 100644 --- a/SQF/dayz_code/actions/trade_items.sqf +++ b/SQF/dayz_code/actions/trade_items.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_textPartIn","_textPartOut","_bos","_needed","_started","_finished","_animState","_isMedic","_total_parts_out","_abort","_removed","_activatingPlayer","_traderID","_done"]; // [part_out,part_in, qty_out, qty_in,]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"]}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -30,7 +30,7 @@ while {r_autoTrade} do { // check if current magazine count is greater than 20 - if ((count (magazines player)) > 20) exitWith { cutText [(localize "str_player_24"), "PLAIN DOWN"]; r_autoTrade = false}; + if ((count (magazines player)) > 20) exitWith {cutText [localize "str_player_24","PLAIN DOWN"]; r_autoTrade = false}; _canAfford = false; if(_bos == 1) then { @@ -59,7 +59,7 @@ while {r_autoTrade} do { r_autoTrade = false }; - cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; player playActionNow "Medic"; @@ -98,7 +98,7 @@ while {r_autoTrade} do { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { diff --git a/SQF/dayz_code/actions/trade_items_old.sqf b/SQF/dayz_code/actions/trade_items_old.sqf index 7a3131184..f35c677ea 100644 --- a/SQF/dayz_code/actions/trade_items_old.sqf +++ b/SQF/dayz_code/actions/trade_items_old.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_textPartIn","_textPartOut","_bos","_needed","_started","_finished","_animState","_isMedic","_total_parts_out","_abort","_removed","_tradeCounter","_next_highest_bar","_third_highest_bar","_next_highest_conv","_third_highest_conv","_third_parts_out_raw","_third_parts_out","_remainder","_next_parts_out_raw","_next_parts_out","_activatingPlayer","_traderID","_total_trades"]; // [part_out,part_in, qty_out, qty_in,]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"] }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"]}; DZE_ActionInProgress = true; _total_parts_out = 0; @@ -88,7 +88,7 @@ for "_x" from 1 to _total_trades do { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { diff --git a/SQF/dayz_code/actions/trade_items_wo_db.sqf b/SQF/dayz_code/actions/trade_items_wo_db.sqf index 12e64467f..eea0cdcf9 100644 --- a/SQF/dayz_code/actions/trade_items_wo_db.sqf +++ b/SQF/dayz_code/actions/trade_items_wo_db.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_textPartIn","_textPartOut","_qty","_needed","_started","_finished","_animState","_isMedic","_abort","_removed","_tradeCounter","_total_trades","_humanityGain","_humanity"]; // [part_out,part_in, qty_out, qty_in,]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; //_activatingPlayer = [player] call FNC_GetPlayerUID; @@ -73,7 +73,7 @@ for "_x" from 1 to _total_trades do { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; _qty = {_x == _part_in} count magazines player; diff --git a/SQF/dayz_code/actions/trade_metals.sqf b/SQF/dayz_code/actions/trade_metals.sqf index 4c2930b35..959645237 100644 --- a/SQF/dayz_code/actions/trade_metals.sqf +++ b/SQF/dayz_code/actions/trade_metals.sqf @@ -1,6 +1,6 @@ private ["_buy","_metals_conversion","_cancel"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_parts;s_player_parts = []; diff --git a/SQF/dayz_code/actions/trade_weapons.sqf b/SQF/dayz_code/actions/trade_weapons.sqf index 447343590..b50b02702 100644 --- a/SQF/dayz_code/actions/trade_weapons.sqf +++ b/SQF/dayz_code/actions/trade_weapons.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic","_removed"]; // [part_out,part_in, qty_out, qty_in,"buy"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -73,7 +73,7 @@ if (_abort) exitWith { DZE_ActionInProgress = false; }; -cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; +cutText [localize "str_epoch_player_105","PLAIN DOWN"]; // force animation player playActionNow "Medic"; @@ -109,7 +109,7 @@ if (!_finished) exitWith { player playActionNow "stop"; }; DZE_ActionInProgress = false; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { diff --git a/SQF/dayz_code/actions/trade_weapons_old.sqf b/SQF/dayz_code/actions/trade_weapons_old.sqf index e86b4c487..434514f0e 100644 --- a/SQF/dayz_code/actions/trade_weapons_old.sqf +++ b/SQF/dayz_code/actions/trade_weapons_old.sqf @@ -1,7 +1,7 @@ private ["_part_out","_part_in","_qty_out","_qty_in","_qty","_buy_o_sell","_traderID","_bos","_needed","_activatingPlayer","_textPartIn","_textPartOut","_started","_finished","_animState","_isMedic","_removed"]; // [part_out,part_in, qty_out, qty_in,"buy"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_103") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_103","PLAIN DOWN"];}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -26,7 +26,7 @@ if(_buy_o_sell == "buy") then { if (_qty >= _qty_in) then { - cutText [(localize "str_epoch_player_105"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_105","PLAIN DOWN"]; [1,1] call dayz_HungerThirst; // force animation @@ -66,7 +66,7 @@ if (_qty >= _qty_in) then { [objNull, player, rSwitchMove,""] call RE; player playActionNow "stop"; }; - cutText [(localize "str_epoch_player_106") , "PLAIN DOWN"]; + cutText [localize "str_epoch_player_106","PLAIN DOWN"]; }; if (_finished) then { diff --git a/SQF/dayz_code/actions/unlock_veh.sqf b/SQF/dayz_code/actions/unlock_veh.sqf index 84eb31717..b15c8316e 100644 --- a/SQF/dayz_code/actions/unlock_veh.sqf +++ b/SQF/dayz_code/actions/unlock_veh.sqf @@ -2,7 +2,7 @@ private["_vehicle","_key"]; _vehicle = (_this select 3) select 0; _key = (_this select 3) select 1; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_37") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_37","PLAIN DOWN"];}; DZE_ActionInProgress = true; {player removeAction _x} count s_player_lockunlock;s_player_lockunlock = []; diff --git a/SQF/dayz_code/actions/vault_combination_1.sqf b/SQF/dayz_code/actions/vault_combination_1.sqf index b2f0fa37a..4e7994840 100644 --- a/SQF/dayz_code/actions/vault_combination_1.sqf +++ b/SQF/dayz_code/actions/vault_combination_1.sqf @@ -1,6 +1,6 @@ private ["_ok"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "STR_EPOCH_PLAYER_21") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "STR_EPOCH_PLAYER_21","PLAIN DOWN"];}; DZE_ActionInProgress = true; dayz_selectedVault = _this select 3; diff --git a/SQF/dayz_code/actions/vault_pitch.sqf b/SQF/dayz_code/actions/vault_pitch.sqf index 4802c2c6c..e251cee11 100644 --- a/SQF/dayz_code/actions/vault_pitch.sqf +++ b/SQF/dayz_code/actions/vault_pitch.sqf @@ -5,7 +5,7 @@ private ["_tent","_location","_isOk","_cancel","_location3","_location4","_location1","_location2","_counter","_pondPos","_isPond","_ppos","_hastentitem","_dir","_building","_isBuilding","_playerPos","_item","_offset_x","_offset_y","_offset_z","_offset_z_attach","_config","_text","_tmpvault","_vault_location","_objectsPond","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_removed"]; //check if can pitch here -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_108") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_108","PLAIN DOWN"];}; DZE_ActionInProgress = true; //disableSerialization; @@ -52,7 +52,7 @@ _counter = 0; while {_isOk} do { if(_counter == 0) then { - cutText [(localize "str_epoch_player_109"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_109","PLAIN DOWN"]; uiSleep 5; _location1 = getPosATL player; uiSleep 5; @@ -60,7 +60,7 @@ while {_isOk} do { if(_location1 distance _location2 < 0.1) exitWith { - cutText [(localize "str_epoch_player_109"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_109","PLAIN DOWN"]; _location3 = getPosATL player; uiSleep 5; _location4 = getPosATL player; @@ -167,11 +167,11 @@ if(!_cancel) then { }; } else { - cutText [(localize "str_epoch_player_110"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_110","PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_111"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_111","PLAIN DOWN"]; }; DZE_ActionInProgress = false; \ No newline at end of file diff --git a/SQF/dayz_code/actions/water_fill.sqf b/SQF/dayz_code/actions/water_fill.sqf index ccd0d0968..4febd1fd3 100644 --- a/SQF/dayz_code/actions/water_fill.sqf +++ b/SQF/dayz_code/actions/water_fill.sqf @@ -10,7 +10,7 @@ _pondPos = []; _objectsWell = []; _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; -if (_onLadder) exitWith {cutText [(localize "str_player_21") , "PLAIN DOWN"]}; +if (_onLadder) exitWith {cutText [localize "str_player_21","PLAIN DOWN"]}; _hasbottleitem = _this in magazines player; @@ -63,8 +63,8 @@ if (_canFill) then { cutText [format[(localize "str_player_01"),_qty], "PLAIN DOWN"]; } else { - cutText [(localize "str_player_02") , "PLAIN DOWN"]; + cutText [localize "str_player_02","PLAIN DOWN"]; }; } else { - cutText [(localize "str_player_20") , "PLAIN DOWN"]; + cutText [localize "str_player_20","PLAIN DOWN"]; }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/fn_damageActions.sqf b/SQF/dayz_code/compile/fn_damageActions.sqf index de9c5c6f2..972140f27 100644 --- a/SQF/dayz_code/compile/fn_damageActions.sqf +++ b/SQF/dayz_code/compile/fn_damageActions.sqf @@ -8,7 +8,7 @@ scriptName "Functions\misc\fn_damageActions.sqf"; - [] call fnc_usec_damageActions; ************************************************************/ if (DZE_ActionInProgress) exitWith {}; -private ["_action","_weaponName","_turret","_weapons","_assignedRole","_driver","_action1","_action2","_vehicle","_unit","_vehType","_vehClose","_hasVehicle","_unconscious","_lowBlood","_injured","_inPain","_legsBroke","_armsBroke","_charID","_friendlies","_playerMagazines","_hasBandage","_hasEpi","_hasMorphine","_hasBlood","_hasPainkillers","_unconscious_crew","_patients","_crew","_menClose","_hasPatient","_inVehicle","_isClose","_transfuse"]; +private ["_action","_weaponName","_turret","_weapons","_assignedRole","_driver","_action1","_action2","_vehicle","_unit","_vehType","_vehClose","_hasVehicle","_unconscious","_lowBlood","_injured","_inPain","_legsBroke","_armsBroke","_charID","_friendlies","_playerMagazines","_hasBandage","_hasEpi","_hasMorphine","_hasPainkillers","_unconscious_crew","_patients","_crew","_menClose","_hasPatient","_inVehicle","_isClose","_transfuse"]; _menClose = cursorTarget; _hasPatient = alive _menClose; @@ -135,7 +135,7 @@ if (isPlayer cursorTarget) then { if (_hasPatient) then { //Allow player to drag - if(_unconscious) then { + if (_unconscious) then { r_action = true; _action1 = _unit addAction [localize "STR_UI_GEAR", "\z\addons\dayz_code\actions\openGear.sqf",_unit, 0, true, true]; _action2 = _unit addAction [localize "str_actions_medical_01", "\z\addons\dayz_code\medical\drag.sqf",_unit, 0, true, true]; @@ -161,43 +161,43 @@ if (isPlayer cursorTarget) then { r_player_actions set [count r_player_actions,_action]; }; //Allow player to bandage - if(_injured && _hasBandage) then { + if (_injured && _hasBandage) then { r_action = true; _action = _unit addAction [localize "str_actions_medical_04", "\z\addons\dayz_code\medical\bandage.sqf",[_unit,"ItemBandage"], 0, true, true, "", "'ItemBandage' in magazines player"]; r_player_actions set [count r_player_actions,_action]; }; //Sepsis - if(_hasSepsis && _hasSepsisBandage) then { + if (_hasSepsis && _hasSepsisBandage) then { r_action = true; _action = _unit addAction [localize "str_actions_medical_04", "\z\addons\dayz_code\medical\bandage.sqf",[_unit,"ItemSepsisBandage"], 0, true, true, "", "'ItemBandage' in magazines player"]; r_player_actions set [count r_player_actions,_action]; }; //Allow player to give Epinephrine - if(_unconscious && _hasEpi) then { + if (_unconscious && _hasEpi) then { r_action = true; _action = _unit addAction [localize "str_actions_medical_05", "\z\addons\dayz_code\medical\epinephrine.sqf",[_unit], 0, true, true]; r_player_actions set [count r_player_actions,_action]; }; //Allow player to give Morphine - if((_legsBroke or _armsBroke) && _hasMorphine) then { + if ((_legsBroke or _armsBroke) && _hasMorphine) then { r_action = true; _action = _unit addAction [localize "str_actions_medical_06", "\z\addons\dayz_code\medical\brokeBones.sqf",[_unit,"ItemMorphine"], 0, true, true, "", "'ItemMorphine' in magazines player"]; r_player_actions set [count r_player_actions,_action]; }; //Allow player to give equip_woodensplint - if((_legsBroke or _armsBroke) && _hasSplint) then { + if ((_legsBroke or _armsBroke) && _hasSplint) then { r_action = true; _action = _unit addAction [localize "str_actions_medical_06_splint", "\z\addons\dayz_code\medical\brokeBones.sqf",[_unit,"equip_woodensplint"], 0, true, true, "", "'equip_woodensplint' in magazines player"]; r_player_actions set [count r_player_actions,_action]; }; //Allow player to give Painkillers - if(_inPain && _hasPainkillers) then { + if (_inPain && _hasPainkillers) then { r_action = true; _action = _unit addAction [localize "str_actions_medical_07", "\z\addons\dayz_code\medical\painkiller.sqf",[_unit], 0, true, true, "", "'ItemPainkiller' in magazines player"]; r_player_actions set [count r_player_actions,_action]; }; //Allow player to transfuse blood - if(_lowBlood && _hasBlood) then { + if (_lowBlood && _hasBloodBag) then { _transfuse = if (DZE_UseBloodTypes) then {"\z\addons\dayz_code\medical\transfusion.sqf"} else {"\z\addons\dayz_code\medical\transfusion_NoBloodTypes.sqf"}; r_action = true; _action = _unit addAction [localize "str_actions_medical_08",_transfuse,[_unit], 0, true, true]; diff --git a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf index afc0975e7..8165770c2 100644 --- a/SQF/dayz_code/compile/fn_gearMenuChecks.sqf +++ b/SQF/dayz_code/compile/fn_gearMenuChecks.sqf @@ -8,7 +8,7 @@ if ((vehicle player) == player) then { _dis = if (_cTarget isKindOf "USEC_ch53_E" || _cTarget isKindOf "MV22") then {25} else {12}; if ((locked _cTarget) && {(_cTarget isKindOf "LandVehicle") or {_cTarget isKindOf "Air"} or {_cTarget isKindOf "Ship"}} && {(player distance _cTarget) < _dis}) then { - cutText [(localize "str_epoch_player_7"),"PLAIN DOWN"]; + cutText [localize "str_epoch_player_7","PLAIN DOWN"]; _display closeDisplay 1; }; @@ -16,7 +16,7 @@ if ((vehicle player) == player) then { _friendlies = player getVariable ["friendlies",[]]; _rcharID = _cTarget getVariable ["CharacterID","0"]; if (!canbuild && {_cTarget isKindOf "Man"} && {alive _cTarget} && {!((typeOf _cTarget) in serverTraders)} && {!(_rcharID in _friendlies)} && {(player distance _cTarget) < 12}) then { - cutText [(localize "STR_EPOCH_PLAYER_316"),"PLAIN DOWN"]; + cutText [localize "STR_EPOCH_PLAYER_316","PLAIN DOWN"]; _display closeDisplay 1; }; }; diff --git a/SQF/dayz_code/compile/object_removeNearby.sqf b/SQF/dayz_code/compile/object_removeNearby.sqf index 6d993c80a..03e7bf418 100644 --- a/SQF/dayz_code/compile/object_removeNearby.sqf +++ b/SQF/dayz_code/compile/object_removeNearby.sqf @@ -4,19 +4,18 @@ _objects = _this select 0; _range = _this select 1; _error = _this select 2; - _onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1; _canDo = (!r_drag_sqf && !r_player_unconscious && !_onLadder); _nearByObjects = nearestObjects [player,_objects,_range]; if (count _nearByObjects == 0) exitWith { - cutText [(localize _error), "PLAIN DOWN"]; + cutText [localize _error,"PLAIN DOWN"]; }; _targetObject = _nearByObjects select 0; if (!isNull _targetObject && _canDo) then { [0,1,2,_targetObject] spawn player_removeObject; } else { - cutText [(localize _error), "PLAIN DOWN"]; + cutText [localize _error,"PLAIN DOWN"]; }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_antiWall.sqf b/SQF/dayz_code/compile/player_antiWall.sqf index 8d70cb181..deb1c1b94 100644 --- a/SQF/dayz_code/compile/player_antiWall.sqf +++ b/SQF/dayz_code/compile/player_antiWall.sqf @@ -39,31 +39,31 @@ if(_activated) then { // this method is said to be faster than switch, lets try it. call { if (DZE_AntiWallCounter == DZE_AntiWallLimit) exitWith { - cutText [(localize "str_epoch_player_9"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_9","PLAIN DOWN"]; _id = [player,"crushed"] spawn player_death; }; if ((_vehicle emptyPositions "driver") > 0) exitWith { - cutText [(localize "STR_EPOCH_ACTIONS_15"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; player moveInDriver _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; if ((_vehicle emptyPositions "gunner") > 0) exitWith { - cutText [(localize "STR_EPOCH_ACTIONS_15"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; player moveInGunner _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; if ((_vehicle emptyPositions "commander") > 0) exitWith { - cutText [(localize "STR_EPOCH_ACTIONS_15"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; player moveInCommander _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; if ((_vehicle emptyPositions "cargo") > 0) exitWith { - cutText [(localize "STR_EPOCH_ACTIONS_15"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_ACTIONS_15","PLAIN DOWN"]; player moveInCargo _vehicle; DZE_AntiWallCounter = DZE_AntiWallCounter + 1; }; // kill player if none of the above are matched - cutText [(localize "str_epoch_player_9"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_9","PLAIN DOWN"]; _id = [player,"crushed"] spawn player_death; }; diff --git a/SQF/dayz_code/compile/player_fired.sqf b/SQF/dayz_code/compile/player_fired.sqf index 45feb0cbf..be0186cac 100644 --- a/SQF/dayz_code/compile/player_fired.sqf +++ b/SQF/dayz_code/compile/player_fired.sqf @@ -45,12 +45,12 @@ if ((_ammo isKindOf "SmokeShell") or (_ammo isKindOf "GrenadeHandTimedWest") or if (isNull group _x) then { _group = _x; }; - _isLocal = (local _x); + _isLocal = local _x; _x reveal [_projectile,4]; _localtargets = _group getVariable ["localtargets",[]]; _remotetargets = _group getVariable ["remotetargets",[]]; _targets = _localtargets + _remotetargets; - if (!(_projectile in _targets)) then { + if !(_projectile in _targets) then { switch (_isLocal) do { case false: { _remotetargets set [count _remotetargets,_projectile]; @@ -64,31 +64,28 @@ if ((_ammo isKindOf "SmokeShell") or (_ammo isKindOf "GrenadeHandTimedWest") or }; } forEach (_pos nearEntities ["zZombie_Base",50]); } else { - while { alive _projectile } do { + while {alive _projectile} do { _pos = getPosATL _projectile; uiSleep 0.01; }; { _x setVariable ["myDest",_pos]; // removed networked var. targets should be enough - } forEach (_pos nearEntities ["zZombie_Base",50]); + } count (_pos nearEntities ["zZombie_Base",50]); }; }; } else { - - [_unit,_distance,true,(getPosATL player)] call player_alertZombies; + [_unit,_distance,true,getPosATL player] call player_alertZombies; //Check if need to place arrow if (_ammo isKindOf "Bolt") then { [_this] spawn player_crossbowBolt; }; if (_ammo isKindOf "GrenadeHand") then { - if (_ammo isKindOf "ThrownObjects") then { [_this] spawn player_throwObject; }; if (_ammo isKindOf "RoadFlare") then { - //hint str(_ammo); _projectile = nearestObject [_unit, "RoadFlare"]; [_projectile,0] spawn object_roadFlare; PVDZ_obj_RoadFlare = [_projectile,0]; diff --git a/SQF/dayz_code/compile/player_gearSet.sqf b/SQF/dayz_code/compile/player_gearSet.sqf index 12c4155bf..95f925463 100644 --- a/SQF/dayz_code/compile/player_gearSet.sqf +++ b/SQF/dayz_code/compile/player_gearSet.sqf @@ -1,6 +1,5 @@ -private ["_inventory","_wpns","_mags","_idc","_isOK","_typedBags"]; +private "_idc"; _inventory = _this; -_typedBags = ["bloodBagANEG", "bloodBagAPOS", "bloodBagBNEG", "bloodBagBPOS", "bloodBagONEG", "bloodBagOPOS","wholeBloodBagANEG", "wholeBloodBagAPOS", "wholeBloodBagBNEG", "wholeBloodBagBPOS", "wholeBloodBagONEG", "wholeBloodBagOPOS"]; if (count _inventory > 0) then { _wpns = _inventory select 0; _mags = _inventory select 1; @@ -24,13 +23,11 @@ if (count _inventory > 0) then { if (DZE_UseBloodTypes) then { if (_item == "ItemBloodbag") then { _item = "bloodBagONEG" }; // Convert ItemBloodbag into universal blood type/rh bag } else { - if (_item in _typedBags) then {_item = "ItemBloodbag"}; + if (_item in DZE_typedBags) then { _item = "ItemBloodbag" }; }; - if (_item == "ItemTent") then { _item = "ItemTentOld" }; //Is item legal? - _isOK = isClass(configFile >> "CfgMagazines" >> _item); - if (_isOK) then { + if (isClass(configFile >> "CfgMagazines" >> _item)) then { if (_val != -1) then { player addMagazine [_item,_val]; } else { @@ -39,15 +36,15 @@ if (count _inventory > 0) then { }; _idc = _idc + 1; } count _mags; + //Add weapons { - if(_x in (DZE_REPLACE_WEAPONS select 0)) then { + if (_x in (DZE_REPLACE_WEAPONS select 0)) then { _x = (DZE_REPLACE_WEAPONS select 1) select ((DZE_REPLACE_WEAPONS select 0) find _x); }; //Is item legal? - _isOK = isClass(configFile >> "CfgWeapons" >> _x); - if (_isOK) then { + if (isClass(configFile >> "CfgWeapons" >> _x)) then { player addWeapon _x; }; } count _wpns; diff --git a/SQF/dayz_code/compile/player_humanityChange.sqf b/SQF/dayz_code/compile/player_humanityChange.sqf index 3f7e47f8b..4b6f21db8 100644 --- a/SQF/dayz_code/compile/player_humanityChange.sqf +++ b/SQF/dayz_code/compile/player_humanityChange.sqf @@ -1,8 +1,6 @@ -private ["_object","_change","_humanity","_wait"]; -//Set Variables +private ["_object","_change","_wait","_humanity","_model","_isMen","_isMenH","_isMenB","_isWomen","_isWomenH","_isWomenB"]; _object = _this select 0; _change = _this select 1; -_humanity = 0; _wait = if (count _this > 2) then { _this select 2 } else { 0 }; if (_object == player) then { @@ -16,7 +14,7 @@ if (_object == player) then { private ["_endtime","_wait"]; _wait = _this select 0; _endTime = diag_tickTime + _wait; - waitUntil { uisleep 1; diag_tickTime > _endTime }; + waitUntil { uiSleep 1; diag_tickTime > _endTime }; player setVariable ["FTcounter",((player getVariable ["FTcounter",0]) - _wait)]; if ((player getVariable ["FTcounter",0]) <= 0) then { player setVariable ["FTcounter",0]; @@ -25,4 +23,53 @@ if (_object == player) then { }; }; }; + /* Humanity morphing disabled on Epoch to avoid loss of purchased clothing + + //add humanity cap both ways + //if (_humanity < 500000) then { player setVariable["humanity",-500000,true]; }; //Hive adds/removes diffrence + //if (_humanity > 500000) then { player setVariable["humanity",500000,true]; }; //Hive adds/removes diffrence + + _model = typeOf player; + + //if model will not be changed by humanity + if !(_model in ["Survivor1_DZ","Survivor2_DZ","Survivor3_DZ","SurvivorW2_DZ","SurvivorW3_DZ","Bandit1_DZ","BanditW1_DZ"]) exitWith {}; + + //Not sure if this will work needs testing + _isMen = _model == "Survivor1_DZ" || _model == "Survivor2_DZ"; + _isMenH = _model == "Survivor3_DZ"; + _isMenB = _model == "Bandit1_DZ"; + _isWomen = _model == "SurvivorW2_DZ"; + _isWomenH = _model == "SurvivorW3_DZ"; //TODO + _isWomenB = _model == "BanditW1_DZ"; + + // Bandit + if (_humanity <= -2000) then { + if (_isMen || _isMenH) then { + [dayz_playerUID,dayz_characterID,"Bandit1_DZ"] spawn player_humanityMorph; + }; + if (_isWomen || _isWomenH) then { + [dayz_playerUID,dayz_characterID,"BanditW1_DZ"] spawn player_humanityMorph; + }; + }; + //Survivor + if (_humanity > -2000 && _humanity <= 5000) then { + if (_isMenH || _isMenB) then { + [dayz_playerUID,dayz_characterID,"Survivor2_DZ"] spawn player_humanityMorph; + }; + if (_isWomenH || _isWomenB) then { + [dayz_playerUID,dayz_characterID,"SurvivorW2_DZ"] spawn player_humanityMorph; + }; + }; + + // Hero + if (_humanity > 5000) then { + if (_isMen || _isMenB) then { + [dayz_playerUID,dayz_characterID,"Survivor3_DZ"] spawn player_humanityMorph; + }; + if (_isWomenB) then { + [dayz_playerUID,dayz_characterID,"SurvivorW2_DZ"] spawn player_humanityMorph; + }; + }; + + */ }; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_humanityMorph.sqf b/SQF/dayz_code/compile/player_humanityMorph.sqf index fd14fe782..7dc732d94 100644 --- a/SQF/dayz_code/compile/player_humanityMorph.sqf +++ b/SQF/dayz_code/compile/player_humanityMorph.sqf @@ -2,10 +2,9 @@ private ["_charID","_newmodel","_old","_updates","_humanity","_medical","_worlds //_playerUID = _this select 0; _charID = _this select 1; _model = _this select 2; - _old = player; -player allowDamage false; +player allowDamage false; player removeEventHandler ["FiredNear",eh_player_killed]; player removeEventHandler ["HandleDamage",mydamage_eh1]; player removeEventHandler ["Killed",mydamage_eh3]; @@ -23,8 +22,8 @@ _zombieKills = player getVariable ["zombieKills",0]; _headShots = player getVariable ["headShots",0]; _humanKills = player getVariable ["humanKills",0]; _banditKills = player getVariable ["banditKills",0]; - _achievements = player getVariable ["Achievements",[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]]; +_friendlies = player getVariable ["friendlies",[]]; //Switch _switch = _model spawn player_switchModel; @@ -35,7 +34,7 @@ waitUntil { scriptDone _switch }; //set medical values if (count _medical > 0) then { player setVariable["USEC_isDead",(_medical select 0),true]; - player setVariable["NORRN_unconscious", (_medical select 1), true]; + player setVariable["NORRN_unconscious",(_medical select 1), true]; player setVariable["USEC_infected",(_medical select 2),true]; player setVariable["USEC_injured",(_medical select 3),true]; player setVariable["USEC_inPain",(_medical select 4),true]; @@ -43,7 +42,6 @@ if (count _medical > 0) then { player setVariable["USEC_lowBlood",(_medical select 6),true]; player setVariable["USEC_BloodQty",(_medical select 7),true]; player setVariable["unconsciousTime",(_medical select 10),true]; - player setVariable["blood_type",(_medical select 11),true]; player setVariable["rh_factor",(_medical select 12),true]; player setVariable["messing",(_medical select 13),true]; @@ -57,13 +55,12 @@ if (count _medical > 0) then { publicVariable "PVDZ_hlt_Bleed"; } forEach (_medical select 8); - //Add fractures - _fractures = (_medical select 9); + _fractures = _medical select 9; // player setVariable ["hit_legs",(_fractures select 0),true]; // player setVariable ["hit_hands",(_fractures select 1),true]; - [player,"legs", (_fractures select 0)] call object_setHit; - [player,"hands", (_fractures select 1)] call object_setHit; + [player,"legs",(_fractures select 0)] call object_setHit; + [player,"hands",(_fractures select 1)] call object_setHit; } else { //Reset Fractures player setVariable ["hit_legs",0,true]; @@ -72,7 +69,6 @@ if (count _medical > 0) then { player setVariable ["USEC_inPain",false,true]; }; - //General Stats player setVariable["humanity",_humanity,true]; player setVariable["zombieKills",_zombieKills,true]; @@ -82,25 +78,19 @@ player setVariable["banditKills",_banditKills,true]; player setVariable["characterID",_charID,true]; player setVariable["worldspace",_worldspace]; player setVariable["Achievements",_achievements]; -player setVariable["CharacterID",_charID,true]; -player setVariable["worldspace",_worldspace,true]; player setVariable["friendlies",_friendlies,true]; -player setVariable["tagList",_tagList,true]; + PVDZ_serverStoreVar = [player,"Achievements",_achievements]; publicVariableServer "PVDZ_serverStoreVar"; call dayz_resetSelfActions; - -eh_player_killed = player addeventhandler ["FiredNear",{_this call player_weaponFiredNear;} ]; - +eh_player_killed = player addeventhandler ["FiredNear",{_this call player_weaponFiredNear;}]; [player] call fnc_usec_damageHandle; player allowDamage true; player addWeapon "Loot"; - uiSleep 0.1; -//melee check call dayz_meleeMagazineCheck; uiSleep 0.1; -if !(isNull _old) then {deleteVehicle _old;}; \ No newline at end of file +if !(isNull _old) then {deleteVehicle _old;}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_lockVault.sqf b/SQF/dayz_code/compile/player_lockVault.sqf index 333eba082..2cee40f6c 100644 --- a/SQF/dayz_code/compile/player_lockVault.sqf +++ b/SQF/dayz_code/compile/player_lockVault.sqf @@ -5,7 +5,7 @@ */ private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_alreadyPacking","_lockedClass","_text","_playerNear"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_10") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_10","PLAIN DOWN"];}; DZE_ActionInProgress = true; player removeAction s_player_lockvault; @@ -15,7 +15,7 @@ _obj = _this; _objType = typeOf _obj; _lockedClass = getText (configFile >> "CfgVehicles" >> _objType >> "lockedClass"); -_text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); +_text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); // Silently exit if object no longer exists if(isNull _obj) exitWith { DZE_ActionInProgress = false; }; @@ -26,11 +26,11 @@ uiSleep 1; uiSleep 5; _playerNear = _obj call dze_isnearest_player; -if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_11") , "PLAIN DOWN"]; }; +if (_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_11","PLAIN DOWN"];}; _ownerID = _obj getVariable["CharacterID","0"]; -_objectID = _obj getVariable["ObjectID","0"]; -_objectUID = _obj getVariable["ObjectUID","0"]; +_objectID = _obj getVariable["ObjectID","0"]; +_objectUID = _obj getVariable["ObjectUID","0"]; if((_ownerID != dayz_combination) && (_ownerID != dayz_playerUID)) exitWith {DZE_ActionInProgress = false; s_player_lockvault = -1; cutText [format[(localize "str_epoch_player_115"),_text], "PLAIN DOWN"]; }; @@ -41,7 +41,7 @@ _obj setVariable["packing",1]; _dir = direction _obj; _pos = _obj getVariable["OEMPos",(getposATL _obj)]; -if(!isNull _obj) then { +if (!isNull _obj) then { dze_waiting = nil; PVDZE_log_lockUnlock = [player, _obj,true]; publicVariableServer "PVDZE_log_lockUnlock"; @@ -59,9 +59,9 @@ if(!isNull _obj) then { _holder setVariable["ObjectUID",_objectUID,true]; _holder setVariable ["OEMPos", _pos, true]; - _weapons = getWeaponCargo _obj; - _magazines = getMagazineCargo _obj; - _backpacks = getBackpackCargo _obj; + _weapons = getWeaponCargo _obj; + _magazines = getMagazineCargo _obj; + _backpacks = getBackpackCargo _obj; // remove vault deleteVehicle _obj; diff --git a/SQF/dayz_code/compile/player_music.sqf b/SQF/dayz_code/compile/player_music.sqf index 0f4456476..1b9a0b682 100644 --- a/SQF/dayz_code/compile/player_music.sqf +++ b/SQF/dayz_code/compile/player_music.sqf @@ -1,6 +1,5 @@ -private ["_sound","_num","_length","_pause"]; while {!r_player_dead} do { - _num = floor(random 37); + _num = round(random 37); _sound = "z_suspense_" + str(_num); _length = getNumber(configFile >> "cfgMusic" >> _sound >> "Duration"); _pause = ((random 5) + 2) + _length; diff --git a/SQF/dayz_code/compile/player_onPause.sqf b/SQF/dayz_code/compile/player_onPause.sqf index 78e997c6e..05dc19987 100644 --- a/SQF/dayz_code/compile/player_onPause.sqf +++ b/SQF/dayz_code/compile/player_onPause.sqf @@ -9,10 +9,9 @@ _btnAbort = _display displayCtrl 104; _btnRespawn ctrlEnable false; _btnAbort ctrlEnable false; _btnAbortText = ctrlText _btnAbort; -_timeOut = 0; -_timeMax = diag_tickTime+10; +_isPZombie = player isKindOf "PZombie_VB"; -if(r_fracture_legs && !r_player_dead) then {_btnRespawn ctrlEnable true;}; +if (r_fracture_legs) then {_btnRespawn ctrlEnable true;}; dayz_lastCheckSave = time; //force gear save @@ -20,38 +19,31 @@ if (time - dayz_lastCheckSave > 10) then { call player_forceSave; }; -while {(!isNull _display) and !r_player_dead} do { +while {(!isNull _display) && !r_player_dead} do { _timeout = 30; _timeout = player getVariable["combattimeout", 0]; - _inCombat = if (_timeout >= diag_tickTime) then { true } else { false }; - _playerCheck = if ({isPlayer _x} count (player nearEntities ["AllVehicles", 5]) > 1) then { true } else { false }; - //_zedCheck = if (count (player nearEntities ["zZombie_Base", 10]) > 0) then { true } else { false }; + _inCombat = if (_timeout >= diag_tickTime) then {true} else {false}; + _playerCheck = if ({isPlayer _x} count (player nearEntities ["AllVehicles",5]) > 1) then {true} else {false}; + _zedCheck = if ((count (player nearEntities ["zZombie_Base",10]) > 0) && !_isPZombie) then {true} else {false}; - Switch true do { + switch true do { case (_playerCheck) : { _btnAbort ctrlEnable false; _btnAbort ctrlSetText format["%1 (in 30)", _btnAbortText]; cutText [localize "str_abort_playerclose", "PLAIN DOWN"]; }; - case (isInTraderCity) : { - _btnAbort ctrlEnable false; - cutText [(localize "str_epoch_player_12"), "PLAIN DOWN"]; - _sleep = 1; - }; - /*case (_zedCheck) : { + case (_zedCheck) : { _btnAbort ctrlEnable false; _btnAbort ctrlSetText format["%1 (in 10)", _btnAbortText]; cutText [localize "str_abort_zedsclose", "PLAIN DOWN"]; - };*/ - case (_inCombat and !_playerCheck) : { + }; + case (_inCombat && !_zedCheck && !_playerCheck) : { _btnAbort ctrlEnable false; _btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)]; }; - case (_timeOut < _timeMax) : { + case (isInTraderCity) : { _btnAbort ctrlEnable false; - _btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, (ceil ((_timeMax - diag_tickTime)*10)/10)]; - cutText ["", "PLAIN DOWN"]; - _sleep = 0.1; + cutText [localize "str_epoch_player_12","PLAIN DOWN"]; }; default { _btnAbort ctrlEnable true; @@ -61,5 +53,4 @@ while {(!isNull _display) and !r_player_dead} do { uiSleep 1; }; -if (r_player_dead) exitWith {_btnAbort ctrlEnable true;}; - +if (r_player_dead) exitWith {_btnAbort ctrlEnable true;}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_packTent.sqf b/SQF/dayz_code/compile/player_packTent.sqf index 10623fcb4..08cf6e940 100644 --- a/SQF/dayz_code/compile/player_packTent.sqf +++ b/SQF/dayz_code/compile/player_packTent.sqf @@ -1,7 +1,7 @@ /* [_obj] call player_packTent; */ -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_13") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_13","PLAIN DOWN"];}; DZE_ActionInProgress = true; _obj = _this; @@ -20,9 +20,9 @@ s_player_packtent = -1; player removeAction s_player_packtentinfected; s_player_packtentinfected = -1; -if(_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_packtent = -1; cutText [(localize "str_epoch_player_14"), "PLAIN DOWN"];}; +if (_objectID == "0" && _objectUID == "0") exitWith {DZE_ActionInProgress = false; s_player_packtent = -1; cutText [localize "str_epoch_player_14","PLAIN DOWN"];}; -if(_ownerID != dayz_characterID) exitWith {DZE_ActionInProgress = false; s_player_packtent = -1; cutText [localize "str_fail_tent_pack", "PLAIN DOWN"];}; +if (_ownerID != dayz_characterID) exitWith {DZE_ActionInProgress = false; s_player_packtent = -1; cutText [localize "str_fail_tent_pack", "PLAIN DOWN"];}; _alreadyPacking = _obj getVariable["packing",0]; @@ -31,7 +31,7 @@ if (_alreadyPacking == 1) exitWith {DZE_ActionInProgress = false; s_player_packt _campitems = ["IC_DomeTent","IC_Tent"]; if (_ownerID == dayz_characterID or (typeOf _obj in _campitems)) then { _pickup = true; }; -if(_pickup) then { +if (_pickup) then { _obj setVariable["packing",1]; _dir = direction _obj; diff --git a/SQF/dayz_code/compile/player_packVault.sqf b/SQF/dayz_code/compile/player_packVault.sqf index 12c7f91ce..58fc70c80 100644 --- a/SQF/dayz_code/compile/player_packVault.sqf +++ b/SQF/dayz_code/compile/player_packVault.sqf @@ -3,7 +3,7 @@ */ private ["_activatingPlayer","_obj","_ownerID","_objectID","_objectUID","_alreadyPacking","_location1","_location2","_dir","_pos","_bag","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_packedClass","_text","_playerNear"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_15") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_15","PLAIN DOWN"];}; DZE_ActionInProgress = true; _activatingPlayer = player; @@ -19,7 +19,7 @@ if(isNull _obj || !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; _playerNear = _obj call dze_isnearest_player; -if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_16") , "PLAIN DOWN"]; }; +if(_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_16","PLAIN DOWN"];}; _ownerID = _obj getVariable["CharacterID","0"]; _objectID = _obj getVariable["ObjectID","0"]; diff --git a/SQF/dayz_code/compile/player_tameDog.sqf b/SQF/dayz_code/compile/player_tameDog.sqf index 346457406..994df173f 100644 --- a/SQF/dayz_code/compile/player_tameDog.sqf +++ b/SQF/dayz_code/compile/player_tameDog.sqf @@ -18,7 +18,7 @@ if ((_hasRawMeat) && (_hasdog == "false")) then { _target removeAction _id; player setvariable ["dogid", _fsmid]; } else { - cutText [(localize "str_epoch_player_18"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_18","PLAIN DOWN"]; }; //handle publicVariables here later. diff --git a/SQF/dayz_code/compile/player_traderMenuConfig.sqf b/SQF/dayz_code/compile/player_traderMenuConfig.sqf index 837bb240b..cf46f0d9c 100644 --- a/SQF/dayz_code/compile/player_traderMenuConfig.sqf +++ b/SQF/dayz_code/compile/player_traderMenuConfig.sqf @@ -205,7 +205,7 @@ TraderDialogBuy = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [(localize "str_epoch_player_6"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_6","PLAIN DOWN"]; }; _item = TraderItemList select _index; _data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8]; @@ -217,7 +217,7 @@ TraderDialogSell = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [(localize "str_epoch_player_6"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_6","PLAIN DOWN"]; }; _item = TraderItemList select _index; _data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8]; diff --git a/SQF/dayz_code/compile/player_traderMenuHive.sqf b/SQF/dayz_code/compile/player_traderMenuHive.sqf index 0aaeeb297..bb7060e15 100644 --- a/SQF/dayz_code/compile/player_traderMenuHive.sqf +++ b/SQF/dayz_code/compile/player_traderMenuHive.sqf @@ -193,7 +193,7 @@ TraderDialogBuy = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [(localize "str_epoch_player_6"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_6","PLAIN DOWN"]; }; _item = TraderItemList select _index; _data = [_item select 0, _item select 3, 1, _item select 2, "buy", _item select 4, _item select 1, _item select 8]; @@ -205,7 +205,7 @@ TraderDialogSell = { private ["_index", "_item", "_data"]; _index = _this select 0; if (_index < 0) exitWith { - cutText [(localize "str_epoch_player_6"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_6","PLAIN DOWN"]; }; _item = TraderItemList select _index; _data = [_item select 6, _item select 0, _item select 5, 1, "sell", _item select 1, _item select 7, _item select 8]; diff --git a/SQF/dayz_code/compile/player_unlockDoor.sqf b/SQF/dayz_code/compile/player_unlockDoor.sqf index d327eeeea..431fbba6a 100644 --- a/SQF/dayz_code/compile/player_unlockDoor.sqf +++ b/SQF/dayz_code/compile/player_unlockDoor.sqf @@ -5,37 +5,32 @@ */ private ["_display","_obj","_objectCharacterID"]; -if(!isNil "DZE_DYN_UnlockDoorInprogress") exitWith { cutText [(localize "str_epoch_player_21") , "PLAIN DOWN"]; }; +if (!isNil "DZE_DYN_UnlockDoorInprogress") exitWith {cutText [localize "str_epoch_player_21","PLAIN DOWN"];}; DZE_DYN_UnlockDoorInprogress = true; -if(!isNull dayz_selectedDoor) then { - +if (!isNull dayz_selectedDoor) then { if (!isNil 'KeyCodeTryTimer') then { - if(diag_tickTime > KeyCodeTryTimer) then { + if (diag_tickTime > KeyCodeTryTimer) then { KeyCodeTry = nil; KeyCodeTryTimer = nil; }; }; - // our target - _obj = dayz_selectedDoor; - + _obj = dayz_selectedDoor; // our target _notNearestPlayer = _obj call dze_isnearest_player; if (_notNearestPlayer) then { // close display since another player is closer _display = findDisplay 41144; _display closeDisplay 3000; - cutText [(localize "STR_EPOCH_ACTIONS_16"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_ACTIONS_16","PLAIN DOWN"]; } else { - // get object combination _objectCharacterID = _obj getVariable ["CharacterID","0"]; // Check combination if (DZE_Lock_Door == _objectCharacterID) then { - [player,"combo_unlock",0,false] call dayz_zombieSpeak; // close display @@ -43,43 +38,34 @@ if(!isNull dayz_selectedDoor) then { _display closeDisplay 3000; // unlock if locked - if(_obj animationPhase "Open_hinge" == 0) then { + if (_obj animationPhase "Open_hinge" == 0) then { _obj animate ["Open_hinge", 1]; }; - - if(_obj animationPhase "Open_latch" == 0) then { + if (_obj animationPhase "Open_latch" == 0) then { _obj animate ["Open_latch", 1]; }; KeyCodeTry = nil; - } else { - [10,10] call dayz_HungerThirst; - DZE_Lock_Door = ""; [player,"combo_locked",0,false] call dayz_zombieSpeak; [player,20,true,(getPosATL player)] spawn player_alertZombies; if (isNil 'KeyCodeTry') then {KeyCodeTry = 0;}; - KeyCodeTry = KeyCodeTry + 1; if (!isNil 'KeyCodeTryTimer') then {KeyCodeTryTimer = diag_tickTime+10;}; - - if(KeyCodeTry >= ((round(random 4)) + 4)) then { - - if (isNil 'KeyCodeTryTimer') then {KeyCodeTryTimer = diag_tickTime+10;}; - - cutText [(localize "str_epoch_player_19"), "PLAIN DOWN"]; + if (KeyCodeTry >= ((round(random 4)) + 4)) then { + if (isNil 'KeyCodeTryTimer') then {KeyCodeTryTimer = diag_tickTime+10;}; + cutText [localize "str_epoch_player_19","PLAIN DOWN"]; _display = findDisplay 41144; _display closeDisplay 3000; }; }; }; } else { - // close display since no target _display = findDisplay 41144; _display closeDisplay 3000; }; -DZE_DYN_UnlockDoorInprogress = nil; +DZE_DYN_UnlockDoorInprogress = nil; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_unlockVault.sqf b/SQF/dayz_code/compile/player_unlockVault.sqf index 1db203127..e6cab375a 100644 --- a/SQF/dayz_code/compile/player_unlockVault.sqf +++ b/SQF/dayz_code/compile/player_unlockVault.sqf @@ -5,28 +5,29 @@ */ private ["_objectID","_objectUID","_obj","_ownerID","_dir","_pos","_holder","_weapons","_magazines","_backpacks","_objWpnTypes","_objWpnQty","_countr","_alreadyPacking","_playerNear","_playerID","_claimedBy","_unlockedClass","_text","_nul","_objType"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "str_epoch_player_21") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "str_epoch_player_21","PLAIN DOWN"];}; DZE_ActionInProgress = true; -{player removeAction _x} count s_player_combi;s_player_combi = []; +{player removeAction _x} count s_player_combi; +s_player_combi = []; s_player_unlockvault = 1; _obj = _this; _objType = typeOf _obj; -if (!(_objType in DZE_LockedStorage)) exitWith { +if !(_objType in DZE_LockedStorage) exitWith { s_player_unlockvault = -1; DZE_ActionInProgress = false; }; _playerNear = _obj call dze_isnearest_player; -if(_playerNear) exitWith { DZE_ActionInProgress = false; cutText [(localize "str_epoch_player_20") , "PLAIN DOWN"]; }; +if (_playerNear) exitWith {DZE_ActionInProgress = false; cutText [localize "str_epoch_player_20","PLAIN DOWN"];}; // Silently exit if object no longer exists || alive -if(isNull _obj || !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; +if (isNull _obj || !(alive _obj)) exitWith { DZE_ActionInProgress = false; }; _unlockedClass = getText (configFile >> "CfgVehicles" >> _objType >> "unlockedClass"); -_text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); +_text = getText (configFile >> "CfgVehicles" >> _objType >> "displayName"); _alreadyPacking = _obj getVariable["packing",0]; _claimedBy = _obj getVariable["claimed","0"]; @@ -48,9 +49,9 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { }; _dir = direction _obj; - _pos = _obj getVariable["OEMPos",(getposATL _obj)]; - _objectID = _obj getVariable["ObjectID","0"]; - _objectUID = _obj getVariable["ObjectUID","0"]; + _pos = _obj getVariable["OEMPos",getPosATL _obj]; + _objectID = _obj getVariable["ObjectID","0"]; + _objectUID = _obj getVariable["ObjectUID","0"]; _claimedBy = _obj getVariable["claimed","0"]; @@ -66,9 +67,9 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { _obj setVariable["packing",1]; [1,1] call dayz_HungerThirst; - _weapons = _obj getVariable["WeaponCargo",[]]; - _magazines = _obj getVariable["MagazineCargo",[]]; - _backpacks = _obj getVariable["BackpackCargo",[]]; + _weapons = _obj getVariable["WeaponCargo",[]]; + _magazines = _obj getVariable["MagazineCargo",[]]; + _backpacks = _obj getVariable["BackpackCargo",[]]; player playActionNow "Medic"; uiSleep 1; [player,"tentpack",0,false] call dayz_zombieSpeak; @@ -88,8 +89,8 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { if (count _weapons > 0) then { //Add weapons - _objWpnTypes = _weapons select 0; - _objWpnQty = _weapons select 1; + _objWpnTypes = _weapons select 0; + _objWpnQty = _weapons select 1; _countr = 0; { _holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)]; @@ -103,7 +104,7 @@ if ((_ownerID == dayz_combination) || (_ownerID == dayz_playerUID)) then { _objWpnQty = _magazines select 1; _countr = 0; { - if( _x != "CSGAS" ) then + if (_x != "CSGAS") then { _holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)]; _countr = _countr + 1; diff --git a/SQF/dayz_code/compile/player_upgradeVehicle.sqf b/SQF/dayz_code/compile/player_upgradeVehicle.sqf index 3a762a4a7..8165ba8f2 100644 --- a/SQF/dayz_code/compile/player_upgradeVehicle.sqf +++ b/SQF/dayz_code/compile/player_upgradeVehicle.sqf @@ -4,13 +4,13 @@ */ private ["_proceed","_itemIn","_countIn","_missing","_missingQty","_qty","_removed","_tobe_removed_total","_textMissing","_num_removed","_removed_total","_temp_removed_array","_countr","_objectID","_objectUID","_location","_dir","_objectCharacterID","_weapons","_magazines","_backpacks","_classname","_object","_holder","_objWpnTypes","_objWpnQty","_newclassname","_requirements","_upgrade","_vehicle","_findNearestVehicles","_findNearestVehicle","_IsNearVehicle"]; -if(DZE_ActionInProgress) exitWith { cutText [(localize "STR_EPOCH_PLAYER_52") , "PLAIN DOWN"]; }; +if (DZE_ActionInProgress) exitWith {cutText [localize "STR_EPOCH_PLAYER_52","PLAIN DOWN"];}; DZE_ActionInProgress = true; // This is used to find correct upgrade based what upgrades was called allows multiple upgrades per vehicle. _upgrade = _this; -if (vehicle player != player) exitWith {DZE_ActionInProgress = false; cutText [(localize "STR_EPOCH_ACTIONS_18"), "PLAIN DOWN"]}; +if (vehicle player != player) exitWith {DZE_ActionInProgress = false; cutText [localize "STR_EPOCH_ACTIONS_18","PLAIN DOWN"]}; // look for nearest empty vehicle _findNearestVehicles = player nearEntities [["LandVehicle"],10]; @@ -113,7 +113,7 @@ if (_IsNearVehicle >= 1) then { _objectUID = _vehicle getVariable ["ObjectUID","0"]; if(_objectID == "0" && _objectUID == "0") then { - cutText [(localize "str_epoch_player_50"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_50","PLAIN DOWN"]; } else { // Get position @@ -128,7 +128,7 @@ if (_IsNearVehicle >= 1) then { PVDZE_veh_Upgrade = [_vehicle,[_dir,_location],_newclassname,true,_objectCharacterID,player]; publicVariableServer "PVDZE_veh_Upgrade"; - cutText [(localize "STR_EPOCH_VEHUP_SUCCESS"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_VEHUP_SUCCESS","PLAIN DOWN"]; {player reveal _x;} count (player nearEntities [["LandVehicle"],10]); }; } @@ -144,15 +144,15 @@ if (_IsNearVehicle >= 1) then { }; } else { - cutText [(localize "str_epoch_player_82"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_82","PLAIN DOWN"]; }; } else { - cutText [(localize "str_epoch_player_245"), "PLAIN DOWN"]; + cutText [localize "str_epoch_player_245","PLAIN DOWN"]; }; } else { - cutText [(localize "STR_EPOCH_PLAYER_27"), "PLAIN DOWN"]; + cutText [localize "STR_EPOCH_PLAYER_27","PLAIN DOWN"]; }; DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/compile/ui_selectSlot.sqf b/SQF/dayz_code/compile/ui_selectSlot.sqf index f4bde6f0a..40f212b9f 100644 --- a/SQF/dayz_code/compile/ui_selectSlot.sqf +++ b/SQF/dayz_code/compile/ui_selectSlot.sqf @@ -3,9 +3,10 @@ disableSerialization; _control = _this select 0; _button = _this select 1; _parent = findDisplay 106; +_itemData = gearSlotData _control; if (carryClick) then {carryClick = false;}; -if (!DZE_SelfTransfuse && ((gearSlotData _control) in DZE_BloodBags)) exitWith {}; +if (!DZE_SelfTransfuse && {(_itemData == "ItemBloodbag") or (_itemData in DZE_typedBags)}) exitWith {}; if (_button == 1) then { private ["_conf","_name","_compile","_height","_item"]; _group = _parent displayCtrl 6902; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 239af90fc..6a426cb05 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -505,6 +505,7 @@ DZE_isRemovable = ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","Plastic_P DZE_isWreck = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"]; DZE_isWreckBuilding = ["Land_wreck_cinder","Land_wood_wreck_quarter","Land_wood_wreck_floor","Land_wood_wreck_third","Land_wood_wreck_frame","Land_iron_vein_wreck","Land_silver_vein_wreck","Land_gold_vein_wreck","Land_ammo_supply_wreck"]; DZE_isNewStorage = ["VaultStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ","GunRack_DZ","WoodCrate_DZ"]; +DZE_typedBags = ["bloodBagANEG","bloodBagAPOS","bloodBagBNEG","bloodBagBPOS","bloodBagABNEG","bloodBagABPOS","bloodBagONEG","bloodBagOPOS","wholeBloodBagANEG","wholeBloodBagAPOS","wholeBloodBagBNEG","wholeBloodBagBPOS","wholeBloodBagABNEG","wholeBloodBagABPOS","wholeBloodBagONEG","wholeBloodBagOPOS"]; gear_done = false; helperDetach = false; isInTraderCity = false; diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 56cdf85f5..71710924a 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -627,7 +627,6 @@ class FSM "player allowDamage false;" \n "_lastAte = _survival select 1;" \n "_lastDrank = _survival select 2;" \n - "_typedBags = [""bloodBagANEG"", ""bloodBagAPOS"", ""bloodBagBNEG"", ""bloodBagBPOS"", ""bloodBagONEG"", ""bloodBagOPOS"",""wholeBloodBagANEG"", ""wholeBloodBagAPOS"", ""wholeBloodBagBNEG"", ""wholeBloodBagBPOS"", ""wholeBloodBagONEG"", ""wholeBloodBagOPOS""];" \n "" \n "_usedFood = 0;" \n "_usedWater = 0;" \n @@ -679,7 +678,7 @@ class FSM " if (DZE_UseBloodTypes) then {" \n " if (_item == ""ItemBloodbag"") then { _item = ""bloodBagONEG"" }; // Convert ItemBloodbag into universal blood type/rh bag" \n " } else {" \n - " if (_item in _typedBags) then {_item = ""ItemBloodbag""};" \n + " if (_item in DZE_typedBags) then {_item = ""ItemBloodbag""};" \n " };" \n " dayz_myBackpack addMagazineCargoGlobal [_x,(_backpackMagQty select _countr)];" \n " _countr = _countr + 1;" \n