diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 5e3af5e6b..a1e355589 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -564,6 +564,17 @@ class CfgMagazines { descriptionShort = "Gold Bar"; class ItemActions { + class Crafting + { + text = "Smelt 10oz bar"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar10oz",1}}; + input[] = {{"ItemGoldBar",10}}; + + }; + /* class Crafting { text = "Add 1oz Bar"; @@ -584,6 +595,7 @@ class CfgMagazines { input[] = {{"ItemGoldBar",10}}; }; + */ }; }; /* diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 09eb6140b..3f098e9e6 100644 --- a/SQF/dayz_code/Configs/rscTitles.hpp +++ b/SQF/dayz_code/Configs/rscTitles.hpp @@ -149,7 +149,7 @@ class RscDisplayMain : RscStandardDisplay class DAYZ_Version : CA_Version { idc = -1; - text = "DayZ Epoch 1.0.2.2 (DEV14)"; + text = "DayZ Epoch 1.0.2.2 (DEV15)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; delete CA_TitleMainMenu; diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 42bf3bba2..8784f4bc6 100644 --- a/SQF/dayz_code/config.cpp +++ b/SQF/dayz_code/config.cpp @@ -41,7 +41,7 @@ class CfgMods hidePicture = 0; hideName = 0; action = "http://www.dayzepoch.com"; - version = "1.0.2.14"; + version = "1.0.2.15"; hiveVersion = 0.96; //0.93 }; }; diff --git a/SQF/dayz_code/init/veh_resetEH.sqf b/SQF/dayz_code/init/veh_resetEH.sqf index d5a653a37..7eb621592 100644 --- a/SQF/dayz_code/init/veh_resetEH.sqf +++ b/SQF/dayz_code/init/veh_resetEH.sqf @@ -12,7 +12,7 @@ _this addeventhandler ["Killed",{ _this call vehicle_handleKilled } ]; if (isServer) then { _this removeAllEventHandlers "GetOut"; _this removeAllEventHandlers "GetIn"; - _this addEventHandler ["GetOut", {_this call server_antiWall;[(_this select 0),"all"] call server_updateObject;}]; + _this addEventHandler ["GetOut", {[(_this select 0),"all"] call server_updateObject;}]; _this addEventHandler ["GetIn", {[(_this select 0),"all"] call server_updateObject;}]; }; diff --git a/SQF/dayz_epoch/models/metal_floor.p3d b/SQF/dayz_epoch/models/metal_floor.p3d index 4f0e2160e..abe11ba0e 100644 Binary files a/SQF/dayz_epoch/models/metal_floor.p3d and b/SQF/dayz_epoch/models/metal_floor.p3d differ diff --git a/SQF/dayz_epoch/textures/mf_co.paa b/SQF/dayz_epoch/textures/mf_co.paa index a355c63f2..83a38590e 100644 Binary files a/SQF/dayz_epoch/textures/mf_co.paa and b/SQF/dayz_epoch/textures/mf_co.paa differ diff --git a/SQF/dayz_epoch/textures/mf_nohq.paa b/SQF/dayz_epoch/textures/mf_nohq.paa index 19abffa9a..6c1b96d88 100644 Binary files a/SQF/dayz_epoch/textures/mf_nohq.paa and b/SQF/dayz_epoch/textures/mf_nohq.paa differ diff --git a/SQF/dayz_epoch/textures/mf_smdi.paa b/SQF/dayz_epoch/textures/mf_smdi.paa index 6d4a3ef4f..377450d81 100644 Binary files a/SQF/dayz_epoch/textures/mf_smdi.paa and b/SQF/dayz_epoch/textures/mf_smdi.paa differ diff --git a/SQF/dayz_server/init/server_functions.sqf b/SQF/dayz_server/init/server_functions.sqf index e1032b0b5..80008b10a 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -25,8 +25,6 @@ server_spawnCrashSite = compile preprocessFileLineNumbers "\z\addons\dayz_se server_handleZedSpawn = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_handleZedSpawn.sqf"; server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf"; -server_antiWall = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_antiWall.sqf"; - fnc_plyrHit = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\fnc_plyrHit.sqf"; server_deaths = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf";