Merge remote-tracking branch 'origin/master' into prod

* origin/master:
  Badges targets: forgot medals above silver
This commit is contained in:
Vincent Riquer 2014-06-19 16:33:33 +02:00
commit c27543c000

32
graph
View File

@ -181,33 +181,31 @@ then
then then
(( bronzecount++ )) (( bronzecount++ ))
else else
(( pct = last["$stat"] * 100 / bronze["$stat"] )) upbronze[last["$stat"] * 100 / bronze["$stat"]]+="$stat "
upbronze[pct]+="$stat "
fi fi
if (( last["$stat"] >= silver["$stat"] )) if (( last["$stat"] >= silver["$stat"] ))
then then
(( silvercount++ )) (( silvercount++ ))
else else
(( pct = last["$stat"] * 100 / silver["$stat"] )) upsilver[last["$stat"] * 100 / silver["$stat"]]+="$stat "
upsilver[pct]+="$stat "
fi fi
if (( last["$stat"] >= gold["$stat"] )) if (( last["$stat"] >= gold["$stat"] ))
then then
(( goldcount++ )) (( goldcount++ ))
else else
upgold+=( "$stat" ) upgold[last["$stat"] * 100 / gold["$stat"]]+="$stat "
fi fi
if (( last["$stat"] >= platinum["$stat"] )) if (( last["$stat"] >= platinum["$stat"] ))
then then
(( platinumcount++ )) (( platinumcount++ ))
else else
upplatinum+=( "$stat" ) upplatinum[last["$stat"] * 100 / platinum["$stat"]]+="$stat "
fi fi
if (( last["$stat"] >= black["$stat"] )) if (( last["$stat"] >= black["$stat"] ))
then then
(( blackcount++ )) (( blackcount++ ))
else else
upblack+=( "$stat" ) upblack[last["$stat"] * 100 / black["$stat"]]+="$stat "
fi fi
done done
cat <<-EOHTML cat <<-EOHTML
@ -253,8 +251,9 @@ then
for id in {100..0} for id in {100..0}
do do
[ -z "${upsilver[id]}" ] && continue [ -z "${upsilver[id]}" ] && continue
(( colforce = id * 255 / 100 )) (( greenlevel = id * 255 / 100 ))
echo "<div style=\"background:#FF$(printf %02x $colforce )00\"><a href=\"#${upsilver[id]}\">${upsilver[id]} ($id%)</a></div>" (( redlevel = 255 - greenlevel ))
echo "<div style=\"background:#$(printf %02x%02x $redlevel $greenlevel )00\"><a href=\"#${upsilver[id]}\">${upsilver[id]} ($id%)</a></div>"
done done
echo '</td>' echo '</td>'
fi fi
@ -266,8 +265,9 @@ then
for id in {100..0} for id in {100..0}
do do
[ -z "${upgold[id]}" ] && continue [ -z "${upgold[id]}" ] && continue
(( colforce = id * 255 / 100 )) (( greenlevel = id * 255 / 100 ))
echo "<div style=\"background:#FF$(printf %02x $colforce )00\"><a href=\"#${upgold[id]}\">${upgold[id]} ($id%)</a></div>" (( redlevel = 255 - greenlevel ))
echo "<div style=\"background:#$(printf %02x%02x $redlevel $greenlevel )00\"><a href=\"#${upgold[id]}\">${upgold[id]} ($id%)</a></div>"
done done
echo '</td>' echo '</td>'
fi fi
@ -279,8 +279,9 @@ then
for id in {100..0} for id in {100..0}
do do
[ -z "${upplatinum[id]}" ] && continue [ -z "${upplatinum[id]}" ] && continue
(( colforce = id * 255 / 100 )) (( greenlevel = id * 255 / 100 ))
echo "<div style=\"background:#FF$(printf %02x $colforce )00\"><a href=\"#${upplatinum[id]}\">${upplatinum[id]} ($id%)</a></div>" (( redlevel = 255 - greenlevel ))
echo "<div style=\"background:#$(printf %02x%02x $redlevel $greenlevel )00\"><a href=\"#${upplatinum[id]}\">${upplatinum[id]} ($id%)</a></div>"
done done
echo '</td>' echo '</td>'
fi fi
@ -292,8 +293,9 @@ then
for id in {100..0} for id in {100..0}
do do
[ -z "${upblack[id]}" ] && continue [ -z "${upblack[id]}" ] && continue
(( colforce = id * 255 / 100 )) (( greenlevel = id * 255 / 100 ))
echo "<div style=\"background:#FF$(printf %02x $colforce )00\"><a href=\"#${upblack[id]}\">${upblack[id]} ($id%)</a></div>" (( redlevel = 255 - greenlevel ))
echo "<div style=\"background:#$(printf %02x%02x $redlevel $greenlevel )00\"><a href=\"#${upblack[id]}\">${upblack[id]} ($id%)</a></div>"
done done
echo '</td>' echo '</td>'
fi fi