diff --git a/dayz_code/actions/refuel.sqf b/dayz_code/actions/refuel.sqf index ac46cd7f1..86df64c09 100644 --- a/dayz_code/actions/refuel.sqf +++ b/dayz_code/actions/refuel.sqf @@ -67,7 +67,7 @@ _availableCans = ["ItemJerrycan","ItemFuelBarrel"]; if (r_interrupt) then { r_doLoop = false; }; - if (vehicle player == player) then { + if (vehicle player != player) then { r_doLoop = false; }; sleep 0.1; diff --git a/dayz_code/compile/player_friendliesCheck.sqf b/dayz_code/compile/player_friendliesCheck.sqf index 28d941f24..9872e2853 100644 --- a/dayz_code/compile/player_friendliesCheck.sqf +++ b/dayz_code/compile/player_friendliesCheck.sqf @@ -21,12 +21,12 @@ _tagList = player getVariable ["tagList", []]; _tag setVariable ["belongsTo", _rcharID]; // Force white - _tag setobjecttexture [0,"#(argb,8,8,3)color(1,1,1,0.5,ca)"]; + // _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"]]; + _tagList set [count _tagList, [_x, _tag,"init"]]; player setVariable ["tagList", _tagList]; }; }; @@ -39,8 +39,8 @@ _newTagList = []; _tag = _x select 1; _status = _x select 2; _statusNew = "white"; - //_tagColor = ""; - _tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)"; + _tagColor = ""; + // _tagColor = "#(argb,8,8,3)color(1,1,1,0.5,ca)"; // friendly player disconnected @@ -49,7 +49,7 @@ _newTagList = []; } else { if (_status != "green") then { - diag_log format["CHECK IF FRIENDLY: %1", _player]; + //diag_log format["CHECK IF FRIENDLY: %1", _player]; _rcharID = _player getVariable ["characterID", "0"]; _rfriendlies = _player getVariable ["friendlies", []]; _rfriendlyTo = _player getVariable ["friendlyTo", []]; @@ -57,7 +57,7 @@ _newTagList = []; if ((_rcharID in _friendlies) and (_charID in _rfriendlies)) then { if (!(_charID in _rfriendlyTo)) then { - diag_log format["IS FRIENDLY: %1", _player]; + // diag_log format["IS FRIENDLY: %1", _player]; _rfriendlyTo set [count _rfriendlyTo, _charID]; _player setVariable ["friendlyTo", _rfriendlyTo, true]; @@ -83,7 +83,7 @@ _newTagList = []; }; }; - diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity]; + // diag_log format["CHECK HUMANITY: %1 %2", _player, _humanity]; }; @@ -95,7 +95,7 @@ _newTagList = []; }; }; - diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status]; + // diag_log format["CHECK STATUS: %1 != %2", _statusNew, _status]; _newTagList set [count _newTagList, [_player, _tag, _status]]; }; } forEach _tagList; diff --git a/dayz_code/init/compiles.sqf b/dayz_code/init/compiles.sqf index df2508990..cf6a974c4 100644 --- a/dayz_code/init/compiles.sqf +++ b/dayz_code/init/compiles.sqf @@ -124,7 +124,7 @@ if (!isDedicated) then { _control1 = _display displayctrl 8400; _control2 = _display displayctrl 102; // 120 sec timeout - while { _timeOut < 3000 && !dayz_clientPreload && !dayz_authed } do { + while { _timeOut < 1500 && !dayz_clientPreload && !dayz_authed } do { if ( isNull _display ) then { waitUntil { !dialog; }; diff --git a/dayz_code/stringtable.xml b/dayz_code/stringtable.xml index 71cbd3ab0..4e13157bf 100644 --- a/dayz_code/stringtable.xml +++ b/dayz_code/stringtable.xml @@ -2493,7 +2493,7 @@ Red Bull is an energy drink sold by Austrian company Red Bull GmbH, - Orange Sherbet/Original> + Orange Sherbet Orange Sherbet Orange Sherbet Orange Sherbet diff --git a/dayz_epoch/models/lockbox.p3d b/dayz_epoch/models/lockbox.p3d new file mode 100644 index 000000000..fc5836cf2 Binary files /dev/null and b/dayz_epoch/models/lockbox.p3d differ diff --git a/dayz_epoch/textures/camokeypad.rvmat b/dayz_epoch/textures/camokeypad.rvmat new file mode 100644 index 000000000..58cbc44ce --- /dev/null +++ b/dayz_epoch/textures/camokeypad.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.10588235,0.13725491,0.17254902,1}; +specularPower=22.700001; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\keypad_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\keypad_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/camonet.rvmat b/dayz_epoch/textures/camonet.rvmat new file mode 100644 index 000000000..aecd8040a --- /dev/null +++ b/dayz_epoch/textures/camonet.rvmat @@ -0,0 +1,25 @@ +ambient[]={0.50588238,0.50588238,0.50588238,1}; +diffuse[]={0.50588238,0.50588238,0.50588238,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.15686275,0.22352941,0.16078432,1}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage0 +{ + texture="z\addons\dayz_epoch\textures\camonet_co.paa"; + uvSource="tex"; +}; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\camonet_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/camonet_co.paa b/dayz_epoch/textures/camonet_co.paa new file mode 100644 index 000000000..90d0ecfbd Binary files /dev/null and b/dayz_epoch/textures/camonet_co.paa differ diff --git a/dayz_epoch/textures/camonet_norm.paa b/dayz_epoch/textures/camonet_norm.paa new file mode 100644 index 000000000..79515a412 Binary files /dev/null and b/dayz_epoch/textures/camonet_norm.paa differ diff --git a/dayz_epoch/textures/keypad_co.paa b/dayz_epoch/textures/keypad_co.paa new file mode 100644 index 000000000..9bc2b7f07 Binary files /dev/null and b/dayz_epoch/textures/keypad_co.paa differ diff --git a/dayz_epoch/textures/keypad_gui.paa b/dayz_epoch/textures/keypad_gui.paa new file mode 100644 index 000000000..c6fbc970d Binary files /dev/null and b/dayz_epoch/textures/keypad_gui.paa differ diff --git a/dayz_epoch/textures/keypad_norm.paa b/dayz_epoch/textures/keypad_norm.paa new file mode 100644 index 000000000..4570f0c41 Binary files /dev/null and b/dayz_epoch/textures/keypad_norm.paa differ diff --git a/dayz_epoch/textures/keypad_spec.paa b/dayz_epoch/textures/keypad_spec.paa new file mode 100644 index 000000000..975b75907 Binary files /dev/null and b/dayz_epoch/textures/keypad_spec.paa differ diff --git a/dayz_epoch/textures/lockbox.rvmat b/dayz_epoch/textures/lockbox.rvmat new file mode 100644 index 000000000..238e18d53 --- /dev/null +++ b/dayz_epoch/textures/lockbox.rvmat @@ -0,0 +1,32 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.082352944,0.10196079,0.082352944,1}; +specularPower=100; +PixelShaderID="NormalMapSpecularDIMap"; +VertexShaderID="NormalMap"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\lockbox_norm.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="z\addons\dayz_epoch\textures\lockbox_spec.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/dayz_epoch/textures/lockbox_co.paa b/dayz_epoch/textures/lockbox_co.paa new file mode 100644 index 000000000..20497cb86 Binary files /dev/null and b/dayz_epoch/textures/lockbox_co.paa differ diff --git a/dayz_epoch/textures/lockbox_norm.paa b/dayz_epoch/textures/lockbox_norm.paa new file mode 100644 index 000000000..51e484346 Binary files /dev/null and b/dayz_epoch/textures/lockbox_norm.paa differ diff --git a/dayz_epoch/textures/lockbox_spec.paa b/dayz_epoch/textures/lockbox_spec.paa new file mode 100644 index 000000000..2914853ff Binary files /dev/null and b/dayz_epoch/textures/lockbox_spec.paa differ diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp index 729bcef3e..27e79914a 100644 --- a/dayz_equip/config.cpp +++ b/dayz_equip/config.cpp @@ -2430,7 +2430,7 @@ class CfgMagazines type = 256; displayName = "Zombie Parts"; model = "\z\addons\dayz_epoch\models\zombie_parts_bag_v2.p3d"; - picture = "\z\addons\dayz_epoch\pictures\arts_bag_texture3c_CA.paa"; + picture = "\z\addons\dayz_epoch\pictures\parts_bag_texture3c_CA.paa"; descriptionShort = "Zombie Parts in a Bag: Trade these for Bio Meat at medic traders."; }; @@ -3117,7 +3117,17 @@ class CfgMagazines }; }; }; - + class ItemLockbox: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Lockbox"; + model = "\z\addons\dayz_epoch\models\lockbox.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_safe_ca.paa"; + descriptionShort = "Semi secure lockbox"; + + }; class ItemTankTrap: CA_Magazine { scope = 2; diff --git a/dayz_server/modules/drop_bombs.sqf b/dayz_server/modules/drop_bombs.sqf new file mode 100644 index 000000000..c8fe81b6d --- /dev/null +++ b/dayz_server/modules/drop_bombs.sqf @@ -0,0 +1,4 @@ +// Sample Drop Bomb + +_position = [MarkerPosition,0,DynamicVehicleArea,10,0,2000,0] call BIS_fnc_findSafePos; +bomb = "Bo_GBU12_LGB" createVehicle [(_position select 0),(_position select 1), 1000]; \ No newline at end of file diff --git a/dayz_server/modules/hello_world.sqf b/dayz_server/modules/hello_world.sqf index 7d15c76fd..03b39477f 100644 --- a/dayz_server/modules/hello_world.sqf +++ b/dayz_server/modules/hello_world.sqf @@ -1,3 +1,3 @@ // Sample Hello World -[nil,nil,"per",rTITLETEXT,"Hello World","PLAIN DOWN"] call RE; +[nil,nil,"per",rTITLETEXT,"Welcome to DayzEpoch.com","PLAIN DOWN"] call RE; diff --git a/dayz_server/modules/hello_world2.sqf b/dayz_server/modules/hello_world2.sqf deleted file mode 100644 index 20b2c44aa..000000000 --- a/dayz_server/modules/hello_world2.sqf +++ /dev/null @@ -1,3 +0,0 @@ -// Sample Hello World - -[nil,nil,"per",rTITLETEXT,"Hello World 2","PLAIN DOWN"] call RE;