From 34176f8d56bdea8c73f4c3125668d989c9a80f7e Mon Sep 17 00:00:00 2001 From: A Clark Date: Fri, 23 Nov 2012 07:32:34 -0600 Subject: [PATCH] sync with dayz CE 1.7.4.4 --- dayz_code/actions/water_fill.sqf | 2 +- dayz_code/compile/building_spawnLoot.sqf | 1 + dayz_code/compile/fn_selfActions.sqf | 30 ++++++---------------- dayz_code/compile/player_zombieAttack.sqf | 12 ++++----- dayz_code/compile/vehicle_handleKilled.sqf | 2 ++ dayz_code/config.cpp | 8 +++--- dayz_code/init/compiles.sqf | 2 -- dayz_code/init/variables.sqf | 3 +-- dayz_code/rscTitles.hpp | 2 +- dayz_server/init/server_functions.sqf | 1 - 10 files changed, 23 insertions(+), 40 deletions(-) diff --git a/dayz_code/actions/water_fill.sqf b/dayz_code/actions/water_fill.sqf index dfdf69d07..86057479d 100644 --- a/dayz_code/actions/water_fill.sqf +++ b/dayz_code/actions/water_fill.sqf @@ -3,7 +3,7 @@ private["_hasFood","_item","_text","_qty"]; call gear_ui_init; _playerPos = getPosATL player; -_canFill = count nearestObjects [_playerPos, ["Land_pumpa","Land_water_tank","Land_Misc_Well_L_EP1","Land_Misc_Well_C_EP1"], 4] > 0; +_canFill = count nearestObjects [_playerPos, ["Land_pumpa","Land_water_tank","Land_Misc_Well_L_EP1","Land_Misc_Well_C_EP1","Land_Barrel_water"], 4] > 0; _isPond = false; _isWell = false; _pondPos = []; diff --git a/dayz_code/compile/building_spawnLoot.sqf b/dayz_code/compile/building_spawnLoot.sqf index cc7d0b043..250c5881d 100644 --- a/dayz_code/compile/building_spawnLoot.sqf +++ b/dayz_code/compile/building_spawnLoot.sqf @@ -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]; }; diff --git a/dayz_code/compile/fn_selfActions.sqf b/dayz_code/compile/fn_selfActions.sqf index e894d4935..fd758c8bc 100644 --- a/dayz_code/compile/fn_selfActions.sqf +++ b/dayz_code/compile/fn_selfActions.sqf @@ -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 { diff --git a/dayz_code/compile/player_zombieAttack.sqf b/dayz_code/compile/player_zombieAttack.sqf index d4d36bc6c..039beabed 100644 --- a/dayz_code/compile/player_zombieAttack.sqf +++ b/dayz_code/compile/player_zombieAttack.sqf @@ -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); diff --git a/dayz_code/compile/vehicle_handleKilled.sqf b/dayz_code/compile/vehicle_handleKilled.sqf index f1d498fb7..c7ed015ea 100644 --- a/dayz_code/compile/vehicle_handleKilled.sqf +++ b/dayz_code/compile/vehicle_handleKilled.sqf @@ -1,5 +1,7 @@ private["_unit","_selection","_killer"]; +Diag_log ("handlekilled"); + _unit = _this select 0; _killer = _this select 1; diff --git a/dayz_code/config.cpp b/dayz_code/config.cpp index e6de4f5b1..d456d10c2 100644 --- a/dayz_code/config.cpp +++ b/dayz_code/config.cpp @@ -33,7 +33,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayzmod.com"; - version = "1.7.4.3"; + version = "1.7.4.4"; hiveVersion = 0.96; //0.93 }; }; @@ -229,7 +229,6 @@ class CfgBuildingLoot { { "WeaponHolder_PartVRotor","object" }, { "WeaponHolder_ItemJerrycan","object" }, { "WeaponHolder_ItemHatchet","object" }, - { "WeaponHolder_ItemOilBarrel","object" }, { "ItemKnife","military" }, { "ItemToolbox","weapon" }, { "ItemWire","magazine" }, @@ -247,7 +246,6 @@ class CfgBuildingLoot { 0.01, 0.04, 0.11, - 0.02, 0.07, 0.06, 0.01, @@ -375,8 +373,8 @@ class CfgBuildingLoot { 0.05, //{"bizon_silenced","weapon"}, 0.05, //{"M14_EP1","weapon"}, 0.02, //{"FN_FAL_ANPVS4","weapon"}, - 0.01, //{"m107","weapon"}, - 0.02, //{"BAF_AS50_scoped","weapon"}, + 0.02, //{"m107","weapon"}, + 0.01, //{"BAF_AS50_scoped","weapon"}, 0.03, //{"Mk_48_DZ","weapon"}, 0.05, //{"M249_DZ","weapon"}, //0.01, //{"BAF_L85A2_RIS_CWS","weapon"}, diff --git a/dayz_code/init/compiles.sqf b/dayz_code/init/compiles.sqf index 0a7b1be4a..74b514887 100644 --- a/dayz_code/init/compiles.sqf +++ b/dayz_code/init/compiles.sqf @@ -65,8 +65,6 @@ if (!isDedicated) then { //actions player_countmagazines = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_countmagazines.sqf"; player_addToolbelt = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_addToolbelt.sqf"; - player_convertBars = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_convertBars.sqf"; - player_SplitBars = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_SplitBars.sqf"; player_reloadMag = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\player_reloadMags.sqf"; player_tentPitch = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\tent_pitch.sqf"; player_vaultPitch = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\vault_pitch.sqf"; diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf index c81e5f1df..733bb95ac 100644 --- a/dayz_code/init/variables.sqf +++ b/dayz_code/init/variables.sqf @@ -172,8 +172,7 @@ dayzHit = []; dayzPublishObj = []; //used for eventhandler to spawn a mirror of players tent dayzHideBody = objNull; dayzPublishVeh = []; // for vehicle traders -// dayzPublishBank = []; -dayzTraderMenu = []; +dayzTraderMenu = []; // For all traders //DayZ settings dayz_dawn = 6; diff --git a/dayz_code/rscTitles.hpp b/dayz_code/rscTitles.hpp index 4b3660f00..8a45b0599 100644 --- a/dayz_code/rscTitles.hpp +++ b/dayz_code/rscTitles.hpp @@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ 1.7.4.2"; + text = "DayZ 1.7.4.4"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; class CA_TitleMainMenu; diff --git a/dayz_server/init/server_functions.sqf b/dayz_server/init/server_functions.sqf index a7cc17e78..10cd92148 100644 --- a/dayz_server/init/server_functions.sqf +++ b/dayz_server/init/server_functions.sqf @@ -9,7 +9,6 @@ server_updateObject = compile preprocessFileLineNumbers "\z\addons\dayz_server\ server_playerDied = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDied.sqf"; server_publishObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishObject.sqf"; server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle.sqf"; // Custom to add vehicles -server_publishBank = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishBank.sqf"; server_traders = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf"; local_publishObj = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_publishObj.sqf"; //Creates the object in DB local_deleteObj = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\local_deleteObj.sqf"; //Creates the object in DB