diff --git a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp index 7db1937fb..8e6efae96 100644 --- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp @@ -366,17 +366,15 @@ class CfgBuildingLoot { { "machineguns", "cfglootweapon", 0.03 } }; lootTypeSmall[] = { - { "pistols","cfglootweapon",0.15 }, - { "Binocular","weapon",0.02 }, - { "ItemFlashlightRed","weapon",0.03 }, - { "ItemKnife","weapon",0.04 }, - { "ItemGPS","weapon",0.02 }, - { "ItemMap","weapon",0.02 }, - { "","medical",0.09 }, - { "","generic",0.34 }, - { "","military",0.26 }, - { "submachinegun","cfglootweapon",0.02 }, - { "ItemEtool","weapon",0.01 } + { "pistols", "cfglootweapon", 0.14 }, + { "Binocular", "weapon", 0.05 }, + { "ItemFlashlightRed", "weapon", 0.03 }, + { "ItemKnife", "weapon", 0.04 }, + { "ItemGPS", "weapon", 0.02 }, + { "", "medical", 0.12 }, + { "", "generic", 0.22 }, + { "", "military", 0.35 }, + { "ItemEtool", "weapon", 0.03 } }; }; class MilitaryIndustrial: Default { @@ -412,16 +410,15 @@ class CfgBuildingLoot { { "machineguns", "cfglootweapon", 0.01 } }; lootTypeSmall[] = { - { "pistols","cfglootweapon",0.12 }, - { "Binocular","weapon",0.05 }, - { "ItemFlashlightRed","weapon",0.03 }, - { "ItemKnife","weapon",0.04 }, - { "ItemGPS","weapon",0.02 }, - { "","medical",0.02 }, - { "","generic",0.09 }, - { "","military",0.34 }, - { "submachinegun","cfglootweapon",0.26 }, - { "ItemEtool","weapon",0.03 } + { "pistols", "cfglootweapon", 0.14 }, + { "Binocular", "weapon", 0.05 }, + { "ItemFlashlightRed", "weapon", 0.03 }, + { "ItemKnife", "weapon", 0.04 }, + { "ItemGPS", "weapon", 0.02 }, + { "", "medical", 0.12 }, + { "", "generic", 0.22 }, + { "", "military", 0.35 }, + { "ItemEtool", "weapon", 0.03 } }; }; class IndustrialMilitary: Default { @@ -462,15 +459,14 @@ class CfgBuildingLoot { { "machineguns", "cfglootweapon", 0.01 } }; lootTypeSmall[] = { - { "pistols", "cfglootweapon", 0.12 }, + { "pistols", "cfglootweapon", 0.14 }, { "Binocular", "weapon", 0.05 }, { "ItemFlashlightRed", "weapon", 0.03 }, { "ItemKnife", "weapon", 0.04 }, { "ItemGPS", "weapon", 0.02 }, - { "", "medical", 0.02 }, - { "", "generic", 0.09 }, - { "", "military", 0.34 }, - { "submachinegun", "cfglootweapon", 0.26 }, + { "", "medical", 0.12 }, + { "", "generic", 0.22 }, + { "", "military", 0.35 }, { "ItemEtool", "weapon", 0.03 } }; }; diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index 51138b7bb..3103a97a5 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -1,16 +1,6 @@ -#include "\usec_ch53\config.cpp" - -class CH53_base: USEC_ch53_E { - class Turrets: Turrets { - class MainTurret: MainTurret { - class ViewOptics: ViewOptics {}; - class Turrets: Turrets {}; - }; - }; -}; - -class CH53_DZ: CH53_base { - displayname = "USEC CH53E"; +class USEC_ch53_E; +class CH53_DZE : USEC_ch53_E { + displayname = "USEC CH53E DZ"; displaynameshort = "CH53_DZ"; enablemanualfire = 0; scope = 2; @@ -27,18 +17,4 @@ class CH53_DZ: CH53_base { transportMaxWeapons = 25; transportMaxMagazines = 80; transportmaxbackpacks = 15; - - class Turrets : Turrets { - class MainTurret : MainTurret { - magazines[] = {"2000Rnd_762x51_M134"}; - }; - }; -}; -class CH53_DZE: CH53_DZ { - displaynameshort = "CH53_DZE"; - class Turrets : Turrets { - class MainTurret : MainTurret { - magazines[] = {}; - }; - }; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/actions/fill_nearestVehicle.sqf b/SQF/dayz_code/actions/fill_nearestVehicle.sqf index 1fa14766f..f7d51061c 100644 --- a/SQF/dayz_code/actions/fill_nearestVehicle.sqf +++ b/SQF/dayz_code/actions/fill_nearestVehicle.sqf @@ -7,6 +7,8 @@ _isVehicle = false; _vehicleSrc = _this select 3; +_abort = false; + if(!(isNull _vehicleSrc)) then { _isVehicle = ((_vehicleSrc isKindOf "AllVehicles") && !(_vehicleSrc isKindOf "Man")); @@ -147,4 +149,4 @@ if(_IsNearVehicle >= 1) then { } else { cutText [(localize "str_epoch_player_27"), "PLAIN DOWN"]; }; -DZE_ActionInProgress = false; \ No newline at end of file +DZE_ActionInProgress = false; diff --git a/SQF/dayz_code/actions/maintain_area.sqf b/SQF/dayz_code/actions/maintain_area.sqf index c7125f783..6dc3f15d5 100644 --- a/SQF/dayz_code/actions/maintain_area.sqf +++ b/SQF/dayz_code/actions/maintain_area.sqf @@ -115,7 +115,7 @@ switch _option do { _countIn = _x select 1; _itemText = getText(configFile >> "CfgMagazines" >> _itemIn >> "displayName"); if (_cost != "") then { - _cost = _cost + " && "; + _cost = _cost + " and "; }; _cost = _cost + (str(_countIn) + " of " + _itemText); } count _requirements; diff --git a/SQF/dayz_code/compile/player_death.sqf b/SQF/dayz_code/compile/player_death.sqf index c9596d097..1a0ef2984 100644 --- a/SQF/dayz_code/compile/player_death.sqf +++ b/SQF/dayz_code/compile/player_death.sqf @@ -22,7 +22,7 @@ _infected = 0; if (r_player_infected && DZE_PlayerZed) then { _infected = 1; }; -PVDZE_plr_Died = [dayz_characterID,0,_body,_playerID,_infected]; +PVDZE_plr_Died = [dayz_characterID,0,_body,_playerID,_infected, dayz_playerName]; publicVariableServer "PVDZE_plr_Died"; _id = [player,20,true,getPosATL player] call player_alertZombies; @@ -91,9 +91,9 @@ addSwitchableUnit dayz_originalPlayer; setPlayable dayz_originalPlayer; selectPlayer dayz_originalPlayer; -_myGroup = group _body; -[_body] joinSilent dayz_firstGroup; -deleteGroup _myGroup; +//_myGroup = group _body; +//[_body] joinSilent dayz_firstGroup; +//deleteGroup _myGroup; 3 cutRsc ["default", "PLAIN",3]; 4 cutRsc ["default", "PLAIN",3]; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 5c8b0eebd..22e9b9737 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -605,7 +605,15 @@ if(isServer) then { if(isNil "DZE_CleanNull") then { DZE_CleanNull = false; }; - + if (isNil "DZE_DeathMsgGlobal") then { + DZE_DeathMsgGlobal = false; + }; + if (isNil "DZE_DeathMsgSide") then { + DZE_DeathMsgSide = false; + }; + if (isNil "DZE_DeathMsgTitleText") then { + DZE_DeathMsgTitleText = false; + }; DZE_safeVehicle = ["ParachuteWest","ParachuteC"]; }; @@ -663,7 +671,7 @@ if(!isDedicated) then { dayz_guiHumanity = -90000; dayz_firstGroup = group player; dayz_originalPlayer = player; - dayz_playerName = "Unknown"; + dayz_playerName = name player; dayz_sourceBleeding = objNull; dayz_clientPreload = false; dayz_authed = false; diff --git a/SQF/dayz_code/system/BIS_Effects/secondaries.sqf b/SQF/dayz_code/system/BIS_Effects/secondaries.sqf index fe3f98665..4cfd810e1 100644 --- a/SQF/dayz_code/system/BIS_Effects/secondaries.sqf +++ b/SQF/dayz_code/system/BIS_Effects/secondaries.sqf @@ -24,4 +24,4 @@ while {_int>1} do sleep _x; if((_lifecheck&&(alive _v))||(isnull _v)||(((getposASL _v)select 2)<0))exitwith{}; createVehicle ["SmallSecondary", (_v modelToWorld _effect2pos), [], 0, "CAN_COLLIDE"]; -}count(_list); \ No newline at end of file +}forEach(_list); \ No newline at end of file diff --git a/SQF/dayz_server/compile/fnc_plyrHit.sqf b/SQF/dayz_server/compile/fnc_plyrHit.sqf index 6fa4d8706..35843aa71 100644 --- a/SQF/dayz_server/compile/fnc_plyrHit.sqf +++ b/SQF/dayz_server/compile/fnc_plyrHit.sqf @@ -4,7 +4,9 @@ _attacker = _this select 1; _damage = _this select 2; if (!isPlayer _victim || !isPlayer _attacker) exitWith {}; -if ((owner _victim) == (owner _attacker)) exitWith {}; +if ((owner _victim) == (owner _attacker)) exitWith { + _victim setVariable["AttackedBy", _victim, true]; +}; _weapon = weaponState _attacker; if (_weapon select 0 == "Throw") then diff --git a/SQF/dayz_server/compile/server_playerDied.sqf b/SQF/dayz_server/compile/server_playerDied.sqf index 1ca812c00..ecddabe73 100644 --- a/SQF/dayz_server/compile/server_playerDied.sqf +++ b/SQF/dayz_server/compile/server_playerDied.sqf @@ -5,7 +5,7 @@ _minutes = _this select 1; _newObject = _this select 2; _playerID = _this select 3; _infected = _this select 4; -_victimName = name _newObject; +_victimName = _this select 5; _victim = _newObject; _newObject setVariable ["bodyName", _victimName, true]; @@ -15,12 +15,12 @@ _killerName = _victim getVariable["AttackedByName", "nil"]; // when a zombie kills a player _killer, _killerName && _weapon will be "nil" // we can use this to determine a zombie kill && send a customized message for that. right now no killmsg means it was a zombie. -if (_killerName != "nil") then +if ((typeName _killer) != "STRING") then { _weapon = _victim getVariable["AttackedByWeapon", "nil"]; _distance = _victim getVariable["AttackedFromDistance", "nil"]; - if (_victimName == _killerName) then + if ((owner _victim) == (owner _killer)) then { _message = format["%1 killed himself",_victimName]; _loc_message = format["PKILL: %1 killed himself", _victimName]; diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index de564d76c..a0f696983 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -833,20 +833,23 @@ server_spawnCleanLoot = { _delQty = 0; _dateNow = (DateToNumber date); { - _keep = _x getVariable ["permaLoot",false]; - if (!_keep) then { - _created = _x getVariable ["created",-0.1]; - if (_created == -0.1) then { - _x setVariable ["created",_dateNow,false]; - _created = _dateNow; - } else { - _age = (_dateNow - _created) * 525948; - if (_age > 20) then { - _nearby = {(isPlayer _x) && (alive _x)} count (_x nearEntities [["CAManBase","AllVehicles"], 130]); - if (_nearby==0) then { - deleteVehicle _x; - sleep 0.025; - _delQty = _delQty + 1; + if (!isNull _x) then { + _keep = _x getVariable["permaLoot", false]; + if (!_keep) then { + _created = _x getVariable["created", -0.1]; + if (_created == -0.1) then{ + _x setVariable["created", _dateNow, false]; + _created = _dateNow; + } + else { + _age = (_dateNow - _created) * 525948; + if (_age > 20) then{ + _nearby = { (isPlayer _x) && (alive _x) } count(_x nearEntities[["CAManBase", "AllVehicles"], 130]); + if (_nearby == 0) then{ + deleteVehicle _x; + sleep 0.025; + _delQty = _delQty + 1; + }; }; }; }; diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index 8b24742c3..6e3d1a122 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -80,7 +80,7 @@ if (isServer && isNil "sm_done") then { _vQty = _vQty + 1; }; }; - diag_log ("HIVE: got " + str(_bQty) + " Epoch Objects && " + str(_vQty) + " Vehicles"); + diag_log ("HIVE: got " + str(_bQty) + " Epoch Objects and " + str(_vQty) + " Vehicles"); }; // # NOW SPAWN OBJECTS #