mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-19 10:02:02 +03:00
1.0.1.2 RC1
+ [FIXED] Prevent player zombies from getting any default loadouts. + [FIXED] Bad vehicle type message when using default loadout override and no backpack. + [FIXED] dayz_zedsAttackVehicles logic was reversed fixed now so that true = attack vehicles. + [ADDED] Safes now have a keypad GUI. Simply click on the numbers to enter your combo and then press #. https://www.dropbox.com/s/b00fgdpo13wokg9/Untitled-1.jpg + [ADDED] Tons of awesome cars by vilas from http://www.armaholic.com/page.php?id=17447 + [FIXED] Models needed extra variable to prevent being sunk into the ground. + [CHANGED] Bleeding duration reduced to minimum of 30 sec and max of 330 seconds. Before it was min 100 max 500. + [ADDED] When kneeling bleeding per second is reduced by 50%. + [ADDED] When crawling bleeding per second is reduced by 75%. + [ADDED] When changing locations the locations name will display in the bottom right. + [CHANGED] Replaced m107 with BAF_LRR_scoped. + [CHANGED] Replaced as50 with AK_107_PSO. TODO + [FIXED] Lock vehicle no longer shows on killed vehicles. + [ADDED] Disabled purchased vehicle parachute spawning by default added variable DZE_TRADER_SPAWNMODE = true; to enable. (Default: false) + [CHANGED] Plot pole has changed to another model a "no entry" sign and can be removed by anyone. When done building take your plot pole with you, if it isn't yours remove it and put it back down again. + [ADDED] Loot positions on top of some tables. + [ADDED] Briefcase that can hold up to 10 x 10oz Gold Bars or 100oz. + [ADDED] Full moon nights as option with dayz_fullMoonNights = true; + [CHANGED] Can no longer Salvage vehicle parts with 0 damage. Fixes bugged hitpoints and duping. + [REMOVED] Remove all crates of toolbelt items. This was just to add stock to traders and since most servers are now auto stocking them at the traders its not needed and cumbersome to use. + [CHANGED] Generator can only be built within 30m of gas stations that say "Needs Power". + [CHANGED] Moved light bulb to farm loot table as it was to common on trash loots. + [ADDED] Fuel pump can be built near standard fuel source (i.e. rusty tanks) then powered with a generator to make a refuel station. + [CHANGED] R3f realism no more fade to black, changed to use dayz shaking and knockouts. + [ADDED] Reset tiredness when you take painkillers. + [ADDED] Reset tiredness when you sleep at a tent. + [ADDED] added back fixed rbull soda and added new can orange sherbet
This commit is contained in:
@@ -40,7 +40,12 @@ if (_canPickLight and !dayz_hasLight and !_isPZombie) then {
|
||||
if(DZEdebug) then {
|
||||
hint str(typeOf cursorTarget);
|
||||
if (s_player_debuglootpos < 0) then {
|
||||
s_player_debuglootpos = player addAction ["Save to arma2.rpt", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["save"], 99, false, true, "",""];
|
||||
s_player_debuglootpos = player addAction ["Save to arma2.rpt", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["start"], 99, false, true, "",""];
|
||||
s_player_debuglootpos1 = player addAction ["Raise Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["up"], 99, false, true, "",""];
|
||||
s_player_debuglootpos2 = player addAction ["Lower Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["down"], 99, false, true, "",""];
|
||||
s_player_debuglootpos3 = player addAction ["Raise Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["up_small"], 99, false, true, "",""];
|
||||
s_player_debuglootpos4 = player addAction ["Lower Z", "\z\addons\dayz_code\actions\debug\Make_lootPos.sqf", ["down_small"], 99, false, true, "",""];
|
||||
Base_Z_height = 0.5;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -130,7 +135,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
|
||||
_isZombie = _cursorTarget isKindOf "zZombie_base";
|
||||
_isDestructable = _cursorTarget isKindOf "BuiltItems";
|
||||
_isWreck = _typeOfCursorTarget in ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
|
||||
_isRemovable = _typeOfCursorTarget in ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","SandNest_DZ"];
|
||||
_isRemovable = _typeOfCursorTarget in ["Fence_corrugated_DZ","M240Nest_DZ","ParkBench_DZ","SandNest_DZ","Plastic_Pole_EP1_DZ"];
|
||||
_isDisallowRepair = _typeOfCursorTarget in ["M240Nest_DZ"];
|
||||
|
||||
_isTent = _cursorTarget isKindOf "TentStorage";
|
||||
@@ -157,7 +162,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
|
||||
// diag_log ("OWNERID = " + _ownerID + " CHARID = " + dayz_characterID + " " + str(_ownerID == dayz_characterID));
|
||||
|
||||
//Allow player to delete objects
|
||||
if((_isDestructable or _isWreck or (_isRemovable and ("ItemCrowbar" in _itemsPlayer))) and _hasToolbox) then {
|
||||
if((_isDestructable or _isWreck or (_isRemovable and ("ItemCrowbar" in _itemsPlayer))) and _hasToolbox and _isAlive) then {
|
||||
if (s_player_deleteBuild < 0) then {
|
||||
s_player_deleteBuild = player addAction [format[localize "str_actions_delete",_text], "\z\addons\dayz_code\actions\remove.sqf",_cursorTarget, 1, true, true, "", ""];
|
||||
};
|
||||
@@ -167,7 +172,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
|
||||
};
|
||||
|
||||
// Allow Owner to lock and unlock vehicle
|
||||
if(_isVehicle and !_isMan and _ownerID != "0") then {
|
||||
if(_isVehicle and _isAlive and !_isMan and _ownerID != "0") then {
|
||||
if (s_player_lockUnlock_crtl < 0) then {
|
||||
_hasKey = _ownerID in _temp_keys;
|
||||
_oldOwner = (_ownerID == dayz_playerUID);
|
||||
@@ -205,7 +210,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
|
||||
player removeAction s_player_forceSave;
|
||||
s_player_forceSave = -1;
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
if((_isVehicle or _isTent or _isnewstorage) and _isAlive and !_isMan) then {
|
||||
if (s_player_checkGear < 0) then {
|
||||
@@ -215,6 +220,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
|
||||
player removeAction s_player_checkGear;
|
||||
s_player_checkGear = -1;
|
||||
};
|
||||
*/
|
||||
|
||||
//flip vehicle small vehicles by your self and all other vehicles with help nearby
|
||||
if (_isVehicle and !_canmove and _isAlive and (player distance _cursorTarget >= 2) and (count (crew _cursorTarget))== 0 and ((vectorUp _cursorTarget) select 2) < 0.5) then {
|
||||
|
||||
@@ -1,26 +1,33 @@
|
||||
private ["_charID","_friendlies","_rcharID","_rfriendlyTo","_tag","_player","_newTagList","_position","_rfriendlies","_tagList"];
|
||||
private ["_charID","_friendlies","_rcharID","_rfriendlyTo","_tag","_player","_newTagList","_position","_rfriendlies","_tagList","_statusNew","_tagColor","_humanity","_status","_everyone"];
|
||||
_charID = player getVariable ["characterID", "0"];
|
||||
_friendlies = player getVariable ["friendlies", []];
|
||||
_everyone = player getVariable ["everyone", []];
|
||||
_tagList = player getVariable ["tagList", []];
|
||||
|
||||
// create tags
|
||||
{
|
||||
if (isPlayer _x) then {
|
||||
if (isPlayer _x and player != _x) then {
|
||||
_rcharID = _x getVariable ["characterID", "0"];
|
||||
_rfriendlies = _x getVariable ["friendlies", []];
|
||||
_rfriendlyTo = _x getVariable ["friendlyTo", []];
|
||||
if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then {
|
||||
if (!(_charID in _rfriendlyTo)) then {
|
||||
_position = [0,0,0];
|
||||
_tag = "Sign_sphere10cm_EP1" createVehicleLocal _position;
|
||||
_tag attachTo [_x,[0,0,0],"lwrist"];
|
||||
_tag setVariable ["belongsTo", _rcharID];
|
||||
_rfriendlyTo set [count _rfriendlyTo, _charID];
|
||||
_x setVariable ["friendlyTo", _rfriendlyTo, true];
|
||||
_tagList set [count _tagList, [_x, _tag]];
|
||||
player setVariable ["tagList", _tagList];
|
||||
titleText [format["You and %1 are now tagged as friendlies.", (name _x)], "PLAIN DOWN"];
|
||||
};
|
||||
if(!(_rcharID in _everyone)) then {
|
||||
|
||||
// Track who has tags
|
||||
_everyone set [count _everyone, _rcharID];
|
||||
player setVariable ["everyone", _everyone];
|
||||
|
||||
// Add sphere to everyone
|
||||
_position = [0,0,0];
|
||||
_tag = "Sign_sphere10cm_EP1" createVehicleLocal _position;
|
||||
_tag attachTo [_x,[0,0,0],"lwrist"];
|
||||
_tag setVariable ["belongsTo", _rcharID];
|
||||
|
||||
// Force white
|
||||
_tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"];
|
||||
|
||||
diag_log format["SETUP ORB FOR: %1", _x];
|
||||
|
||||
// Maintenance array
|
||||
_tagList set [count _tagList, [_x, _tag,"white"]];
|
||||
player setVariable ["tagList", _tagList];
|
||||
};
|
||||
};
|
||||
} forEach playableUnits;
|
||||
@@ -30,13 +37,68 @@ _newTagList = [];
|
||||
{
|
||||
_player = _x select 0;
|
||||
_tag = _x select 1;
|
||||
_status = _x select 2;
|
||||
_statusNew = "white";
|
||||
//_tagColor = "";
|
||||
_tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)";
|
||||
|
||||
|
||||
// friendly player disconnected
|
||||
if (!(isPlayer _player)) then {
|
||||
deleteVehicle _tag;
|
||||
} else {
|
||||
_newTagList set [count _newTagList, [_player, _tag]];
|
||||
|
||||
if (_status != "green") then {
|
||||
diag_log format["CHECK IF FRIENDLY: %1", _player];
|
||||
_rcharID = _player getVariable ["characterID", "0"];
|
||||
_rfriendlies = _player getVariable ["friendlies", []];
|
||||
_rfriendlyTo = _player getVariable ["friendlyTo", []];
|
||||
|
||||
if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then {
|
||||
if (!(_charID in _rfriendlyTo)) then {
|
||||
|
||||
diag_log format["IS FRIENDLY: %1", _player];
|
||||
|
||||
_rfriendlyTo set [count _rfriendlyTo, _charID];
|
||||
_player setVariable ["friendlyTo", _rfriendlyTo, true];
|
||||
titleText [format["You and %1 are now tagged as friendlies.", (name _player)], "PLAIN DOWN"];
|
||||
|
||||
_statusNew = "green";
|
||||
_tagColor = "#(argb,8,8,3)color(0,1,0,0.5,ca)";
|
||||
// light green #(argb,8,8,3)color(0.04,0.86,0.1,0.5,ca)
|
||||
};
|
||||
|
||||
} else {
|
||||
|
||||
// Get humanity
|
||||
_humanity = _player getVariable ["humanity",0];
|
||||
|
||||
if(_humanity < -2000) then {
|
||||
_statusNew = "red";
|
||||
_tagColor = "#(argb,8,8,3)color(1,0,0,0.5,ca)";
|
||||
} else {
|
||||
if(_humanity > 5000) then {
|
||||
_statusNew = "blue";
|
||||
_tagColor = "#(argb,8,8,3)color(0,0,1,0.5,ca)";
|
||||
};
|
||||
};
|
||||
|
||||
diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity];
|
||||
};
|
||||
|
||||
|
||||
if(_statusNew != _status) then {
|
||||
diag_log format["STATUS CHANGED: %1 != %2", _statusNew, _status];
|
||||
// Set texture based on humanity or friendship status
|
||||
_tag setobjecttexture [0,_tagColor];
|
||||
_status = _statusNew;
|
||||
};
|
||||
|
||||
};
|
||||
diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status];
|
||||
_newTagList set [count _newTagList, [_player, _tag, _status]];
|
||||
};
|
||||
} forEach _tagList;
|
||||
|
||||
player setVariable ["tagList", _newTagList];
|
||||
player setVariable ["tagList", _newTagList];
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ private ["_display","_btnRespawn","_btnAbort","_timeOut","_timeMax"];
|
||||
cutText [format ["Can Abort in %1", (_timeMax - _timeOut)], "PLAIN DOWN"];
|
||||
//cutText [format[localize "str_abort_zedsclose",_text, "PLAIN DOWN"];
|
||||
};
|
||||
case (!placevault) : {
|
||||
case (!canbuild) : {
|
||||
_btnAbort ctrlEnable false;
|
||||
cutText ["Cannot Abort while in a trader city!", "PLAIN DOWN"];
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@ _vehicle = (vehicle player);
|
||||
|
||||
_targets = _unit getVariable ["targets",[]];
|
||||
|
||||
if (dayz_zedsAttackVehicles and !(_vehicle in _targets)) exitWith {};
|
||||
// if (!dayz_zedsAttackVehicles and !(_vehicle in _targets)) exitWith {};
|
||||
|
||||
//Do the attack
|
||||
if (r_player_unconscious && _vehicle == player && _type == "zombie") then {
|
||||
|
||||
@@ -4,8 +4,8 @@ _iClass = _this select 1;
|
||||
_iPos = _this select 2;
|
||||
_radius = _this select 3;
|
||||
|
||||
_iPosZ = _iPos select 2;
|
||||
if( _iPosZ < 0 ) then { _iPos = [_iPos select 0,_iPos select 1,0]; };
|
||||
//_iPosZ = _iPos select 2;
|
||||
//if( _iPosZ < 0 ) then { _iPos = [_iPos select 0,_iPos select 1,0]; };
|
||||
|
||||
switch (_iClass) do {
|
||||
default {
|
||||
|
||||
Reference in New Issue
Block a user