diff --git a/Sources/epoch_config/Configs/CfgEpochClient.hpp b/Sources/epoch_config/Configs/CfgEpochClient.hpp index 204347e2..d28de59b 100644 --- a/Sources/epoch_config/Configs/CfgEpochClient.hpp +++ b/Sources/epoch_config/Configs/CfgEpochClient.hpp @@ -210,6 +210,11 @@ class CfgEpochClient {"PublicStats",1,{}} // DO not change this! Players can disable it within the E-Pad by themself! }; PlayerStatsDialogEntries[] = { +/* + { + {"CommunityVariable","DisplayName","ExtraCalculation"} + }, +*/ { {"ConnectCount","Times connected"}, {"PlayTime","Playtime (hours)","%1/3600 toFixed 2"}, @@ -223,7 +228,7 @@ class CfgEpochClient {"CraftedItems","Crafted Items"} }, { - {"Karma","Karma"}, + {"Karma","Karma","round %1"}, {"Revives","Player Revived"}, {"TraderMissions","Tradermissions"} }, @@ -244,6 +249,9 @@ class CfgEpochClient } }; TopStatsDialogEntries[] = { +/* + {"CommunityVariable","DisplayName","ExtraCalculation"}, +*/ {"PlayTime","Playtime (hours)","%1/3600 toFixed 2"}, {"MaxAliveTime","Max Alivetime (hours)","%1/3600 toFixed 2"}, {"WalkDist","Distance Walked (Km)","%1/1000 toFixed 2"}, @@ -251,7 +259,7 @@ class CfgEpochClient {"NPCTrades","Trades at Trader"}, {"BuildingsSet","Placed Buildings"}, {"CraftedItems","Crafted Items"}, - {"Karma","Karma"}, + {"Karma","Karma","round %1"}, {"Murders","Player Kills"}, {"AIKills","AI Kills"}, {"Deaths","Deaths by Player"}, diff --git a/Sources/epoch_config/Configs/CfgPricing.hpp b/Sources/epoch_config/Configs/CfgPricing.hpp index efd1ebf8..864ec8d6 100644 --- a/Sources/epoch_config/Configs/CfgPricing.hpp +++ b/Sources/epoch_config/Configs/CfgPricing.hpp @@ -2434,6 +2434,10 @@ class CfgPricing { price = 4; }; + class 1Rnd_HE_Grenade_shell + { + price = 3; + }; class 3Rnd_HE_Grenade_shell { price = 10; diff --git a/Sources/epoch_server_events/EpochEvents/HeliCrash.sqf b/Sources/epoch_server_events/EpochEvents/HeliCrash.sqf index 4d045072..5cc7a198 100644 --- a/Sources/epoch_server_events/EpochEvents/HeliCrash.sqf +++ b/Sources/epoch_server_events/EpochEvents/HeliCrash.sqf @@ -63,7 +63,7 @@ if ((random 1) < _chance) then { _veh = createVehicle [_veharray select 1, _pos, [], 0, "CAN_COLLIDE"]; _veh setVectorUp surfaceNormal _pos; _veh setPosatl _pos; - [objnull,"HeliCrash",false,_pos,[true,[6,12]]] call EPOCH_serverLootObject; + _LootWHs = [objnull,"HeliCrash",false,_pos,[true,[6,12]]] call EPOCH_serverLootObject; // Place markers and get decay, compromised and original colors _markers = []; _originalColors = []; @@ -94,7 +94,7 @@ if ((random 1) < _chance) then { _serverSettingsConfig = configFile >> "CfgEpochServer"; _timeMultiplier = ([_serverSettingsConfig, "timeMultiplier", 1] call EPOCH_fnc_returnConfigEntry); _rEvents = missionNameSpace getVariable["EPOCH_RunningEvents",[]]; - _thisEvent = [_pos, [_veh], [], "EPOCH_HeliCrashCounter", diag_tickTime, (_decayTime * _timeMultiplier), _showMarkers, _markers, _originalColors, _decayMarkerColor, _compromisedColor]; + _thisEvent = [_pos, [_veh], _LootWHs, "EPOCH_HeliCrashCounter", diag_tickTime, (_decayTime * _timeMultiplier), _showMarkers, _markers, _originalColors, _decayMarkerColor, _compromisedColor]; missionNameSpace setVariable["EPOCH_RunningEvents",_rEvents + [_thisEvent]]; _effects = [];