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

Fill mixed gas into a chainsaw requires a chainsaw now

Browse Source
This commit is contained in:
A Man
2019-11-02 09:57:05 +01:00
parent e9712c2b2c
commit b0edf3cb75
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SQF/dayz_code/Configs/CfgMagazines/DZE/Items.hpp
View File

@@ -77,7 +77,7 @@ class ItemJerryMixed: CA_Magazine {
text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {}; neednearby[] = {};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox","ChainSaw"};
output[] = {{"CSGAS",1},{"ItemJerryMixed4",1}}; output[] = {{"CSGAS",1},{"ItemJerryMixed4",1}};
input[] = {{"ItemJerryMixed",1}}; input[] = {{"ItemJerryMixed",1}};
}; };
@@ -103,7 +103,7 @@ class ItemJerryMixed4: CA_Magazine {
text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {}; neednearby[] = {};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox","ChainSaw"};
output[] = {{"CSGAS",1},{"ItemJerryMixed3",1}}; output[] = {{"CSGAS",1},{"ItemJerryMixed3",1}};
input[] = {{"ItemJerryMixed4",1}}; input[] = {{"ItemJerryMixed4",1}};
}; };
@@ -129,7 +129,7 @@ class ItemJerryMixed3: CA_Magazine {
text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {}; neednearby[] = {};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox","ChainSaw"};
output[] = {{"CSGAS",1},{"ItemJerryMixed2",1}}; output[] = {{"CSGAS",1},{"ItemJerryMixed2",1}};
input[] = {{"ItemJerryMixed3",1}}; input[] = {{"ItemJerryMixed3",1}};
}; };
@@ -155,7 +155,7 @@ class ItemJerryMixed2: CA_Magazine {
text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {}; neednearby[] = {};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox","ChainSaw"};
output[] = {{"CSGAS",1},{"ItemJerryMixed1",1}}; output[] = {{"CSGAS",1},{"ItemJerryMixed1",1}};
input[] = {{"ItemJerryMixed2",1}}; input[] = {{"ItemJerryMixed2",1}};
}; };
@@ -181,7 +181,7 @@ class ItemJerryMixed1: CA_Magazine {
text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION; text = $STR_EPOCH_CHAINSAW_MIXEDGAS_CAN_ACTION;
script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;"; script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
neednearby[] = {}; neednearby[] = {};
requiretools[] = {"ItemToolbox"}; requiretools[] = {"ItemToolbox","ChainSaw"};
output[] = {{"CSGAS",1},{"ItemJerrycanEmpty",1}}; output[] = {{"CSGAS",1},{"ItemJerrycanEmpty",1}};
input[] = {{"ItemJerryMixed1",1}}; input[] = {{"ItemJerryMixed1",1}};
}; };

16
SQF/dayz_code/compile/dze_requiredItemsCheck.sqf
View File

@@ -15,24 +15,28 @@ _weapons = weapons player;
_hastoolweapon = _x in _weapons; _hastoolweapon = _x in _weapons;
if (_x == "ItemKnife") then { if (_x == "ItemKnife") then {
{if (_x in Dayz_Gutting) exitWith {_hastoolweapon = true};} forEach _items; {if (_x in Dayz_Gutting) exitWith {_hastoolweapon = true};} count _items;
}; };
if (_x == "ItemMatchbox") then { if (_x == "ItemMatchbox") then {
{if (_x in DayZ_Ignitors) exitWith {_hastoolweapon = true};} forEach _items; {if (_x in DayZ_Ignitors) exitWith {_hastoolweapon = true};} count _items;
}; };
if (_x == "ChainSaw") then {
{if (_x in ["ChainSaw","ChainSawB","ChainSawG","ChainSawG","ChainSawR"]) exitWith {_hastoolweapon = true};} count _weapons;
};
{ {
_melee = format ["Melee%1",_x]; _melee = format ["Melee%1",_x];
if (_weapon == format["Item%1",_x] && {(_melee in _weapons) or (dayz_onBack == _melee)}) then { if (_weapon == format["Item%1",_x] && {(_melee in _weapons) || {dayz_onBack == _melee}}) then {
_hastoolweapon = true; _hastoolweapon = true;
}; };
} forEach ["Crowbar","Hatchet","Sledge"]; } count ["Crowbar","Hatchet","Sledge"];
if (!_hastoolweapon) then { if (!_hastoolweapon) then {
_missingText = getText (configFile >> "cfgWeapons" >> _x >> "displayName"); _missingText = getText (configFile >> "cfgWeapons" >> _x >> "displayName");
_missing set [count _missing, _missingText]; _missing set [count _missing, _missingText];
_hasrequireditem = false; _hasrequireditem = false;
}; };
} forEach _require; } count _require;
_missingText = ""; _missingText = "";
{ {
@@ -48,7 +52,7 @@ _missingText = "";
} forEach _missing; } forEach _missing;
_hasbuilditem = _item in magazines player; _hasbuilditem = _item in magazines player;
if (!_hasbuilditem && _text != "") exitWith {dayz_actionInProgress = false; format[localize "str_player_31",_text,"build"] call dayz_rollingMessages; false;}; if (!_hasbuilditem && {_text != ""}) exitWith {dayz_actionInProgress = false; format[localize "str_player_31",_text,"build"] call dayz_rollingMessages; false;};
if (!_hasrequireditem) exitWith {dayz_actionInProgress = false; format[localize "str_epoch_player_137",_missingText] call dayz_rollingMessages; false;}; if (!_hasrequireditem) exitWith {dayz_actionInProgress = false; format[localize "str_epoch_player_137",_missingText] call dayz_rollingMessages; false;};
//When calling this function in another script use a silent exitWith, unless you have something special to say. i.e. if (!_hasrequireditem) exitWith{}; //When calling this function in another script use a silent exitWith, unless you have something special to say. i.e. if (!_hasrequireditem) exitWith{};