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

sync with dayz CE 1.7.4.4

Browse Source
This commit is contained in:
A Clark
2012-11-23 07:32:34 -06:00
parent 638ceee5c6
commit 34176f8d56
10 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dayz_code/compile/building_spawnLoot.sqf
View File

@@ -38,6 +38,7 @@ _itemChance = [] + getArray (_config >> "itemChance");
_iArray set [3,0];
_iArray call spawn_loot;
_iArray = [];
diag_log ("LOOTSPAWN");
};
_item setVariable ["created",(DateToNumber date),true];
};

30
dayz_code/compile/fn_selfActions.sqf
View File

@@ -71,27 +71,6 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
s_player_deleteBuild = -1;
};
// Bank Vault Code Misc_cargo_cont_tiny
if (!_isMan and _traderType == bank_atm) then {
if (s_player_bankvault_crtl < 0) then {
_Deposit = player addAction ["Make Deposit", "\z\addons\dayz_code\actions\bank_deposit.sqf",cursorTarget, 99, true, false, "",""];
_Withdraw = player addAction ["Make Withdraw", "\z\addons\dayz_code\actions\bank_withdraw.sqf",cursorTarget, 98, true, false, "",""];
_Balance = player addAction ["Check Balance", "\z\addons\dayz_code\actions\bank_checkbalance.sqf",cursorTarget, 97, true, false, "",""];
s_player_bank set [count s_player_bank,_Deposit];
s_player_bank set [count s_player_bank,_Withdraw];
s_player_bank set [count s_player_bank,_Balance];
s_player_bankvault_crtl = 1;
};
} else {
{player removeAction _x} forEach s_player_bank;s_player_bank = [];
s_player_bankvault_crtl = -1;
};
// Allow Owner to lock and unlock vehicle
if(_isVehicle and !_isMan and _canDo and _ownerID == dayz_characterID) then {
@@ -148,7 +127,6 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
s_player_butcher = -1;
};
//Fireplace Actions check
if(inflamed cursorTarget and _hasRawMeat and _canDo) then {
if (s_player_cook < 0) then {
@@ -167,6 +145,14 @@ if (!isNull cursorTarget and !_inVehicle and (player distance cursorTarget < 4))
s_player_fireout = -1;
};
//place tent
//if(_hasTent and _canDo) then {
// s_player_placetent = player addAction [localize "Place Tent", "\z\addons\dayz_code\actions\tent_pitch.sqf",cursorTarget, 0, false, true, "", ""];
//} else {
// player removeAction s_player_placetent;
// s_player_placetent = -1;
//};
//Packing my tent
if(cursorTarget isKindOf "TentStorage" and _canDo and _ownerID == dayz_characterID) then {
if ((s_player_packtent < 0) and (player distance cursorTarget < 3)) then {

12
dayz_code/compile/player_zombieAttack.sqf
View File

@@ -3,7 +3,7 @@ _unit = _this;
_vehicle = (vehicle player);
_targets = _unit getVariable ["targets",[]];
if (!(_vehicle in _targets)) exitWith {};
if (!(_vehicle in _targets) and ((random 1) < 0.9)) exitWith {};
//Do the attack
_move = "ZombieStandingAttack1";
@@ -30,32 +30,32 @@ if (_vehicle != player) then {
_total = 0;
if(["Glass",_hp,false] call fnc_inString) then {
_damage = 0.5;
_damage = 0.03;
_strH = "hit_" + (_wound);
_dam = _vehicle getVariable [_strH,0];
_total = (_dam + _damage);
};
if(["Wheel",_hp,false] call fnc_inString) then {
_damage = 0.1;
_damage = 0.02;
_strH = "hit_" + (_wound);
_dam = _vehicle getVariable [_strH,0];
_total = (_dam + _damage);
};
if(["Body",_hp,false] call fnc_inString) then {
_damage = 0.05;
_damage = 0.01;
_strH = "hit_" + (_wound);
_dam = _vehicle getVariable [_strH,0];
_total = (_dam + _damage);
};
if(["Engine",_hp,false] call fnc_inString) then {
_damage = 0.03;
_damage = 0.01;
_strH = "hit_" + (_wound);
_dam = _vehicle getVariable [_strH,0];
_total = (_dam + _damage);
};
if(["Fuel",_hp,false] call fnc_inString) then {
[_unit,"hit",0,false] call dayz_zombieSpeak;
_damage = 0.03;
_damage = 0.01;
_strH = "hit_" + (_wound);
_dam = _vehicle getVariable [_strH,0];
_total = (_dam + _damage);

2
dayz_code/compile/vehicle_handleKilled.sqf
View File

@@ -1,5 +1,7 @@
private["_unit","_selection","_killer"];
Diag_log ("handlekilled");
_unit = _this select 0;
_killer = _this select 1;