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

sync with 0.3.8.0439

Browse Source
This commit is contained in:
vbawol 2016-04-29 09:54:41 -05:00
parent 3b16eb6561
commit e6e3026200
9 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/compile/EPOCH_consumeItem.sqf
View File

@ -117,9 +117,9 @@ switch _interactOption do {
closeDialog 0; closeDialog 0;
_buildingJammerRange = ["CfgEpochClient", "buildingJammerRange", 75] call EPOCH_fnc_returnConfigEntryV2; _buildingJammerRange = ["CfgEpochClient", "buildingJammerRange", 75] call EPOCH_fnc_returnConfigEntryV2;
_buildingCountLimit = ["CfgEpochClient", "buildingCountLimit", 200] call EPOCH_fnc_returnConfigEntryV2; _buildingCountLimit = ["CfgEpochClient", "buildingCountLimit", 200] call EPOCH_fnc_returnConfigEntryV2;
_partCheck = _item in (magazines player);
_buildClass = getText(configfile >> "CfgMagazines" >> _item >> "buildClass"); _buildClass = getText(configfile >> "CfgMagazines" >> _item >> "buildClass");
if (_buildClass != "") then { if (_buildClass != "" && _partCheck) then {
_isStorage = getNumber(configfile >> "CfgMagazines" >> _item >> "isStorage"); _isStorage = getNumber(configfile >> "CfgMagazines" >> _item >> "isStorage");
_isOk = if (_isStorage == 1 || _buildClass isKindOf "Secure_Storage_Temp") then { EPOCH_StorageSlotsCount > 0 } else { EPOCH_BuildingSlotCount > 0 }; _isOk = if (_isStorage == 1 || _buildClass isKindOf "Secure_Storage_Temp") then { EPOCH_StorageSlotsCount > 0 } else { EPOCH_BuildingSlotCount > 0 };

2
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -57,7 +57,7 @@ _lootBubble = {
_lootDist = 30 + _distanceTraveled; _lootDist = 30 + _distanceTraveled;
_lootLoc = player getRelPos [_lootDist, (random [-180,0,180])]; _lootLoc = player getRelPos [_lootDist, (random [-180,0,180])];
_objects = nearestObjects[_lootLoc, _lootClasses, 30]; _objects = nearestObjects[_lootLoc, _lootClasses, 30];
_jammer = nearestObjects [_lootLoc, ["PlotPole_EPOCH"], _buildingJammerRange]; _jammer = nearestObjects [_lootLoc, ["PlotPole_EPOCH","ProtectionZone_Invisible_F"], _buildingJammerRange];
if (!(_objects isEqualTo[]) && (_jammer isEqualTo[])) then { if (!(_objects isEqualTo[]) && (_jammer isEqualTo[])) then {
_building = selectRandom _objects; _building = selectRandom _objects;
if !(_building in EPOCH_LootedBlds) then { if !(_building in EPOCH_LootedBlds) then {

5
Sources/epoch_server/compile/epoch_bases/EPOCH_server_loadBuildings.sqf
View File

@ -72,8 +72,7 @@ for "_i" from 0 to _this do {
// remove old safes on && !(_class isKindOf 'Constructions_lockedstatic_F') // remove old safes on && !(_class isKindOf 'Constructions_lockedstatic_F')
if (isClass (configFile >> "CfgVehicles" >> _class) && (_damage < 1) && !(_class isKindOf 'Constructions_lockedstatic_F')) then { if (isClass (configFile >> "CfgVehicles" >> _class) && (_damage < 1) && !(_class isKindOf 'Constructions_lockedstatic_F')) then {
_baseObj = createVehicle [_class, _location, [], 0, "CAN_COLLIDE"]; _baseObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_baseObj setposATL _location; _baseObj setposATL _location;
_baseObj setVectorDirAndUp _worldspace; _baseObj setVectorDirAndUp _worldspace;
@ -81,7 +80,7 @@ for "_i" from 0 to _this do {
_ammoClass = (configFile >> "CfgVehicles" >> _class >> "ammoClass"); _ammoClass = (configFile >> "CfgVehicles" >> _class >> "ammoClass");
if(isText _ammoClass) then { if(isText _ammoClass) then {
_ammoClass = getText _ammoClass; _ammoClass = getText _ammoClass;
_ammoObj = createVehicle [_ammoClass, _location, [], 0, "CAN_COLLIDE"]; _ammoObj = createVehicle [_ammoClass, [0,0,0], [], 0, "CAN_COLLIDE"];
_ammoObj setposATL _location; _ammoObj setposATL _location;
_ammoObj setVectorDirAndUp _worldspace; _ammoObj setVectorDirAndUp _worldspace;
_baseObj setVariable ["EPOCH_TRAP_OBJ",_ammoObj]; _baseObj setVariable ["EPOCH_TRAP_OBJ",_ammoObj];

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

@ -41,7 +41,7 @@ if (_vehSlot != -1 || _storageSlot != "ABORT" || _isTemporary == 1) then{
_gwh = _nearbyWH select 0; _gwh = _nearbyWH select 0;
// _posWH = getPosATL _gwh; // _posWH = getPosATL _gwh;
} else { } else {
_gwh = createVehicle["groundWeaponHolder", _posWH, [], 0, "CAN_COLLIDE"]; _gwh = createVehicle["groundWeaponHolder", [0,0,0], [], 0, "CAN_COLLIDE"];
_gwh setPosATL _posWH; _gwh setPosATL _posWH;
}; };

3
Sources/epoch_server/compile/epoch_bases/EPOCH_server_saveBuilding.sqf
View File

@ -41,8 +41,7 @@ if (isText _config) then {
_vectorDirAndUp = [vectordir _vehicle, vectorup _vehicle]; _vectorDirAndUp = [vectordir _vehicle, vectorup _vehicle];
deleteVehicle _vehicle; deleteVehicle _vehicle;
_storageObj = createVehicle[_staticClass, _vehiclePos, [], 0, "CAN_COLLIDE"]; _storageObj = createVehicle[_staticClass, [0,0,0], [], 0, "CAN_COLLIDE"];
_storageObj setposATL _vehiclePos; _storageObj setposATL _vehiclePos;
_storageObj setVectorDirAndUp _vectorDirAndUp; _storageObj setVectorDirAndUp _vectorDirAndUp;

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

@ -25,7 +25,7 @@ _entities = allMissionObjects "Constructions_modular_F";
if (_objSlot != -1) then { if (_objSlot != -1) then {
_worldspace = [_currentPosition,(vectordir _x),(vectorup _x)]; _worldspace = [_currentPosition,(vectordir _x),(vectorup _x)];
deleteVehicle _x; deleteVehicle _x;
_newObj = createVehicle [_class, (_worldspace select 0), [], 0, "CAN_COLLIDE"]; _newObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_newObj setVariable ["BUILD_SLOT",_objSlot,true]; _newObj setVariable ["BUILD_SLOT",_objSlot,true];
_newObj call EPOCH_server_buildingInit; _newObj call EPOCH_server_buildingInit;

4
Sources/epoch_server/compile/epoch_bases/EPOCH_server_simulSwap.sqf
View File

@ -36,7 +36,7 @@ if (_objSlot != -1) then {
_worldspace = [getposATL _object,vectordir _object,vectorup _object]; _worldspace = [getposATL _object,vectordir _object,vectorup _object];
deleteVehicle _object; deleteVehicle _object;
_newObj = createVehicle [_class, _worldspace select 0, [], 0, "CAN_COLLIDE"]; _newObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_newObj setVariable ["BUILD_SLOT",_objSlot,true]; _newObj setVariable ["BUILD_SLOT",_objSlot,true];
_newObj call EPOCH_server_buildingInit; _newObj call EPOCH_server_buildingInit;
@ -53,7 +53,7 @@ if (_objSlot != -1) then {
_ammoClass = (configFile >> "CfgVehicles" >> _class >> "ammoClass"); _ammoClass = (configFile >> "CfgVehicles" >> _class >> "ammoClass");
if (isText _ammoClass) then { if (isText _ammoClass) then {
_ammoClass = getText _ammoClass; _ammoClass = getText _ammoClass;
_ammoObj = createVehicle [_ammoClass, _worldspace select 0, [], 0, "CAN_COLLIDE"]; _ammoObj = createVehicle [_ammoClass, [0,0,0], [], 0, "CAN_COLLIDE"];
_ammoObj setposATL (_worldspace select 0); _ammoObj setposATL (_worldspace select 0);
_ammoObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)]; _ammoObj setVectorDirAndUp [(_worldspace select 1),(_worldspace select 2)];
_newObj setVariable ["EPOCH_TRAP_OBJ",_ammoObj]; _newObj setVariable ["EPOCH_TRAP_OBJ",_ammoObj];

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

@ -43,7 +43,7 @@ _stableCount = 0;
_playerUID = _x getVariable["BUILD_OWNER", "-1"]; _playerUID = _x getVariable["BUILD_OWNER", "-1"];
_slot = _x getVariable["EPOCH_secureStorage", "-1"]; _slot = _x getVariable["EPOCH_secureStorage", "-1"];
deleteVehicle _x; deleteVehicle _x;
_newObj = createVehicle[_class, _objectPos, [], 0, "CAN_COLLIDE"]; _newObj = createVehicle[_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_newObj setVariable["BUILD_SLOT", _objSlot, true]; _newObj setVariable["BUILD_SLOT", _objSlot, true];
_newObj setposASL _objectPos; _newObj setposASL _objectPos;
_newObj setVectorDirAndUp[_vDir, _vUP]; _newObj setVectorDirAndUp[_vDir, _vUP];

4
Sources/epoch_server/compile/epoch_bases/EPOCH_server_upgradeBUILD.sqf
View File

@ -33,7 +33,7 @@ if (_objSlot != -1) then {
deleteVehicle _object; deleteVehicle _object;
_class = _upgrade select 0; _class = _upgrade select 0;
_newObj = createVehicle [_class, _objectPos, [], 0, "CAN_COLLIDE"]; _newObj = createVehicle [_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_newObj setVariable ["BUILD_SLOT",_objSlot,true]; _newObj setVariable ["BUILD_SLOT",_objSlot,true];
_newObj call EPOCH_server_buildingInit; _newObj call EPOCH_server_buildingInit;
_newObj setposATL _objectPos; _newObj setposATL _objectPos;
@ -55,7 +55,7 @@ if (_objSlot != -1) then {
deleteVehicle _object; deleteVehicle _object;
_class = _upgrade select 0; _class = _upgrade select 0;
_newObj = createVehicle[_class, (_worldspace select 0), [], 0, "CAN_COLLIDE"]; _newObj = createVehicle[_class, [0,0,0], [], 0, "CAN_COLLIDE"];
_newObj setposATL(_worldspace select 0); _newObj setposATL(_worldspace select 0);
_newObj setVectorDirAndUp[(_worldspace select 1), (_worldspace select 2)]; _newObj setVectorDirAndUp[(_worldspace select 1), (_worldspace select 2)];
}; };