From e8f735cab97f3865d3cf7e97cc7c339feaa2c78f Mon Sep 17 00:00:00 2001 From: He-Man Date: Tue, 15 Oct 2019 20:13:39 +0200 Subject: [PATCH] Loothelper --- Server_Install_Pack/@epochhive/epochconfig.hpp | 1 + Sources/epoch_code/compile/setup/masterLoop/init.sqf | 2 +- .../compile/epoch_looting/EPOCH_server_spawnLoot.sqf | 5 +++-- Sources/epoch_server/init/server_init.sqf | 1 + 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Server_Install_Pack/@epochhive/epochconfig.hpp b/Server_Install_Pack/@epochhive/epochconfig.hpp index 55efe810..df8b85dc 100644 --- a/Server_Install_Pack/@epochhive/epochconfig.hpp +++ b/Server_Install_Pack/@epochhive/epochconfig.hpp @@ -6,6 +6,7 @@ forceRestartTime = 14400; // 4 hour restarts timeDifference = 0; // Server uses real time this will allow you to offset just the hour. timeMultiplier = 4; // Sets a time multiplier for in-game time. The command range is now capped at 0.1 - 120 to avoid performance problems. lootMultiplier = 1; // 1 = normal loot multiplier. This controls how much loot can payout per loot container. + UseLootHelper = "true"; // GroundLoot will get a visible sphere for better loot identification // Events WeatherChances[] = { diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf index de2b4c82..d42eb52e 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf @@ -349,7 +349,7 @@ _lootBubble = { _position = _lootpositions deleteat (floor (random (count _lootpositions))); _position params ["_m2WPos","_relDir"]; _pos = _building modelToWorld _m2WPos; - _pos vectoradd [0,0,0.1]; + _pos = _pos vectoradd [0,0,0.02]; if (_pos select 2 < 0) then { _pos set[2, 0]; }; diff --git a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnLoot.sqf b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnLoot.sqf index 3c2ed15f..4b98032b 100644 --- a/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnLoot.sqf +++ b/Sources/epoch_server/compile/epoch_looting/EPOCH_server_spawnLoot.sqf @@ -14,12 +14,13 @@ */ private [ "_masterConfig","_building","_buildingLoot","_selectedConfig","_config","_EpochLootChance","_cfgBaseBuilding","_loots","_lootLimit","_possibleLoots","_posName","_positions","_possibleCount","_randomIndex","_selectedLoot", - "_pos","_dir","_item","_color","_GroundSpawnChance","_MinGroundContainers","_MaxGroundContainers","_lootType","_privateDir" + "_pos","_dir","_item","_color","_GroundSpawnChance","_MinGroundContainers","_MaxGroundContainers","_lootType","_privateDir","_GroundClass" ]; params [["_player",objNull,[objNull]],["_token","",[""]],["_LootsArray",[]]]; if !([_player, _token] call EPOCH_server_getPToken) exitWith{}; +_GroundClass = if (Epoch_UseLootHelper) then {"Epoch_LootHolder_Sphere"} else {"Epoch_LootHolder"}; _privateDir = []; _masterConfig = getmissionconfig "CfgBuildingLootPos"; { @@ -54,7 +55,7 @@ _masterConfig = getmissionconfig "CfgBuildingLootPos"; case "GroundLoot": { { _x params ["_lootType","_pos"]; - _item = createVehicle ["Epoch_LootHolder", _pos, [], 0, "CAN_COLLIDE"]; + _item = createVehicle [_GroundClass, _pos, [], 0, "CAN_COLLIDE"]; _buildingLoot pushback _item; if (surfaceIsWater _pos) then { _item setPosASL _pos; diff --git a/Sources/epoch_server/init/server_init.sqf b/Sources/epoch_server/init/server_init.sqf index c5864f16..8b086dae 100644 --- a/Sources/epoch_server/init/server_init.sqf +++ b/Sources/epoch_server/init/server_init.sqf @@ -171,6 +171,7 @@ for "_i" from 0 to 9 do { }; UseCustomTextures = ([_serverSettingsConfig, "UseCustomTextures", false] call EPOCH_fnc_returnConfigEntry); +Epoch_UseLootHelper = ([_serverSettingsConfig, "UseLootHelper", false] call EPOCH_fnc_returnConfigEntry); //Execute Server Functions diag_log "Epoch: Loading buildings";