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

Merge pull request #454 from EpochModTeam/experimental

Browse Source 
0.3.6.025
This commit is contained in:
vbawol 2015-12-20 11:33:16 -06:00
commit ffb9e2350b
7 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelogs/0.3.6.0.txt
View File

@ -19,3 +19,6 @@
[Changed] Magazines now spawn with a random ammo count. [Changed] Magazines now spawn with a random ammo count.
[Changed] Disable simulation of locked storage devices. This also prevents removal of items until device is unlocked/re-simulated. [Changed] Disable simulation of locked storage devices. This also prevents removal of items until device is unlocked/re-simulated.
[Info] Removed old .bikey and added new one for 0360. [Info] Removed old .bikey and added new one for 0360.
**Server Build 025**
[Fixed] New workaround for inventoryOpened and locked storage protection.

BIN
Server_Install_Pack/@epochhive/addons/a3_epoch_server.pbo
View File

Binary file not shown.

BIN
Server_Install_Pack/@epochhive/addons/a3_epoch_server_settings.pbo
View File

Binary file not shown.

4
Sources/epoch_code/compile/missions/EPOCH_spawn_looters.sqf
View File

@ -1,9 +1,9 @@
private["_unit"]; private["_unit"];
for "_i" from 0 to 4 step 1 do { for "_i" from 0 to 4 step 1 do {
_unit = createGroup RESISTANCE createUnit ["Epoch_Female_F", getPos player, [], 400, "CAN_COLLIDE"]; _unit = createGroup RESISTANCE createUnit ["Epoch_Female_F", getPos player, [], 400, "CAN_COLLIDE"];
_unit addBackPack "B_Kitbag_Base"; _unit addBackPack "B_FieldPack_blk";
_unit addWeapon "Hatchet"; _unit addWeapon "Hatchet";
_unit addMagazine "hatchet_swing"; _unit addMagazine "hatchet_swing";
{_unit disableAI _x}count["TARGET","AUTOTARGET","FSM"]; {_unit disableAI _x}count["TARGET","AUTOTARGET","FSM"];

2
Sources/epoch_server/compile/epoch_vehicle/EPOCH_load_storage.sqf
View File

@ -109,7 +109,7 @@ for "_i" from 1 to _this do {
// set locked state of secure storage // set locked state of secure storage
if ((_arr select 6) != -1) then { if ((_arr select 6) != -1) then {
_vehicle setVariable["EPOCH_Locked", true, true]; _vehicle setVariable["EPOCH_Locked", true, true];
_vehicle enableSimulationGlobal false; //_vehicle enableSimulationGlobal false;
}; };
}; };
}; };

4
Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_lockStorage.sqf
View File

@ -16,11 +16,11 @@ _fnc_lock = {
_this setVariable ["EPOCH_Locked", true, true]; _this setVariable ["EPOCH_Locked", true, true];
// force save on lock // force save on lock
if !(_this in EPOCH_saveStorQueue) then { EPOCH_saveStorQueue pushBack _this }; if !(_this in EPOCH_saveStorQueue) then { EPOCH_saveStorQueue pushBack _this };
_this enableSimulationGlobal false; //_this enableSimulationGlobal false;
}; };
_fnc_unlock = { _fnc_unlock = {
_this setVariable ["EPOCH_Locked", false, true]; _this setVariable ["EPOCH_Locked", false, true];
_this enableSimulationGlobal true; //_this enableSimulationGlobal true;
}; };
// functions // functions

2
Sources/epoch_server_settings/configs/security/security_checks.h
View File

@ -74,7 +74,7 @@ class CfgSecConf
checks[] = {"Fired","InventoryClosed","InventoryOpened","Killed","HandleDamage","HandleHeal","Dammaged","Hit","HitPart"}; checks[] = {"Fired","InventoryClosed","InventoryOpened","Killed","HandleDamage","HandleHeal","Dammaged","Hit","HitPart"};
Fired = "_this call EPOCH_fnc_playerFired;"; Fired = "_this call EPOCH_fnc_playerFired;";
InventoryClosed = "if !(EPOCH_arr_interactedObjs isEqualTo[]) then {EPOCH_arr_interactedObjs remoteExec['EPOCH_server_save_vehicles', 2]; EPOCH_arr_interactedObjs = [];};"; InventoryClosed = "if !(EPOCH_arr_interactedObjs isEqualTo[]) then {EPOCH_arr_interactedObjs remoteExec['EPOCH_server_save_vehicles', 2]; EPOCH_arr_interactedObjs = [];};";
InventoryOpened = "_this spawn EPOCH_initUI;_container = _this select 1; _lockedNear = false;if (_container isKindOf 'GroundWeaponHolder') then {{if (locked _x in [2, 3] || _x getVariable['EPOCH_Locked', false]) exitWith {_lockedNear = true}} forEach (player nearSupplies 5);};(locked _container in [2, 3] || _container getVariable['EPOCH_Locked', false] || _lockedNear)"; InventoryOpened = "_this spawn EPOCH_initUI;_container = _this select 1;_lockedNear = false;if (_container isKindOf 'GroundWeaponHolder') then {{if (locked _x in [2, 3] ||_x getVariable['EPOCH_Locked', false]) exitWith {_lockedNear = true}} forEach (player nearSupplies 10);};if (locked _container in [2, 3] || _container getVariable['EPOCH_Locked', false] || _lockedNear) then {[] spawn {disableSerialization;waitUntil {!isNull findDisplay 602};_display = findDisplay 602;_ctrl_cargo = _display displayCtrl 6401;_ctrl_ground = _display displayCtrl 6321;_ctrl_cargo ctrlEnable false;ctrlSetFocus _ctrl_ground;ctrlActivate _ctrl_ground;};};";
Killed = "_this call EPOCH_fnc_playerDeath;"; Killed = "_this call EPOCH_fnc_playerDeath;";
HandleDamage = ""; HandleDamage = "";
HandleHeal = ""; HandleHeal = "";