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

RC5

Browse Source
This commit is contained in:
[VB]AWOL
2013-12-04 23:59:09 -06:00
parent 3e6bb42436
commit 0b79bbc210
24 changed files with 551 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,7 +293,7 @@ class CfgMagazines {
displayName = $STR_EPOCH_VEHUP_AVE;
model = "\z\addons\dayz_epoch\models\doc_Up2.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_docup2_ca.paa";
descriptionShort = STR_EPOCH_VEHUP_AVE_DESC;
descriptionShort = $STR_EPOCH_VEHUP_AVE_DESC;
weight = 0.1;
sfx = "document";
class ItemActions

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

@@ -174,7 +174,26 @@ class CfgWeapons {
};
descriptionShort = "Horlite Chainsaw";
};
class ChainSawB : ChainSaw {
model = "\z\addons\dayz_epoch\models\chainsaw_B.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_chainsawB_CA.paa";
descriptionShort = "Horlite Chainsaw (Blue)";
};
class ChainSawG : ChainSaw {
model = "\z\addons\dayz_epoch\models\chainsaw_G.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_chainsawG_CA.paa";
descriptionShort = "Horlite Chainsaw (Green)";
};
class ChainSawP : ChainSaw {
model = "\z\addons\dayz_epoch\models\chainsaw_P.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_chainsawP_CA.paa";
descriptionShort = "Horlite Chainsaw (Pink)";
};
class ChainSawR : ChainSaw {
model = "\z\addons\dayz_epoch\models\chainsaw_R.p3d";
picture = "\z\addons\dayz_epoch\pictures\equip_chainsawR_CA.paa";
descriptionShort = "Horlite Chainsaw (Red)";
};

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

@@ -3155,9 +3155,9 @@ class CfgVehicles {
vehicleClass = "Survival";
displayName = "Grave DZE";
destrType = "DestructNo";
model = "\ca\buildings\Misc\hrobecek.p3d";
model = "\z\addons\dayz_epoch\models\skeleton.p3d";
transportMaxMagazines = 80;
transportMaxWeapons = 5;
transportMaxWeapons = 15;
transportMaxBackpacks = 1;
};
};

2
SQF/dayz_code/Configs/rscTitles.hpp
View File

@@ -166,7 +166,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version
{
idc = -1;
text = "DayZ Epoch 1.0.3 RC2";
text = "DayZ Epoch 1.0.3 RC5";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
};
delete CA_TitleMainMenu;

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

@@ -27,10 +27,12 @@ player playActionNow "PutDown";
if(_classname isKindOf "TrapBear") exitwith {DZE_CanPickup = true; deleteVehicle _holder;};
if(_classname isKindOf "Bag_Base_EP1") exitwith {
// diag_log("Picked up a bag: " + _classname);
if(_classname == typeOf _holder) then {
player action ["TakeBag", _holder];
};
DZE_CanPickup = true;
};
_obj = nearestObjects [(getPosATL player), [(typeOf _holder)], 5];

4
SQF/dayz_code/compile/spawn_loot.sqf
View File

@@ -76,6 +76,10 @@ switch (_iClass) do
_index = _weights select _index;
_iItem = _itemTypes select _index;
if (_iItem == "Chainsaw") then {
_iItem = ["ChainSaw","ChainSawB","ChainSawG","ChainSawP","ChainSawR"] call BIS_fnc_selectRandom;
};
//Item is a weapon, add it and a random quantity of magazines
_item = createVehicle ["WeaponHolder", _iPos, [], _radius, "CAN_COLLIDE"];
_item addWeaponCargoGlobal [_iItem,1];

2
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.92";
version = "1.0.2.93";
hiveVersion = 0.96; //0.93
};
};

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

@@ -1326,7 +1326,7 @@ class FSM
priority = 2.000000;
to="ERROR__No_Player_1";
precondition = /*%FSM<CONDPRECONDITION""">*/""/*%FSM</CONDPRECONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.92"") || (_myEpoch != ""1.0.2.92"") || (_myEpochB != ""1.0.2.92"") || (_myEpochSfx != ""1.0.2.92"")"/*%FSM</CONDITION""">*/;
condition=/*%FSM<CONDITION""">*/"(_myEpochAnim != ""1.0.2.93"") || (_myEpoch != ""1.0.2.93"") || (_myEpochB != ""1.0.2.93"") || (_myEpochSfx != ""1.0.2.93"")"/*%FSM</CONDITION""">*/;
action=/*%FSM<ACTION""">*/""/*%FSM</ACTION""">*/;
};
/*%FSM</LINK>*/