W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-24 09:00:50 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update vanilla building

Browse Source 
Vanilla commits:

2ec04a7f8d

f333910f95

156b90ccb5
This commit is contained in:
ebayShopper
2017-06-10 10:45:14 -04:00
parent 867c618470
commit 39e05ad0e4
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgMagazines/Items/MetalFenceItems.hpp
View File

@@ -36,12 +36,13 @@ class ItemScrews: CA_Magazine //Construection,farm,indestrial,castle,residential
scope = 2; scope = 2;
count = 1; count = 1;
type = 256; type = 256;
displayName = "Loose Screws";//"Box of screws for metal" displayName = $STR_BLD_name_ItemScrews;//"Box of screws for metal"
picture = "\z\addons\dayz_buildings\equip\item_screws.paa"; picture = "\z\addons\dayz_buildings\equip\item_screws.paa";
model = "z\addons\dayz_buildings\models\screws.p3d"; model = "z\addons\dayz_buildings\models\screws.p3d";
descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws" descriptionShort = $STR_BLD_desc_ItemScrews;//"Box of screws"
}; };
/*
class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
{ {
scope = 2; scope = 2;
@@ -61,7 +62,6 @@ class ItemBagScrews: CA_Magazine//Construection,indestrial,supermarket
}; };
/*
ItemScrews //Construection,farm,indestrial,castle,residential ItemScrews //Construection,farm,indestrial,castle,residential
ItemBagScrews //(LowChance)Construection,(LowChance)indestrial,supermarket ItemBagScrews //(LowChance)Construection,(LowChance)indestrial,supermarket
ItemRSJ //Construection,farm,indestrial,castle ItemRSJ //Construection,farm,indestrial,castle

13
SQF/dayz_code/compile/fn_selfActions.sqf
View File

@@ -10,7 +10,7 @@ private ["_canPickLight","_text","_unlock","_lock","_totalKeys","_temp_keys","_t
"_combi","_findNearestGen","_humanity_logic","_low_high","_cancel","_buy","_buyV","_humanity","_traderMenu","_warn","_typeOfCursorTarget", "_combi","_findNearestGen","_humanity_logic","_low_high","_cancel","_buy","_buyV","_humanity","_traderMenu","_warn","_typeOfCursorTarget",
"_isVehicle","_isBicycle","_isDestructable","_isGenerator","_ownerID","_isVehicletype","_hasBarrel","_hasFuel20","_hasFuel5","_hasEmptyFuelCan", "_isVehicle","_isBicycle","_isDestructable","_isGenerator","_ownerID","_isVehicletype","_hasBarrel","_hasFuel20","_hasFuel5","_hasEmptyFuelCan",
"_itemsPlayer","_hasToolbox","_hasbottleitem","_isAlive","_isPlant","_istypeTent","_upgradeItems","_isDisallowRefuel","_isDog", "_itemsPlayer","_hasToolbox","_hasbottleitem","_isAlive","_isPlant","_istypeTent","_upgradeItems","_isDisallowRefuel","_isDog",
"_isModular","_isModularDoor","_isHouse","_isGate","_isFence","_isLockableGate","_isUnlocked","_isOpen","_isClosed","_ownerArray","_ownerBuildLock", "_isModular","_isModularDoor","_isHouse","_isGateOperational","_isGateLockable","_isFence","_isLockableGate","_isUnlocked","_isOpen","_isClosed","_ownerArray","_ownerBuildLock",
"_ownerPID","_speed","_dog","_vehicle","_inVehicle","_cursorTarget","_primaryWeapon","_currentWeapon","_magazinesPlayer","_onLadder","_canDo", "_ownerPID","_speed","_dog","_vehicle","_inVehicle","_cursorTarget","_primaryWeapon","_currentWeapon","_magazinesPlayer","_onLadder","_canDo",
"_nearLight","_vehicleOwnerID","_hasHotwireKit","_isPZombie","_dogHandle","_allowedDistance","_id","_upgrade","_weaponsPlayer","_hasCrowbar", "_nearLight","_vehicleOwnerID","_hasHotwireKit","_isPZombie","_dogHandle","_allowedDistance","_id","_upgrade","_weaponsPlayer","_hasCrowbar",
"_allowed","_hasAccess","_uid","_myCharID"]; "_allowed","_hasAccess","_uid","_myCharID"];
@@ -515,7 +515,8 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
/* //Vanilla base building currently not used in Epoch /* //Vanilla base building currently not used in Epoch
// House locking and unlocking // House locking and unlocking
_isHouse = _typeOfCursorTarget in ["SurvivorWorkshopAStage5", "SurvivorWorkshopBStage5", "SurvivorWorkshopCStage5"]; _isHouse = _typeOfCursorTarget in ["SurvivorWorkshopAStage5", "SurvivorWorkshopBStage5", "SurvivorWorkshopCStage5"];
_isGate = _typeOfCursorTarget in ["WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4","MetalGate_1","MetalGate_2","MetalGate_3","MetalGate_4"]; _isGateOperational = _typeOfCursorTarget in ["WoodenGate_1","WoodenGate_2","WoodenGate_3","WoodenGate_4","MetalGate_1","MetalGate_2","MetalGate_3","MetalGate_4"];
_isGateLockable = _typeOfCursorTarget in ["WoodenGate_1","WoodenGate_2","WoodenGate_3","MetalGate_1","MetalGate_2","MetalGate_3"];
_isFence = _typeOfCursorTarget in ["WoodenFence_1","WoodenFence_2","WoodenFence_3","WoodenFence_4","WoodenFence_5","WoodenFence_6","MetalFence_1","MetalFence_2","MetalFence_3","MetalFence_4","MetalFence_5","MetalFence_6","MetalFence_7"]; _isFence = _typeOfCursorTarget in ["WoodenFence_1","WoodenFence_2","WoodenFence_3","WoodenFence_4","WoodenFence_5","WoodenFence_6","MetalFence_1","MetalFence_2","MetalFence_3","MetalFence_4","MetalFence_5","MetalFence_6","MetalFence_7"];
//Only the owners can lock the gates //Only the owners can lock the gates
@@ -532,7 +533,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
_ownerPID = (_ownerArray select 0); _ownerPID = (_ownerArray select 0);
// open Gate // open Gate
if (_isGate && _isClosed && _isUnlocked) then { if (_isGateOperational && _isClosed && _isUnlocked) then {
if (s_player_openGate < 0) then { if (s_player_openGate < 0) then {
s_player_openGate = player addAction [localize "STR_DN_OUT_O_GATE", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"Open"], 1, true, true]; s_player_openGate = player addAction [localize "STR_DN_OUT_O_GATE", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"Open"], 1, true, true];
}; };
@@ -541,7 +542,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
s_player_openGate = -1; s_player_openGate = -1;
}; };
// Close Gate // Close Gate
if (_isGate && _isOpen && _isUnlocked) then { if (_isGateOperational && _isOpen && _isUnlocked) then {
if (s_player_CloseGate < 0) then { if (s_player_CloseGate < 0) then {
s_player_CloseGate = player addAction [localize "STR_DN_OUT_C_GATE", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"Close"], 1, true, true]; s_player_CloseGate = player addAction [localize "STR_DN_OUT_C_GATE", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"Close"], 1, true, true];
}; };
@@ -559,7 +560,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
s_player_setCode = -1; s_player_setCode = -1;
}; };
//Lock Build point //Lock Build point
if ((_isFence or _isGate) && (_ownerPID == _uid) && !_ownerBuildLock) then { if ((_isFence or _isGateLockable) && (_ownerPID == _uid) && !_ownerBuildLock) then {
if (s_player_BuildLock < 0) then { if (s_player_BuildLock < 0) then {
s_player_BuildLock = player addAction [localize "STR_BLD_ACTIONS_LOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"BuildLock"], 1, true, true]; s_player_BuildLock = player addAction [localize "STR_BLD_ACTIONS_LOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"BuildLock"], 1, true, true];
}; };
@@ -568,7 +569,7 @@ if (!isNull _cursorTarget && !_inVehicle && !_isPZombie && (player distance _cur
s_player_BuildLock = -1; s_player_BuildLock = -1;
}; };
//UnLock Build point //UnLock Build point
if ((_isFence or _isGate) && (_ownerPID == _uid) && _ownerBuildLock) then { if ((_isFence or _isGateLockable) && (_ownerPID == _uid) && _ownerBuildLock) then {
if (s_player_BuildUnLock < 0) then { if (s_player_BuildUnLock < 0) then {
s_player_BuildUnLock = player addAction [localize "STR_BLD_ACTIONS_UNLOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"BuildUnLock"], 1, true, true]; s_player_BuildUnLock = player addAction [localize "STR_BLD_ACTIONS_UNLOCKBUILD", "\z\addons\dayz_code\actions\player_operate.sqf",[_cursorTarget,"BuildUnLock"], 1, true, true];
}; };

12
SQF/dayz_code/system/mission/chernarus/antiwallhack.sqf
View File

@@ -153,6 +153,16 @@
["LADAWreck",[11325,6637.85,0.234833],160.033], ["LADAWreck",[11325,6637.85,0.234833],160.033],
["Misc_TyreHeap",[11308.6,6640.9,0.0248337],170.033], ["Misc_TyreHeap",[11308.6,6640.9,0.0248337],170.033],
["Fort_Barricade_EP1",[11459.571,7390.7227,-0.040615425],225.14645],*/ //Wrecks are removable on Epoch and not synced across network if local spawned ["Fort_Barricade_EP1",[11459.571,7390.7227,-0.040615425],225.14645],*/ //Wrecks are removable on Epoch and not synced across network if local spawned
//Cherno
["Land_CncBlock_D",[6382.5,2794,6],218], ["Land_CncBlock_D",[6382.5,2794,6],218],
["Land_CncBlock_D",[6382.5,2794,4.7],218] ["Land_CncBlock_D",[6382.5,2794,4.7],218],
//Berezino
["Land_CncBlock_D",[12228.8,9521.95,5.78098],23.2569],
["Land_CncBlock_D",[12228.8,9521.73,4.66826],23.2569],
["Land_CncBlock_D",[12239.6,9489.99,5.81526],142.355],
["Land_CncBlock_D",[12239.2,9489.61,4.5343],142.355],
["Land_CncBlock_D",[12803.3,10085.3,5.70783],201.212],
["Land_CncBlock_D",[12803.3,10085.3,4.5478],201.212],
["Land_CncBlock_D",[12778.4,10124,5.69832],201.186],
["Land_CncBlock_D",[12778.4,10124,4.55829],201.186]
],true,true,true] call fnc_spawnObjects; ],true,true,true] call fnc_spawnObjects;