diff --git a/add.html b/add.html index fca6784..43e80b9 100755 --- a/add.html +++ b/add.html @@ -70,6 +70,7 @@ then DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \ DS:Engineer:GAUGE:$((48*60*60)):0:NaN \ DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \ + DS:Translator:GAUGE:$((48*60*60)):0:NaN \ DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \ RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \ RRA:AVERAGE:99e-2:1:$((24*15)) \ diff --git a/import b/import index fb9e2ec..8d54fec 100755 --- a/import +++ b/import @@ -24,7 +24,7 @@ do done read_query_string -template=AP:Explorer:Seer:XM:Walked:Builder:Connector:Mind_Controller:MU:Longest_Link:Largest_Field:Recharger:Liberator:Pioneer:Engineer:Purifier:Neutralized:Links_Destroyed:Fields_Destroyed:Guardian:Link_Maintained:Link_Length_x_Days:Field_Held:Field_x_Days:Mercenary:Hacker:Hackaton:Recruiter +template=AP:Explorer:Seer:XM:Walked:Builder:Connector:Mind_Controller:MU:Longest_Link:Largest_Field:Recharger:Liberator:Pioneer:Engineer:Purifier:Neutralized:Links_Destroyed:Fields_Destroyed:Guardian:Link_Maintained:Link_Length_x_Days:Field_Held:Field_x_Days:Mercenary:Hacker:Translator:Hackaton:Recruiter if [[ $REQUEST_METHOD == POST ]] then @@ -135,6 +135,7 @@ else DS:Mercenary:GAUGE:$((48*60*60)):0:NaN \ DS:Engineer:GAUGE:$((48*60*60)):0:NaN \ DS:Recruiter:GAUGE:$((48*60*60)):0:NaN \ + DS:Translator:GAUGE:$((48*60*60)):0:NaN \ DS:Hackaton:GAUGE:$((48*60*60)):0:NaN \ RRA:HWPREDICT:8760:8e-1:8e-1:$((24)) \ RRA:AVERAGE:99e-2:1:$((24*15)) \ @@ -162,6 +163,7 @@ else

Import data from e.g. https://www.agent-stats.com/
Expected format: YYYY-MM-DD hh:mm:ss ${template[@]//:/ }

+

Latest data: $(date +"%Y-%m-%d %H:%M:%S" -d @${last[time]%:})

diff --git a/index b/index index 50a24ad..eefc4cb 100755 --- a/index +++ b/index @@ -367,18 +367,27 @@ then
- << - < - R - > - >> + First + -Y + -M + -W + -D + Now + +D + +W + +M + +Y - << - < - R - > - >> + -Y + -M + -W + -D + Now + +D + +W + +M + +Y
@@ -606,10 +615,8 @@ else next=('COMMENT:\n') fi - (( start > -1209600 )) && datastart=-1209600 - (( end < 157680001 )) && dataend="+157680001" - (( start > 0 )) && start="+$start" - (( end > 0 )) && end="+$end" + (( start - now > -1209600 )) && datastart=-1209600 + (( end - now < 157680001 )) && dataend="+157680001" (( datastart > 0 )) && datastart="+$datastart" rrdtool graph - \ diff --git a/settings b/settings index 957dcac..3353fbb 100644 --- a/settings +++ b/settings @@ -29,9 +29,11 @@ L14color=8B1479 L15color=6B127D L16color=591494 -default_start=-604800 -default_end=1209600 default_prevperiod=1m +now=$(date +%s) + +(( default_start = now - 604800 )) +(( default_end = now + 1209600 )) start=$default_start end=$default_end @@ -64,6 +66,7 @@ uinames=( "Largest Field MUs x Days" "Unique missions completed" Hacks + "Glyph Hack Points" "Agents Recruited" "Consecutive Days Hacking" ) @@ -94,6 +97,7 @@ dsnames=( Field_x_Days Mercenary Hacker + Translator Recruiter Hackaton ) @@ -112,6 +116,7 @@ medals=( Mercenary Engineer Hacker + Translator Recruiter ) @@ -212,3 +217,9 @@ silver["Recruiter"]=10 gold["Recruiter"]=25 platinum["Recruiter"]=50 black["Recruiter"]=100 + +bronze["Translator"]=200 +silver["Translator"]=2000 +gold["Translator"]=6000 +platinum["Translator"]=20000 +black["Translator"]=50000