mirror of
https://github.com/EpochModTeam/Epoch.git
synced 2024-08-30 18:22:13 +00:00
Smaller fixes and tweaks
- 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:
parent
3eac0b0035
commit
a2172aaef5
@ -53,13 +53,14 @@ if(count _itemMags > 1)then{
|
|||||||
// adjust the item
|
// adjust the item
|
||||||
if!(_chg isEqualTo 0)then{
|
if!(_chg isEqualTo 0)then{
|
||||||
_index = ((count _itemMags) - 1);
|
_index = ((count _itemMags) - 1);
|
||||||
_usedItemArray = _itemMags select _index;
|
_usedItemArray = _itemMags deleteat _index;
|
||||||
_usedItemArray params ["_mag","_count"];
|
_usedItemArray params ["_mag","_count"];
|
||||||
_itemMags pushBack [_mag, (_count + _chg)];
|
_itemMags pushBack [_mag, (_count + _chg)];
|
||||||
_itemMags = _itemMags - [_usedItemArray];
|
|
||||||
_player removeMagazines _mag;
|
_player removeMagazines _mag;
|
||||||
{
|
{
|
||||||
|
if ((_x select 1) > 0) then {
|
||||||
_player addMagazine _x;
|
_player addMagazine _x;
|
||||||
[format["You have used your %1", _displayName],5,[[0,0,0,0.2],[1,1,1,1]]] call Epoch_message_stack;
|
};
|
||||||
}forEach _itemMags;
|
}forEach _itemMags;
|
||||||
|
[format["You have used your %1", _displayName],5,[[0,0,0,0.2],[1,1,1,1]]] call Epoch_message_stack;
|
||||||
};
|
};
|
||||||
|
@ -48,7 +48,9 @@ if !(_object in EPOCH_cleanupQueue) then {
|
|||||||
|
|
||||||
[_object, _type] call EPOCH_serverLootObject;
|
[_object, _type] call EPOCH_serverLootObject;
|
||||||
// force player to open gear on this object.
|
// force player to open gear on this object.
|
||||||
|
if !(_type isequalto "Cargo_Container") then {
|
||||||
[_object, {player action["Gear", _this]}] remoteExec ["call", _player];
|
[_object, {player action["Gear", _this]}] remoteExec ["call", _player];
|
||||||
|
};
|
||||||
} else {
|
} else {
|
||||||
[_object, "Food"] call EPOCH_serverLootObject;
|
[_object, "Food"] call EPOCH_serverLootObject;
|
||||||
// force player to open gear on this object.
|
// force player to open gear on this object.
|
||||||
|
@ -105,8 +105,9 @@ for "_i" from 1 to _maxStorageLimit do {
|
|||||||
|
|
||||||
_vehicle setVariable ["STORAGE_SLOT", str(_i), true];
|
_vehicle setVariable ["STORAGE_SLOT", str(_i), true];
|
||||||
|
|
||||||
|
if (isDamageAllowed _vehicle) then {
|
||||||
_vehicle call EPOCH_server_storageInit;
|
_vehicle call EPOCH_server_storageInit;
|
||||||
|
};
|
||||||
if (count _arr >= 5) then {
|
if (count _arr >= 5) then {
|
||||||
_color = _arr select 4;
|
_color = _arr select 4;
|
||||||
_cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig;
|
_cfgBaseBuilding = 'CfgBaseBuilding' call EPOCH_returnConfig;
|
||||||
|
@ -84,7 +84,7 @@ for "_i" from 1 to _maxVehicleLimit do {
|
|||||||
};
|
};
|
||||||
|
|
||||||
// spawn vehicle at temp location.
|
// 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
|
// turn off BIS randomization
|
||||||
_vehicle setVariable ["BIS_enableRandomization", false];
|
_vehicle setVariable ["BIS_enableRandomization", false];
|
||||||
if !(isNull _vehicle) then {
|
if !(isNull _vehicle) then {
|
||||||
|
@ -50,9 +50,6 @@ _newVeh setVariable ["VEHICLE_SLOT", _slot, true];
|
|||||||
_newVeh setVariable ["VEHICLE_BASECLASS", _baseVeh];
|
_newVeh setVariable ["VEHICLE_BASECLASS", _baseVeh];
|
||||||
_newVeh call EPOCH_server_setVToken;
|
_newVeh call EPOCH_server_setVToken;
|
||||||
_newVeh call EPOCH_server_vehicleInit;
|
_newVeh call EPOCH_server_vehicleInit;
|
||||||
_newVeh setdir _dir;
|
|
||||||
_newVeh setposasl _pos;
|
|
||||||
|
|
||||||
// set fuel level
|
// set fuel level
|
||||||
_newVeh setFuel _fuel;
|
_newVeh setFuel _fuel;
|
||||||
|
|
||||||
@ -131,5 +128,8 @@ if !(_removemagazinesturret isequalto []) then {
|
|||||||
} foreach _removemagazinesturret;
|
} foreach _removemagazinesturret;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
_newVeh setdir _dir;
|
||||||
|
_newVeh setposasl _pos;
|
||||||
|
|
||||||
// save new vehicle to db
|
// save new vehicle to db
|
||||||
_newveh call EPOCH_Server_Save_Vehicle;
|
_newveh call EPOCH_Server_Save_Vehicle;
|
||||||
|
@ -21,7 +21,7 @@ _serverSettingsConfig = configFile >> "CfgEpochServer";
|
|||||||
_removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry;
|
_removeweapons = [_serverSettingsConfig, "removevehweapons", []] call EPOCH_fnc_returnConfigEntry;
|
||||||
_removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry;
|
_removemagazinesturret = [_serverSettingsConfig, "removevehmagazinesturret", []] call EPOCH_fnc_returnConfigEntry;
|
||||||
_disableVehicleTIE = [_serverSettingsConfig, "disableVehicleTIE", true] 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
|
// turn off BIS randomization
|
||||||
_vehObj setVariable ["BIS_enableRandomization", false];
|
_vehObj setVariable ["BIS_enableRandomization", false];
|
||||||
if !(isNull _vehObj) then{
|
if !(isNull _vehObj) then{
|
||||||
|
@ -112,7 +112,7 @@ for "_i" from 1 to _spawnCount do {
|
|||||||
} else {
|
} else {
|
||||||
|
|
||||||
if (_allCitysDync isEqualTo []) then {
|
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 {
|
} else {
|
||||||
_selectedCity = _allCitysDync deleteAt (floor random(count _allCitysDync));
|
_selectedCity = _allCitysDync deleteAt (floor random(count _allCitysDync));
|
||||||
_cityPos = getArray(_selectedCity >> "position");
|
_cityPos = getArray(_selectedCity >> "position");
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
*/
|
*/
|
||||||
class Altis : Default
|
class Altis : Default
|
||||||
{
|
{
|
||||||
worldSize = 20000;
|
worldSize = 25000;
|
||||||
plantLimit = 10;
|
plantLimit = 10;
|
||||||
// vehicles - Max vehicle slots is calculated from per vehicle limits below. Warning! Higher the number lower the performance.
|
// vehicles - Max vehicle slots is calculated from per vehicle limits below. Warning! Higher the number lower the performance.
|
||||||
vehicleSpawnTypes[] = {
|
vehicleSpawnTypes[] = {
|
||||||
|
Loading…
Reference in New Issue
Block a user