Merge pull request #63 from FRC2706/dev

v1.2.2
FRC2706 · Mar 30, 2024 · c53be1b · c53be1b
2 parents e8cb9a4 + e2cd5a4
commit c53be1b
Showing 1 changed file with 67 additions and 40 deletions.
diff --git a/assets/games/2024.json b/assets/games/2024.json
@@ -7,115 +7,142 @@
     },
     {
       "name": "Event",
-      "choices": ["Newmarket", "North Bay", "District Champs"],
+      "choices": ["DCMP", "Worlds", "Newmarket", "North Bay"],
       "required": true,
       "type": "radio"
     },
-    {
-      "name": "Match #",
-      "required": true,
-      "type": "number"
-    },
     {
       "name": "Robot",
       "choices": ["Red 1", "Red 2", "Red 3", "Blue 1", "Blue 2", "Blue 3"],
-      "required": true,
+      "required": false,
       "type": "radio"
     },
     {
-      "name": "Starting Postition",
-      "choices": ["1", "2", "3"],
+      "name": "Match #",
       "required": true,
-      "type": "radio"
+      "type": "number"
     },
     {
       "name": "Team #",
-      "required": false,
+      "required": true,
       "type": "number"
+    },
+    {
+      "name": "Starting Postition",
+      "choices": ["1", "2", "3", "4", "N/A"],
+      "required": false,
+      "type": "radio"
     }
   ],
   "Autonomous": [
     {
-      "name": "Leave Starting Zone",
+      "name": "Crossed Starting Line",
       "type": "bool"
     },
     {
-      "name": "Notes Picked Up",
+      "name": "Auto Notes Picked Up",
       "type": "counter"
     },
     {
-      "name": "Auto Amp Scores",
+      "name": "Auto Notes Failed to pick up",
       "type": "counter"
     },
     {
       "name": "Auto Speaker Scores",
       "type": "counter"
+    },
+    {
+      "name": "Auto Amp Scores",
+      "type": "counter"
+    },
+    {
+      "name": "Missed Shots",
+      "type": "counter"
+    },
+    {
+      "name": "Comments on Auto",
+      "type": "text"
     }
   ],
   "TeleOp": [
     {
-      "name": "Picked UP: Ground",
+      "name": "Notes Picked Up",
       "type": "counter"
     },
     {
-      "name": "Picked Up: Source",
+      "name": "Notes Dropped",
       "type": "counter"
     },
     {
-      "name": "Notes: Dropped",
+      "name": "Speaker Score",
       "type": "counter"
     },
     {
-      "name": "Amp: Scores",
+      "name": "Speaker Missed",
       "type": "counter"
     },
     {
-      "name": "Amp Misses",
+      "name": "AMP Score",
       "type": "counter"
     },
     {
-      "name": "Speaker: Scores",
+      "name": "AMP Missed",
       "type": "counter"
-    },
+    }
+  ],
+  "EndGame": [
     {
-      "name": "Speaker: Misses",
+      "name": "Trap Score",
       "type": "counter"
     },
     {
-      "name": "Pickup From",
-      "type": "radio",
-      "choices": ["Source", "Floor", "Both", "Not Attempted"],
-      "required": true
+      "name": "Trap Fails",
+      "type": "counter"
     },
     {
-      "name": "Died :( [time is logged when clicked]",
-      "type": "bool"
+      "name": "Ending Position",
+      "type": "radio",
+      "required": false,
+      "choices": ["None", "Parked", "Onstage (climb)", "Harmonized (climb with friend)", "Spotlight (human player bonus)", "Attempted but failed"]
     }
   ],
-  "EndGame": [
+  "PostMatch": [
     {
-      "name": "Final Status",
+      "name": "Picked up from",
       "type": "radio",
       "required": true,
-      "choices": ["Parked (touching stage)", "Onstage (climb)", "Harmony (climb with friend)", "Onstage (Spotlit)", "Attempted but failed :(", "Not attempted"]
+      "choices": ["Ground", "Source", "Both"]
     },
     {
-      "name": "Note in Trap",
+      "name": "Defense Rating",
       "type": "radio",
       "required": true,
-      "choices": ["Not attempted", "Yes", "Attempted, but failed"]
-    }
-  ],
-  "PostMatch": [
+      "choices": ["1", "2", "3", "4", "5", "N/A"]
+    },
     {
-      "name": "Comments",
+      "name": "Ability to withstand defence",
+      "type": "radio",
+      "required": true,
+      "choices": ["1", "2", "3", "4", "5", "N/A"]
+    },
+    {
+      "name": "Were they heavily defended during the match?",
+      "required": true,
+      "type": "bool"
+    },
+    {
+      "name": "Did they die during the match?",
+      "type": "bool"
+    },
+    {
+      "name": "Penalities (if any)",
       "type": "text",
       "required": false
     },
-    {
-      "name": "Penalities descriptions (if any)",
+        {
+      "name": "Comments",
       "type": "text",
       "required": false
     }
   ]
-}
+}