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 #1010 from EpochModTeam/experimental

Browse Source 
release
This commit is contained in:
vbawol 2019-11-26 06:06:08 -06:00 committed by GitHub
commit cc7d97dbb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -34,7 +34,7 @@ Starting a FAQ here. Can get expanded later
- GroundSpawnChance - GroundSpawnChance
- MinGroundContainers - MinGroundContainers
- MaxGroundContainers - MaxGroundContainers
- @epochhove\addons\epoch_server_settings\configs\CfgMainTable.h -> Change the Loot for each Container / Buildingtype - @epochhive\addons\epoch_server_settings\configs\CfgMainTable.h -> Change the Loot for each Container / Buildingtype
- lootMin - lootMin
- lootMax - lootMax
- I have added an item to the loot, but it will not spawn (rpt log say "have no price") - I have added an item to the loot, but it will not spawn (rpt log say "have no price")

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

Binary file not shown.

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

Binary file not shown.

2
Sources/epoch_server/compile/epoch_bases/EPOCH_saveBuilding.sqf
View File

@ -22,7 +22,7 @@ if !(isNull _this) then {
_cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig; _cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig;
_this setDamage 0; _this setDamage 0;
_class = typeOf _this; _class = typeOf _this;
_worldspace = [getposworld _this, vectordir _this, vectorup _this, true]; _worldspace = [getposworld _this call EPOCH_precisionPos, vectordir _this, vectorup _this, true];
_objHiveKey = format["%1:%2", (call EPOCH_fn_InstanceID), _objSlot]; _objHiveKey = format["%1:%2", (call EPOCH_fn_InstanceID), _objSlot];
_animPhases = []; _animPhases = [];
{ {

16
Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_CargoFill.sqf
View File

@ -80,10 +80,22 @@ params [["_vehicle",objnull],["_items",[]]];
case 4: { case 4: {
_type = _x select 0; _type = _x select 0;
_subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []}; _subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []};
if !(_subContainers isequalto []) if !(_subContainers isequalto []) then {
then {
_subContainer = _subContainers select 0 select 1; _subContainer = _subContainers select 0 select 1;
[_subContainer,_x select 1] call EPOCH_server_CargoFill; [_subContainer,_x select 1] call EPOCH_server_CargoFill;
}
else {
if (_type isKindOf "Bag_Base") then {
_vehicle addBackpackCargoGlobal [_type, 1];
}
else {
_vehicle addItemCargoGlobal [_type, 1];
};
_subContainers = (everycontainer _vehicle) select {(_x select 0) isequalto _type && magazinesAmmoCargo (_x select 1) isequalto [] && weaponsItemsCargo (_x select 1) isequalto []};
if !(_subContainers isequalto []) then {
_subContainer = _subContainers select 0 select 1;
[_subContainer,_x select 1] call EPOCH_server_CargoFill;
};
}; };
}; };
}; };

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

@ -32,7 +32,7 @@ if (!isNull _vehicle) then {
_colorSlot = _vehicle getVariable ["STORAGE_TEXTURE",0]; _colorSlot = _vehicle getVariable ["STORAGE_TEXTURE",0];
_storageOwners = _vehicle getVariable["STORAGE_OWNERS",[]]; _storageOwners = _vehicle getVariable["STORAGE_OWNERS",[]];
_locked = if (_vehicle getVariable["EPOCH_Locked", true]) then {1} else {-1}; _locked = if (_vehicle getVariable["EPOCH_Locked", true]) then {1} else {-1};
_worldspace = [getposworld _vehicle, vectordir _vehicle, vectorup _vehicle, true]; _worldspace = [getposworld _vehicle call EPOCH_precisionPos, vectordir _vehicle, vectorup _vehicle, true];
_VAL = [_class, _worldspace, _damage, _inventory, _colorSlot, _storageOwners, _locked]; _VAL = [_class, _worldspace, _damage, _inventory, _colorSlot, _storageOwners, _locked];
["Storage", _vehHiveKey, EPOCH_expiresBuilding, _VAL] call EPOCH_fnc_server_hiveSETEX; ["Storage", _vehHiveKey, EPOCH_expiresBuilding, _VAL] call EPOCH_fnc_server_hiveSETEX;

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

@ -37,7 +37,7 @@ if (!isNull _vehicle) then {
_Textures = getObjectTextures _vehicle; _Textures = getObjectTextures _vehicle;
}; };
_VAL = [typeOf _vehicle,[getposworld _vehicle,vectordir _vehicle,vectorup _vehicle,true],damage _vehicle,_hitpoints,fuel _vehicle,_inventory,[true,magazinesAllTurrets _vehicle],_colorSlot,_baseType, getPlateNumber _vehicle, _Textures]; _VAL = [typeOf _vehicle,[getposworld _vehicle call EPOCH_precisionPos,vectordir _vehicle,vectorup _vehicle,true],damage _vehicle,_hitpoints,fuel _vehicle,_inventory,[true,magazinesAllTurrets _vehicle],_colorSlot,_baseType, getPlateNumber _vehicle, _Textures];
["Vehicle", _vehHiveKey, EPOCH_expiresVehicle, _VAL] call EPOCH_fnc_server_hiveSETEX; ["Vehicle", _vehHiveKey, EPOCH_expiresVehicle, _VAL] call EPOCH_fnc_server_hiveSETEX;
}; };
}; };

5
Sources/epoch_server_settings/configs/CfgLootTable.h
View File

@ -1773,10 +1773,7 @@ class CfgLootTable
items[] = { items[] = {
{ { "V_TacChestrig_grn_F", "item" }, 1 }, { { "V_TacChestrig_grn_F", "item" }, 1 },
{ { "V_TacChestrig_oli_F", "item" }, 1 }, { { "V_TacChestrig_oli_F", "item" }, 1 },
{ { "V_TacChestrig_cbr_F", "item" }, 1 }, { { "V_TacChestrig_cbr_F", "item" }, 1 }
{ { "V_TacChestrig_grn_F", "item" }, 1 },
{ { "V_TacChestrig_grn_F", "item" }, 1 },
{ { "V_TacChestrig_grn_F", "item" }, 1 }
}; };
}; };
class Backpacks_Low_Base class Backpacks_Low_Base