sourcebots · RealOrangeOne · Aug 4, 2024 · Apr 18, 2024 · Apr 25, 2024 · May 9, 2024
diff --git a/src/fig-arena.svg b/src/fig-arena.svg
diff --git a/src/index.html b/src/index.html
@@ -4,16 +4,16 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>Rules 2023 &mdash; Tin Can Rally | SourceBots</title>
+    <title>Rules 2023 &mdash; Tin Can Rally | SRO</title>
     <link rel="stylesheet" href="./index.scss">
     <link rel="stylesheet" href="../node_modules/normalize.css/normalize.css">
-    <link rel="shortcut icon" href="https://sourcebots.co.uk/favicon.ico">
+    <link rel="shortcut icon" href="https://roboticsoutreach.org/favicon.ico">
   </head>
   <body>
     <header>
       <a class="anchor" id="top"></a>
-      <a href="https://www.sourcebots.co.uk/">
-        <img width="300" src="https://sourcebots.co.uk/img/logo-white.svg" alt="SourceBots">
+      <a href="https://roboticsoutreach.org/">
+        <img width="300" src="https://raw.githubusercontent.com/roboticsoutreach/art/master/sro_logo_arm.svg" alt="SRO">
       </a>
       <h1 id="header">
         <a href="#top">TIN CAN RALLY</a>
@@ -44,7 +44,7 @@ <h2><a class="anchor" id="game-rules"></a>Game Rules</h2>
             <li>Present their robot in the staging area, adjacent to the arena, before the scheduled close of staging time. The staging area will be clearly marked on the day.
             <li>Attach a <a href="#flag-specification">robot flag</a>. Robot flags will be provided by SourceBots officials in the staging area.
             <li>Place their robot in the starting area that they are assigned. The robot must be placed such that it is entirely within this starting area, with no parts overhanging its boundary. Its orientation does not matter.
-            <li>Vacate the arena 40 seconds before the scheduled start time. During the 40 second period prior to the start of the match there must be no interaction with the robot.
+            <li>Vacate the arena before the scheduled start time. At this point there must be no interaction with the robot.
             <li>Follow the directions of the match officials.
           </ul>
           Teams that fail to comply with these rules – such as by arriving late – may forfeit the match, at the discretion of the judge.
@@ -53,7 +53,7 @@ <h2><a class="anchor" id="game-rules"></a>Game Rules</h2>
         <li>
           Each match lasts for <strong>150</strong> seconds.
         <li>
-          Robots will be started by, or at the direction of, match officials.
+          Robots will be started at the direction of match officials.
         <li>
           Game points will be awarded as follows:
           <ol type="a">
@@ -67,7 +67,7 @@ <h2><a class="anchor" id="game-rules"></a>Game Rules</h2>
             <li>
               At the end of each lap - defined as every sixth scoring line crossed in a forward direction - a robot is awarded an additional <strong>4</strong> points above the points it would normally get for the crossing.
             <li>
-              A robot is deemed to have passed a scoring line when the back of the robot passes the line.
+              A robot is deemed to have passed a scoring line when the whole robot passes the line.
             <li>
               If a robot passes backwards (i.e: clockwise) over any scoring line it must "undo" these before any further forwards line crossings will be counted.
             <li>
@@ -90,41 +90,39 @@ <h2><a class="anchor" id="regulations"></a>Regulations</h2>
         <li>
           Teams must conduct themselves within the principles of good sporting conduct.
         <li>
-          Any assistance from Smallpeice Trust staff and volunteers is provided without guarantees.
+          Robots must be fully autonomous. No remote control systems or receivers are permitted.
         <li>
-          No remote control systems or radio transmitters or receivers are permitted.
+          Robots must pass a safety inspection before they can compete.
+          <ol>
+            <li>
+              Robots must not have any sharp edges or points.
+            <li>
+              Robots must have all electronics securely mounted and easily removable.
+            <li>
+              Robots must provide adequate protection to the batteries they use, including
+              protection from mechanical damage.
+            <li>
+              Robots must have a power switch, obvious and on top, which will completely immobilise
+              the robot.
+          </ol>
         <li>
           While accidental bumps and scrapes are inevitable, the sport is non-contact.
         <li>
-          Robots must pass a safety inspection before they can compete.
-        <li>
-          Robots must have a mass of less than 10kg.
+          Robots must not intentionally damage anything inside the arena.
+          At the discretion of the judge, teams who deliberately engage in collisions
+          or take insufficient precautions against collisions may be penalised,
+          including disqualification from rounds and deduction of league points.
         <li>
-          Robots must not intentionally damage anything inside the arena. At the discretion of the judge, teams who deliberately engage in collisions or take insufficient precautions against collisions may be penalised, including disqualification from rounds and deduction of league points.
+          Robots must have a spare USB slot accessible to match officials,
+          so that a dongle can be connected to enable competition mode on the robot.
         <li>
-          Robots must fit within a 500mm ⨉ 500mm ⨉ 500mm cube at the start of each match.
+          Robots must fit within a 500mm ⨉ 500mm ⨉ 500mm cube.
         <li>
