Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

config fix + Door / Gate counter for new elements

Browse Source
This commit is contained in:
He-Man 2018-05-18 19:41:28 +02:00
parent af9c941f5b
commit 0d02324f3e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Sources/epoch_code/compile/building/EPOCH_upgradeBUILD.sqf
View File

@ -116,15 +116,15 @@ if (_object isKindOf "Constructions_static_F") then {
_canUpgradePartCount = _canUpgradePartCount + _req; _canUpgradePartCount = _canUpgradePartCount + _req;
} forEach _upgradeParts; } forEach _upgradeParts;
_doors = ["WoodLargeWallDoorL_EPOCH","WoodWall4_EPOCH","CinderWallDoorwHatch_EPOCH"]; _doors = ["WoodLargeWallDoorL_EPOCH","WoodWall4_EPOCH","CinderWallDoorwHatch_EPOCH","WoodStairs3_EPOCH"];
_gates = ["CinderWallGarage_EPOCH"]; _gates = ["CinderWallGarage_EPOCH","WoodWallGarage_EPOCH","MetalWallGarage_EPOCH"];
if (_canUpgrade) then { if (_canUpgrade) then {
_upgradeto = _upgrade select 0; _upgradeto = _upgrade select 0;
if (_upgradeto in _doors) then { if (_upgradeto in _doors) then {
_countdoors = count (nearestobjects [_nearestJammer,_doors,_buildingJammerRange]); _countdoors = count (nearestobjects [_nearestJammer,_doors,_buildingJammerRange]);
if (_countdoors >= _maxdoors) then { if (_countdoors >= _maxdoors) then {
_canUpgrade = false; _canUpgrade = false;
_missingParts = format["Can not upgrade to locked Door! Max %1 allowed per Base!", _maxdoors]; _missingParts = format["Can not upgrade to locked Door / Stairs! Max %1 allowed per Base!", _maxdoors];
}; };
}; };
if (_upgradeto in _gates) then { if (_upgradeto in _gates) then {

2
Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
View File

@ -123,7 +123,7 @@ class Drink
class Wash class Wash
{ {
condition = "dyna_Watersource"; condition = "dyna_Watersource";
action = "if !('Soap_Epoch' in magazines player) exitwith {['You need a Soap to wash yourself',5] call Epoch_Message;};[] spawn {player playMove 'AinvPknlMstpSnonWrflDnon_medic0';player playMove 'AinvPknlMstpSnonWrflDnon_medicEnd';['Washing ...',5] call Epoch_Message;player removeitem "Soap_Epoch";uisleep 6;{_output = _x call EPOCH_giveAttributes; if (_output != '') then {[_output, 5] call Epoch_message_stack;};} foreach [['Soiled',-25]];};"; action = "if !('Soap_Epoch' in magazines player) exitwith {['You need a Soap to wash yourself',5] call Epoch_Message;};[] spawn {player playMove 'AinvPknlMstpSnonWrflDnon_medic0';player playMove 'AinvPknlMstpSnonWrflDnon_medicEnd';['Washing ...',5] call Epoch_Message;player removeitem 'Soap_Epoch';uisleep 6;{_output = _x call EPOCH_giveAttributes; if (_output != '') then {[_output, 5] call Epoch_message_stack;};} foreach [['Soiled',-25]];};";
icon = "x\addons\a3_epoch_code\Data\UI\buttons\Washing.paa"; icon = "x\addons\a3_epoch_code\Data\UI\buttons\Washing.paa";
tooltip = "Wash yourself"; tooltip = "Wash yourself";
}; };