Update app.R

app.R

@@ -163,24 +163,6 @@ app_css <- "
 # ======================  HITTER CODE (VERBATIM)  ======================
 # =====================================================================
 
-tableau_pitch_colors <- c(
-  # Primary pitches from screenshots
-  "Sinker" = "#5DADE2",      # Teal/Cyan
-  "Slider" = "#E67E22",      # Orange
-  "Cutter" = "#F4D03F",      # Yellow/Gold
-  "Sweeper" = "#E67E22",     # Same as Slider
-  
-  # Other pitch types (standard colors)
-  "Fastball" = "#E74C3C",    # Red
-  "Four-Seam" = "#E74C3C",
-  "FourSeamFastBall" = "#E74C3C",
-  "Curveball" = "#9B59B6",   # Purple
-  "ChangeUp" = "#2ECC71",    # Green
-  "Splitter" = "#1ABC9C",    # Teal-green
-  "Knuckle Curve" = "#8E44AD",
-  "Other" = "#95A5A6"        # Gray
-)
-
 process_dataset <- function(df) {
   if ("Batter" %in% names(df)) {
     df <- df %>% mutate(Batter = stringr::str_replace(Batter, "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1"))
@@ -1086,10 +1068,45 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
   }
 }
 
+
+# =====================================================================
+# TABLEAU-STYLE PITCHER POST-GAME REPORT - FIXED VERSION
 # =====================================================================
-# TABLEAU-STYLE PITCHER REPORT FUNCTIONS
+# Fixes:
+# - Pitch type detection (handles "Undefined", empty, NA)
+# - Correct header colors matching screenshot
+# - Single row stats layout
+# - No labels in info row (just values)
+# - Smaller location chart, bigger release chart
 # =====================================================================
 
