From 56a9be77dd1e1bf04f34ea3b16b1ca0e2b416099 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Thu, 12 Sep 2013 02:53:17 -0500 Subject: [PATCH] 1.0.2.14 --- SQF/dayz_code/Configs/CfgMagazines.hpp | 64 +++++++++++- .../Configs/CfgVehicles/DZE/Doors.hpp | 4 +- SQF/dayz_code/Configs/cfgVehicles.hpp | 12 +-- SQF/dayz_code/Configs/rscTitles.hpp | 2 +- SQF/dayz_code/actions/player_build.sqf | 1 + SQF/dayz_code/compile/fn_lightFunctions.sqf | 13 +-- SQF/dayz_code/compile/local_lights_house.sqf | 2 +- SQF/dayz_code/compile/local_lights_init.sqf | 2 +- SQF/dayz_code/compile/local_lights_off.sqf | 2 +- SQF/dayz_code/compile/local_lights_street.sqf | 2 +- SQF/dayz_code/compile/local_lights_tower.sqf | 2 +- SQF/dayz_code/config.cpp | 2 +- SQF/dayz_code/init/veh_resetEH.sqf | 2 +- .../models/Steel_door_frame_ghost.p3d | Bin 0 -> 1280581 bytes SQF/dayz_epoch/models/metal_floor.p3d | Bin 56595 -> 96032 bytes SQF/dayz_epoch/models/metal_floor_ghost.p3d | Bin 37314 -> 46246 bytes SQF/dayz_epoch/textures/metal_floor.rvmat | 92 ++++++++++++++++++ SQF/dayz_epoch/textures/mf_co.paa | Bin 0 -> 591743 bytes SQF/dayz_epoch/textures/mf_ghost_ca.paa | Bin 0 -> 652074 bytes SQF/dayz_epoch/textures/mf_nohq.paa | Bin 0 -> 884482 bytes SQF/dayz_epoch/textures/mf_smdi.paa | Bin 0 -> 475330 bytes SQF/dayz_server/init/server_functions.sqf | 15 +-- 22 files changed, 176 insertions(+), 41 deletions(-) create mode 100644 SQF/dayz_epoch/models/Steel_door_frame_ghost.p3d create mode 100644 SQF/dayz_epoch/textures/metal_floor.rvmat create mode 100644 SQF/dayz_epoch/textures/mf_co.paa create mode 100644 SQF/dayz_epoch/textures/mf_ghost_ca.paa create mode 100644 SQF/dayz_epoch/textures/mf_nohq.paa create mode 100644 SQF/dayz_epoch/textures/mf_smdi.paa 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 0000000000000000000000000000000000000000..4384f003e30a8d5eb9ac23eb70fa9969626c5e15 GIT binary patch literal 1280581 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