diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp index 6ad9b39d5..ba7dcfed6 100644 --- a/SQF/dayz_code/Configs/CfgMagazines.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines.hpp @@ -136,8 +136,8 @@ class CfgMagazines { count = 1; type = 256; displayName = "Hotwire kit"; - model = "\z\addons\dayz_epoch\models\canvas.p3d"; - picture = "\z\addons\dayz_epoch\pictures\equip_canvas_ca.paa"; + model = "\z\addons\dayz_epoch\models\hotwire.p3d"; + picture = "\z\addons\dayz_epoch\pictures\equip_hotwire_ca.paa"; descriptionShort = "Used to temporarily unlock and start a vehicle has a chance of failure and is consumed on use."; weight = 2; }; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp index da7512215..237a78012 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp @@ -1,7 +1,9 @@ -class ItemHatchet : ItemCore { - displayName="$STR_EQUIP_NAME_41"; - descriptionShort="$STR_EQUIP_DESC_41"; - +class ItemHatchet_DZE : ItemCore { + scope = 2; + displayName = "$STR_EQUIP_NAME_41"; + model = "\dayz_equip\models\hatchet.p3d"; + picture = "\dayz_equip\textures\equip_hatchet_CA.paa"; + descriptionShort = "$STR_EQUIP_DESC_41"; class ItemActions { class Toolbelt @@ -10,7 +12,7 @@ class ItemHatchet : ItemCore { script="spawn player_addToolbelt;"; use[]= { - "ItemHatchet" + "ItemHatchet_DZE" }; output[]= { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp index 121dec383..37b157c6e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp @@ -7,7 +7,7 @@ class MeleeHatchet: MeleeWeapon model="\dayz_weapons\models\Hatchet_weaponized"; picture="\dayz_equip\textures\equip_hatchet_CA.paa"; displayName="$STR_EQUIP_NAME_41"; - droppeditem= "ItemHatchet"; + droppeditem= "ItemHatchet_DZE"; magazines[]= { "Hatchet_Swing" @@ -34,7 +34,7 @@ class MeleeHatchet: MeleeWeapon }; output[]= { - "ItemHatchet" + "ItemHatchet_DZE" }; }; }; diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index 09e9c8b66..038238f5c 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -2641,6 +2641,27 @@ class CfgVehicles { transportRepair = 0; transportFuel = 0; }; + class WoodenArrowF : WeaponHolderBase { + scope = public; + displayName = "Arrow"; + model = "\dayz_weapons\models\bolt"; + class eventHandlers + { + init = "[(_this select 0),'cfgMagazines','WoodenArrow'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; + }; + }; + + class WeaponHolder_ItemHatchet_DZE: WeaponHolderBase + { + scope = 2; + displayName = "$STR_EQUIP_NAME_41"; + model = "\dayz_equip\models\hatchet.p3d"; + class eventHandlers + { + init = "[(_this select 0),'cfgWeapons','ItemHatchet_DZE'] execVM '\z\addons\dayz_code\init\object_pickupAction.sqf';"; + }; + }; + class WeaponHolder_ItemMachete: WeaponHolderBase { scope = 2; diff --git a/SQF/dayz_code/actions/player_addToolbelt.sqf b/SQF/dayz_code/actions/player_addToolbelt.sqf index 74e7d1963..42df4fe83 100644 --- a/SQF/dayz_code/actions/player_addToolbelt.sqf +++ b/SQF/dayz_code/actions/player_addToolbelt.sqf @@ -28,7 +28,7 @@ if (_item in ["MeleeHatchet","MeleeCrowbar","MeleeMachete","MeleeFishingPole","M }; }; -if (_item in ["ItemHatchet","ItemCrowbar","ItemMachete","ItemFishingPole","ItemSledge"]) then { +if (_item in ["ItemHatchet_DZE","ItemCrowbar","ItemMachete","ItemFishingPole","ItemSledge"]) then { switch (primaryWeapon player) do { case "MeleeHatchet": { "MeleeHatchet" call player_addToolbelt }; diff --git a/SQF/dayz_code/actions/player_chopWood.sqf b/SQF/dayz_code/actions/player_chopWood.sqf index 20c1efeff..3f939f7b1 100644 --- a/SQF/dayz_code/actions/player_chopWood.sqf +++ b/SQF/dayz_code/actions/player_chopWood.sqf @@ -8,6 +8,8 @@ private ["_isOk","_i","_objName","_objInfo","_lenInfo","_started","_finished","_ if(TradeInprogress) exitWith { cutText ["\n\nHarvest wood already in progress." , "PLAIN DOWN"]; }; TradeInprogress = true; +if((currentWeapon player) != "MeleeHatchet") exitWith {TradeInprogress = false; cutText ["\n\nHatchet needs to be in your hand to harvest wood.", "PLAIN DOWN"]; }; + // allowed trees list move this later _trees = ["t_larix3s.p3d","t_pyrus2s.p3d","str_briza_kriva.p3d","dd_borovice.p3d","les_singlestrom_b.p3d","les_singlestrom.p3d","smrk_velky.p3d","smrk_siroky.p3d","smrk_maly.p3d","les_buk.p3d","str krovisko vysoke.p3d","str_fikovnik_ker.p3d","str_fikovnik.p3d","str vrba.p3d","hrusen2.p3d","str dub jiny.p3d","str lipa.p3d","str briza.p3d","p_akat02s.p3d","jablon.p3d","p_buk.p3d","str_topol.p3d","str_topol2.p3d","p_osika.p3d","t_picea3f.p3d","t_picea2s.p3d","t_picea1s.p3d","t_fagus2w.p3d","t_fagus2s.p3d","t_fagus2f.p3d","t_betula1f.p3d","t_betula2f.p3d","t_betula2s.p3d","t_betula2w.p3d","t_alnus2s.p3d","t_acer2s.p3d","t_populus3s.p3d","t_quercus2f.p3d","t_sorbus2s.p3d","t_malus1s.p3d","t_salix2s.p3d","t_picea1s_w.p3d","t_picea2s_w.p3d","t_ficusb2s_ep1.p3d","t_populusb2s_ep1.p3d","t_populusf2s_ep1.p3d","t_amygdalusc2s_ep1.p3d","t_ficusb2s_ep1.p3d","t_pistacial2s_ep1.p3d","t_pinuse2s_ep1.p3d","t_pinuss3s_ep1.p3d","t_prunuss2s_ep1.p3d","t_pinusn2s.p3d","t_pinusn1s.p3d","t_pinuss2f.p3d","t_poplar2f_dead_pmc.p3d","misc_torzotree_pmc.p3d","misc_burnspruce_pmc.p3d","brg_cocunutpalm8.p3d","brg_umbrella_acacia01b.p3d","brg_jungle_tree_canopy_1.p3d","brg_jungle_tree_canopy_2.p3d","brg_cocunutpalm4.p3d","brg_cocunutpalm3.p3d","palm_01.p3d","palm_02.p3d","palm_03.p3d","palm_04.p3d","palm_09.p3d","palm_10.p3d","brg_cocunutpalm2.p3d","brg_jungle_tree_antiaris.p3d","brg_cocunutpalm1.p3d"]; diff --git a/SQF/dayz_code/actions/player_dropWeapon.sqf b/SQF/dayz_code/actions/player_dropWeapon.sqf index 69d49a949..715e85017 100644 --- a/SQF/dayz_code/actions/player_dropWeapon.sqf +++ b/SQF/dayz_code/actions/player_dropWeapon.sqf @@ -15,7 +15,7 @@ for "_i" from 1 to _meleeNum do { }; player removeWeapon _item; -if (_item == "MeleeHatchet") then {_item = "ItemHatchet";}; +if (_item == "MeleeHatchet") then {_item = "ItemHatchet_DZE";}; if (_item == "MeleeCrowbar") then {_item = "MeleeCrowbar";}; if (_item == "MeleeMachete") then {_item = "ItemMachete";}; diff --git a/SQF/dayz_code/actions/player_goFishing.sqf b/SQF/dayz_code/actions/player_goFishing.sqf index dbaa01add..f827ec8cd 100644 --- a/SQF/dayz_code/actions/player_goFishing.sqf +++ b/SQF/dayz_code/actions/player_goFishing.sqf @@ -14,6 +14,8 @@ call gear_ui_init; _position = player modeltoworld [0,5,0]; if(!(surfaceIsWater _position)) exitWith {TradeInprogress = false; cutText ["\n\nMust be near a shore or on a boat to fish." , "PLAIN DOWN"]; }; +if((currentWeapon player) != "MeleeFishingPole") exitWith {TradeInprogress = false; cutText ["\n\nFishing pole needs to be in your hand to fish.", "PLAIN DOWN"]; }; + if(dayz_isSwimming) exitWith {TradeInprogress = false; cutText [localize "str_player_26", "PLAIN DOWN"]; }; if(player getVariable["combattimeout", 0] >= time) exitWith {TradeInprogress = false; cutText ["\n\nCanceled Fishing.", "PLAIN DOWN"];}; diff --git a/SQF/dayz_code/compile/player_gearSet.sqf b/SQF/dayz_code/compile/player_gearSet.sqf index 9a80f6594..6ecc70b85 100644 --- a/SQF/dayz_code/compile/player_gearSet.sqf +++ b/SQF/dayz_code/compile/player_gearSet.sqf @@ -34,9 +34,10 @@ if (count _inventory > 0) then { //Add weapons { - if (_x == "Crossbow") then { _x = "Crossbow_DZ" }; // Convert Crossbow to Crossbow_DZ - if (_x == "ItemMatchbox") then { _x = "ItemMatchbox_DZE" }; // Convert Crossbow to Crossbow_DZ - + if(_x in (DZE_REPLACE_WEAPONS select 0)) then { + _x = (DZE_REPLACE_WEAPONS select 1) select ((DZE_REPLACE_WEAPONS select 0) find _x); + }; + //Is item legal? _isOK = isClass(configFile >> "CfgWeapons" >> _x); if (_isOK) then { diff --git a/SQF/dayz_code/config.cpp b/SQF/dayz_code/config.cpp index d3b5d1650..e8e518d5f 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.38"; + version = "1.0.2.39"; hiveVersion = 0.96; //0.93 }; }; @@ -669,7 +669,7 @@ class CfgBuildingLoot { { "PartGlass","magazine" }, { "PartVRotor","magazine" }, { "ItemJerrycan","magazine" }, - { "WeaponHolder_ItemHatchet","object" }, + { "WeaponHolder_ItemHatchet_DZE","object" }, { "ItemKnife","military" }, { "ItemToolbox","weapon" }, { "ItemWire","magazine" }, @@ -721,7 +721,7 @@ class CfgBuildingLoot { { "PartGlass","magazine" }, { "PartVRotor","magazine" }, { "ItemJerrycan","magazine" }, - { "WeaponHolder_ItemHatchet","object" }, + { "WeaponHolder_ItemHatchet_DZE","object" }, { "ItemKnife","military" }, { "ItemToolbox","weapon" }, { "ItemWire","magazine" }, @@ -764,7 +764,7 @@ class CfgBuildingLoot { { "","trash" }, { "Crossbow_DZ","weapon"}, { "PartPlankPack","magazine" }, - { "WeaponHolder_ItemHatchet","object" }, + { "WeaponHolder_ItemHatchet_DZE","object" }, { "MR43","weapon" }, { "ItemFuelBarrel","magazine"}, { "WeaponHolder_ItemMachete", "object"}, diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 46978f642..5a137ca02 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -438,6 +438,7 @@ if(isNil "DZE_HumanityTargetDistance") then { DZE_HumanityTargetDistance = 25; }; +DZE_REPLACE_WEAPONS = [["Crossbow","ItemMatchbox","ItemHatchet"],["Crossbow_DZ","ItemMatchbox_DZE","ItemHatchet_DZE"]]; /* if(isNil "dayz_canBuildInCity") then { diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index e06d30934..c36bd01d8 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -18,11 +18,11 @@ item13[] = {"no_PlayerID",4,218,50.000000,150.000000,150.000000,200.000000,2.000 item14[] = {"ERROR__No_Player",2,250,175.000000,150.000000,275.000000,200.000000,0.000000,"ERROR:" \n "No PlayerID"}; item15[] = {"Request",2,250,-75.000000,400.000000,25.000000,450.000000,0.000000,"Request"}; item16[] = {"Response",4,218,-175.000000,450.000000,-75.000000,500.000000,0.000000,"Response"}; -item17[] = {"Parse_Login",2,4346,-75.000000,500.000000,25.000000,550.000000,0.000000,"Parse Login"}; +item17[] = {"Parse_Login",2,250,-75.000000,500.000000,25.000000,550.000000,0.000000,"Parse Login"}; item18[] = {"Hive_Bad",4,218,50.000000,500.000000,150.000000,550.000000,10.000000,"Hive" \n "Bad"}; item19[] = {"ERROR__Wrong_HIVE",2,250,175.000000,500.000000,275.000000,550.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"}; item20[] = {"Hive_Ok",4,218,-175.000000,550.000000,-75.000000,600.000000,0.000000,"Hive" \n "Ok"}; -item21[] = {"Phase_One",2,250,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; +item21[] = {"Phase_One",2,4346,-75.000000,600.000000,25.000000,650.000000,0.000000,"Phase One"}; item22[] = {"Response",4,218,-175.000000,650.000000,-75.000000,700.000000,0.000000,"Response"}; item23[] = {"Phase_Two",2,250,-75.000000,700.000000,25.000000,750.000000,0.000000,"Phase Two"}; item24[] = {"Dead_Player",4,218,50.000000,700.000000,150.000000,750.000000,0.000000,"Dead" \n "Player"}; @@ -152,8 +152,8 @@ link77[] = {66,59}; link78[] = {67,15}; link79[] = {68,69}; link80[] = {69,20}; -globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-251.037598,801.434570,1133.794189,96.643585,893,880,1}; -window[] = {2,-1,-1,-1,-1,936,156,1528,156,3,911}; +globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-251.037598,801.434570,1129.079834,91.929260,893,880,1}; +window[] = {2,-1,-1,-1,-1,884,-1576,-204,104,3,911}; *//*%FSM*/ class FSM { @@ -694,8 +694,9 @@ class FSM " };" \n " _countr = 0;" \n " {" \n - " if (_x == ""Crossbow"") then { _x = ""Crossbow_DZ"" };" \n - " if (_x == ""ItemMatchbox"") then { _x = ""ItemMatchbox_DZE"" };" \n + " if(_x in (DZE_REPLACE_WEAPONS select 0)) then {" \n + " _x = (DZE_REPLACE_WEAPONS select 1) select ((DZE_REPLACE_WEAPONS select 0) find _x);" \n + " };" \n " dayz_myBackpack addWeaponCargoGlobal [_x,(_backpackWpnQtys select _countr)];" \n " _countr = _countr + 1;" \n " } forEach _backpackWpnTypes;" \n @@ -704,7 +705,7 @@ class FSM " _countr = 0;" \n " {" \n " if (_x == ""BoltSteel"") then { _x = ""WoodenArrow"" }; // Convert BoltSteel to WoodenArrow" \n - " if (_x == ""ItemTent"") then { _x = ""ItemTentOld"" };" \n + " if (_x == ""ItemTent"") then { _x = ""ItemTentOld"" };" \n " dayz_myBackpack addMagazineCargoGlobal [_x,(_backpackMagQty select _countr)];" \n " _countr = _countr + 1;" \n " } forEach _backpackMagTypes;" \n @@ -765,7 +766,7 @@ class FSM "_setDir = _worldspace select 0;" \n "_setPos = _worldspace select 1;" \n "" \n - "if(dayz_paraSpawn and !(player isKindOf ""PZombie_VB"")) then {" \n + "if(dayz_paraSpawn and !(player isKindOf ""PZombie_VB"")) then {" \n " _para = createVehicle [""ParachuteWest"", _setPos, [], 0, ""FLY""]; " \n " player moveInDriver _para;" \n "} else {" \n @@ -1086,7 +1087,7 @@ class FSM "if (player hasWeapon ""MeleeCrowbar"") then {" \n " player addMagazine 'crowbar_swing';" \n "};" \n - "if (player hasWeapon ""MeleeSledge"") then {" \n + "if (player hasWeapon ""MeleeSledge"") then {" \n " player addMagazine 'sledge_swing';" \n "};" \n "if (player hasWeapon ""MeleeHatchet"") then {" \n diff --git a/SQF/dayz_epoch/models/gold_ore.p3d b/SQF/dayz_epoch/models/gold_ore.p3d new file mode 100644 index 000000000..dc60d74b7 Binary files /dev/null and b/SQF/dayz_epoch/models/gold_ore.p3d differ diff --git a/SQF/dayz_epoch/models/gold_vein.p3d b/SQF/dayz_epoch/models/gold_vein.p3d new file mode 100644 index 000000000..cc886a1fc Binary files /dev/null and b/SQF/dayz_epoch/models/gold_vein.p3d differ diff --git a/SQF/dayz_epoch/models/hotwire.p3d b/SQF/dayz_epoch/models/hotwire.p3d new file mode 100644 index 000000000..0ba0438c6 Binary files /dev/null and b/SQF/dayz_epoch/models/hotwire.p3d differ diff --git a/SQF/dayz_epoch/models/iron_ore.p3d b/SQF/dayz_epoch/models/iron_ore.p3d new file mode 100644 index 000000000..095915fa9 Binary files /dev/null and b/SQF/dayz_epoch/models/iron_ore.p3d differ diff --git a/SQF/dayz_epoch/models/iron_vein.p3d b/SQF/dayz_epoch/models/iron_vein.p3d new file mode 100644 index 000000000..dae96ff84 Binary files /dev/null and b/SQF/dayz_epoch/models/iron_vein.p3d differ diff --git a/SQF/dayz_epoch/models/silver_ore.p3d b/SQF/dayz_epoch/models/silver_ore.p3d new file mode 100644 index 000000000..28558062c Binary files /dev/null and b/SQF/dayz_epoch/models/silver_ore.p3d differ diff --git a/SQF/dayz_epoch/models/silver_vein.p3d b/SQF/dayz_epoch/models/silver_vein.p3d new file mode 100644 index 000000000..69794b5b2 Binary files /dev/null and b/SQF/dayz_epoch/models/silver_vein.p3d differ diff --git a/SQF/dayz_epoch/models/vein.p3d b/SQF/dayz_epoch/models/vein.p3d new file mode 100644 index 000000000..cae5f2acd Binary files /dev/null and b/SQF/dayz_epoch/models/vein.p3d differ diff --git a/SQF/dayz_epoch/pictures/equip_hotwire_ca.paa b/SQF/dayz_epoch/pictures/equip_hotwire_ca.paa new file mode 100644 index 000000000..2fc23c6ae Binary files /dev/null and b/SQF/dayz_epoch/pictures/equip_hotwire_ca.paa differ diff --git a/SQF/dayz_epoch/textures/Vein_co.paa b/SQF/dayz_epoch/textures/Vein_co.paa new file mode 100644 index 000000000..43ae0ce0a Binary files /dev/null and b/SQF/dayz_epoch/textures/Vein_co.paa differ diff --git a/SQF/dayz_epoch/textures/Vein_nohq.paa b/SQF/dayz_epoch/textures/Vein_nohq.paa new file mode 100644 index 000000000..7e6e7e049 Binary files /dev/null and b/SQF/dayz_epoch/textures/Vein_nohq.paa differ diff --git a/SQF/dayz_epoch/textures/Vein_smdi.paa b/SQF/dayz_epoch/textures/Vein_smdi.paa new file mode 100644 index 000000000..9409a93a2 Binary files /dev/null and b/SQF/dayz_epoch/textures/Vein_smdi.paa differ diff --git a/SQF/dayz_epoch/textures/gold_ore.rvmat b/SQF/dayz_epoch/textures/gold_ore.rvmat new file mode 100644 index 000000000..ff409b041 --- /dev/null +++ b/SQF/dayz_epoch/textures/gold_ore.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.41960785,0.33333334,0.094117649,0.19}; +diffuse[]={0.41960785,0.33333334,0.094117649,0.19}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.69803923,0.5529412,0.16078432,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\Vein_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[]={8,0,0}; + up[]={0,8,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\gold_ore_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,64,64,1)fresnel(0.8,0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/SQF/dayz_epoch/textures/hotwire.rvmat b/SQF/dayz_epoch/textures/hotwire.rvmat new file mode 100644 index 000000000..ef24bcc11 --- /dev/null +++ b/SQF/dayz_epoch/textures/hotwire.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.74901962,0.74901962,0.74901962,1}; +specularPower=200; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\hotwire_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\hotwire_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/hotwire_co.paa b/SQF/dayz_epoch/textures/hotwire_co.paa new file mode 100644 index 000000000..67ccf16cf Binary files /dev/null and b/SQF/dayz_epoch/textures/hotwire_co.paa differ diff --git a/SQF/dayz_epoch/textures/hotwire_nohq.paa b/SQF/dayz_epoch/textures/hotwire_nohq.paa new file mode 100644 index 000000000..27bc2e3f6 Binary files /dev/null and b/SQF/dayz_epoch/textures/hotwire_nohq.paa differ diff --git a/SQF/dayz_epoch/textures/hotwire_smdi.paa b/SQF/dayz_epoch/textures/hotwire_smdi.paa new file mode 100644 index 000000000..c0fe48e0c Binary files /dev/null and b/SQF/dayz_epoch/textures/hotwire_smdi.paa differ diff --git a/SQF/dayz_epoch/textures/iron_ore.rvmat b/SQF/dayz_epoch/textures/iron_ore.rvmat new file mode 100644 index 000000000..fde465f8a --- /dev/null +++ b/SQF/dayz_epoch/textures/iron_ore.rvmat @@ -0,0 +1,92 @@ +ambient[]={0.35686275,0.35686275,0.35686275,1}; +diffuse[]={0.35686275,0.35686275,0.35686275,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.68235296,0.68235296,0.68235296,1}; +specularPower=200; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\Vein_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\Vein_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/silver_ore.rvmat b/SQF/dayz_epoch/textures/silver_ore.rvmat new file mode 100644 index 000000000..5d38d1528 --- /dev/null +++ b/SQF/dayz_epoch/textures/silver_ore.rvmat @@ -0,0 +1,78 @@ +ambient[]={0.56999999,0.56999999,0.56999999,0.5}; +diffuse[]={0.56999999,0.56999999,0.56999999,0.5}; +forcedDiffuse[]={0,0,0,1}; +emmisive[]={0,0,0,1}; +specular[]={0.52999997,0.52999997,0.54000002,1}; +specularPower=100; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\Vein_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[]={8,0,0}; + up[]={0,8,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\gold_ore_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,64,64,1)fresnel(0.8,0.0)"; + uvSource="none"; +}; +class Stage7 +{ + texture="z\addons\dayz_epoch\textures\env_land_co.paa"; + uvSource="none"; +}; diff --git a/SQF/dayz_epoch/textures/vein.rvmat b/SQF/dayz_epoch/textures/vein.rvmat new file mode 100644 index 000000000..bdb64bd47 --- /dev/null +++ b/SQF/dayz_epoch/textures/vein.rvmat @@ -0,0 +1,92 @@ +ambient[]={1,1,1,1}; +diffuse[]={1,1,1,1}; +forcedDiffuse[]={0,0,0,0}; +emmisive[]={0,0,0,1}; +specular[]={0.45490196,0.45490196,0.45490196,1}; +specularPower=200; +PixelShaderID="Super"; +VertexShaderID="Super"; +class Stage1 +{ + texture="z\addons\dayz_epoch\textures\Vein_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\Vein_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/ui/screen_death_ca.paa b/SQF/dayz_epoch/ui/screen_death_ca.paa index 6711ef447..8a9b56a5f 100644 Binary files a/SQF/dayz_epoch/ui/screen_death_ca.paa and b/SQF/dayz_epoch/ui/screen_death_ca.paa differ diff --git a/SQF/dayz_server/system/server_cleanup.fsm b/SQF/dayz_server/system/server_cleanup.fsm index f27527038..9cacdf8ce 100644 --- a/SQF/dayz_server/system/server_cleanup.fsm +++ b/SQF/dayz_server/system/server_cleanup.fsm @@ -5,7 +5,7 @@ item0[] = {"init",0,250,-75.000000,-400.000000,25.000000,-350.000000,0.000000,"i item1[] = {"true",8,218,-75.000000,-175.000000,25.000000,-125.000000,0.000000,"true"}; item2[] = {"waiting",2,250,-75.000000,-100.000000,25.000000,-50.000000,0.000000,"waiting"}; item3[] = {"time_sync",4,218,-275.000000,-25.000000,-175.000000,25.000000,1.000000,"time" \n "sync"}; -item4[] = {"sync_the_time",2,250,-275.000000,50.000000,-175.000000,100.000000,0.000000,"sync" \n "the time"}; +item4[] = {"sync_the_time",2,4346,-275.000000,50.000000,-175.000000,100.000000,0.000000,"sync" \n "the time"}; item5[] = {"true",8,218,-75.000000,125.000000,25.000000,175.000000,0.000000,"true"}; item6[] = {"general_cleanup",2,250,-75.000000,200.000000,25.000000,250.000000,0.000000,"general" \n "cleanup" \n "loop"}; item7[] = {"",7,210,-304.000000,220.999985,-296.000000,229.000015,0.000000,""}; @@ -20,7 +20,7 @@ item15[] = {"",7,210,221.000000,-79.000000,229.000000,-71.000000,0.000000,""}; item16[] = {"cleanup_groups",4,218,-150.000000,-25.000000,-50.000000,25.000000,1.000000,"cleanup" \n "groups"}; item17[] = {"group_cleanup",2,250,-150.000000,50.000000,-50.000000,100.000000,0.000000,"group" \n "cleanup"}; item18[] = {"cleanup_vehicles",4,218,-25.000000,-25.000000,75.000000,25.000000,1.000000,"cleanup" \n "vehicles"}; -item19[] = {"vehicle_cleanup",2,4346,-25.000000,50.000000,75.000000,100.000000,0.000000,"vehicle" \n "cleanup"}; +item19[] = {"vehicle_cleanup",2,250,-25.000000,50.000000,75.000000,100.000000,0.000000,"vehicle" \n "cleanup"}; link0[] = {0,11}; link1[] = {1,2}; link2[] = {2,3}; @@ -46,7 +46,7 @@ link21[] = {17,5}; link22[] = {18,19}; link23[] = {19,5}; globals[] = {25.000000,1,0,0,0,640,480,1,30,6316128,1,-419.782135,377.473389,510.243530,-212.601486,675,612,1}; -window[] = {0,-1,-1,-1,-1,810,52,1330,52,1,693}; +window[] = {0,-1,-1,-1,-1,940,182,1460,182,1,693}; *//*%FSM*/ class FSM { @@ -156,7 +156,7 @@ class FSM " _minute = _date select 4;" \n " " \n " //Force full moon nights" \n - " _date = [2012,6,6,_hour,_minute];" \n + " _date = [2013,8,3,_hour,_minute];" \n " };" \n "" \n " setDate _date;" \n diff --git a/SQF/dayz_server/system/server_monitor.sqf b/SQF/dayz_server/system/server_monitor.sqf index fb8e126ca..a7a2fd2e4 100644 --- a/SQF/dayz_server/system/server_monitor.sqf +++ b/SQF/dayz_server/system/server_monitor.sqf @@ -32,7 +32,7 @@ if(_outcome == "PASS") then { _minute = _date select 4; //Force full moon nights - _date = [2012,6,6,_hour,_minute]; + _date = [2013,8,3,_hour,_minute]; }; if(isDedicated) then { @@ -191,8 +191,9 @@ if (isServer and isNil "sm_done") then { _objWpnQty = (_intentory select 0) select 1; _countr = 0; { - if (_x == "Crossbow") then { _x = "Crossbow_DZ" }; // Convert Crossbow to Crossbow_DZ - if (_x == "ItemMatchbox") then { _x = "ItemMatchbox_DZE" }; // Convert Crossbow to Crossbow_DZ + if(_x in (DZE_REPLACE_WEAPONS select 0)) then { + _x = (DZE_REPLACE_WEAPONS select 1) select ((DZE_REPLACE_WEAPONS select 0) find _x); + }; _isOK = isClass(configFile >> "CfgWeapons" >> _x); if (_isOK) then { _block = getNumber(configFile >> "CfgWeapons" >> _x >> "stopThis") == 1; diff --git a/Server Files/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/Server Files/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index 468d0360b..05fbcaadc 100644 --- a/Server Files/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/Server Files/MPMissions/TEMPLATE/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -1228,6 +1228,11 @@ class CfgWeight { weight = 1; }; + + class ItemHatchet_DZE + { + weight = 1; + }; class ItemCrowbar { weight = 1; diff --git a/Server Files/mysql/epoch.sql b/Server Files/mysql/epoch.sql index dfa058c41..2f68a4565 100644 --- a/Server Files/mysql/epoch.sql +++ b/Server Files/mysql/epoch.sql @@ -2028,7 +2028,7 @@ INSERT INTO `trader_items` VALUES(422, 'ItemFlashlight', 3, 'ToolBelt', 'trade_w INSERT INTO `trader_items` VALUES(423, 'ItemFlashlightRed', 3, 'ToolBelt', 'trade_weapons'); INSERT INTO `trader_items` VALUES(424, 'ItemGenerator', 1, 'Building Supplies', 'trade_items'); INSERT INTO `trader_items` VALUES(425, 'ItemGPS', 3, 'ToolBelt', 'trade_weapons'); -INSERT INTO `trader_items` VALUES(426, 'ItemHatchet', 3, 'ToolBelt', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(426, 'ItemHatchet_DZE', 3, 'ToolBelt', 'trade_weapons'); INSERT INTO `trader_items` VALUES(427, 'ItemHeatPack', 1, 'Medical', 'trade_items'); INSERT INTO `trader_items` VALUES(428, 'ItemJerrycan', 1, 'Car Parts', 'trade_items'); INSERT INTO `trader_items` VALUES(429, 'ItemJerrycanEmpty', 1, 'Car Parts', 'trade_items');