1.0.2.4 RC1

This commit is contained in:
[VB]AWOL
2013-10-05 06:29:39 -05:00
parent b8b5d35926
commit 27300140a8
34 changed files with 661 additions and 77 deletions

View File

@@ -68,6 +68,9 @@ if (!isDedicated) then {
zombie_generate = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_generate.sqf"; //Server compile, used for loiter behaviour
wild_spawnZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\wild_spawnZombies.sqf"; //Server compile, used for loiter behaviour
pz_attack = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\pzombie\pz_attack.sqf";
//
dog_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dog_findTargetAgent.sqf";
@@ -261,6 +264,8 @@ if (!isDedicated) then {
private ["_dikCode", "_handled"];
_dikCode = _this select 1;
_handled = false;
if (_dikCode in[0x58,0x57,0x44,0x43,0x42,0x41,0x40,0x3F,0x3E,0x3D,0x3C,0x3B,0x0B,0x0A,0x09,0x08,0x07,0x06,0x05]) then {
_handled = true;
};
@@ -280,17 +285,16 @@ if (!isDedicated) then {
//diag_log format["Keypress: %1", _this];
_handled = false;
if (_dikCode in (actionKeys "GetOver")) then {
if (player isKindOf "PZombie_VB") then {
player switchAction "walkf";
_handled = true;
DZE_PZATTACK = true;
} else {
_inBuilding = [player] call fnc_isInsideBuilding;
_nearbyObjects = nearestObjects[getPosATL player, dayz_disallowedVault, 8];
if (!r_player_unconscious and (_inBuilding or (count _nearbyObjects > 0))) then {
[objNull, player, rSwitchMove,"GetOver"] call RE;
player playActionNow "GetOver";
if (count _nearbyObjects > 0) then {
_handled = true;
};
};
};

View File

@@ -241,6 +241,7 @@ dayz_resetSelfActions = {
s_player_fillgen = -1;
s_player_upgrade_build = -1;
s_player_maint_build = -1;
s_player_downgrade_build = -1;
s_player_towing = -1;
};
call dayz_resetSelfActions;
@@ -469,7 +470,7 @@ DZE_UnLockedStorage = ["VaultStorage","LockboxStorage"];
// List of removable items that require crowbar
DZE_isRemovable = ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","Plastic_Pole_EP1_DZ"];
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"];
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"];
DZE_isNewStorage = ["VaultStorage","OutHouse_DZ","Wooden_shed_DZ","WoodShack_DZ","StorageShed_DZ"];
// These work with just a running generator
@@ -629,5 +630,5 @@ if(!isDedicated) then {
DZE_6 = false;
DZE_cancelBuilding = false;
DZE_PZATTACK = false;
};