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 pull request #872 from ravmustang/karma-2

Browse Source 
remove from default vars and add to debug
This commit is contained in:
vbawol 2017-09-24 17:49:38 -05:00 committed by GitHub
commit 9e4ef957bf
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/compile/EPOCH_debugMonitor.sqf
View File

@ -35,6 +35,7 @@ hintSilent parseText format ["
<t size='1.0' font='puristaLight' align='center'>Build: %2</t><br/> <t size='1.0' font='puristaLight' align='center'>Build: %2</t><br/>
" + _customVars + " " + _customVars + "
<t size='1.15' font='puristaLight' align='left'>Karma: </t><t size='1.15' font='puristaLight' align='right'>%17</t><br/>
<br/> <br/>
<t size='1.15' font='puristaLight' align='left'>Fatigue: </t><t size='1.15' font='puristaLight' align='right'>%3</t><br/> <t size='1.15' font='puristaLight' align='left'>Fatigue: </t><t size='1.15' font='puristaLight' align='right'>%3</t><br/>
@ -68,5 +69,6 @@ hintSilent parseText format ["
round diag_fps, round diag_fps,
_hours, _hours,
round((serverTime/60)-(_hours*60)), round((serverTime/60)-(_hours*60)),
if (EPOCH_diag_fps isEqualType 0) then [{EPOCH_diag_fps},{"MANIPULATED"}] if (EPOCH_diag_fps isEqualType 0) then [{EPOCH_diag_fps},{"MANIPULATED"}],
missionNamespace getVariable ["EPOCH_totalKarma",0]
]; ];

2
Sources/epoch_code/init/both_init.sqf
View File

@ -62,8 +62,8 @@ EPOCH_customVarsDefaults = [
["Crypto",0,[250000,0]], ["Crypto",0,[250000,0]],
["HitPoints",[0,0,0,0],[1,1,1,1]], ["HitPoints",[0,0,0,0],[1,1,1,1]],
["BloodP",100,[190,0]], ["BloodP",100,[190,0]],
["NotUsed",0,[50000,-50000]],
["SpawnArray",[],[]], ["SpawnArray",[],[]],
["Karma",0,[50000,-50000]],
["Alcohol",0,[100,0]], ["Alcohol",0,[100,0]],
["Radiation",0,[100,0]], ["Radiation",0,[100,0]],
["Nuisance",0,[100,0]], ["Nuisance",0,[100,0]],

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

@ -100,7 +100,7 @@ class CfgEpochClient
{"HitPoints",{0,0,0,0},{1,0,0.5,1,-1,-1}}, // only limits here used for HUD. {"HitPoints",{0,0,0,0},{1,0,0.5,1,-1,-1}}, // only limits here used for HUD.
{"BloodP",100,{190,0,120,140,70,50}}, {"BloodP",100,{190,0,120,140,70,50}},
{"SpawnArray",{},{}}, {"SpawnArray",{},{}},
{"Karma",0,{50000,-50000}}, // TODO remove or replace {"NotUsed",0,{50000,-50000}}, // TODO remove or replace
{"Alcohol",0,{100,0,35,55,-1,-1}}, {"Alcohol",0,{100,0,35,55,-1,-1}},
{"Radiation",0,{100,0,35,55,-1,-1}}, // local {"Radiation",0,{100,0,35,55,-1,-1}}, // local
{"Nuisance",0,{100,0}}, {"Nuisance",0,{100,0}},