-          Robots must fit within a 500mm ⨉ 750mm ⨉ 750mm cube, with one 750mm axis vertical,
-          at all times during each match.
+          Robots must have a mass of less than 10kg.
         <li>
           Robots must not deliberately drop any part of themselves onto the arena.
         <li>
-          Robots must have all electronics securely mounted and easily removable.
-        <li>
-          Robots must provide adequate protection to the batteries they use, including
-          protection from mechanical damage.
-        <li>
-          Robots must not have any devices designed to produce noise except where included
-          in the SourceBots kit.
-        <li>
-          Robots must not have any fiducial markers visible to other robots.
-        <li>
-          Robots must have a spare USB slot accessible to match officials.
-        <li>
-          Robots must have a power switch, obvious and on top, which will completely immobilise
-          the robot.
-        <li>
-          Robots must not have any sharp edges or points.
+          Any assistance from Smallpeice Trust staff and volunteers is provided without guarantees.
         <li>
           Robots must have a <a href="#flag-specification">flag mounting</a>.
       </ol>
@@ -155,9 +153,6 @@ <h3><a class="anchor" id="marker-specification"></a>Markers</h3>
           </tr>
         </tbody>
       </table>
-      <p>
-        The markers can be printed on a black-and-white printer.
-      </p>
       <p>
         Sixteen arena wall markers are positioned around the arena as shown in the <a href="#arena-specification">arena specification</a>. Marker codes are mirrored on each side of the arena.
       </p>
@@ -173,25 +168,21 @@ <h3><a class="anchor" id="arena-specification"></a>Arena</h3>
         <li>
           The floor of the arena is covered with a closed-loop, short pile carpet.
         <li>
-          The perimeter of the arena floor is delimited by the arena wall, which has a minimum height of 100mm.
-        <li>
-          Starting areas are 1000 ±50mm squares and will be marked by tape which is considered part of the starting area.
-        <li>
-          Starting area 1 is at the top of the arena diagram, and area 2 is at the bottom.
-        <li>
-          The green boxes denote a robot in their start locations, shown in yellow. Robots may start anywhere inside their starting area facing any direction.
+          The perimeter of the arena floor is delimited by the arena wall, which has a minimum height of 250mm.
         <li>
           The inner walls of the arena have a minimum height of 170mm.
         <li>
-          SourceBots reserves the right to have match officials in the arena during games.
+          Starting areas are 1000 ±50mm squares and will be marked by tape which is considered part of the starting area. Robots may start anywhere inside their starting area facing any direction.
+        <li>
+          SRO reserves the right to have match officials in the arena during games.
       </ol>
       <h3><a class="anchor" id="flag-specification"></a>Robot flags</h3>
       <img src="./fig-flag.svg" alt="Robot flag" width="40%" height="auto">
       <ol>
         <li>
           A "robot flag" is a removable identifier that will be attached to a robot throughout a match. It allows spectators to easily associate a robot with its starting area.
         <li>
-          Flags are not counted when considering the starting size of the robot.
+          Flags are not counted when considering the size of the robot.
         <li>
           The identifying part of the robot flag must be visible when attached to the mount.
         <li>
@@ -205,8 +196,6 @@ <h3><a class="anchor" id="can-specification"></a>Cans</h3>
           Cans are 67mm ±3mm in diameter with a height of 100mm ±5mm.
         <li>
           Cans will be arranged as shown in the <a href="#arena-specification">arena specification</a>.
-        <li>
-          Cans are electrically conductive and ferromagnetic.
       </ol>
     </section>
     <section>
@@ -221,24 +210,24 @@ <h3><a class="anchor" id="matches"></a>Matches</h3>
         <li>
           At the end of a game, league points will be awarded as follows:
           <ul>
-            <li>The team with the most game points will be awarded 8 points towards the competition league.
-            <li>The team with the second most will be awarded 6.
+            <li>The team with the most game points will be awarded 4 points towards the competition league.
+            <li>The team with the second most will be awarded 2.
             <li>Teams whose robot was not entered into the round, or who were disqualified from the round, will be awarded no points.
           </ul>
         <li>
           If a match ends in a tie, robots will be awarded the average of the points that their combined
-          positions would be awarded, in this case 7 (since this is (8 + 6) &div; 2).
+          positions would be awarded, in this case 3 (since this is (4 + 2) &div; 2).
         <li>
           At the end of the leagues, positions in the leagues are used to seed a
-          knockout. This will be used to determine the final 1<sup>st</sup>,
+          knockout. The knockouts will be used to determine the final 1<sup>st</sup>,
           2<sup>nd</sup> and 3<sup>rd</sup> awards.
         <li>
           In the event of a tie in a knockout match, the team that ranked highest in the league will
           go through.
       </ol>
     </section>
     <footer class="no-print">
-        <p>© SourceBots</p>
+        <p>© SRO</p>
     </footer>
   </body>
 </html>