Update app.R

app.R

@@ -8,10 +8,11 @@ library(webshot2)
 library(htmlwidgets)
 
 ui <- dashboardPage(
-  dashboardHeader(title = "Bullpen Tracker"),
+  dashboardHeader(title = "Pitching Tracker"),
   dashboardSidebar(
     sidebarMenu(
       menuItem("Bullpen Session", tabName = "bullpen", icon = icon("baseball")),
+      menuItem("Game Tracking", tabName = "game", icon = icon("gamepad")),
       menuItem("Leaderboard", tabName = "leaderboard", icon = icon("chart-bar")),
       menuItem("Export Data", tabName = "export", icon = icon("download"))
     )
@@ -52,6 +53,7 @@ ui <- dashboardPage(
     ),
     
     tabItems(
+      # BULLPEN TAB - SIMPLIFIED
       tabItem(
         tabName = "bullpen",
         fluidRow(
@@ -95,7 +97,7 @@ ui <- dashboardPage(
             ),
             
             hr(),
-            h4("2. Intended Location (Optional)"),
+            h4("2. Intended Location"),
             p("Select vertical OR horizontal OR both", style = "font-size: 12px; color: #666;"),
             fluidRow(
               column(6, actionButton("int_up", "UP", class = "btn-info btn-block", style = "min-height: 60px; font-size: 18px;")),
@@ -108,41 +110,12 @@ ui <- dashboardPage(
             ),
             
             hr(),
-            h4("3. Actual Zone"),
-            div(
-              style = "text-align: center; max-width: 500px; margin: 0 auto;",
-              actionButton("zone_12", "12", class = "border-zone-btn btn-outline-secondary", style = "width: 66%; margin: 5px auto;"),
-              div(
-                style = "display: flex; gap: 5px; justify-content: center; align-items: center;",
-                actionButton("zone_14", "14", class = "border-zone-btn btn-outline-secondary", style = "width: 60px; height: 280px;"),
-                div(
-                  class = "zone-grid",
-                  actionButton("zone_3", "3", class = "zone-btn btn-primary"),
-                  actionButton("zone_2", "2", class = "zone-btn btn-primary"),
-                  actionButton("zone_1", "1", class = "zone-btn btn-primary"),
-                  actionButton("zone_6", "6", class = "zone-btn btn-primary"),
-                  actionButton("zone_5", "5", class = "zone-btn btn-success"),
-                  actionButton("zone_4", "4", class = "zone-btn btn-primary"),
-                  actionButton("zone_9", "9", class = "zone-btn btn-info"),
-                  actionButton("zone_8", "8", class = "zone-btn btn-info"),
-                  actionButton("zone_7", "7", class = "zone-btn btn-info")
-                ),
-                actionButton("zone_11", "11", class = "border-zone-btn btn-outline-secondary", style = "width: 60px; height: 280px;")
-              ),
-              actionButton("zone_13", "13", class = "border-zone-btn btn-outline-secondary", style = "width: 66%; margin: 5px auto;")
-            ),
-            
-            hr(),
-            h4("4. Result"),
+            h4("3. Result"),
             fluidRow(
               column(6, actionButton("result_strike", "STRIKE", class = "btn-success", style = "width: 100%; min-height: 80px; font-size: 24px;")),
               column(6, actionButton("result_ball", "BALL", class = "btn-danger", style = "width: 100%; min-height: 80px; font-size: 24px;"))
             ),
             
-            hr(),
-            h4("5. Velocity (Required)"),
-            numericInput("velo", "MPH:", value = NULL, min = 40, max = 110, width = "200px"),
-            
             hr(),
             actionButton("clearPitch", "Clear Selection", class = "btn-warning btn-block")
           )
@@ -159,6 +132,81 @@ ui <- dashboardPage(
         )
       ),
       
+      # GAME TAB - NEW
+      tabItem(
+        tabName = "game",
+        fluidRow(
+          box(
+            title = "Game Setup", 
+            status = "primary", 
+            solidHeader = TRUE, 
+            width = 4,
+            textInput("gamePitcherName", "Pitcher Name:", placeholder = "Enter name"),
+            actionButton("addGamePitcher", "Add Pitcher", class = "btn-success btn-block"),
+            hr(),
+            selectInput("currentGamePitcher", "Currently Pitching:", choices = NULL),
+            selectInput("gameBatterSide", "Batter Side:",
+                        choices = c("Right (Default)" = "R", "Left" = "L"),
+                        selected = "R"),
+            hr(),
+            div(
+              style = "background: #f4f4f4; padding: 15px; border-radius: 10px;",
+              h4("Game Stats"),
+              verbatimTextOutput("gameStats")
+            )
+          ),
+          
+          box(
+            title = "Record Game Pitch", 
+            status = "success", 
+            solidHeader = TRUE, 
+            width = 8,
+            div(class = "selection-display", uiOutput("gameSelectionDisplay")),
+            
+            h4("1. Pitch Call"),
+            fluidRow(
+              column(4, actionButton("game_pitch_fb", "Fastball", class = "btn-primary btn-block", style = "min-height: 60px; font-size: 18px;")),
+              column(4, actionButton("game_pitch_cb", "Curveball", class = "btn-warning btn-block", style = "min-height: 60px; font-size: 18px;")),
+              column(4, actionButton("game_pitch_ch", "Changeup", class = "btn-info btn-block", style = "min-height: 60px; font-size: 18px;"))
+            ),
+            fluidRow(
+              column(4, actionButton("game_pitch_sl", "Slider", class = "btn-warning btn-block", style = "min-height: 60px; font-size: 18px;")),
+              column(4, actionButton("game_pitch_ct", "Cutter", class = "btn-primary btn-block", style = "min-height: 60px; font-size: 18px;")),
+              column(4, actionButton("game_pitch_sn", "Sinker", class = "btn-primary btn-block", style = "min-height: 60px; font-size: 18px;"))
+            ),
+            
+            hr(),
+            h4("2. Intended Location"),
+            p("Select vertical OR horizontal OR both", style = "font-size: 12px; color: #666;"),
+            fluidRow(
+              column(6, actionButton("game_int_up", "UP", class = "btn-info btn-block", style = "min-height: 60px; font-size: 18px;")),
+              column(6, actionButton("game_int_down", "DOWN", class = "btn-info btn-block", style = "min-height: 60px; font-size: 18px;"))
+            ),
+            fluidRow(
+              column(4, actionButton("game_int_away", "AWAY", class = "btn-secondary btn-block", style = "min-height: 60px; font-size: 18px;")),
+              column(4, actionButton("game_int_middle", "MIDDLE", class = "btn-secondary btn-block", style = "min-height: 60px; font-size: 18px;")),
+              column(4, actionButton("game_int_in", "IN", class = "btn-secondary btn-block", style = "min-height: 60px; font-size: 18px;"))
+            ),
+            
+            hr(),
+            actionButton("recordGamePitch", "RECORD PITCH", class = "btn-success btn-block", style = "min-height: 80px; font-size: 24px;"),
+            hr(),
+            actionButton("clearGamePitch", "Clear Selection", class = "btn-warning btn-block")
+          )
+        ),
+        
+        fluidRow(
+          box(
+            title = "Game Pitches", 
+            status = "info", 
+            solidHeader = TRUE, 
+            width = 12,
+            DT::dataTableOutput("gamePitches")
+          )
+        )
+      ),
+      
+      # LEADERBOARD TAB
       tabItem(
         tabName = "leaderboard",
         fluidRow(
@@ -194,12 +242,7 @@ ui <- dashboardPage(
                     "Total Pitches" = "Total",
                     "Overall Strike %" = "StrikeRate",
                     "FB Strike %" = "FB_StrikeRate",
-                    "OS Strike %" = "OS_StrikeRate",
-                    "Avg FB Velo" = "AvgFBVelo",
-                    "Max FB Velo" = "MaxFBVelo",
-                    "Avg Velo" = "AvgVelo",
-                    "Hit Spot %" = "HitSpotRate",
-                    "In Zone %" = "InZoneRate"
+                    "OS Strike %" = "OS_StrikeRate"
                   ),
                   selected = c("Pitcher", "FB_StrikeRate", "OS_StrikeRate", "StrikeRate"),
                   inline = TRUE
@@ -221,17 +264,27 @@ ui <- dashboardPage(
         )
       ),
       
+      # EXPORT TAB
       tabItem(
         tabName = "export",
         fluidRow(
           box(
-            title = "Export Session Data", 
+            title = "Export Bullpen Data", 
             status = "success", 
             solidHeader = TRUE, 
-            width = 12,
-            textInput("exportFilename", "Session Name (e.g., Horn_Doran_Bullpen):", 
+            width = 6,
+            textInput("exportFilename", "Bullpen Session Name:", 
                       placeholder = "LastName1_LastName2_Bullpen"),
-            downloadButton("downloadData", "Download CSV", class = "btn-primary btn-lg")
+            downloadButton("downloadData", "Download Bullpen CSV", class = "btn-primary btn-lg")
+          ),
+          box(
+            title = "Export Game Data", 
+            status = "info", 
+            solidHeader = TRUE, 
+            width = 6,
+            textInput("exportGameFilename", "Game Name:", 
+                      placeholder = "Game_vs_Opponent"),
+            downloadButton("downloadGameData", "Download Game CSV", class = "btn-primary btn-lg")
           )
         )
       )
@@ -248,9 +301,15 @@ server <- function(input, output, session) {
     currentPitchType = NULL,
     currentIntendedVert = NULL,
     currentIntendedHorz = NULL,
-    currentZone = NULL
+    # Game tracking
+    gamePitchers = character(0),
+    gameData = data.frame(),
+    gamePitchType = NULL,
+    gameIntendedVert = NULL,
+    gameIntendedHorz = NULL
   )
   
+  # BULLPEN SECTION
   output$selectionDisplay <- renderUI({
     parts <- c()
     if (!is.null(values$currentPitchType)) {
@@ -260,12 +319,6 @@ server <- function(input, output, session) {
       loc <- paste(c(values$currentIntendedVert, values$currentIntendedHorz), collapse = " + ")
       parts <- c(parts, paste("Intended:", loc))
     }
-    if (!is.null(values$currentZone)) {
-      parts <- c(parts, paste("Zone:", values$currentZone))
-    }
-    if (!is.null(input$velo) && !is.na(input$velo)) {
-      parts <- c(parts, paste(input$velo, "MPH"))
-    }
     
     if (length(parts) == 0) {
       HTML("<span style='color: #999;'>Select pitch details...</span>")
@@ -304,17 +357,12 @@ server <- function(input, output, session) {
     os_strikes <- sum(os_data$Result == "Strike")
     os_pct <- if (os_total > 0) round(os_strikes / os_total * 100, 1) else 0
     
-    hit_spot <- sum(data$HitSpot, na.rm = TRUE)
-    hit_spot_pct <- round(hit_spot / total * 100, 1)
-    
     paste0(
       "Total Pitches: ", total, "\n",
       "==================\n",
       "Overall Strike%: ", strike_pct, "%\n",
       "FB Strike%: ", fb_pct, "% (", fb_total, " FB)\n",
-      "OS Strike%: ", os_pct, "% (", os_total, " OS)\n",
-      "==================\n",
-      "Hit Spot%: ", hit_spot_pct, "% (", hit_spot, "/", total, ")"
+      "OS Strike%: ", os_pct, "% (", os_total, " OS)"
     )
   })
   
@@ -332,85 +380,18 @@ server <- function(input, output, session) {
   observeEvent(input$int_middle, { values$currentIntendedHorz <- "Middle" })
   observeEvent(input$int_in, { values$currentIntendedHorz <- "In" })
   
-  observeEvent(input$zone_1, { values$currentZone <- 1 })
-  observeEvent(input$zone_2, { values$currentZone <- 2 })
-  observeEvent(input$zone_3, { values$currentZone <- 3 })
-  observeEvent(input$zone_4, { values$currentZone <- 4 })
-  observeEvent(input$zone_5, { values$currentZone <- 5 })
-  observeEvent(input$zone_6, { values$currentZone <- 6 })
-  observeEvent(input$zone_7, { values$currentZone <- 7 })
-  observeEvent(input$zone_8, { values$currentZone <- 8 })
-  observeEvent(input$zone_9, { values$currentZone <- 9 })
-  observeEvent(input$zone_11, { values$currentZone <- 11 })
-  observeEvent(input$zone_12, { values$currentZone <- 12 })
-  observeEvent(input$zone_13, { values$currentZone <- 13 })
-  observeEvent(input$zone_14, { values$currentZone <- 14 })
-  
   recordPitch <- function(result) {
-    req(input$currentPitcher, values$currentPitchType, values$currentZone)
-    
-    if (is.null(input$velo) || is.na(input$velo)) {
-      showNotification("Please enter velocity!", type = "error")
-      return()
-    }
-    
-    batter_side <- input$batterSide
-    zone <- values$currentZone
-    
-    hit_spot <- NA
-    
-    if (!is.null(values$currentIntendedVert) || !is.null(values$currentIntendedHorz)) {
-      vert_match <- FALSE
-      horz_match <- FALSE
-      
-      if (!is.null(values$currentIntendedVert)) {
-        if (values$currentIntendedVert == "Up" && zone %in% c(1, 2, 3, 12)) {
-          vert_match <- TRUE
-        } else if (values$currentIntendedVert == "Down" && zone %in% c(7, 8, 9, 13)) {
-          vert_match <- TRUE
-        }
-      } else {
-        vert_match <- TRUE
-      }
-      
-      if (!is.null(values$currentIntendedHorz)) {
-        if (batter_side == "R") {
-          if (values$currentIntendedHorz == "Away" && zone %in% c(3, 6, 9, 14)) {
-            horz_match <- TRUE
-          } else if (values$currentIntendedHorz == "In" && zone %in% c(1, 4, 7, 11)) {
-            horz_match <- TRUE
-          } else if (values$currentIntendedHorz == "Middle" && zone %in% c(2, 5, 8)) {
-            horz_match <- TRUE
-          }
-        } else {
-          if (values$currentIntendedHorz == "Away" && zone %in% c(1, 4, 7, 11)) {
-            horz_match <- TRUE
-          } else if (values$currentIntendedHorz == "In" && zone %in% c(3, 6, 9, 14)) {
-            horz_match <- TRUE
-          } else if (values$currentIntendedHorz == "Middle" && zone %in% c(2, 5, 8)) {
-            horz_match <- TRUE
-          }
-        }
-      } else {
-        horz_match <- TRUE
-      }
-      
-      hit_spot <- vert_match && horz_match
-    }
+    req(input$currentPitcher, values$currentPitchType)
     
-    in_zone <- zone <= 9
+    intended_loc <- paste(c(values$currentIntendedVert, values$currentIntendedHorz), collapse = " + ")
+    if (intended_loc == "") intended_loc <- NA
     
     new_pitch <- data.frame(
       Pitcher = input$currentPitcher,
       PitchType = values$currentPitchType,
-      Velocity = input$velo,
-      BatterSide = batter_side,
-      IntendedVert = if (!is.null(values$currentIntendedVert)) values$currentIntendedVert else NA,
-      IntendedHorz = if (!is.null(values$currentIntendedHorz)) values$currentIntendedHorz else NA,
-      ActualZone = values$currentZone,
+      BatterSide = input$batterSide,
+      IntendedLocation = intended_loc,
       Result = result,
-      HitSpot = hit_spot,
-      InZone = in_zone,
       Timestamp = Sys.time(),
       stringsAsFactors = FALSE
     )
@@ -420,8 +401,6 @@ server <- function(input, output, session) {
     values$currentPitchType <- NULL
     values$currentIntendedVert <- NULL
     values$currentIntendedHorz <- NULL
-    values$currentZone <- NULL
-    updateNumericInput(session, "velo", value = NA)
     
     showNotification(paste(result, "recorded!"), type = "message", duration = 1)
   }
@@ -433,10 +412,127 @@ server <- function(input, output, session) {
     values$currentPitchType <- NULL
     values$currentIntendedVert <- NULL
     values$currentIntendedHorz <- NULL
-    values$currentZone <- NULL
-    updateNumericInput(session, "velo", value = NA)
   })
   
+  output$recentPitches <- DT::renderDataTable({
+    if (nrow(values$pitchData) == 0) {
+      return(data.frame(Message = "No pitches recorded"))
+    }
+    
+    recent <- tail(values$pitchData, 20) %>%
+      arrange(desc(Timestamp)) %>%
+      select(Pitcher, PitchType, BatterSide, IntendedLocation, Result)
+    
+    DT::datatable(recent, options = list(pageLength = 20, dom = 't'), rownames = FALSE)
+  })
+  
+  # GAME SECTION
+  output$gameSelectionDisplay <- renderUI({
+    parts <- c()
+    if (!is.null(values$gamePitchType)) {
+      parts <- c(parts, paste("Call:", values$gamePitchType))
+    }
+    if (!is.null(values$gameIntendedVert) || !is.null(values$gameIntendedHorz)) {
+      loc <- paste(c(values$gameIntendedVert, values$gameIntendedHorz), collapse = " + ")
+      parts <- c(parts, paste("Location:", loc))
+    }
+    
+    if (length(parts) == 0) {
+      HTML("<span style='color: #999;'>Select pitch call and location...</span>")
+    } else {
+      HTML(paste(parts, collapse = " | "))
+    }
+  })
+  
+  observeEvent(input$addGamePitcher, {
+    req(input$gamePitcherName)
+    name <- trimws(input$gamePitcherName)
+    if (name != "" && !(name %in% values$gamePitchers)) {
+      values$gamePitchers <- c(values$gamePitchers, name)
+      updateSelectInput(session, "currentGamePitcher", choices = values$gamePitchers, selected = name)
+      updateTextInput(session, "gamePitcherName", value = "")
+      showNotification(paste("Added", name, "to game"), type = "message")
+    }
+  })
+  
+  output$gameStats <- renderText({
+    req(input$currentGamePitcher)
+    data <- values$gameData %>% filter(Pitcher == input$currentGamePitcher)
+    if (nrow(data) == 0) return("No pitches yet")
+    
+    total <- nrow(data)
+    
+    fb_data <- data %>% filter(PitchCall %in% c("Fastball", "Sinker", "Cutter"))
+    fb_total <- nrow(fb_data)
+    
+    os_data <- data %>% filter(PitchCall %in% c("Curveball", "Slider", "Changeup"))
+    os_total <- nrow(os_data)
+    
+    paste0(
+      "Total Pitches: ", total, "\n",
+      "==================\n",
+      "Fastballs: ", fb_total, "\n",
+      "Offspeed: ", os_total
+    )
+  })
+  
+  observeEvent(input$game_pitch_fb, { values$gamePitchType <- "Fastball" })
+  observeEvent(input$game_pitch_cb, { values$gamePitchType <- "Curveball" })
+  observeEvent(input$game_pitch_ch, { values$gamePitchType <- "Changeup" })
+  observeEvent(input$game_pitch_sl, { values$gamePitchType <- "Slider" })
+  observeEvent(input$game_pitch_ct, { values$gamePitchType <- "Cutter" })
+  observeEvent(input$game_pitch_sn, { values$gamePitchType <- "Sinker" })
+  
+  observeEvent(input$game_int_up, { values$gameIntendedVert <- "Up" })
+  observeEvent(input$game_int_down, { values$gameIntendedVert <- "Down" })
+  
+  observeEvent(input$game_int_away, { values$gameIntendedHorz <- "Away" })
+  observeEvent(input$game_int_middle, { values$gameIntendedHorz <- "Middle" })
+  observeEvent(input$game_int_in, { values$gameIntendedHorz <- "In" })
+  
+  observeEvent(input$recordGamePitch, {
+    req(input$currentGamePitcher, values$gamePitchType)
+    
+    intended_loc <- paste(c(values$gameIntendedVert, values$gameIntendedHorz), collapse = " + ")
+    if (intended_loc == "") intended_loc <- NA
+    
+    new_pitch <- data.frame(
+      Pitcher = input$currentGamePitcher,
+      PitchCall = values$gamePitchType,
+      BatterSide = input$gameBatterSide,
+      IntendedLocation = intended_loc,
+      Timestamp = Sys.time(),
+      stringsAsFactors = FALSE
+    )
+    
+    values$gameData <- rbind(values$gameData, new_pitch)
+    
+    values$gamePitchType <- NULL
+    values$gameIntendedVert <- NULL
+    values$gameIntendedHorz <- NULL
+    
+    showNotification("Pitch recorded!", type = "message", duration = 1)
+  })
+  
+  observeEvent(input$clearGamePitch, {
+    values$gamePitchType <- NULL
+    values$gameIntendedVert <- NULL
+    values$gameIntendedHorz <- NULL
+  })
+  
+  output$gamePitches <- DT::renderDataTable({
+    if (nrow(values$gameData) == 0) {
+      return(data.frame(Message = "No pitches recorded"))
+    }
+    
+    recent <- tail(values$gameData, 50) %>%
+      arrange(desc(Timestamp)) %>%
+      select(Pitcher, PitchCall, BatterSide, IntendedLocation)
+    
+    DT::datatable(recent, options = list(pageLength = 50, dom = 't'), rownames = FALSE)
+  })
+  
+  # LEADERBOARD SECTION
   observeEvent(input$uploadCSV, {
     req(input$uploadCSV)
     
@@ -460,20 +556,6 @@ server <- function(input, output, session) {
     showNotification("Cleared uploaded data", type = "warning")
   })
   
-  output$recentPitches <- DT::renderDataTable({
-    if (nrow(values$pitchData) == 0) {
-      return(data.frame(Message = "No pitches recorded"))
-    }
-    
-    recent <- tail(values$pitchData, 20) %>%
-      arrange(desc(Timestamp)) %>%
-      select(Pitcher, PitchType, Velocity, BatterSide, IntendedVert, IntendedHorz, ActualZone, Result, HitSpot)
-    
-    DT::datatable(recent, options = list(pageLength = 20, dom = 't'), rownames = FALSE) %>%
-      formatStyle('HitSpot', backgroundColor = styleEqual(c(TRUE, FALSE), c('#90EE90', '#FFB6C1')))
-  })
-  
-  # Function to generate leaderboard data
   generate_leaderboard <- function() {
     all_data <- bind_rows(values$pitchData, values$uploadedData)
     
@@ -493,11 +575,6 @@ server <- function(input, output, session) {
         OS_Total = sum(PitchType %in% c("Curveball", "Slider", "Changeup")),
         OS_Strikes = sum(Result == "Strike" & PitchType %in% c("Curveball", "Slider", "Changeup")),
         OS_StrikeRate = if_else(OS_Total > 0, round(OS_Strikes / OS_Total * 100, 1), NA_real_),
-        AvgFBVelo = round(mean(Velocity[PitchType %in% c("Fastball", "Sinker", "Cutter")], na.rm = TRUE), 1),
-        MaxFBVelo = suppressWarnings(max(Velocity[PitchType %in% c("Fastball", "Sinker", "Cutter")], na.rm = TRUE)),
-        AvgVelo = round(mean(Velocity, na.rm = TRUE), 1),
-        HitSpotRate = round(mean(HitSpot, na.rm = TRUE) * 100, 1),
-        InZoneRate = round(mean(InZone) * 100, 1),
         .groups = 'drop'
       ) %>%
       filter(Total >= input$minPitches)
@@ -505,24 +582,16 @@ server <- function(input, output, session) {
     return(leaderboard)
   }
   
-  # Function to prepare leaderboard display (used by both render and download)
   prepare_leaderboard_display <- function(leaderboard) {
     if (is.null(leaderboard)) return(NULL)
     
-    # Rename columns for display
     leaderboard_display <- leaderboard
     if ("Pitcher" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(PLAYER = Pitcher)
     if ("FB_StrikeRate" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`FB STRIKE%` = FB_StrikeRate)
     if ("OS_StrikeRate" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`OS STRIKE%` = OS_StrikeRate)
     if ("StrikeRate" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`OVR STRIKE%` = StrikeRate)
-    if ("AvgFBVelo" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`AVG FB VELO` = AvgFBVelo)
-    if ("MaxFBVelo" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`MAX FB VELO` = MaxFBVelo)
-    if ("AvgVelo" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`AVG VELO` = AvgVelo)
-    if ("HitSpotRate" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`HIT SPOT%` = HitSpotRate)
-    if ("InZoneRate" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`IN ZONE%` = InZoneRate)
     if ("Total" %in% colnames(leaderboard)) leaderboard_display <- leaderboard_display %>% rename(`TOTAL PITCHES` = Total)
     
-    # Select only chosen columns
     if (!is.null(input$leaderboardCols) && length(input$leaderboardCols) > 0) {
       cols_to_keep <- input$leaderboardCols
       
@@ -531,12 +600,7 @@ server <- function(input, output, session) {
         "Total" = "TOTAL PITCHES",
         "StrikeRate" = "OVR STRIKE%",
         "FB_StrikeRate" = "FB STRIKE%",
-        "OS_StrikeRate" = "OS STRIKE%",
-        "AvgFBVelo" = "AVG FB VELO",
-        "MaxFBVelo" = "MAX FB VELO",
-        "AvgVelo" = "AVG VELO",
-        "HitSpotRate" = "HIT SPOT%",
-        "InZoneRate" = "IN ZONE%"
+        "OS_StrikeRate" = "OS STRIKE%"
       )
       
       display_cols <- col_mapping[cols_to_keep]
@@ -583,9 +647,8 @@ server <- function(input, output, session) {
         border = '2px solid black'
       )
     
-    # Apply conditional formatting to percentage columns
     pct_cols <- intersect(
-      c("FB STRIKE%", "OS STRIKE%", "OVR STRIKE%", "HIT SPOT%", "IN ZONE%"), 
+      c("FB STRIKE%", "OS STRIKE%", "OVR STRIKE%"), 
       colnames(leaderboard_display)
     )
     
@@ -606,7 +669,6 @@ server <- function(input, output, session) {
     dt
   })
   
-  # Download leaderboard as CSV
   output$downloadLeaderboardCSV <- downloadHandler(
     filename = function() {
       paste0("Leaderboard_", format(Sys.Date(), "%m%d"), ".csv")
@@ -622,9 +684,9 @@ server <- function(input, output, session) {
     }
   )
   
-  # Download leaderboard as PNG
   output$downloadLeaderboardPNG <- downloadHandler(
-    filename = function() {paste0("Leaderboard_", format(Sys.Date(), "%m%d"), ".png")
+    filename = function() {
+      paste0("Leaderboard_", format(Sys.Date(), "%m%d"), ".png")
     },
     content = function(file) {
       leaderboard <- generate_leaderboard()
@@ -634,7 +696,6 @@ server <- function(input, output, session) {
         return()
       }
       
-      # Prepare display version using the shared function
       leaderboard_display <- prepare_leaderboard_display(leaderboard)
       
       if (is.null(leaderboard_display)) {
@@ -642,7 +703,6 @@ server <- function(input, output, session) {
         return()
       }
       
-      # Create datatable widget with conditional formatting
       dt <- DT::datatable(
         leaderboard_display,
         options = list(
@@ -669,9 +729,8 @@ server <- function(input, output, session) {
           border = '2px solid black'
         )
       
-      # Apply conditional formatting to percentage columns
       pct_cols <- intersect(
-        c("FB STRIKE%", "OS STRIKE%", "OVR STRIKE%", "HIT SPOT%", "IN ZONE%"), 
+        c("FB STRIKE%", "OS STRIKE%", "OVR STRIKE%"), 
         colnames(leaderboard_display)
       )
       
@@ -689,11 +748,9 @@ server <- function(input, output, session) {
           )
       }
       
-      # Save as HTML temporarily
       temp_html <- tempfile(fileext = ".html")
       htmlwidgets::saveWidget(dt, temp_html, selfcontained = TRUE)
       
-      # Convert to PNG using webshot2
       tryCatch({
         webshot2::webshot(temp_html, file = file, vwidth = 1400, vheight = 1000, delay = 0.5)
         showNotification("Leaderboard PNG downloaded successfully!", type = "message")
@@ -701,11 +758,11 @@ server <- function(input, output, session) {
         showNotification(paste("Error creating PNG:", e$message), type = "error")
       })
       
-      # Clean up temp file
       unlink(temp_html)
     }
   )
   
+  # EXPORT HANDLERS
   output$downloadData <- downloadHandler(
     filename = function() {
       base_name <- if (!is.null(input$exportFilename) && input$exportFilename != "") {
@@ -720,6 +777,21 @@ server <- function(input, output, session) {
       write_csv(values$pitchData, file)
     }
   )
+  
+  output$downloadGameData <- downloadHandler(
+    filename = function() {
+      base_name <- if (!is.null(input$exportGameFilename) && input$exportGameFilename != "") {
+        gsub(" ", "_", trimws(input$exportGameFilename))
+      } else {
+        "Game_Data"
+      }
+      date_str <- format(Sys.Date(), "%m%d")
+      paste0(base_name, "_", date_str, ".csv")
+    },
+    content = function(file) {
+      write_csv(values$gameData, file)
+    }
+  )
 }
 
 shinyApp(ui = ui, server = server)