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

Smaller fixes and tweaks

Browse Source 
- Fixed usedItemRepack removes all same items with same rounds
- removed action "gear" by opening Cargo Container
- removed StorageInit (EH Killed), if Storage is indestructible
- Spawn Vehicles near 0 and port them after all is loaded to final
position (prevent collide)
- increased Altis World size to 25000 (better Vehicle / Trader Spawn)
This commit is contained in:
He-Man 2018-01-10 20:10:00 +01:00
parent 3eac0b0035
commit a2172aaef5
8 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Sources/epoch_code/compile/inventory/EPOCH_usedItemRepack.sqf
View File

@ -53,13 +53,14 @@ if(count _itemMags > 1)then{
// adjust the item
if!(_chg isEqualTo 0)then{
_index = ((count _itemMags) - 1);
_usedItemArray = _itemMags select _index;
_usedItemArray = _itemMags deleteat _index;
_usedItemArray params ["_mag","_count"];
_itemMags pushBack [_mag, (_count + _chg)];
_itemMags = _itemMags - [_usedItemArray];
_player removeMagazines _mag;
{
_player addMagazine _x;
[format["You have used your %1", _displayName],5,[[0,0,0,0.2],[1,1,1,1]]] call Epoch_message_stack;
if ((_x select 1) > 0) then {
_player addMagazine _x;
};
}forEach _itemMags;
[format["You have used your %1", _displayName],5,[[0,0,0,0.2],[1,1,1,1]]] call Epoch_message_stack;
};

4
Sources/epoch_server/compile/epoch_looting/EPOCH_server_lootContainer.sqf
View File

@ -48,7 +48,9 @@ if !(_object in EPOCH_cleanupQueue) then {
[_object, _type] call EPOCH_serverLootObject;
// force player to open gear on this object.
[_object, {player action["Gear", _this]}] remoteExec ["call", _player];
if !(_type isequalto "Cargo_Container") then {
[_object, {player action["Gear", _this]}] remoteExec ["call", _player];
};
} else {
[_object, "Food"] call EPOCH_serverLootObject;
// force player to open gear on this object.

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

@ -105,8 +105,9 @@ for "_i" from 1 to _maxStorageLimit do {
_vehicle setVariable ["STORAGE_SLOT", str(_i), true];
_vehicle call EPOCH_server_storageInit;
if (isDamageAllowed _vehicle) then {
_vehicle call EPOCH_server_storageInit;
};
if (count _arr >= 5) then {
_color = _arr select 4;
_cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig;

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

@ -84,7 +84,7 @@ for "_i" from 1 to _maxVehicleLimit do {
};
// spawn vehicle at temp location.
_vehicle = createVehicle [_class, _location, [], 0, "CAN_COLLIDE"];
_vehicle = createVehicle [_class, [random 500, random 500,500], [], 0, "CAN_COLLIDE"];
// turn off BIS randomization
_vehicle setVariable ["BIS_enableRandomization", false];
if !(isNull _vehicle) then {

6
Sources/epoch_server/compile/epoch_vehicle/EPOCH_server_upgrade_vehicle.sqf
View File

@ -50,9 +50,6 @@ _newVeh setVariable ["VEHICLE_SLOT", _slot, true];
_newVeh setVariable ["VEHICLE_BASECLASS", _baseVeh];
_newVeh call EPOCH_server_setVToken;
_newVeh call EPOCH_server_vehicleInit;
_newVeh setdir _dir;
_newVeh setposasl _pos;
// set fuel level
_newVeh setFuel _fuel;
@ -131,5 +128,8 @@ if !(_removemagazinesturret isequalto []) then {
} foreach _removemagazinesturret;
};
_newVeh setdir _dir;
_newVeh setposasl _pos;
// save new vehicle to db
_newveh call EPOCH_Server_Save_Vehicle;

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

@ -21,7 +21,7 @@ _serverSettingsConfig = configFile >> "CfgEpochServer";
_removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry;
_removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry;
_disableVehicleTIE = [_serverSettingsConfig, "disableVehicleTIE", true] call EPOCH_fnc_returnConfigEntry;
_vehObj = createVehicle[_vehClass, _position, [], 0, _can_collide];
_vehObj = createVehicle[_vehClass, [random 500,random 500, 500], [], 0, "CAN_COLLIDE"];
// turn off BIS randomization
_vehObj setVariable ["BIS_enableRandomization", false];
if !(isNull _vehObj) then{

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

@ -112,7 +112,7 @@ for "_i" from 1 to _spawnCount do {
} else {
if (_allCitysDync isEqualTo []) then {
_position = [epoch_centerMarkerPosition, 0, EPOCH_dynamicVehicleArea, 10, 0, 1000, 0] call BIS_fnc_findSafePos;
_position = [epoch_centerMarkerPosition, 0, EPOCH_dynamicVehicleArea, 3, 0, 1000, 0] call BIS_fnc_findSafePos;
} else {
_selectedCity = _allCitysDync deleteAt (floor random(count _allCitysDync));
_cityPos = getArray(_selectedCity >> "position");

2
Sources/epoch_server_settings/configs/maps/altis.h
View File

@ -14,7 +14,7 @@
*/
class Altis : Default
{
worldSize = 20000;
worldSize = 25000;
plantLimit = 10;
// vehicles - Max vehicle slots is calculated from per vehicle limits below. Warning! Higher the number lower the performance.
vehicleSpawnTypes[] = {