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 branch 'experimental' of https://github.com/EpochModTeam/Epoch into experimental

Browse Source
This commit is contained in:
vbawol 2017-09-15 11:07:15 -05:00
commit f4a95f6ab4
2 changed files with 4 additions and 1 deletions
Sources
epoch_code/compile
EPOCH_consumeItem.sqf
epoch_server/compile/epoch_traders
EPOCH_server_loadTraders.sqf

3
Sources/epoch_code/compile/EPOCH_consumeItem.sqf

@ -149,6 +149,9 @@ switch _interactOption do {
};
};
case 4: { // Refuel 4
if !(player == vehicle player) exitwith {
["Fill from outside!", 5] call Epoch_message;
};
_vehicles = player nearEntities [["LandVehicle","Ship","Air","Tank"], 30];
if (cursorTarget in _vehicles) then {
_vehicle = cursorTarget;

2
Sources/epoch_server/compile/epoch_traders/EPOCH_server_loadTraders.sqf

@ -29,7 +29,7 @@ _storedVehicleLimit = [_serverSettingsConfig, "storedVehicleLimit", 20] call EPO
EPOCH_storedVehicleCount = 0;
for "_i" from 1 to _maxTraderLimit do {
for "_i" from 0 to (_maxTraderLimit-1) do {
_traderSlotIndex = EPOCH_TraderSlots pushBack _i;
// Spawn static traders first