+# =====================================================================
+# PITCH COLORS - Extended to handle more variations
+# =====================================================================
+tableau_pitch_colors <- c(
+  # Primary pitches
+  "Sinker" = "#5DADE2",
+  "Slider" = "#E67E22",
+  "Cutter" = "#F4D03F",
+  "Sweeper" = "#E67E22",
+  "Fastball" = "#E74C3C",
+  "Four-Seam" = "#E74C3C",
+  "FourSeamFastBall" = "#E74C3C",
+  "4-Seam Fastball" = "#E74C3C",
+  "Curveball" = "#9B59B6",
+  "ChangeUp" = "#2ECC71",
+  "Changeup" = "#2ECC71",
+  "Splitter" = "#1ABC9C",
+  "Knuckle Curve" = "#8E44AD",
+  "Two-Seam" = "#F2A541",
+  "TwoSeamFastBall" = "#F2A541",
+  "Other" = "#95A5A6",
+  "Undefined" = "#95A5A6"
+)
+
+# =====================================================================
+# IMPROVED DATA PROCESSING - Better pitch type handling
+# =====================================================================
 process_tableau_pitcher_data <- function(df) {
   # Standardize Pitcher name
   if (!"Pitcher" %in% names(df)) {
@@ -1100,10 +1117,25 @@ process_tableau_pitcher_data <- function(df) {
   df <- df %>%
     mutate(Pitcher = str_replace(coalesce(Pitcher, ""), "^\\s*(\\w+)\\s*,\\s*(\\w+)\\s*$", "\\2 \\1"))
   
+  # CRITICAL: Clean up TaggedPitchType - replace empty/NA/Undefined with actual pitch type if available
+  if ("TaggedPitchType" %in% names(df)) {
+    df <- df %>%
+      mutate(
+        TaggedPitchType = case_when(
+          is.na(TaggedPitchType) | TaggedPitchType == "" | TaggedPitchType == "Undefined" ~ 
+            ifelse(!is.na(AutoPitchType) & AutoPitchType != "" & AutoPitchType != "Undefined", 
+                   AutoPitchType, 
+                   ifelse(!is.na(PitchType) & PitchType != "" & PitchType != "Undefined",
+                          PitchType, "Undefined")),
+          TRUE ~ TaggedPitchType
+        )
+      )
+  }
+  
   # Calculate all indicators
   df <- df %>%
     mutate(
-      # Strike Zone Indicator (standard zone)
+      # Strike Zone Indicator
       StrikeZoneIndicator = ifelse(PlateLocSide >= -0.8333 & PlateLocSide <= 0.8333 & 
                                      PlateLocHeight >= 1.5 & PlateLocHeight <= 3.5, 1, 0),
       
@@ -1117,50 +1149,40 @@ process_tableau_pitcher_data <- function(df) {
       EdgeIndicator = ifelse((EdgeHeightIndicator == 1 & EdgeZoneWIndicator == 1) | 
                                (EdgeWidthIndicator == 1 & EdgeZoneHtIndicator == 1), 1, 0),
       
-      # Quality pitch (zone or edge)
       QualityPitchIndicator = ifelse(StrikeZoneIndicator == 1 | EdgeIndicator == 1, 1, 0),
       
-      # Strike/Ball indicators
       StrikeIndicator = ifelse(PitchCall %in% c("StrikeSwinging", "StrikeCalled", 
                                                   "FoulBallNotFieldable", "FoulBall", "InPlay"), 1, 0),
       WhiffIndicator = ifelse(PitchCall == "StrikeSwinging", 1, 0),
       SwingIndicator = ifelse(PitchCall %in% c("StrikeSwinging", "FoulBallNotFieldable", 
                                                  "FoulBall", "InPlay"), 1, 0),
       
-      # First pitch indicators
       FPindicator = ifelse(Balls == 0 & Strikes == 0, 1, 0),
       FPSindicator = ifelse(PitchCall %in% c("StrikeCalled", "StrikeSwinging", 
                                                "FoulBallNotFieldable", "FoulBall", "InPlay") & 
                               FPindicator == 1, 1, 0),
       
-      # Ahead indicator (0-1 or 1-1 count, got strike)
       AheadIndicator = ifelse(((Balls == 0 & Strikes == 1) | (Balls == 1 & Strikes == 1)) & 
                                 StrikeIndicator == 1, 1, 0),
       
-      # At-bat indicator
       ABindicator = ifelse(PlayResult %in% c("Error", "FieldersChoice", "Out", 
                                                "Single", "Double", "Triple", "HomeRun") | 
                              KorBB == "Strikeout", 1, 0),
       
-      # Hit indicator
       HitIndicator = ifelse(PlayResult %in% c("Single", "Double", "Triple", "HomeRun"), 1, 0),
       
-      # Plate appearance indicator
       PAindicator = ifelse(PitchCall %in% c("InPlay", "HitByPitch", "CatchersInterference") | 
                              KorBB %in% c("Walk", "Strikeout"), 1, 0),
       
-      # Leadoff indicators
       LeadOffIndicator = ifelse((PAofInning == 1 & (PlayResult != "Undefined" | KorBB != "Undefined")) | 
                                   PitchCall == "HitByPitch", 1, 0),
       OutIndicator = ifelse((PlayResult %in% c("Out", "FieldersChoice") | KorBB == "Strikeout") & 
                               PitchCall != "HitByPitch", 1, 0),
       LOOindicator = ifelse(LeadOffIndicator == 1 & OutIndicator == 1, 1, 0),
       
-      # Walk/HBP indicators
       HBPIndicator = ifelse(PitchCall == "HitByPitch", 1, 0),
       WalkIndicator = ifelse(KorBB == "Walk", 1, 0),
       
-      # Batter side indicators
       LHHindicator = ifelse(BatterSide == "Left", 1, 0),
       RHHindicator = ifelse(BatterSide == "Right", 1, 0)
     )
@@ -1168,8 +1190,10 @@ process_tableau_pitcher_data <- function(df) {
   df
 }
 
+# =====================================================================
+# HEADER STATISTICS
+# =====================================================================
 calculate_tableau_header_stats <- function(pitcher_df) {
-  # At-bats (unique AB-ending events)
   ab_data <- pitcher_df %>% 
     filter(ABindicator == 1) %>%
     group_by(Inning, Batter, PAofInning) %>% 
@@ -1181,7 +1205,6 @@ calculate_tableau_header_stats <- function(pitcher_df) {
   xbh <- sum(ab_data$PlayResult %in% c("Double", "Triple", "HomeRun"), na.rm = TRUE)
   runs <- sum(pitcher_df$RunsScored, na.rm = TRUE)
   
-  # Plate appearances
   pa_data <- pitcher_df %>% 
     filter(PAindicator == 1) %>%
     group_by(Inning, Batter, PAofInning) %>% 
@@ -1192,10 +1215,8 @@ calculate_tableau_header_stats <- function(pitcher_df) {
   hbp <- sum(pa_data$HBPIndicator, na.rm = TRUE)
   so <- sum(pa_data$KorBB == "Strikeout", na.rm = TRUE)
   
-  # Batting average
   avg <- ifelse(at_bats > 0, round(hits / at_bats, 3), 0)
   
-  # Percentage stats
   total_pitches <- nrow(pitcher_df)
   strike_pct <- ifelse(total_pitches > 0, 
                        round(100 * sum(pitcher_df$StrikeIndicator, na.rm = TRUE) / total_pitches, 0), 0)
@@ -1204,16 +1225,13 @@ calculate_tableau_header_stats <- function(pitcher_df) {
   fp_k_pct <- ifelse(fp_pitches > 0, 
                      round(100 * sum(pitcher_df$FPSindicator, na.rm = TRUE) / fp_pitches, 0), 0)
   
-  # E+A% = (FPS + Ahead pitches) / First pitches
   ea_pct <- ifelse(fp_pitches > 0, 
                    round(100 * (sum(pitcher_df$FPSindicator, na.rm = TRUE) + 
                                   sum(pitcher_df$AheadIndicator & pitcher_df$Balls == 0, na.rm = TRUE)) / fp_pitches, 0), 0)
   
-  # Comp% = Quality pitches / Total pitches
   comp_pct <- ifelse(total_pitches > 0, 
                      round(100 * sum(pitcher_df$QualityPitchIndicator, na.rm = TRUE) / total_pitches, 0), 0)
   
-  # LOO% = Leadoff outs / Leadoff opportunities
   leadoff_opps <- sum(pitcher_df$LeadOffIndicator, na.rm = TRUE)
   loo_pct <- ifelse(leadoff_opps > 0, 
                     round(100 * sum(pitcher_df$LOOindicator, na.rm = TRUE) / leadoff_opps, 0), 0)
@@ -1234,9 +1252,27 @@ calculate_tableau_header_stats <- function(pitcher_df) {
   )
 }
 
+# =====================================================================
+# TABLE CALCULATIONS - Now handles "Undefined" pitch types
+# =====================================================================
 calculate_tableau_location_data <- function(pitcher_df) {
+  # Get all pitch types including "Undefined" if that's all we have
+  valid_types <- pitcher_df %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "") %>%
+    pull(TaggedPitchType) %>%
+    unique()
+  
+  # If only "Undefined" exists, use it; otherwise exclude it
+  if (length(valid_types) == 1 && valid_types[1] == "Undefined") {
+    filter_types <- valid_types
+  } else {
+    filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  }
+  
+  if (length(filter_types) == 0) filter_types <- "Undefined"
+  
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
+    filter(TaggedPitchType %in% filter_types) %>%
     group_by(TaggedPitchType) %>%
     summarise(
       `Zone%` = paste0(round(100 * sum(StrikeZoneIndicator, na.rm = TRUE) / n(), 0), "%"),
@@ -1253,8 +1289,21 @@ calculate_tableau_pitch_usage <- function(pitcher_df) {
   lhh_pitches <- sum(pitcher_df$LHHindicator, na.rm = TRUE)
   rhh_pitches <- sum(pitcher_df$RHHindicator, na.rm = TRUE)
   
+  valid_types <- pitcher_df %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "") %>%
+    pull(TaggedPitchType) %>%
+    unique()
+  
+  if (length(valid_types) == 1 && valid_types[1] == "Undefined") {
+    filter_types <- valid_types
+  } else {
+    filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  }
+  
+  if (length(filter_types) == 0) filter_types <- "Undefined"
+  
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
+    filter(TaggedPitchType %in% filter_types) %>%
     group_by(TaggedPitchType) %>%
     summarise(
       `Pitch Count` = n(),
@@ -1265,8 +1314,21 @@ calculate_tableau_pitch_usage <- function(pitcher_df) {
 }
 
 calculate_tableau_velo_movement <- function(pitcher_df) {
+  valid_types <- pitcher_df %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "") %>%
+    pull(TaggedPitchType) %>%
+    unique()
+  
+  if (length(valid_types) == 1 && valid_types[1] == "Undefined") {
+    filter_types <- valid_types
+  } else {
+    filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  }
+  
+  if (length(filter_types) == 0) filter_types <- "Undefined"
+  
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
+    filter(TaggedPitchType %in% filter_types) %>%
     group_by(TaggedPitchType) %>%
     summarise(
       `Avg. Velo` = round(mean(RelSpeed, na.rm = TRUE), 1),
@@ -1280,14 +1342,26 @@ calculate_tableau_velo_movement <- function(pitcher_df) {
 }
 
 calculate_tableau_release_data <- function(pitcher_df) {
-  # Get primary fastball for comparison
   primary <- pitcher_df %>% 
     filter(TaggedPitchType %in% c("Fastball", "Sinker", "Four-Seam", "FourSeamFastBall"))
   fb_ht <- if (nrow(primary) > 0) mean(primary$RelHeight, na.rm = TRUE) else NA
   fb_side <- if (nrow(primary) > 0) mean(primary$RelSide, na.rm = TRUE) else NA
   
+  valid_types <- pitcher_df %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "") %>%
+    pull(TaggedPitchType) %>%
+    unique()
+  
+  if (length(valid_types) == 1 && valid_types[1] == "Undefined") {
+    filter_types <- valid_types
+  } else {
+    filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  }
+  
+  if (length(filter_types) == 0) filter_types <- "Undefined"
+  
   pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other") %>%
+    filter(TaggedPitchType %in% filter_types) %>%
     group_by(TaggedPitchType) %>%
     summarise(
       `Avg. Rel Height (ft.)` = round(mean(RelHeight, na.rm = TRUE), 2),
@@ -1300,11 +1374,25 @@ calculate_tableau_release_data <- function(pitcher_df) {
 }
 
 # =====================================================================
-# LOCATION PLOT - WITH PROPER ZONE GRAPHICS
+# LOCATION PLOT
 # =====================================================================
 create_tableau_location_plot <- function(pitcher_df, pitch_colors) {
+  # Get valid pitch types
+  valid_types <- pitcher_df %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "") %>%
+    pull(TaggedPitchType) %>%
+    unique()
+  
+  if (length(valid_types) == 1 && valid_types[1] == "Undefined") {
+    filter_types <- valid_types
+  } else {
+    filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  }
+  
+  if (length(filter_types) == 0) filter_types <- "Undefined"
+  
   df <- pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other",
+    filter(TaggedPitchType %in% filter_types,
            !is.na(PlateLocSide), !is.na(PlateLocHeight)) %>%
     mutate(
       ResultDisplay = case_when(
@@ -1326,94 +1414,56 @@ create_tableau_location_plot <- function(pitcher_df, pitch_colors) {
   if (nrow(df) == 0) {
     return(ggplot() + theme_void() + 
              labs(title = "Location Report") +
-             theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5)))
+             theme(plot.title = element_text(size = 12, face = "bold", hjust = 0.5)))
   }
   
-  # Define zone boundaries
-  zone_left <- -0.8333
-  zone_right <- 0.8333
-  zone_bottom <- 1.5
-  zone_top <- 3.5
-  
-  # Shadow zone (outer dashed) - about 0.25 wider on each side
-  shadow_left <- -1.1
-  shadow_right <- 1.1
-  shadow_bottom <- 1.2
-  shadow_top <- 3.8
-  
-  # Inner zone thirds
+  zone_left <- -0.8333; zone_right <- 0.8333
+  zone_bottom <- 1.5; zone_top <- 3.5
+  shadow_left <- -1.1; shadow_right <- 1.1
+  shadow_bottom <- 1.2; shadow_top <- 3.8
   zone_width <- (zone_right - zone_left) / 3
   zone_height <- (zone_top - zone_bottom) / 3
   
   p <- ggplot(df, aes(x = PlateLocSide, y = PlateLocHeight)) +
-    
-    # Shadow zone (outer dashed rectangle)
-    annotate("rect", 
-             xmin = shadow_left, xmax = shadow_right, 
+    annotate("rect", xmin = shadow_left, xmax = shadow_right, 
              ymin = shadow_bottom, ymax = shadow_top, 
              fill = NA, color = "gray30", linetype = "dashed", linewidth = 0.6) +
-    
-    # Strike zone (solid RED rectangle)
-    annotate("rect", 
-             xmin = zone_left, xmax = zone_right, 
+    annotate("rect", xmin = zone_left, xmax = zone_right, 
              ymin = zone_bottom, ymax = zone_top, 
              fill = NA, color = "#E74C3C", linewidth = 1.2) +
-    
-    # Inner zone divisions (dashed gray lines)
-    # Vertical lines
     annotate("segment", x = zone_left + zone_width, xend = zone_left + zone_width,
              y = zone_bottom, yend = zone_top, color = "gray50", linetype = "dashed", linewidth = 0.4) +
     annotate("segment", x = zone_left + 2*zone_width, xend = zone_left + 2*zone_width,
              y = zone_bottom, yend = zone_top, color = "gray50", linetype = "dashed", linewidth = 0.4) +
-    # Horizontal lines
     annotate("segment", x = zone_left, xend = zone_right,
              y = zone_bottom + zone_height, yend = zone_bottom + zone_height, 
              color = "gray50", linetype = "dashed", linewidth = 0.4) +
     annotate("segment", x = zone_left, xend = zone_right,
              y = zone_bottom + 2*zone_height, yend = zone_bottom + 2*zone_height, 
              color = "gray50", linetype = "dashed", linewidth = 0.4) +
-    
-    # Home plate
     annotate("segment", x = -0.708, y = 0.15, xend = 0.708, yend = 0.15, color = "black", linewidth = 0.6) +
     annotate("segment", x = -0.708, y = 0.30, xend = -0.708, yend = 0.15, color = "black", linewidth = 0.6) +
     annotate("segment", x = 0.708, y = 0.30, xend = 0.708, yend = 0.15, color = "black", linewidth = 0.6) +
     annotate("segment", x = -0.708, y = 0.30, xend = 0, yend = 0.50, color = "black", linewidth = 0.6) +
     annotate("segment", x = 0.708, y = 0.30, xend = 0, yend = 0.50, color = "black", linewidth = 0.6) +
-    
-    # Center line (dashed, vertical through zone)
     annotate("segment", x = 0, xend = 0, y = 0.5, yend = shadow_top + 0.3, 
              color = "gray60", linetype = "dotted", linewidth = 0.4) +
-    
-    # Pitch points
-    geom_point(aes(color = TaggedPitchType, shape = ResultDisplay), size = 3.5, stroke = 1.2) +
-    
+    geom_point(aes(color = TaggedPitchType, shape = ResultDisplay), size = 3, stroke = 1) +
     scale_color_manual(values = pitch_colors, name = "Pitch Type") +
     scale_shape_manual(
-      values = c(
-        "BallCalled" = 1,      # Open circle
-        "Double" = 18,         # Diamond
-        "FoulBall" = 2,        # Open triangle
-        "HitByPitch" = 8,      # Asterisk
-        "Sacrifice" = 3,       # Plus
-        "Single" = 19,         # Half-filled circle
-        "StrikeCalled" = 4,    # X
-        "StrikeSwinging" = 8,  # Asterisk
-        "Triple" = 17,         # Filled triangle
-        "HomeRun" = 18,        # Diamond
-        "Out" = 4,             # X
-        "Other" = 16           # Filled circle
-      ),
+      values = c("BallCalled" = 1, "Double" = 18, "FoulBall" = 2, "HitByPitch" = 8,
+                 "Sacrifice" = 3, "Single" = 19, "StrikeCalled" = 4, "StrikeSwinging" = 8,
+                 "Triple" = 17, "HomeRun" = 18, "Out" = 4, "Other" = 16),
       name = "Play Result"
     ) +
-    
-    coord_fixed(xlim = c(-2.2, 2.2), ylim = c(-0.2, 4.5)) +
+    coord_fixed(xlim = c(-2, 2), ylim = c(-0.2, 4.2)) +
     labs(title = "Location Report") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 14, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
       legend.position = "left",
-      legend.title = element_text(size = 8, face = "bold"),
-      legend.text = element_text(size = 7),
+      legend.title = element_text(size = 7, face = "bold"),
+      legend.text = element_text(size = 6),
       axis.text = element_blank(),
       axis.title = element_blank(),
       axis.ticks = element_blank(),
@@ -1423,15 +1473,31 @@ create_tableau_location_plot <- function(pitcher_df, pitch_colors) {
   p
 }
 
+# =====================================================================
+# MOVEMENT PLOT
+# =====================================================================
 create_tableau_movement_plot <- function(pitcher_df, pitch_colors) {
+  valid_types <- pitcher_df %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "") %>%
+    pull(TaggedPitchType) %>%
+    unique()
+  
+  if (length(valid_types) == 1 && valid_types[1] == "Undefined") {
+    filter_types <- valid_types
+  } else {
+    filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  }
+  
+  if (length(filter_types) == 0) filter_types <- "Undefined"
+  
   df <- pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other",
+    filter(TaggedPitchType %in% filter_types,
            !is.na(HorzBreak), !is.na(InducedVertBreak))
   
   if (nrow(df) == 0) {
     return(ggplot() + theme_void() + 
              labs(title = "Movement Profile") +
-             theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5)))
+             theme(plot.title = element_text(size = 12, face = "bold", hjust = 0.5)))
   }
   
   ggplot(df, aes(x = HorzBreak, y = InducedVertBreak, color = TaggedPitchType)) +
@@ -1443,71 +1509,79 @@ create_tableau_movement_plot <- function(pitcher_df, pitch_colors) {
     labs(title = "Movement Profile", x = "Horz Break", y = "Induced Vert Break") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 14, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
       legend.position = "none",
-      axis.title = element_text(size = 9),
-      axis.text = element_text(size = 8)
+      axis.title = element_text(size = 8),
+      axis.text = element_text(size = 7)
     )
 }
 
+# =====================================================================
+# RELEASE PLOT - WITH MOUND
+# =====================================================================
 create_tableau_release_plot <- function(pitcher_df, pitch_colors) {
+  valid_types <- pitcher_df %>%
+    filter(!is.na(TaggedPitchType), TaggedPitchType != "") %>%
+    pull(TaggedPitchType) %>%
+    unique()
+  
+  if (length(valid_types) == 1 && valid_types[1] == "Undefined") {
+    filter_types <- valid_types
+  } else {
+    filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  }
+  
+  if (length(filter_types) == 0) filter_types <- "Undefined"
+  
   df <- pitcher_df %>%
-    filter(!is.na(TaggedPitchType), TaggedPitchType != "", TaggedPitchType != "Other",
+    filter(TaggedPitchType %in% filter_types,
            !is.na(RelSide), !is.na(RelHeight))
   
   if (nrow(df) == 0) {
     return(ggplot() + theme_void() + 
              labs(title = "Release Plot") +
-             theme(plot.title = element_text(size = 14, face = "bold", hjust = 0.5)))
+             theme(plot.title = element_text(size = 12, face = "bold", hjust = 0.5)))
   }
   
-  # Create mound arc data (terracotta half-circle)
   mound_theta <- seq(0, pi, length.out = 100)
   mound_radius <- 3
   mound_df <- data.frame(
     x = mound_radius * cos(mound_theta),
-    y = mound_radius * sin(mound_theta) * 0.35  # Flatten the arc
+    y = mound_radius * sin(mound_theta) * 0.35
   )
   
   ggplot(df, aes(x = RelSide, y = RelHeight)) +
-    # Mound (terracotta half-circle)
     geom_polygon(data = mound_df, aes(x = x, y = y), 
                  fill = "#C0392B", color = NA, inherit.aes = FALSE) +
-    
-    # Pitching rubber (white rectangle)
     annotate("rect", xmin = -0.5, xmax = 0.5, ymin = 0.85, ymax = 1.05, 
              fill = "white", color = "gray40", linewidth = 0.3) +
-    
-    # Center line (dashed vertical)
     geom_vline(xintercept = 0, color = "gray60", linetype = "dashed", linewidth = 0.4) +
-    
-    # Release points
     geom_point(aes(color = TaggedPitchType), size = 3, alpha = 0.8) +
-    
     scale_color_manual(values = pitch_colors) +
     coord_cartesian(xlim = c(-4, 4), ylim = c(0, 7)) +
     labs(title = "Release Plot", x = "Rel Side", y = "Rel Height") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 14, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
       legend.position = "none",
-      axis.title = element_text(size = 9),
-      axis.text = element_text(size = 8)
+      axis.title = element_text(size = 8),
+      axis.text = element_text(size = 7)
     )
 }
 
+# =====================================================================
+# TABLE DRAWING FUNCTION
+# =====================================================================
 draw_tableau_table <- function(title, data, metrics, pitch_types, pitch_colors, 
-                                x_start, y_start, col_w = 0.12, row_h = 0.018) {
+                                x_start, y_start, col_w = 0.10, row_h = 0.016) {
   
-  # Title
-  grid.text(title, x = x_start + 0.2, y = y_start + 0.03, 
-            gp = gpar(fontface = "bold", cex = 0.9))
+  grid.text(title, x = x_start + length(pitch_types) * col_w / 2, y = y_start + 0.025, 
+            gp = gpar(fontface = "bold", cex = 0.8))
   
-  # Column headers (pitch types)
   header_y <- y_start
   for (i in seq_along(pitch_types)) {
     pt <- pitch_types[i]
-    col_color <- ifelse(pt %in% names(pitch_colors), pitch_colors[pt], "#95A5A6")
+    col_color <- if (pt %in% names(pitch_colors)) pitch_colors[pt] else "#95A5A6"
     
     grid.rect(x = x_start + (i-1)*col_w, y = header_y, 
               width = col_w * 0.95, height = row_h * 1.1,
@@ -1515,19 +1589,16 @@ draw_tableau_table <- function(title, data, metrics, pitch_types, pitch_colors,
               gp = gpar(fill = col_color, col = "black", lwd = 0.5))
     
     grid.text(pt, x = x_start + (i-1)*col_w + col_w/2, y = header_y,
-              gp = gpar(col = "white", cex = 0.45, fontface = "bold"))
+              gp = gpar(col = "white", cex = 0.38, fontface = "bold"))
   }
   
-  # Data rows
   for (m in seq_along(metrics)) {
     metric_name <- metrics[m]
     y_pos <- header_y - m * row_h
     
-    # Row label
-    grid.text(metric_name, x = x_start - 0.02, y = y_pos, just = "right",
-              gp = gpar(cex = 0.45, fontface = "bold"))
+    grid.text(metric_name, x = x_start - 0.015, y = y_pos, just = "right",
+              gp = gpar(cex = 0.38, fontface = "bold"))
     
-    # Values for each pitch type
     for (i in seq_along(pitch_types)) {
       pt <- pitch_types[i]
       idx <- which(data$TaggedPitchType == pt)
@@ -1543,16 +1614,17 @@ draw_tableau_table <- function(title, data, metrics, pitch_types, pitch_colors,
                 gp = gpar(fill = "white", col = "gray80", lwd = 0.3))
       
       grid.text(val, x = x_start + (i-1)*col_w + col_w/2, y = y_pos,
-                gp = gpar(cex = 0.42))
+                gp = gpar(cex = 0.36))
     }
   }
 }
-                     
+
+# =====================================================================
+# MAIN PDF CREATION FUNCTION - PORTRAIT LAYOUT
+# =====================================================================
 create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
-  # Close any open devices
   if (length(dev.list()) > 0) try(dev.off(), silent = TRUE)
   
-  # Process and filter data
   pitcher_df <- process_tableau_pitcher_data(game_df) %>% 
     filter(Pitcher == pitcher_name)
   
@@ -1575,19 +1647,20 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   if (is.na(pitcher_team)) pitcher_team <- "Unknown"
   
   batter_teams <- unique(pitcher_df$BatterTeam)
-  batter_team_str <- if (length(batter_teams) > 1) "All" else batter_teams[1]
+  batter_team_str <- if (length(batter_teams) > 1) paste(batter_teams, collapse = " / ") else batter_teams[1]
   if (is.na(batter_team_str)) batter_team_str <- "Unknown"
   
-  # Calculate all stats
+  # Calculate stats
   stats <- calculate_tableau_header_stats(pitcher_df)
   loc_data <- calculate_tableau_location_data(pitcher_df)
   usage_data <- calculate_tableau_pitch_usage(pitcher_df)
   velo_data <- calculate_tableau_velo_movement(pitcher_df)
   rel_data <- calculate_tableau_release_data(pitcher_df)
   
-  # Get pitch types used
+  # Get pitch types
   pitch_types <- unique(c(loc_data$TaggedPitchType, usage_data$TaggedPitchType))
   pitch_types <- pitch_types[!is.na(pitch_types) & pitch_types != ""]
+  if (length(pitch_types) == 0) pitch_types <- "Undefined"
   
   # Create plots
   loc_plot <- create_tableau_location_plot(pitcher_df, tableau_pitch_colors)
@@ -1603,79 +1676,65 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   # =====================================================================
   # HEADER BAR (Teal)
   # =====================================================================
-  grid.rect(x = 0, y = 0.94, width = 1, height = 0.06, 
+  grid.rect(x = 0, y = 0.95, width = 1, height = 0.05, 
             just = c("left", "bottom"),
             gp = gpar(fill = "#006F71", col = NA))
   
-  grid.text("Pitcher Post-Game Report", x = 0.02, y = 0.97, just = "left",
-            gp = gpar(col = "white", fontface = "bold", cex = 1.4))
+  grid.text("Pitcher Post-Game Report", x = 0.02, y = 0.975, just = "left",
+            gp = gpar(col = "white", fontface = "bold", cex = 1.3))
   
   # =====================================================================
-  # INFO ROW
+  # INFO ROW - NO LABELS, just values
   # =====================================================================
-  info_y <- 0.91
-  info_labels <- c("Date", "Pitcher Team", "Pitcher", "Batter Team", "vs. L/R")
-  info_values <- c(game_date, pitcher_team, pitcher_name, batter_team_str, "All")
-  
-  for (i in 1:5) {
-    x_pos <- 0.02 + (i-1) * 0.18
-    grid.text(info_labels[i], x = x_pos, y = info_y + 0.015, just = "left",
-              gp = gpar(cex = 0.6, col = "gray50"))
-    grid.text(info_values[i], x = x_pos, y = info_y - 0.012, just = "left",
+  info_y <- 0.925
+  info_values <- c(game_date, pitcher_team, pitcher_name, batter_team_str)
+  info_x_positions <- c(0.05, 0.22, 0.42, 0.70)
+  
+  for (i in 1:4) {
+    grid.text(info_values[i], x = info_x_positions[i], y = info_y, just = "left",
               gp = gpar(cex = 0.7, fontface = "bold"))
   }
   
   # =====================================================================
-  # STAT BOXES (Two rows)
+  # STAT BOXES - SINGLE ROW matching screenshot colors
   # =====================================================================
-  # Row 1: At Bats, H, XBH, R, BB/HBP, SO, AVG
-  stat_labels_1 <- c("At Bats", "H", "XBH", "R", "BB/HBP", "SO", "AVG")
-  stat_values_1 <- c(stats$at_bats, stats$hits, stats$xbh, stats$runs, stats$bb_hbp, stats$so, stats$avg)
-  stat_colors_1 <- c("#006F71", "#006F71", "#006F71", "#E74C3C", "#006F71", "#006F71", "#006F71")
-  
-  box_y1 <- 0.865
-  box_w <- 0.085
-  box_h <- 0.04
-  
-  for (i in 1:7) {
-    x_pos <- 0.02 + (i-1) * (box_w + 0.01)
-    grid.rect(x = x_pos, y = box_y1, width = box_w, height = box_h,
-              just = c("left", "center"),
-              gp = gpar(fill = stat_colors_1[i], col = "black", lwd = 0.5))
-    grid.text(stat_labels_1[i], x = x_pos + box_w/2, y = box_y1 + 0.01,
-              gp = gpar(col = "white", cex = 0.5, fontface = "bold"))
-    grid.text(as.character(stat_values_1[i]), x = x_pos + box_w/2, y = box_y1 - 0.008,
-              gp = gpar(col = "white", cex = 0.7, fontface = "bold"))
-  }
-  
-  # Row 2: Strike%, 1st P K%, E+A%, Comp%, LOO%
-  stat_labels_2 <- c("Strike%", "1st P K%", "E+A%", "Comp%", "LOO%")
-  stat_values_2 <- c(stats$strike_pct, stats$fp_k_pct, stats$ea_pct, stats$comp_pct, stats$loo_pct)
-  
-  box_y2 <- 0.82
-  
-  for (i in 1:5) {
-    x_pos <- 0.02 + (i-1) * (box_w + 0.01)
-    grid.rect(x = x_pos, y = box_y2, width = box_w, height = box_h,
+  # Colors from screenshot:
+  # At Bats = Red, H/XBH = Blue, R/BB+HBP/SO = Green, AVG = Cyan
+  # Strike%/1st P K%/E+A%/Comp%/LOO% = Orange text on white
+  
+  stat_labels <- c("At Bats", "H", "XBH", "R", "BB/HBP", "SO", "AVG", "Strike%", "1st P K..", "E+A%", "Comp..", "LOO%")
+  stat_values <- c(stats$at_bats, stats$hits, stats$xbh, stats$runs, stats$bb_hbp, stats$so, stats$avg,
+                   stats$strike_pct, stats$fp_k_pct, stats$ea_pct, stats$comp_pct, stats$loo_pct)
+  stat_bg_colors <- c("#E74C3C", "#3498DB", "#3498DB", "#27AE60", "#27AE60", "#27AE60", "#00BCD4",
+                      "white", "white", "white", "white", "white")
+  stat_text_colors <- c("white", "white", "white", "white", "white", "white", "white",
+                        "#E67E22", "#E67E22", "#E67E22", "#E67E22", "#E67E22")
+  
+  box_y <- 0.885
+  box_w <- 0.072
+  box_h <- 0.045
+  x_start <- 0.02
+  
+  for (i in 1:12) {
+    x_pos <- x_start + (i-1) * (box_w + 0.005)
+    
+    grid.rect(x = x_pos, y = box_y, width = box_w, height = box_h,
               just = c("left", "center"),
-              gp = gpar(fill = "#006F71", col = "black", lwd = 0.5))
-    grid.text(stat_labels_2[i], x = x_pos + box_w/2, y = box_y2 + 0.01,
-              gp = gpar(col = "white", cex = 0.5, fontface = "bold"))
-    grid.text(stat_values_2[i], x = x_pos + box_w/2, y = box_y2 - 0.008,
-              gp = gpar(col = "white", cex = 0.7, fontface = "bold"))
+              gp = gpar(fill = stat_bg_colors[i], col = "black", lwd = 0.5))
+    
+    # Label at top
+    grid.text(stat_labels[i], x = x_pos + box_w/2, y = box_y + 0.012,
+              gp = gpar(col = stat_text_colors[i], cex = 0.42, fontface = "bold"))
+    
+    # Value below
+    grid.text(as.character(stat_values[i]), x = x_pos + box_w/2, y = box_y - 0.008,
+              gp = gpar(col = stat_text_colors[i], cex = 0.55, fontface = "bold"))
   }
   
-  # PDF button
-  grid.rect(x = 0.92, y = 0.84, width = 0.06, height = 0.06,
-            just = c("left", "center"),
-            gp = gpar(fill = "#E74C3C", col = "black", lwd = 0.5))
-  grid.text("PDF", x = 0.95, y = 0.84,
-            gp = gpar(col = "white", cex = 0.7, fontface = "bold"))
-  
   # =====================================================================
-  # LOCATION PLOT (Left side, smaller)
+  # LOCATION PLOT (Left side - SMALLER)
   # =====================================================================
-  pushViewport(viewport(x = 0.25, y = 0.60, width = 0.45, height = 0.32))
+  pushViewport(viewport(x = 0.25, y = 0.62, width = 0.42, height = 0.26))
   print(loc_plot, newpage = FALSE)
   popViewport()
   
@@ -1688,13 +1747,13 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
     metrics = c("Zone%", "Edge%", "Strike%", "Whiff%"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.55, y_start = 0.73,
-    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
-    row_h = 0.018
+    x_start = 0.52, y_start = 0.76,
+    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
+    row_h = 0.016
   )
   
   # =====================================================================
-  # PITCH USAGE TABLE (Right side, below location data)
+  # PITCH USAGE TABLE
   # =====================================================================
   draw_tableau_table(
     title = "Pitch Usage",
@@ -1702,26 +1761,20 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
     metrics = c("Usage vs. LHH", "Usage vs. RHH", "Pitch Count"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.55, y_start = 0.58,
-    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
-    row_h = 0.018
+    x_start = 0.52, y_start = 0.62,
+    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
+    row_h = 0.016
   )
   
-  # =====================================================================
-  # DIVIDER
-  # =====================================================================
-  grid.lines(x = c(0.02, 0.98), y = c(0.42, 0.42), 
-             gp = gpar(col = "gray70", lty = "dotted"))
-  
   # =====================================================================
   # MOVEMENT PLOT (Left side)
   # =====================================================================
-  pushViewport(viewport(x = 0.25, y = 0.28, width = 0.45, height = 0.26))
+  pushViewport(viewport(x = 0.25, y = 0.36, width = 0.42, height = 0.24))
   print(mov_plot, newpage = FALSE)
   popViewport()
   
   # =====================================================================
-  # VELO & MOVEMENT TABLE (Right side)
+  # VELO & MOVEMENT TABLE
   # =====================================================================
   draw_tableau_table(
     title = "Velo & Movement",
@@ -1730,26 +1783,20 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
                 "Avg. Vert Break", "Avg. Horz Break"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.55, y_start = 0.38,
-    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
-    row_h = 0.016
+    x_start = 0.52, y_start = 0.46,
+    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
+    row_h = 0.014
   )
   
   # =====================================================================
-  # DIVIDER
+  # RELEASE PLOT (Left side - BIGGER)
   # =====================================================================
-  grid.lines(x = c(0.02, 0.98), y = c(0.14, 0.14), 
-             gp = gpar(col = "gray70", lty = "dotted"))
-  
-  # =====================================================================
-  # RELEASE PLOT (Left side)
-  # =====================================================================
-  pushViewport(viewport(x = 0.25, y = 0.07, width = 0.45, height = 0.13))
+  pushViewport(viewport(x = 0.25, y = 0.10, width = 0.42, height = 0.22))
   print(rel_plot, newpage = FALSE)
   popViewport()
   
   # =====================================================================
-  # RELEASE DATA TABLE (Right side)
+  # RELEASE DATA TABLE
   # =====================================================================
   draw_tableau_table(
     title = "Release Data",
@@ -1759,14 +1806,14 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
                 "Avg. Extension (ft.)"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.55, y_start = 0.12,
-    col_w = min(0.12, 0.4 / max(1, length(pitch_types))),
+    x_start = 0.52, y_start = 0.22,
+    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
     row_h = 0.014
   )
   
   invisible(output_file)
 }
-
+                        
 # =====================================================================
 # =====================  CATCHER CODE (wrapped)  =======================
 # =====================================================================