2 files changed, 89 insertions, 71 deletions
diff --git a/public/assets/images/counters.svg b/public/assets/images/counters.svg
index f433d97..4ff96a3 100644
--- a/public/assets/images/counters.svg
+++ b/public/assets/images/counters.svg
@@ -49,122 +49,134 @@
     </g>
   </defs>
 
-  <g id="rifle" style="r: inherit;" class="weapon-symbol">
+  <!--Semi-Automatic Firearms-->
+
+  <g id="pistol" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
       <use href="#semi-auto" />
       <line x1="0" y1="-5" x2="0" y2="5"/>
-      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="smg" style="r: inherit;" class="weapon-symbol">
+  <g id="rifle" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <use href="#auto"/>
-      <line x1="0" y1="-5" x2="0" y2="4.5"/>
-      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
+      <use href="#semi-auto" />
+      <line x1="0" y1="-5" x2="0" y2="5"/>
+      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="blazer" style="r: inherit;" class="weapon-symbol">
+  <g id="riflegl" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <use href="#auto"/>
-      <use href="#laser"/>
+      <use href="#semi-auto" />
+      <circle cy="-2.25" r="1"/>
+      <line x1="0" y1="-5" x2="0" y2="5"/>
       <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="lmg" style="r: inherit;" class="weapon-symbol">
+  <g id="laserpistol" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
-      <line x1="0" y1="-4.5" x2="0" y2="4.5"/>
-      <line x1="-2" y1="0.5" x2="2" y2="0.5"/>
-      <polyline points="-2,-3.25 0,-4.75 2,-3.25"/>
+      <use href="#semi-auto"/>
+      <use href="#laser"/>
     </g>
   </g>
 
-  <g id="srm" style="r: inherit;" class="weapon-symbol">
+  <g id="laserrifle" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <line x1="0" y1="-4.75" x2="0" y2="5"/>
-      <line x1="-2" y1="0.5" x2="2" y2="0.5"/>
-      <path d="M -2,4.75 V -2.5 C -2,-5.5 2,-5.5 2,-2.5 V 4.75"/>
+      <use href="#semi-auto"/>
+      <use href="#laser"/>
+      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="hsplaser" style="r: inherit;" class="weapon-symbol">
+  <g id="gyrojetrifle" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
-      <use href="#auto"/>
-      <polyline points="0,-5 0,-3 -3,-2.5 3,-1.5 0,-1 0,2.5 0,4.5"/>
+      <line x1="-2" y1="-1" x2="-2" y2="3"/>
+      <line x1="2" y1="-1" x2="2" y2="3"/>
+      <line x1="0" y1="-5" x2="0" y2="5"/>
       <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="smggl" style="r: inherit;" class="weapon-symbol">
+  <!--Automatic Firearms-->
+
+  <g id="blazer" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
       <use href="#auto"/>
-      <circle cy="-2.25" r="1"/>
-      <line x1="0" y1="-5" x2="0" y2="4.5"/>
-      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
+      <use href="#laser"/>
+      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="riflegl" style="r: inherit;" class="weapon-symbol">
+  <g id="autopistol" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <use href="#semi-auto" />
-      <circle cy="-2.25" r="1"/>
+      <use href="#auto" />
       <line x1="0" y1="-5" x2="0" y2="5"/>
-      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="pistol" style="r: inherit;" class="weapon-symbol">
+  <g id="smg" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <use href="#semi-auto" />
-      <line x1="0" y1="-5" x2="0" y2="5"/>
+      <use href="#auto"/>
+      <line x1="0" y1="-5" x2="0" y2="4.5"/>
+      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
     </g>
   </g>
 
-  <g id="laserpistol" style="r: inherit;" class="weapon-symbol">
+  <g id="smggl" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <use href="#semi-auto"/>
-      <use href="#laser"/>
+      <use href="#auto"/>
+      <circle cy="-2.25" r="1"/>
+      <line x1="0" y1="-5" x2="0" y2="4.5"/>
+      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
     </g>
   </g>
 
