From 0b9aaa028b35d2551c9ac2d6471a0da56f480224 Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Thu, 31 Jan 2013 22:12:50 -0700
Subject: [PATCH] Fix scoreboard, update some documentation

---
 packages/mcp/bin/scoreboard   | 16 ++++------------
 packages/mcp/www/credits.html | 26 ++++++++++++++------------
 packages/mcp/www/scoring.html | 35 ++++++++++++++---------------------
 3 files changed, 32 insertions(+), 45 deletions(-)
diff --git a/packages/mcp/bin/scoreboard b/packages/mcp/bin/scoreboard
index a44b6f3..74f171b 100755
--- a/packages/mcp/bin/scoreboard
+++ b/packages/mcp/bin/scoreboard
@@ -34,11 +34,11 @@ function head() {
     print "<!DOCTYPE html>"
     print "<html><head><title>Project 2 Scoreboard</title>"
     print "<meta http-equiv=\"refresh\" content=\"60\">"
+    print "<link rel=\"stylesheet\" href=\"ctf.css\" type=\"text/css\">"
     print "<style>"
-    print "html {background: black url(\"p2inv.png\") no-repeat top center; background-size: contain; min-height: 100%; color: white;}"
-    print "body {background: black; opacity: 0.92; margin: 0;}"
-    print "p {margin: 0;}"
-    print "span {display: inline-block; margin: 0; border: 0;}"
+    print "body {opacity: 0.9; margin: 0; padding: 0; max-width: inherit;}"
+    print "p {margin: 0; padding:0; line-height: inherit;}"
+    print "span {display: inline-block; margin: 0; border: 0; padding: 0;}"
     print ".cat0 {background-color: #a6cee3; color: black;}"
     print ".cat1 {background-color: #1f78b4;}"
     print ".cat2 {background-color: #b2df8a; color: black;}"
@@ -61,14 +61,6 @@ function foot() {
 
 
     print "    </div>"
-    print "    <pre style=\"position: fixed; bottom: 0; left: 20%; font-size: 250%;"
-    print "    opacity: 0.8; background-color: black\">"
-    print "Project 2<br>"
-    print "<p>A CTF for people with limited time/patience/self-confidence.</p>"
-    print "<p>Plug in ethernet at this table, download puzzles, go think.</p>"
-    print "<p>http://10.0.0.2/</p>"
-    print "<p>Use the terminal to claim points when you've figured something out.</p>"
-    print "    </pre>"
     print "  </body>"
     print "</body></html>"
 }
diff --git a/packages/mcp/www/credits.html b/packages/mcp/www/credits.html
index 4ed359c..5636167 100644
--- a/packages/mcp/www/credits.html
+++ b/packages/mcp/www/credits.html
@@ -7,34 +7,30 @@
   <body>
     <h1>Credits</h1>
 
-    <p>Dirtbags Capture the Flag is brought to you by:</p>
+    <p>Dirtbags King of the Hill was created by:</p>
 
     <ul>
-      <li>The number C</li>
-      <li>The letters ع and ֆ</li>
-    </ul>
-
-    <p>And by:</p>
-    <ul>
+      <li>Neale Pickett</li>
+      <li>Aaron McPhall</li>
+      <li>Russel Nolen</li>
+      <li>Patrick Avery</li>
+      <li>Kate Vajda</li>
       <li>Alex Brugh</li>
       <li>Paul Ferrell</li>
       <li>Jeremy Scott</li>
       <li>Danny Quist</li>
       <li>Adam Glasgall</li>
       <li>Curtis Hash</li>
-      <li>Patrick Avery</li>
-      <li>Aaron McPhall</li>
-      <li>Patrick Avery</li>
       <li>Erin Ochoa</li>
       <li>William Phillips</li>
       <li>Should your name be here?  Please remind me!</li>
     </ul>
 
-    <p>Parts of this contest were inspired by:</p>
+    <p>Parts of this contest were inspired by contests from:</p>
     <ul>
       <li>DC949</li>
       <li>Tube Warriors</li>
-      <li>Bad people from around the world (screw you guys, seriously)</li>
+      <li>Sandia National Laboratories</li>
     </ul>
 
     <p>Lastly, this contest would not exist were it not for hundreds of
@@ -48,5 +44,11 @@
       <li>ngircd</li>
       <li>lua</li>
     </ul>
+    
+    <p>
+      Special thanks to <a href="http://linode.com/">Linode</a>,
+      for running the public version of the contest.
+      You guys are awesome!
+    </p>
   </body>
 </html>
diff --git a/packages/mcp/www/scoring.html b/packages/mcp/www/scoring.html
index c48ec0f..c946209 100644
--- a/packages/mcp/www/scoring.html
+++ b/packages/mcp/www/scoring.html
@@ -8,15 +8,25 @@
   <body>
     <h1>About scoring</h1>
     <p>
-      The contest is made up of multiple categories.  Each category is
-      worth one point toward the total score; the percentage of the
-      total points held by your team is the percentage of one point your
-      team has for that category.  The team that has 30% of the points
+      The contest is made up of multiple categories.
+      Each category is worth one point toward the total score;
+      your team's score in a category is the fraction of the total points unlocked so far in that category.
+    </p>
+    
+    <p>
+      The team that has 30% of the points
       in each of five categories has 1.5 points, whereas the team that
       has 80% of the points in only one category has 0.8 points.  It is
       typically better to have a few points in many categories, than
       many points in a few categories.
     </p>
+    
+    <p>
+      When points are unlocked in a category,
+      every other team's score in that category goes down until they too score that point.
+      Unlike previous years, however,
+      unlocking points is the only way to reduce another team's score.
+    </p>
 
     <p>
       There are two main ways to make points: <em>puzzles</em>
@@ -65,23 +75,6 @@
       see if the token changes.
     </p>
 
-    <h2>Reading the scoreboard</h2>
-    <p>
-      The <a href="scoreboard.html">scoreboard</a> shows total score on
-      the left, and scores within each category.  If you have a smaller
-      or more novice team, you may wish to ignore total rankings and
-      strive to do well within only a few categories.
-    </p>
-
-    <p>
-      If your browser supports the HTML5 canvas (Firefox, Safari,
-      Chrome, Opera, iPhone, Android) and JavaScript, the scoreboard
-      will also have a graph of scores over time.  Additionally,
-      JavaScript-enabled browsers will highlight all point blocks
-      belonging to a team, and a team's line on the graph, when the
-      mouse cursor is over a point block.
-    </p>
-
 
     <h2>About time</h2>
     <p>
