W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix vault from moving potental fix for tents too

Browse Source
This commit is contained in:
A Clark
2012-11-25 08:55:00 -06:00
parent c55f242fd3
commit 3f29dc5766
5 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dayz_code/actions/vault_pitch.sqf
View File

@@ -49,11 +49,13 @@ if (!_isOk) then {
//place tent (local)
_tent = createVehicle ["VaultStorageLocked", _location, [], 0, "CAN_COLLIDE"];
_tent setdir _dir;
_location = getPosATL _tent;
_tent setpos _location;
player reveal _tent;
_location = getPosATL _tent;
_tent setVariable ["characterID",dayz_characterID,true];
_tent setVariable ["OEMPos",_location,true];
//player setVariable ["tentUpdate",["Land_A_tent",_dir,_location,[dayz_tentWeapons,dayz_tentMagazines,dayz_tentBackpacks]],true];

7
dayz_code/compile/player_checkStealth.sqf
View File

@@ -1,4 +1,4 @@
private["_vel","_speed","_scalePose","_scaleMvmt","_scaleLight","_scaleAlert","_anim","_anim4","_initial","_isDay","_nearFlare","_scaler","_pos"];
private["_vel","_speed","_scalePose","_scaleMvmt","_scaleLight","_scaleAlert","_anim","_anim4","_initial","_isDay","_nearFlare","_nearFire","_nearLight","_scaler","_pos"];
_vel = velocity (vehicle player);
_speed = (_vel distance [0,0,0]);
_pos = getPosATL player;
@@ -57,6 +57,11 @@ if (_scaleLight < 0.9) then {
_scaleLight = ((_scaler / 30) * 2) + _scaleLight;
};
};
_nearLight = nearestObject [(vehicle player),"StreetLamp"];
if (!isNull _nearLight) then {
_scaler = 50 - (_nearLight distance (vehicle player));
_scaleLight = ((_scaler / 50) * 2) + _scaleLight;
};
_nearFire = nearestObject [(vehicle player),"Land_Fire"];
if (!isNull _nearFire) then {
_scaler = 50 - (_nearFire distance (vehicle player));

25
dayz_code/compile/player_lockVault.sqf
View File

@@ -19,7 +19,8 @@ if(_ownerID == dayz_characterID) then {
_obj setVariable["packing",1];
_dir = direction _obj;
_pos = getposATL _obj;
// _pos = getposATL _obj;
_pos = _obj getVariable["OEMPos",(getposATL _obj)];
[player,"tentpack",0,false] call dayz_zombieSpeak;
sleep 3;
@@ -32,25 +33,25 @@ if(_ownerID == dayz_characterID) then {
_holder setVariable["CharacterID",_ownerID,true];
_holder setVariable["ObjectID",_objectID,true];
_holder setVariable["ObjectUID",_objectUID,true];
_holder setVariable ["OEMPos", _pos, true];
_weapons = getWeaponCargo _obj;
_magazines = getMagazineCargo _obj;
_backpacks = getBackpackCargo _obj;
// dayzDeleteObj = [_objectID,_objectUID];
// publicVariableServer "dayzDeleteObj";
// if (isServer) then {
// dayzDeleteObj call local_deleteObj;
// };
// remove vault
deleteVehicle _obj;
// Fill variables with loot
_holder setVariable ["WeaponCargo", _weapons, true];
_holder setVariable ["MagazineCargo", _magazines, true];
_holder setVariable ["BackpackCargo", _backpacks, true];
if (count _weapons > 0) then {
_holder setVariable ["WeaponCargo", _weapons, true];
};
if (count _magazines > 0) then {
_holder setVariable ["MagazineCargo", _magazines, true];
};
if (count _backpacks > 0) then {
_holder setVariable ["BackpackCargo", _backpacks, true];
};
cutText ["Your vault has been locked", "PLAIN DOWN"];
} else {

67
dayz_code/compile/player_unlockVault.sqf
View File

@@ -19,7 +19,8 @@ if(_ownerID == dayz_characterID) then {
_obj setVariable["packing",1];
_dir = direction _obj;
_pos = getposATL _obj;
// _pos = getposATL _obj;
_pos = _obj getVariable["OEMPos",(getposATL _obj)];
[player,"tentpack",0,false] call dayz_zombieSpeak;
sleep 3;
@@ -32,47 +33,47 @@ if(_ownerID == dayz_characterID) then {
_holder setVariable["CharacterID",_ownerID,true];
_holder setVariable["ObjectID",_objectID,true];
_holder setVariable["ObjectUID",_objectUID,true];
_holder setVariable ["OEMPos", _pos, true];
_weapons = _obj getVariable["WeaponCargo",[]];
_magazines = _obj getVariable["MagazineCargo",[]];
_backpacks = _obj getVariable["BackpackCargo",[]];
// dayzDeleteObj = [_objectID,_objectUID];
// publicVariableServer "dayzDeleteObj";
// if (isServer) then {
// dayzDeleteObj call local_deleteObj;
// };
// Remove locked vault
deleteVehicle _obj;
if (count _weapons > 0) then {
//Add weapons
_objWpnTypes = _weapons select 0;
_objWpnQty = _weapons select 1;
_countr = 0;
{
_holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)];
_countr = _countr + 1;
} forEach _objWpnTypes;
};
if (count _magazines > 0) then {
//Add Magazines
_objWpnTypes = _magazines select 0;
_objWpnQty = _magazines select 1;
_countr = 0;
{
_holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)];
_countr = _countr + 1;
} forEach _objWpnTypes;
};
//Add weapons
_objWpnTypes = _weapons select 0;
_objWpnQty = _weapons select 1;
_countr = 0;
{
_holder addweaponcargoGlobal [_x,(_objWpnQty select _countr)];
_countr = _countr + 1;
} forEach _objWpnTypes;
//Add Magazines
_objWpnTypes = _magazines select 0;
_objWpnQty = _magazines select 1;
_countr = 0;
{
_holder addmagazinecargoGlobal [_x,(_objWpnQty select _countr)];
_countr = _countr + 1;
} forEach _objWpnTypes;
//Add Backpacks
_objWpnTypes = _backpacks select 0;
_objWpnQty = _backpacks select 1;
_countr = 0;
{
_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];
_countr = _countr + 1;
} forEach _objWpnTypes;
if (count _backpacks > 0) then {
//Add Backpacks
_objWpnTypes = _backpacks select 0;
_objWpnQty = _backpacks select 1;
_countr = 0;
{
_holder addbackpackcargoGlobal [_x,(_objWpnQty select _countr)];
_countr = _countr + 1;
} forEach _objWpnTypes;
};
cutText ["Your vault has been unlocked", "PLAIN DOWN"];
} else {

10
dayz_server/system/server_monitor.sqf
View File

@@ -86,14 +86,7 @@ diag_log "HIVE: Starting";
clearWeaponCargoGlobal _object;
clearMagazineCargoGlobal _object;
if (_object isKindOf "TentStorage") then {
_pos set [2,0];
_object setpos _pos;
};
if (_object isKindOf "VaultStorageLocked") then {
_pos set [2,0];
_object setpos _pos;
};
_object setpos _pos;
_object setdir _dir;
_object setDamage _damage;
@@ -103,6 +96,7 @@ diag_log "HIVE: Starting";
_object setVariable ["WeaponCargo", (_intentory select 0), true];
_object setVariable ["MagazineCargo", (_intentory select 1), true];
_object setVariable ["BackpackCargo", (_intentory select 2), true];
_object setVariable ["OEMPos", _pos, true];
} else {
//Add weapons