-  <g id="laserrifle" style="r: inherit;" class="weapon-symbol">
+  <!--Hand-to-Hand Weapons-->
+
+  <g id="nonlethalhand" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <use href="#semi-auto"/>
-      <use href="#laser"/>
-      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
+      <line x1="-2" y1="-4.25" x2="2" y2="-4.25"/>
+      <line x1="0" y1="-4.25" x2="0" y2="5"/>
     </g>
   </g>
 
-  <g id="gyrojetrifle" style="r: inherit;" class="weapon-symbol">
+  <g id="lethalhand" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <line x1="-2" y1="-1" x2="-2" y2="3"/>
-      <line x1="2" y1="-1" x2="2" y2="3"/>
       <line x1="0" y1="-5" x2="0" y2="5"/>
-      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
     </g>
   </g>
 
-  <g id="autopistol" style="r: inherit;" class="weapon-symbol">
+  <!--Area-Effect Weapons-->
+
+  <g id="srm" style="r: inherit;" class="weapon-symbol">
+    <use style="r: inherit;" href="#counter-base"/>
+    <g style="stroke: white; stroke-width: 0.5px; fill: none;">
+      <line x1="0" y1="-4.75" x2="0" y2="5"/>
+      <line x1="-2" y1="0.5" x2="2" y2="0.5"/>
+      <path d="M -2,4.75 V -2.5 C -2,-5.5 2,-5.5 2,-2.5 V 4.75"/>
+    </g>
+  </g>
+
+  <g id="hsrm" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
+      <line x1="0" y1="-4.75" x2="0" y2="5"/>
       <use href="#auto" />
-      <line x1="0" y1="-5" x2="0" y2="5"/>
+      <path d="M -2,4.75 V -2.5 C -2,-5.5 2,-5.5 2,-2.5 V 4.75"/>
     </g>
   </g>
 
@@ -178,12 +190,11 @@
     </g>
   </g>
 
-  <g id="hsrm" style="r: inherit;" class="weapon-symbol">
+  <g id="grenade" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
-      <line x1="0" y1="-4.75" x2="0" y2="5"/>
-      <use href="#auto" />
-      <path d="M -2,4.75 V -2.5 C -2,-5.5 2,-5.5 2,-2.5 V 4.75"/>
+      <circle cy="-2.25" r="1"/>
+      <line x1="0" y1="-5" x2="0" y2="5"/>
     </g>
   </g>
 
@@ -248,6 +259,18 @@
     </g>
   </g>
 
+  <!--Support Weapons-->
+
+  <g id="lmg" style="r: inherit;" class="weapon-symbol">
+    <use style="r: inherit;" href="#counter-base"/>
+    <g style="stroke: white; stroke-width: 0.5px; fill: none;">
+      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
+      <line x1="0" y1="-4.5" x2="0" y2="4.5"/>
+      <line x1="-2" y1="0.5" x2="2" y2="0.5"/>
+      <polyline points="-2,-3.25 0,-4.75 2,-3.25"/>
+    </g>
+  </g>
+
   <g id="mmg" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
@@ -278,12 +301,24 @@
     </g>
   </g>
 
+  <g id="hsplaser" style="r: inherit;" class="weapon-symbol">
+    <use style="r: inherit;" href="#counter-base"/>
+    <g style="stroke: white; stroke-width: 0.5px; fill: none;">
+      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
+      <use href="#auto"/>
+      <polyline points="0,-5 0,-3 -3,-2.5 3,-1.5 0,-1 0,2.5 0,4.5"/>
+      <polyline points="-2,-3.5 0,-5 2,-3.5"/>
+    </g>
+  </g>
+
   <g id="mpppc" style="r: inherit;" class="weapon-symbol">
     <use style="r: inherit;" href="#counter-base"/>
     <g style="stroke: white; stroke-width: 0.5px; fill: none;">
       <polyline points="-2,-3.5 0,-5 2,-3.5"/>
-      <path d="M -3,-2 h 2 m 2,0 h 2 m -1, -1 v 2"/>
-      <line x1="0" y1="-5" x2="0" y2="5"/>
+      <circle cx="-1.5" cy="-2" style="fill: white;" r="0.25" />
+      <circle cx="1.5" cy="-2" style="fill: white;" r="0.25" />
+      <line x1="-2" y1="4.5" x2="2" y2="4.5"/>
+      <line x1="0" y1="-5" x2="0" y2="4.5"/>
     </g>
   </g>
 
