W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-15 12:42:57 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

1.0.2.39 dev part 2

Browse Source
This commit is contained in:
[VB]AWOL
2013-10-03 12:05:53 -05:00
parent bd7943b473
commit 6a7e557638
37 changed files with 503 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/Configs/CfgMagazines.hpp
View File

@@ -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;
};

12
SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp
View File

@@ -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[]=
{

4
SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp
View File

@@ -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"
};
};
};

21
SQF/dayz_code/Configs/cfgVehicles.hpp
View File

@@ -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;

2
SQF/dayz_code/actions/player_addToolbelt.sqf
View File

@@ -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 };

2
SQF/dayz_code/actions/player_chopWood.sqf
View File

@@ -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"];

2
SQF/dayz_code/actions/player_dropWeapon.sqf
View File

@@ -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";};

2
SQF/dayz_code/actions/player_goFishing.sqf
View File

@@ -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"];};

7
SQF/dayz_code/compile/player_gearSet.sqf
View File

@@ -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 {

8
SQF/dayz_code/config.cpp
View File

@@ -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"},

1
SQF/dayz_code/init/variables.sqf
View File

@@ -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 {

19
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -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</HEAD>*/
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