mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-14 12:12:34 +03:00
Update scripts.txt
- Updated exceptions, added new filters and removed some which were not useful - Removed exceptions for testkit because it is not part of the mod - Added notes to clarify for now, will move this info to BI wiki later - Removed two unused files
This commit is contained in:
ebayShopper
@@ -6,6 +6,9 @@ _type = _array select 1;
|
||||
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
|
||||
if (_onLadder) exitWith {localize "str_player_21" call dayz_rollingMessages;};
|
||||
|
||||
if (dayz_actionInProgress) exitWith {localize "str_player_actionslimit" call dayz_rollingMessages;};
|
||||
dayz_actionInProgress = true;
|
||||
|
||||
player playActionNow "PutDown";
|
||||
|
||||
switch (_type) do {
|
||||
@@ -34,4 +37,6 @@ switch (_type) do {
|
||||
player removeAction s_player_waterdog;
|
||||
s_player_waterdog = -1;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
dayz_actionInProgress = false;
|
||||
@@ -1,4 +1,4 @@
|
||||
private ["_canDo","_iPos","_inVehicle","_item","_onLadder","_pistol","_primary","_removed"];
|
||||
private ["_canDo","_inVehicle","_onLadder","_pistol","_primary","_removed"];
|
||||
|
||||
_inVehicle = (vehicle player != player);
|
||||
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
|
||||
@@ -17,27 +17,24 @@ if (_canDo && !DZE_Surrender && !(player isKindOf "PZombie_VB")) then {
|
||||
|
||||
if (_primary != "" or _pistol != "" or dayz_onBack != "") then {
|
||||
player playActionNow "PutDown";
|
||||
_iPos = getPosATL player;
|
||||
_item = createVehicle ["WeaponHolder", _iPos, [], 1, "CAN_COLLIDE"];
|
||||
_item setposATL _iPos;
|
||||
if (_primary != "") then {
|
||||
_removed = ([player,_primary,1] call BIS_fnc_invRemove);
|
||||
if (_removed == 1) then {
|
||||
_item addWeaponCargoGlobal [_primary,1];
|
||||
[_primary,2,1] call fn_dropItem;
|
||||
};
|
||||
};
|
||||
if (_pistol != "") then {
|
||||
_removed = ([player,_pistol,1] call BIS_fnc_invRemove);
|
||||
if (_removed == 1) then {
|
||||
_item addWeaponCargoGlobal [_pistol,1];
|
||||
[_pistol,2,1] call fn_dropItem;
|
||||
};
|
||||
};
|
||||
if (dayz_onBack != "") then {
|
||||
_item addWeaponCargoGlobal [dayz_onBack,1];
|
||||
[dayz_onBack,2,1] call fn_dropItem;
|
||||
dayz_onBack = ""; // Remove from back
|
||||
if (!isNull findDisplay 106) then {findDisplay 106 displayCtrl 1209 ctrlSetText "";};
|
||||
};
|
||||
player reveal _item;
|
||||
call player_forceSave;
|
||||
};
|
||||
|
||||
// set publicvariable that allows other player to access gear
|
||||
|
||||
@@ -31,15 +31,15 @@ fnc_snapActionCleanup = {
|
||||
player removeAction s_player_toggleSnapSelect; s_player_toggleSnapSelect = -1;
|
||||
if (count s_player_toggleSnapSelectPoint != 0) then {{player removeAction _x;} count s_player_toggleSnapSelectPoint; s_player_toggleSnapSelectPoint=[]; snapActions = -1;};
|
||||
if (_s1 > 0) then {
|
||||
s_player_toggleSnap = player addaction [format[("<t color=""#ffffff"">" + ("Snap: %1") +"</t>"),snapActionState],"\z\addons\dayz_code\actions\snap_build.sqf",[snapActionState,_object,_classname,_objectHelper],10,false,true];
|
||||
s_player_toggleSnap = player addaction [format[("<t color=""#ffffff"">" + ("Snap: %1") +"</t>"),snapActionState], "\z\addons\dayz_code\actions\snap_build.sqf",[snapActionState,_object,_classname,_objectHelper],10,false,true];
|
||||
};
|
||||
if (_s2 > 0) then {
|
||||
s_player_toggleSnapSelect = player addaction [format[("<t color=""#ffffff"">" + ("Snap Point: %1") +"</t>"),snapActionStateSelect],"\z\addons\dayz_code\actions\snap_build.sqf",[snapActionStateSelect,_object,_classname,_objectHelper],9,false,true];
|
||||
s_player_toggleSnapSelect = player addaction [format[("<t color=""#ffffff"">" + ("Snap Point: %1") +"</t>"),snapActionStateSelect], "\z\addons\dayz_code\actions\snap_build.sqf",[snapActionStateSelect,_object,_classname,_objectHelper],9,false,true];
|
||||
};
|
||||
if (_s3 > 0) then {
|
||||
s_player_toggleSnapSelectPoint=[];
|
||||
_cnt = 0;
|
||||
{snapActions = player addaction [format[("<t color=""#ffffff"">" + ("%1)Select: %2") +"</t>"),_cnt,_x select 3],"\z\addons\dayz_code\actions\snap_build.sqf",["Selected",_object,_classname,_objectHelper,_cnt],8,false,false];
|
||||
{snapActions = player addaction [format[("<t color=""#ffffff"">" + ("%1)Select: %2") +"</t>"),_cnt,_x select 3], "\z\addons\dayz_code\actions\snap_build.sqf",["Selected",_object,_classname,_objectHelper,_cnt],8,false,false];
|
||||
s_player_toggleSnapSelectPoint set [count s_player_toggleSnapSelectPoint,snapActions];
|
||||
_cnt = _cnt+1;
|
||||
}count _points;
|
||||
|
||||
@@ -69,7 +69,7 @@ if (typename _this == typename objnull) then {
|
||||
bis_fnc_halo_soundLoop = time;
|
||||
playsound "BIS_HALO_Flapping";
|
||||
|
||||
bis_fnc_halo_action = _unit addaction [localize "STR_HALO_OPEN_CHUTE","\z\addons\dayz_code\compile\BIS_fnc\fn_halo.sqf",[],1,true,true,"Eject"];
|
||||
bis_fnc_halo_action = _unit addaction [localize "STR_HALO_OPEN_CHUTE", "\z\addons\dayz_code\compile\BIS_fnc\fn_halo.sqf",[],1,true,true,"Eject"];
|
||||
|
||||
bis_fnc_halo_keydown = {
|
||||
_key = _this select 1;
|
||||
|
||||
@@ -1,54 +0,0 @@
|
||||
/*
|
||||
Description:
|
||||
Removes the items (magazines) from the player's inventory
|
||||
and performs a double check for the required items.
|
||||
|
||||
Parameter(s):
|
||||
_this: <array> list of item names to be removed (can also be an sub-array with item name and quantity)
|
||||
|
||||
Returns:
|
||||
Boolean (true if all items have been removed from the player's inventory)
|
||||
|
||||
How to use:
|
||||
_removed = [["PartGeneric",4], "PartEngine", ["ItemGenerator"]] call player_removeItems;
|
||||
*/
|
||||
private ["_items","_inventory","_temp_removed_array","_removed_total","_tobe_removed_total","_removed","_itemIn","_countIn","_num_removed"];
|
||||
_items = _this;
|
||||
_inventory = magazines player;
|
||||
_temp_removed_array = [];
|
||||
_removed_total = 0;
|
||||
_tobe_removed_total = 0;
|
||||
{
|
||||
_removed = 0;
|
||||
_itemIn = "";
|
||||
_countIn = 1;
|
||||
if (typeName _x == "ARRAY") then {
|
||||
if (count _x > 0) then {
|
||||
_itemIn = _x select 0;
|
||||
if (count _x > 1) then {
|
||||
_countIn = _x select 1;
|
||||
};
|
||||
};
|
||||
} else {
|
||||
_itemIn = _x;
|
||||
};
|
||||
if (_itemIn != "") then {
|
||||
_tobe_removed_total = _tobe_removed_total + _countIn;
|
||||
{
|
||||
if ((_removed < _countIn) && ((_x == _itemIn) || configName(inheritsFrom(configFile >> "cfgMagazines" >> _x)) == _itemIn)) then {
|
||||
_num_removed = ([player,_x] call BIS_fnc_invRemove);
|
||||
_removed = _removed + _num_removed;
|
||||
_removed_total = _removed_total + _num_removed;
|
||||
if (_num_removed >= 1) then {
|
||||
_temp_removed_array set [count _temp_removed_array, _x];
|
||||
};
|
||||
};
|
||||
} forEach _inventory;
|
||||
};
|
||||
} forEach _items;
|
||||
// all parts removed
|
||||
if (_tobe_removed_total == _removed_total) exitWith { true };
|
||||
// missing parts
|
||||
{ player addMagazine _x; } count _temp_removed_array;
|
||||
format[localize "STR_EPOCH_PLAYER_145",_removed_total,_tobe_removed_total] call dayz_rollingMessages;
|
||||
false
|
||||
@@ -139,6 +139,7 @@ if (_IsNearVehicle >= 1) then {
|
||||
format[localize "str_crafting_failed",_newclassname] call dayz_rollingMessages;
|
||||
} else {
|
||||
localize "STR_EPOCH_VEHUP_SUCCESS" call dayz_rollingMessages;
|
||||
["Working",0,[3,2,4,0]] call dayz_NutritionSystem;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -184,7 +184,6 @@ if (!isDedicated) then {
|
||||
player_loadCrate = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_loadCrate.sqf";
|
||||
player_lockVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_lockVault.sqf";
|
||||
player_packVault = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_packVault.sqf";
|
||||
player_removeItems = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\fn_removeItems.sqf";
|
||||
player_removeNearby = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_removeNearby.sqf";
|
||||
player_removeObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\remove.sqf";
|
||||
player_surrender = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_surrender.sqf";
|
||||
|
||||
Reference in New Issue
Block a user