mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2026-02-04 15:22:53 +03:00
0.935
+ added test to crafting to require fire. + added bronze bars. + Added R3F Realism to chernarus mission file.
This commit is contained in:
@@ -8,7 +8,7 @@ s_player_callzombies = 1;
|
|||||||
// player playActionNow "Surrender";
|
// player playActionNow "Surrender";
|
||||||
|
|
||||||
// for now try reseting animation when this is called to test preventing animation lockups
|
// 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;
|
[player,"spotted",0,false] call dayz_zombieSpeak;
|
||||||
|
|
||||||
|
|||||||
@@ -46,60 +46,66 @@ private["_recipe_ItemTinBar","_recipe_ItemAluminumBar","_recipe_FoodChickenNoodl
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// New items:
|
// New items:
|
||||||
// ItemTinBar
|
|
||||||
// FoodChickenNoodle
|
// FoodChickenNoodle
|
||||||
// FoodBeefBakedBeans
|
// FoodBeefBakedBeans
|
||||||
// ItemSalt
|
// 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_ItemTinBar = [["TrashTinCan",6]];
|
||||||
_recipe_ItemAluminumBar = [["ItemSodaEmpty",6]];
|
_recipe_ItemAluminumBar = [["ItemSodaEmpty",6]];
|
||||||
|
_recipe_ItemBronzeBar = [["ItemCopperBar",3],["ItemTinBar",3]];
|
||||||
|
|
||||||
_recipe_FoodChickenNoodle = [["FoodchickenRaw",1],["FoodCanPasta",1],["ItemWaterbottle",1]];
|
_recipe_FoodChickenNoodle = [["FoodchickenRaw",1],["FoodCanPasta",1],["ItemWaterbottle",1]];
|
||||||
_recipe_FoodBeefBakedBeans = [["FoodbeefRaw",1],["FoodCanBakedBeans",1]];
|
_recipe_FoodBeefBakedBeans = [["FoodbeefRaw",1],["FoodCanBakedBeans",1]];
|
||||||
|
|
||||||
//Add new item
|
//Add new item
|
||||||
_item = _this;
|
_item = _this;
|
||||||
_config = configFile >> "cfgMagazines" >> _item;
|
_config = configFile >> "cfgMagazines" >> _item;
|
||||||
_create = getArray (_config >> "ItemActions" >> "Crafting" >> "output") select 0;
|
_create = getArray (_config >> "ItemActions" >> "Crafting" >> "output") select 0;
|
||||||
|
|
||||||
_selectedRecipe = call compile format["_recipe_%1;",_create];
|
_selectedRecipe = call compile format["_recipe_%1;",_create];
|
||||||
diag_log format["Selected Recipe: %1", _selectedRecipe];
|
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;
|
_itemIn = _x select 0;
|
||||||
_countIn = _x select 1;
|
_countIn = _x select 1;
|
||||||
diag_log format["Recipe Finish: %1 %2", _itemIn,_countIn];
|
diag_log format["Recipe Check: %1 %2", _itemIn,_countIn];
|
||||||
|
|
||||||
for "_x" from 1 to _countIn do {
|
|
||||||
player removeMagazine _itemIn;
|
|
||||||
};
|
|
||||||
|
|
||||||
} forEach _selectedRecipe;
|
|
||||||
|
|
||||||
// Add crafted item
|
if (!(_itemIn in magazines player)) exitWith { _missing = _itemIn; _missingQty = _countIn; _proceed = false; };
|
||||||
player addMagazine _create;
|
|
||||||
cutText [format["Crafted Item: %1",_create], "PLAIN DOWN"];
|
_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 {
|
} else {
|
||||||
cutText [format["Missing component: %1 x %2",_missing,_missingQty], "PLAIN DOWN"];
|
cutText ["Crafting needs a fire", "PLAIN DOWN"];
|
||||||
};
|
};
|
||||||
@@ -33,7 +33,7 @@ class CfgMods
|
|||||||
hidePicture = 0;
|
hidePicture = 0;
|
||||||
hideName = 0;
|
hideName = 0;
|
||||||
action = "http://www.dayzepoch.com";
|
action = "http://www.dayzepoch.com";
|
||||||
version = "0.934";
|
version = "0.935";
|
||||||
hiveVersion = 0.96; //0.93
|
hiveVersion = 0.96; //0.93
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ class RscDisplayMain : RscStandardDisplay
|
|||||||
class DAYZ_Version : CA_Version
|
class DAYZ_Version : CA_Version
|
||||||
{
|
{
|
||||||
idc = -1;
|
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)";
|
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
|
||||||
};
|
};
|
||||||
class CA_TitleMainMenu;
|
class CA_TitleMainMenu;
|
||||||
|
|||||||
@@ -1400,6 +1400,16 @@ class CfgMagazines
|
|||||||
descriptionShort = "Copper Bar";
|
descriptionShort = "Copper Bar";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class ItemBronzeBar: CA_Magazine
|
||||||
|
{
|
||||||
|
scope = 2;
|
||||||
|
count = 1;
|
||||||
|
type = 256;
|
||||||
|
displayName = "Bronze";
|
||||||
|
model = "\dayz_equip\models\bronze_bar.p3d";
|
||||||
|
picture = "\dayz_equip\textures\equip_bar_bronze_CA.paa";
|
||||||
|
descriptionShort = "Bronze Bar";
|
||||||
|
};
|
||||||
class ItemAluminumBar: CA_Magazine
|
class ItemAluminumBar: CA_Magazine
|
||||||
{
|
{
|
||||||
scope = 2;
|
scope = 2;
|
||||||
|
|||||||
BIN
dayz_equip/models/bronze_bar.p3d
Normal file
BIN
dayz_equip/models/bronze_bar.p3d
Normal file
Binary file not shown.
41
dayz_equip/textures/bronzebar.rvmat
Normal file
41
dayz_equip/textures/bronzebar.rvmat
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
//DeRap: Produced from mikero's Dos Tools Dll version 3.97
|
||||||
|
//http://dev-heaven.net/projects/list_files/mikero-pbodll
|
||||||
|
////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#define _ARMA_
|
||||||
|
|
||||||
|
//Class dayz_equip : textures\bronzebar.rvmat{
|
||||||
|
ambient[] = {1.0,1.0,1.0,1.0};
|
||||||
|
diffuse[] = {1.0,1.0,1.0,1.0};
|
||||||
|
forcedDiffuse[] = {0.0,0.0,0.0,1.0};
|
||||||
|
emmisive[] = {0.0,0.0,0.0,1.0};
|
||||||
|
specular[] = {0.99498,0.99498,0.99498,1.0};
|
||||||
|
specularPower = 100.799995;
|
||||||
|
PixelShaderID = "NormalMapSpecularMap";
|
||||||
|
VertexShaderID = "NormalMap";
|
||||||
|
class Stage1
|
||||||
|
{
|
||||||
|
texture = "dayz_equip\textures\bronzebar_NOHQ.paa";
|
||||||
|
uvSource = "tex";
|
||||||
|
class uvTransform
|
||||||
|
{
|
||||||
|
aside[] = {1.0,0.0,0.0};
|
||||||
|
up[] = {0.0,1.0,0.0};
|
||||||
|
dir[] = {0.0,0.0,0.0};
|
||||||
|
pos[] = {0,0,0};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
class Stage2
|
||||||
|
{
|
||||||
|
texture = "dayz_equip\textures\bronzebar_SMDI.paa";
|
||||||
|
uvSource = "tex";
|
||||||
|
class uvTransform
|
||||||
|
{
|
||||||
|
aside[] = {1.0,0.0,0.0};
|
||||||
|
up[] = {0.0,1.0,0.0};
|
||||||
|
dir[] = {0.0,0.0,0.0};
|
||||||
|
pos[] = {0,0,0};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
//};
|
||||||
BIN
dayz_equip/textures/bronzebar_AS.paa
Normal file
BIN
dayz_equip/textures/bronzebar_AS.paa
Normal file
Binary file not shown.
BIN
dayz_equip/textures/bronzebar_NOHQ.paa
Normal file
BIN
dayz_equip/textures/bronzebar_NOHQ.paa
Normal file
Binary file not shown.
BIN
dayz_equip/textures/bronzebar_SMDI.paa
Normal file
BIN
dayz_equip/textures/bronzebar_SMDI.paa
Normal file
Binary file not shown.
BIN
dayz_equip/textures/bronzebar_co.paa
Normal file
BIN
dayz_equip/textures/bronzebar_co.paa
Normal file
Binary file not shown.
BIN
dayz_equip/textures/equip_bar_bronze_ca.paa
Normal file
BIN
dayz_equip/textures/equip_bar_bronze_ca.paa
Normal file
Binary file not shown.
Reference in New Issue
Block a user