diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 749c03745..5e3af5e6b 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -566,16 +566,74 @@ class CfgMagazines { { class Crafting { - text = "Smelt 10oz bar"; + text = "Add 1oz Bar"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; - neednearby[] = {"fire"}; - requiretools[] = {"ItemToolbox"}; + neednearby[] = {}; + requiretools[] = {}; + output[] = {{"ItemGoldBar2oz",1}}; + input[] = {{"ItemGoldBar",2}}; + + }; + class Crafting1 + { + text = "Add 10 1oz bars"; + script = ";['Crafting1','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {}; + requiretools[] = {}; output[] = {{"ItemGoldBar10oz",1}}; input[] = {{"ItemGoldBar",10}}; }; }; }; + /* + class ItemGoldBar2oz: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Gold 2oz"; + model = "\z\addons\dayz_epoch\models\gold_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; + descriptionShort = "2 x 1oz Gold Bar"; + class ItemActions + { + class Crafting + { + text = "Add 1oz Bar"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {"fire"}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"ItemGoldBar3oz",1}}; + input[] = {{"ItemGoldBar2oz",1},{"ItemGoldBar",1}}; + + }; + }; + }; + class ItemGoldBar2oz: CA_Magazine + { + scope = 2; + count = 1; + type = 256; + displayName = "Gold 2oz"; + model = "\z\addons\dayz_epoch\models\gold_bar.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_gold_bar_CA.paa"; + descriptionShort = "2 x 1oz Gold Bar"; + class ItemActions + { + class Crafting + { + text = "Add 1oz Bar"; + script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; + neednearby[] = {"fire"}; + requiretools[] = {"ItemToolbox"}; + output[] = {{"ItemGoldBar4oz",1}}; + input[] = {{"ItemGoldBar3oz",1},{"ItemGoldBar",1}}; + + }; + }; + }; + */ class ItemGoldBar10oz: CA_Magazine { scope = 2; diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp index 99be4d656..05a0b9798 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp @@ -136,7 +136,7 @@ class CinderWallDoor_DZ_Base: DZE_Housebase { mapSize = 8; /* Size of the icon */ icon = "\ca\data\data\Unknown_object.paa"; /* Path to the picture shown in the editor. */ accuracy = 1000; - armor = 1600; /* "Lifepoints", if you like to call it that way.*/ + armor = 1000; /* "Lifepoints", if you like to call it that way.*/ destrType = "DestructBuilding"; /* type of destruction, when armor = 0 */ scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ offset[] = {0,1.5,0}; @@ -150,7 +150,7 @@ class CinderWallDoorLocked_DZ_Base: DZE_Housebase { mapSize = 8; /* Size of the icon */ icon = "\ca\data\data\Unknown_object.paa"; /* Path to the picture shown in the editor. */ accuracy = 1000; - armor = 1600; /* "Lifepoints", if you like to call it that way.*/ + armor = 1000; /* "Lifepoints", if you like to call it that way.*/ destrType = "DestructBuilding"; /* type of destruction, when armor = 0 */ scope = 2; /* Display it in the editor? 1 = No, 2 = Yes */ offset[] = {0,1.5,0}; diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index d589e5ef6..4315d3fa9 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -1612,7 +1612,7 @@ class CfgVehicles { model="\z\addons\dayz_epoch\models\metal_floor.p3d"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; - armor = 1600; + armor = 1000; displayName = "Metal Floor"; vehicleClass = "Fortifications"; GhostPreview = "MetalFloor_Preview_DZ"; @@ -1626,7 +1626,7 @@ class CfgVehicles { model="\z\addons\dayz_epoch\models\cinder_wall_half.p3d"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; - armor = 1600; + armor = 1000; displayName = "Half Cinder Block Wall"; vehicleClass = "Fortifications"; upgradeBuilding[] = {"CinderWall_DZ",{{"CinderBlocks",4},{"MortarBucket",1}}}; @@ -1642,7 +1642,7 @@ class CfgVehicles { model="\z\addons\dayz_epoch\models\cinder_wall_full.p3d"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; - armor = 1600; + armor = 1000; displayName = "Cinder Block Wall"; vehicleClass = "Fortifications"; maintainBuilding[] = {{"MortarBucket",1}}; @@ -1658,7 +1658,7 @@ class CfgVehicles { model="\z\addons\dayz_epoch\models\steel_garage_frame.p3d"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; - armor = 1600; + armor = 1000; displayName = "Block Garage Doorway"; vehicleClass = "Fortifications"; maintainBuilding[] = {{"MortarBucket",1}}; @@ -1675,7 +1675,7 @@ class CfgVehicles { model="\z\addons\dayz_epoch\models\Steel_door_frame.p3d"; icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; - armor = 1600; + armor = 1000; displayName = "Block Doorway"; vehicleClass = "Fortifications"; maintainBuilding[] = {{"MortarBucket",1}}; @@ -1900,7 +1900,7 @@ class CfgVehicles { destrType = "DestructNo"; cost = 100; offset[] = {0,1.5,0}; - model="\z\addons\dayz_epoch\models\steel_garage_frame_ghost.p3d"; // todo change this + model="\z\addons\dayz_epoch\models\Steel_door_frame_ghost.p3d"; // todo change this icon = "\ca\data\data\Unknown_object.paa"; mapSize = 2; armor = 1000; diff --git a/SQF/dayz_code/Configs/rscTitles.hpp b/SQF/dayz_code/Configs/rscTitles.hpp index 6402a8b42..09eb6140b 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.13 DEV"; + text = "DayZ Epoch 1.0.2.2 (DEV14)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; }; delete CA_TitleMainMenu; diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index 2361ead55..d7a2d453c 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -22,6 +22,7 @@ DZE_cancelBuilding = false; DZE_5 = false; call gear_ui_init; +closeDialog 1; if(_isWater) exitWith {TradeInprogress = false; cutText [localize "str_player_26", "PLAIN DOWN"];}; if(_onLadder) exitWith {TradeInprogress = false; cutText [localize "str_player_21", "PLAIN DOWN"];}; diff --git a/SQF/dayz_code/compile/fn_lightFunctions.sqf b/SQF/dayz_code/compile/fn_lightFunctions.sqf index 3169a18e2..f0fcab7fc 100644 --- a/SQF/dayz_code/compile/fn_lightFunctions.sqf +++ b/SQF/dayz_code/compile/fn_lightFunctions.sqf @@ -87,15 +87,4 @@ _nrTLs= position _twr nearObjects ["#lightpoint",30]; }; }; }; -}; -<<<<<<< HEAD -======= - -axe_TestMoveHC={ -private ["_startPos","_currPos"]; -_currPos = _this select 0; -_startPos = [_currPos,50,180,20,0,800,0] call BIS_fnc_findSafePos; -player setPosATL _startPos; -}; - ->>>>>>> origin/master +}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/local_lights_house.sqf b/SQF/dayz_code/compile/local_lights_house.sqf index 16845b859..e45caf3ec 100644 --- a/SQF/dayz_code/compile/local_lights_house.sqf +++ b/SQF/dayz_code/compile/local_lights_house.sqf @@ -46,4 +46,4 @@ if(!isNil "_objHouse")then{ }; }; } forEach _objHouse; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/local_lights_init.sqf b/SQF/dayz_code/compile/local_lights_init.sqf index d17a48ca7..d009e0ed2 100644 --- a/SQF/dayz_code/compile/local_lights_init.sqf +++ b/SQF/dayz_code/compile/local_lights_init.sqf @@ -104,4 +104,4 @@ do }forEach _lightTrig; }; sleep _sleep; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/local_lights_off.sqf b/SQF/dayz_code/compile/local_lights_off.sqf index 8c340942e..48f25ccc0 100644 --- a/SQF/dayz_code/compile/local_lights_off.sqf +++ b/SQF/dayz_code/compile/local_lights_off.sqf @@ -69,4 +69,4 @@ if(_cntNrGen>0)then{//reset house if gen nearby to help create reliability regar _x setVariable ["axeHLight", 0, false]; }; }forEach _objHouses; -*/ +*/ \ No newline at end of file diff --git a/SQF/dayz_code/compile/local_lights_street.sqf b/SQF/dayz_code/compile/local_lights_street.sqf index 0b0514fb2..1a28eea87 100644 --- a/SQF/dayz_code/compile/local_lights_street.sqf +++ b/SQF/dayz_code/compile/local_lights_street.sqf @@ -20,4 +20,4 @@ if(!isNil "_streetLamps")then{ }; }forEach _streetLamps; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/compile/local_lights_tower.sqf b/SQF/dayz_code/compile/local_lights_tower.sqf index 3b6712f18..e2069d86e 100644 --- a/SQF/dayz_code/compile/local_lights_tower.sqf +++ b/SQF/dayz_code/compile/local_lights_tower.sqf @@ -17,4 +17,4 @@ if(count _nrTowers >0)then{ _x setVariable ["axeTLight", 1, false]; }; }forEach _nrTowers; -}; +}; \ No newline at end of file diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index 20d6556eb..42bf3bba2 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.13"; + version = "1.0.2.14"; hiveVersion = 0.96; //0.93 }; }; diff --git a/SQF/dayz_code/init/veh_resetEH.sqf b/SQF/dayz_code/init/veh_resetEH.sqf index 7eb621592..d5a653a37 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 select 0),"all"] call server_updateObject;}]; + _this addEventHandler ["GetOut", {_this call server_antiWall;[(_this select 0),"all"] call server_updateObject;}]; _this addEventHandler ["GetIn", {[(_this select 0),"all"] call server_updateObject;}]; }; diff --git a/SQF/dayz_epoch/models/Steel_door_frame_ghost.p3d b/SQF/dayz_epoch/models/Steel_door_frame_ghost.p3d new file mode 100644 index 000000000..4384f003e Binary files /dev/null and b/SQF/dayz_epoch/models/Steel_door_frame_ghost.p3d differ diff --git a/SQF/dayz_epoch/models/metal_floor.p3d b/SQF/dayz_epoch/models/metal_floor.p3d index 468bafa42..4f0e2160e 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/models/metal_floor_ghost.p3d b/SQF/dayz_epoch/models/metal_floor_ghost.p3d index c97058280..15bd3f794 100644 Binary files a/SQF/dayz_epoch/models/metal_floor_ghost.p3d and b/SQF/dayz_epoch/models/metal_floor_ghost.p3d differ diff --git a/SQF/dayz_epoch/textures/metal_floor.rvmat b/SQF/dayz_epoch/textures/metal_floor.rvmat new file mode 100644 index 000000000..ee3892faa --- /dev/null +++ b/SQF/dayz_epoch/textures/metal_floor.rvmat @@ -0,0 +1,92 @@ +ambient[]={0.80784315,0.80784315,0.80784315,1}; +diffuse[]={0.80784315,0.80784315,0.80784315,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.6901961,0.6901961,0.6901961,1}; +specularPower=200; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\MF_nohq.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage2 +{ + texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage3 +{ + texture="#(argb,8,8,3)color(0,0,0,0,MC)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage4 +{ + texture="#(argb,8,8,3)color(1,1,1,1,AS)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage5 +{ + texture="z\addons\dayz_epoch\textures\mf_smdi.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage6 +{ + texture="#(ai,32,128,1)fresnel(1.7,7.0)"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; +class Stage7 +{ + texture="ca\data\env_land_co.paa"; + uvSource="tex"; + class uvTransform + { + aside[]={1,0,0}; + up[]={0,1,0}; + dir[]={0,0,0}; + pos[]={0,0,0}; + }; +}; diff --git a/SQF/dayz_epoch/textures/mf_co.paa b/SQF/dayz_epoch/textures/mf_co.paa new file mode 100644 index 000000000..a355c63f2 Binary files /dev/null and b/SQF/dayz_epoch/textures/mf_co.paa differ diff --git a/SQF/dayz_epoch/textures/mf_ghost_ca.paa b/SQF/dayz_epoch/textures/mf_ghost_ca.paa new file mode 100644 index 000000000..7e296629e Binary files /dev/null and b/SQF/dayz_epoch/textures/mf_ghost_ca.paa differ diff --git a/SQF/dayz_epoch/textures/mf_nohq.paa b/SQF/dayz_epoch/textures/mf_nohq.paa new file mode 100644 index 000000000..19abffa9a Binary files /dev/null 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 new file mode 100644 index 000000000..6d4a3ef4f Binary files /dev/null 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 a5bc0228b..e1032b0b5 100644 --- a/SQF/dayz_server/init/server_functions.sqf +++ b/SQF/dayz_server/init/server_functions.sqf @@ -25,6 +25,8 @@ 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"; @@ -305,7 +307,7 @@ spawn_vehicles = { }; spawn_roadblocks = { - private ["_position","_veh","_num","_config","_itemType","_itemChance","_weights","_index","_iArray","_istoomany","_marker","_spawnloot","_nearby","_spawnveh","_WreckList"]; + private ["_position","_veh","_istoomany","_marker","_spawnveh","_WreckList"]; _WreckList = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"]; waitUntil{!isNil "BIS_fnc_selectRandom"}; @@ -333,11 +335,6 @@ spawn_roadblocks = { waitUntil{!isNil "BIS_fnc_selectRandom"}; _spawnveh = _WreckList call BIS_fnc_selectRandom; - _spawnloot = "DynamicDebris"; - - if((_spawnveh == "HMMWVWreck") or (_spawnveh == "UralWreck") or (_spawnveh == "UAZWreck")) then { - _spawnloot = "DynamicDebrisMilitary"; - }; //diag_log("DEBUG: Spawning a crashed " + _spawnveh + " with " + _spawnloot + " at " + str(_position)); _veh = createVehicle [_spawnveh,_position, [], 0, "CAN_COLLIDE"]; @@ -462,7 +459,7 @@ dayz_recordLogin = { // Cleanup flies server_cleanFlies = { - private ["_sound","_newdayz_flyMonitor"]; + private ["_sound","_newdayz_flyMonitor","_body"]; DZE_FlyWorkingSet = DZE_FlyWorkingSet+dayz_flyMonitor; dayz_flyMonitor = []; @@ -475,18 +472,16 @@ server_cleanFlies = // Remove flies if (isNull _body) then { deleteVehicle _sound; - [_body] call server_Delete; } else { _newdayz_flyMonitor set [count _newdayz_flyMonitor,_x]; }; } forEach DZE_FlyWorkingSet; - DZE_FlyWorkingSet = _newdayz_flyMonitor; }; server_cleanDead = { - private ["_objectPos","_noPlayerNear","_body","_handled"]; + private ["_objectPos","_noPlayerNear","_body","_handle"]; { if (_x isKindOf "zZombie_Base") then {