diff --git a/components/stats/SmallGraph.tsx b/components/stats/SmallGraph.tsx
index 31e6dd35..cdb0a348 100644
--- a/components/stats/SmallGraph.tsx
+++ b/components/stats/SmallGraph.tsx
@@ -1,4 +1,4 @@
-import { Defense, ReefscapeEnums } from "@/lib/Enums";
+import { Defense, RebuiltEnums } from "@/lib/Enums";
import { Report } from "@/lib/Types";
import ClientApi from "@/lib/api/ClientApi";
@@ -86,17 +86,40 @@ export default function SmallGraph(props: {
case Defense.Full:
return 1;
}
- } else if (key === "EndgameClimbStatus") {
+ } else if (key === "LevelClimbed") {
switch (data) {
- case ReefscapeEnums.EndgameClimbStatus.None:
+ case RebuiltEnums.LevelClimbed.No:
return 0;
- case ReefscapeEnums.EndgameClimbStatus.Park:
+ case RebuiltEnums.LevelClimbed.First:
return 0.33;
- case ReefscapeEnums.EndgameClimbStatus.High:
+ case RebuiltEnums.LevelClimbed.Second:
return 0.66;
- case ReefscapeEnums.EndgameClimbStatus.Low:
+ case RebuiltEnums.LevelClimbed.Third:
return 1;
}
+ } else if (key === "TotalFuelPoints") {
+ switch (data) {
+ default:
+ return (
+ data["AutoFuelPointsOne"] +
+ data["FuelPointsOne"] +
+ (data["AutoFuelPointsFive"] + data["FuelPointsFive"]) * 5 +
+ (data["AutoFuelPointsTen"] + data["FuelPointsTen"]) * 10
+ );
+ }
+ } else if (key === "DriverSkill") {
+ switch (data) {
+ case RebuiltEnums.DriverSkill.One:
+ return 1;
+ case RebuiltEnums.DriverSkill.Two:
+ return 2;
+ case RebuiltEnums.DriverSkill.Three:
+ return 3;
+ case RebuiltEnums.DriverSkill.Four:
+ return 4;
+ case RebuiltEnums.DriverSkill.Five:
+ return 5;
+ }
}
return data;
}
diff --git a/eslint.config.mjs b/eslint.config.mjs
index e0462f2b..e8345844 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -20,7 +20,7 @@ const config = [
},
},
{
- // Ignores has to go in its own config object
+ // Ignores has to go in its own config object
ignores: ["coverage/**/*", ".next/**/*"],
},
];
diff --git a/lib/Auth.ts b/lib/Auth.ts
index 813f972d..665bbb57 100644
--- a/lib/Auth.ts
+++ b/lib/Auth.ts
@@ -54,7 +54,7 @@ export const AuthenticationOptions: AuthOptions = {
},
}),
SlackProvider({
- clientId: process.env.NEXT_PUBLIC_SLACK_CLIENT_ID as string,
+ clientId: process.env.SLACK_CLIENT_ID as string,
clientSecret: process.env.SLACK_CLIENT_SECRET as string,
allowDangerousEmailAccountLinking: true,
profile: async (profile) => {
diff --git a/lib/Enums.ts b/lib/Enums.ts
index ccd7a6f0..ee263c5e 100644
--- a/lib/Enums.ts
+++ b/lib/Enums.ts
@@ -4,13 +4,13 @@ export enum Defense {
Full = "Full",
}
-export enum FTCEndgame {
+/*export enum FTCEndgame {
None = "None",
Parked = "Parked",
TouchingTheLowerBar = "Touching the Lower Bar",
LowClimb = "Low Climb",
HighClimb = "High Climb",
-}
+}*/
export enum IntakeTypes {
None = "None",
@@ -34,7 +34,6 @@ export enum Motors {
CIMs = "CIM",
Krakens = "Krakens",
Falcons = "Falcons",
- Talons = "Talons",
Neos = "Neos",
}
@@ -109,3 +108,54 @@ export namespace ReefscapeEnums {
Shallow = "Shallow",
}
}
+
+export namespace RebuiltEnums {
+ export enum ClimbingCapabilities {
+ No = "No",
+ FirstLevel = "FirstLevel",
+ SecondLevel = "SecondLevel",
+ ThirdLevel = "ThirdLevel",
+ }
+
+ export enum DriveOverBump {
+ No = "No",
+ Slow = "Slow",
+ Fast = "Fast",
+ }
+
+ export enum DriveUnderTrench {
+ No = "No",
+ Slow = "Slow",
+ Fast = "Fast",
+ }
+
+ export enum LevelClimbed {
+ No = "No",
+ First = "First",
+ Second = "Second",
+ Third = "Third",
+ }
+ export enum DriverSkill {
+ One = "1",
+ Two = "2",
+ Three = "3",
+ Four = "4",
+ Five = "5",
+ }
+}
+
+export namespace DecodeEnums {
+ export enum EndgameParkStatus {
+ No = "No",
+ Partial = "Partial",
+ Full = "Full",
+ TwoBotPark = "Two Bot Park",
+ }
+
+ export enum AutoStatus {
+ NoAuto = "No Auto",
+ MovePastStart = "Move Past Start",
+ ScoreOneArtifact = "Score One Artifact",
+ ScoreMultipleArtifacts = "Score Multiple Artifacts",
+ }
+}
diff --git a/lib/Gearbox.code-workspace b/lib/Gearbox.code-workspace
new file mode 100644
index 00000000..0268e976
--- /dev/null
+++ b/lib/Gearbox.code-workspace
@@ -0,0 +1,9 @@
+{
+ "folders": [
+ {
+ "name": "Gearbox",
+ "path": "..",
+ },
+ ],
+ "settings": {},
+}
diff --git a/lib/Layout.ts b/lib/Layout.ts
index 01ef80d1..5f66b2a2 100644
--- a/lib/Layout.ts
+++ b/lib/Layout.ts
@@ -10,6 +10,8 @@ import {
IntoTheDeepEnums,
FtcDrivetrain,
ReefscapeEnums,
+ RebuiltEnums,
+ DecodeEnums,
} from "./Enums";
import { PitReportData, QuantData, Pitreport, Report, League } from "./Types";
@@ -217,19 +219,44 @@ export function keyToType(
ReefscapeEnums.Climbing,
ReefscapeEnums.DriveThroughDeepCage,
ReefscapeEnums.EndgameClimbStatus,
+ //RebuiltEnums.AutoAbilities,
+ RebuiltEnums.ClimbingCapabilities,
+ RebuiltEnums.DriveOverBump,
+ RebuiltEnums.DriveUnderTrench,
+ RebuiltEnums.LevelClimbed,
+ RebuiltEnums.DriverSkill,
+ DecodeEnums.AutoStatus,
+ DecodeEnums.EndgameParkStatus,
];
- if (key === "Defense") return Defense;
- if (key === "swerveLevel") return SwerveLevel;
-
- if (key === "StartedWith") return IntoTheDeepEnums.StartedWith;
- if (key === "EndgameLevelClimbed")
- return IntoTheDeepEnums.EndgameLevelClimbed;
+ // Resolve by field name first. Values such as "None" occur in several enums.
+ const enumByKey: Record