diff --git a/public/assets/images/map4.svg b/public/assets/images/map4.svg
index d38738c..bf5a220 100644
--- a/public/assets/images/map4.svg
+++ b/public/assets/images/map4.svg
@@ -1,23 +1,6 @@
 <?xml version="1.0" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="-10 -10 200 300">
   <defs>
-    <g id="building1" class="building">
-      <g class="footprint">
-        <g data-q="0" data-r="0" data-s="0" data-left="1" data-top="3" data-right="2" data-bottom="4" data-offset="left" />
-      </g>
-
-      <g class="structure">
-        <path id="building1-floor" class="floor" d="M -30.309999,-52.5 H 38.97 l 0,119.999999 H -30.31 Z" />
-        <path id="building1-outer-wall" class="outer-wall" d="M 38.969998,-7.500001 21.65,-7.5 V 7.4999997 L 12.989997,7.5 m 0,30 25.980001,0 M 12.989997,67.5 v -60 l -17.319997,0 0,-30.0000007 M -4.330003,67.5 v -45 H -30.31 m 0,-74.999999 L 38.97,-52.5 38.969999,67.499999 -30.31,67.5 Z" />
-        <path id="building1-inner-wall" class="inner-wall" d="M 38.969998,-7.500001 21.65,-7.5 V 7.4999997 L 12.989997,7.5 m 0,30 25.980001,0 M 12.989997,67.5 v -60 l -17.319997,0 0,-30.0000007 M -4.330003,67.5 v -45 H -30.31 m 0,-74.999999 L 38.97,-52.5 38.969999,67.499999 -30.31,67.5 Z" />
-        <path id="building1-door-edges" class="door-edges" d="m 12.99,52.5 0,-15 M -4.33,45.000003 v -15 M 12.990002,30 l 0,-15" />
-        <path id="building1-doors" class="doors" d="m 12.99,48.169997 0,-6.34 M -4.33,40.67 v -6.34 m 17.320002,-8.66 0,-6.34" />
-        <path id="building1-exit-edges" class="exits door-edges" d="M 0,-52.5 H 17.32 M -30.31,8.66 V -8.66" />
-        <path id="building1-exits" class="doors exits" d="M 4.3300002,-52.5 H 12.99 m -43.3,56.8300023 v -8.660003" />
-        <path id="building1-windows" class="windows" d="m 32.501739,67.499994 -13.043478,0 m -49.768256,-8.478265 0,-13.043478 m 0,-69.456522 0,-13.043479" />
-      </g>
-    </g>
-
     <polygon id="desk" points="-1.5,-7 4.5,-7 4.5,7 -1.5,7 -2.5,6 -2.5,3 -4.5,3 -4.5,-3 -2.5,-3 -2.5,-6" />
     <rect id="couch" x="-4.25" y="-8" width="8.5" height="16" />
     <rect id="bed" x="-5" y="-9" width="10" height="18" />
@@ -25,7 +8,7 @@
 
     <g id="mapsheet" class="mapsheet">
       <g class="building1" data-q="3" data-r="-5" data-s="2">
-        <use href="#building1"/>
+        <use href="mapsheets.svg#building1"/>
         <g class="furniture">
           <use href="#couch" transform="rotate(90,10.34,-27.66)" />
           <use href="#bed" transform="translate(-17.32,45)" />
@@ -56,7 +39,7 @@
     <g class="start-locations" data-attacker-name="liao" data-defender-name="davion">
       <g data-edge="north" style="--i: -2">
         <g class="counter" data-allegiance="attacker" data-number="1" data-squad="1" data-armor="4">
-          <use class="primary-weapon" href="counters.svg#blazer"/>
+          <use class="primary-weapon" href="counters.svg#pistol"/>
           <use class="troop-number" href="counters.svg#number-1"/>
           <use class="squad-number" href="counters.svg#number-1"/>
         </g>