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 / changes / comments

Browse Source
This commit is contained in:
He-Man 2019-09-27 22:28:59 +02:00
parent ff8bf1f766
commit c76fc19333
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/epoch_config/Configs/CfgEpochClient.hpp
View File

@ -210,6 +210,11 @@ class CfgEpochClient
{"PublicStats",1,{}} // DO not change this! Players can disable it within the E-Pad by themself! {"PublicStats",1,{}} // DO not change this! Players can disable it within the E-Pad by themself!
}; };
PlayerStatsDialogEntries[] = { PlayerStatsDialogEntries[] = {
/*
{
{"CommunityVariable","DisplayName","ExtraCalculation"}
},
*/
{ {
{"ConnectCount","Times connected"}, {"ConnectCount","Times connected"},
{"PlayTime","Playtime (hours)","%1/3600 toFixed 2"}, {"PlayTime","Playtime (hours)","%1/3600 toFixed 2"},
@ -223,7 +228,7 @@ class CfgEpochClient
{"CraftedItems","Crafted Items"} {"CraftedItems","Crafted Items"}
}, },
{ {
{"Karma","Karma"}, {"Karma","Karma","round %1"},
{"Revives","Player Revived"}, {"Revives","Player Revived"},
{"TraderMissions","Tradermissions"} {"TraderMissions","Tradermissions"}
}, },
@ -244,6 +249,9 @@ class CfgEpochClient
} }
}; };
TopStatsDialogEntries[] = { TopStatsDialogEntries[] = {
/*
{"CommunityVariable","DisplayName","ExtraCalculation"},
*/
{"PlayTime","Playtime (hours)","%1/3600 toFixed 2"}, {"PlayTime","Playtime (hours)","%1/3600 toFixed 2"},
{"MaxAliveTime","Max Alivetime (hours)","%1/3600 toFixed 2"}, {"MaxAliveTime","Max Alivetime (hours)","%1/3600 toFixed 2"},
{"WalkDist","Distance Walked (Km)","%1/1000 toFixed 2"}, {"WalkDist","Distance Walked (Km)","%1/1000 toFixed 2"},
@ -251,7 +259,7 @@ class CfgEpochClient
{"NPCTrades","Trades at Trader"}, {"NPCTrades","Trades at Trader"},
{"BuildingsSet","Placed Buildings"}, {"BuildingsSet","Placed Buildings"},
{"CraftedItems","Crafted Items"}, {"CraftedItems","Crafted Items"},
{"Karma","Karma"}, {"Karma","Karma","round %1"},
{"Murders","Player Kills"}, {"Murders","Player Kills"},
{"AIKills","AI Kills"}, {"AIKills","AI Kills"},
{"Deaths","Deaths by Player"}, {"Deaths","Deaths by Player"},

4
Sources/epoch_config/Configs/CfgPricing.hpp
View File

@ -2434,6 +2434,10 @@ class CfgPricing
{ {
price = 4; price = 4;
}; };
class 1Rnd_HE_Grenade_shell
{
price = 3;
};
class 3Rnd_HE_Grenade_shell class 3Rnd_HE_Grenade_shell
{ {
price = 10; price = 10;

4
Sources/epoch_server_events/EpochEvents/HeliCrash.sqf
View File

@ -63,7 +63,7 @@ if ((random 1) < _chance) then {
_veh = createVehicle [_veharray select 1, _pos, [], 0, "CAN_COLLIDE"]; _veh = createVehicle [_veharray select 1, _pos, [], 0, "CAN_COLLIDE"];
_veh setVectorUp surfaceNormal _pos; _veh setVectorUp surfaceNormal _pos;
_veh setPosatl _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 // Place markers and get decay, compromised and original colors
_markers = []; _markers = [];
_originalColors = []; _originalColors = [];
@ -94,7 +94,7 @@ if ((random 1) < _chance) then {
_serverSettingsConfig = configFile >> "CfgEpochServer"; _serverSettingsConfig = configFile >> "CfgEpochServer";
_timeMultiplier = ([_serverSettingsConfig, "timeMultiplier", 1] call EPOCH_fnc_returnConfigEntry); _timeMultiplier = ([_serverSettingsConfig, "timeMultiplier", 1] call EPOCH_fnc_returnConfigEntry);
_rEvents = missionNameSpace getVariable["EPOCH_RunningEvents",[]]; _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]]; missionNameSpace setVariable["EPOCH_RunningEvents",_rEvents + [_thisEvent]];
_effects = []; _effects = [];