Merge branch 'development'

Acr515 · Mar 22, 2024 · 02bc289 · 02bc289
2 parents 27ec442 + a093e2e
commit 02bc289
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "start": "webpack serve --mode development --env game_year=2024",
     "test": "echo \"Error: no test specified\" && exit 1",
     "build": "webpack --env game_year=2024",
+    "build-ghp": "webpack --env game_year=2024 ghp",
     "deploy": "gh-pages -d build"
   },
   "keywords": [],

diff --git a/public/manifest-ghp.json b/public/manifest-ghp.json
@@ -3,22 +3,22 @@
     "name": "FortyEight: FRC Scouting",
     "icons": [
         {
-            "src": "./pwa-icons/icon_1024.png",
+            "src": "/FortyEight/pwa-icons/icon_1024.png",
             "sizes": "1024x1024",
             "type": "image/png"
         },
         {
-            "src": "./pwa-icons/icon_512.png",
+            "src": "/FortyEight/pwa-icons/icon_512.png",
             "sizes": "512x512",
             "type": "image/png"
         },
         {
-            "src": "./pwa-icons/icon_196.png",
+            "src": "/FortyEight/pwa-icons/icon_196.png",
             "sizes": "196x196",
             "type": "image/png"
         },
         {
-            "src": "./pwa-icons/icon_144.png",
+            "src": "/FortyEight/pwa-icons/icon_144.png",
             "sizes": "144x144",
             "type": "image/png"
         }

diff --git a/src/data/game_specific/ScoreCalculator/2024.js b/src/data/game_specific/ScoreCalculator/2024.js
@@ -17,10 +17,10 @@ const ScoreCalculator = {
         // Given a performance object, gets the score of all manual-defined "stage" points (climb, trap)
         getScore: data => {
             switch (data.performance.endgame.state) {
-                case EndgameResult.NONE: return 0 + (data.performance.endgame.trap ? 5 : 0);
-                case EndgameResult.PARKED: return 1 + (data.performance.endgame.trap ? 5 : 0);
-                case EndgameResult.ONSTAGE: return 3 + (data.performance.endgame.trap ? 5 : 0);
-                case EndgameResult.HARMONIZED: return 5 + (data.performance.endgame.trap ? 5 : 0);
+                case EndgameResult.NONE: return 0 + (data.performance.endgame.trap * 5);
+                case EndgameResult.PARKED: return 1 + (data.performance.endgame.trap * 5);
+                case EndgameResult.ONSTAGE: return 3 + (data.performance.endgame.trap * 5);
+                case EndgameResult.HARMONIZED: return 5 + (data.performance.endgame.trap * 5);
                 default: return 0;
             }
         },

diff --git a/src/data/game_specific/performanceObject/2024.js b/src/data/game_specific/performanceObject/2024.js
@@ -21,7 +21,7 @@ export default function performanceObject() {
         endgame: {
             state: EndgameResult.NONE,
             failedAttempt: false,
-            trap: false
+            trap: 0
         },
         defense: {},
         notes: {