W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-15 13:26:39 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.935

Browse Source 
+ added test to crafting to require fire.
+ added bronze bars.
+ Added R3F Realism to chernarus mission file.
This commit is contained in:
vbawol
2013-02-10 08:35:15 -06:00
parent 88ddb2fafd
commit 1d22cc55b7
12 changed files with 101 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dayz_code/actions/call_zombies.sqf
View File

@@ -8,7 +8,7 @@ s_player_callzombies = 1;
// player playActionNow "Surrender";
// for now try reseting animation when this is called to test preventing animation lockups
player switchMove "";
// player switchMove "";
[player,"spotted",0,false] call dayz_zombieSpeak;

88
dayz_code/actions/player_craftItem.sqf
View File

@@ -46,60 +46,66 @@ private["_recipe_ItemTinBar","_recipe_ItemAluminumBar","_recipe_FoodChickenNoodl
*/
// New items:
// ItemTinBar
// FoodChickenNoodle
// FoodBeefBakedBeans
// ItemSalt
// ["reqires","fire"]
_onLadder = (getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState player) >> "onLadder")) == 1;
_canDo = (!r_drag_sqf and !r_player_unconscious and !_onLadder);
// reqire fire target
if (inflamed cursorTarget and _canDo) then {
_recipe_ItemTinBar = [["TrashTinCan",6]];
_recipe_ItemAluminumBar = [["ItemSodaEmpty",6]];
_recipe_ItemTinBar = [["TrashTinCan",6]];
_recipe_ItemAluminumBar = [["ItemSodaEmpty",6]];
_recipe_ItemBronzeBar = [["ItemCopperBar",3],["ItemTinBar",3]];
_recipe_FoodChickenNoodle = [["FoodchickenRaw",1],["FoodCanPasta",1],["ItemWaterbottle",1]];
_recipe_FoodBeefBakedBeans = [["FoodbeefRaw",1],["FoodCanBakedBeans",1]];
_recipe_FoodChickenNoodle = [["FoodchickenRaw",1],["FoodCanPasta",1],["ItemWaterbottle",1]];
_recipe_FoodBeefBakedBeans = [["FoodbeefRaw",1],["FoodCanBakedBeans",1]];
//Add new item
_item = _this;
_config = configFile >> "cfgMagazines" >> _item;
_create = getArray (_config >> "ItemActions" >> "Crafting" >> "output") select 0;
//Add new item
_item = _this;
_config = configFile >> "cfgMagazines" >> _item;
_create = getArray (_config >> "ItemActions" >> "Crafting" >> "output") select 0;
_selectedRecipe = call compile format["_recipe_%1;",_create];
diag_log format["Selected Recipe: %1", _selectedRecipe];
_selectedRecipe = call compile format["_recipe_%1;",_create];
diag_log format["Selected Recipe: %1", _selectedRecipe];
_proceed = true;
_proceed = true;
{
_itemIn = _x select 0;
_countIn = _x select 1;
diag_log format["Recipe Check: %1 %2", _itemIn,_countIn];
if (!(_itemIn in magazines player)) exitWith { _missing = _itemIn; _missingQty = _countIn; _proceed = false; };
_qty = {_x == _itemIn} count magazines player;
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
} forEach _selectedRecipe;
if (_proceed) then {
// Take items
{
_itemIn = _x select 0;
_countIn = _x select 1;
diag_log format["Recipe Finish: %1 %2", _itemIn,_countIn];
for "_x" from 1 to _countIn do {
player removeMagazine _itemIn;
};
} forEach _selectedRecipe;
diag_log format["Recipe Check: %1 %2", _itemIn,_countIn];
// Add crafted item
player addMagazine _create;
cutText [format["Crafted Item: %1",_create], "PLAIN DOWN"];
if (!(_itemIn in magazines player)) exitWith { _missing = _itemIn; _missingQty = _countIn; _proceed = false; };
_qty = {_x == _itemIn} count magazines player;
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
} forEach _selectedRecipe;
if (_proceed) then {
// Take items
{
_itemIn = _x select 0;
_countIn = _x select 1;
diag_log format["Recipe Finish: %1 %2", _itemIn,_countIn];
for "_x" from 1 to _countIn do {
player removeMagazine _itemIn;
};
} forEach _selectedRecipe;
// Add crafted item
player addMagazine _create;
cutText [format["Crafted Item: %1",_create], "PLAIN DOWN"];
} else {
cutText [format["Missing component: %1 x %2",_missing,_missingQty], "PLAIN DOWN"];
};
} else {
cutText [format["Missing component: %1 x %2",_missing,_missingQty], "PLAIN DOWN"];
};
cutText ["Crafting needs a fire", "PLAIN DOWN"];
};

2
dayz_code/config.cpp
View File

@@ -33,7 +33,7 @@ class CfgMods
hidePicture = 0;
hideName = 0;
action = "http://www.dayzepoch.com";
version = "0.934";
version = "0.935";
hiveVersion = 0.96; //0.93
};
};

2
dayz_code/rscTitles.hpp
View File

@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version
{
idc = -1;
text = "DayZ Epoch 0.934 (1.7.5.1)";
text = "DayZ Epoch 0.935 (1.7.5.1)";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
};
class CA_TitleMainMenu;