Update app.R

app.R

@@ -1081,10 +1081,25 @@ create_postgame_pdf <- function(game_df, player_name, output_file, bio_data = NU
 # =====================================================================
 
 # =====================================================================
-# PITCH COLORS - Extended to handle more variations
+# TABLEAU-STYLE PITCHER POST-GAME REPORT - VERSION 3
+# =====================================================================
+# Changes from v2:
+# - Charts moved left and higher
+# - Location plot legend much smaller, zone positioned higher
+# - Tables farther right, bigger text, more compact
+# - Header stats: colored label text on white, white value background
+# - Only away team shown in header (no home team/pitcher team)
+# =====================================================================
+
+library(ggplot2)
+library(dplyr)
+library(grid)
+library(stringr)
+
+# =====================================================================
+# PITCH COLORS
 # =====================================================================
 tableau_pitch_colors <- c(
-  # Primary pitches
   "Sinker" = "#5DADE2",
   "Slider" = "#E67E22",
   "Cutter" = "#F4D03F",
@@ -1105,10 +1120,9 @@ tableau_pitch_colors <- c(
 )
 
 # =====================================================================
-# IMPROVED DATA PROCESSING - Better pitch type handling
+# DATA PROCESSING
 # =====================================================================
 process_tableau_pitcher_data <- function(df) {
-  # Standardize Pitcher name
   if (!"Pitcher" %in% names(df)) {
     alt <- intersect(c("PitcherName","pitcher","Pitcher_LastFirst","PlayerName"), names(df))
     if (length(alt)) df$Pitcher <- df[[alt[1]]] else df$Pitcher <- NA_character_
@@ -1117,29 +1131,26 @@ 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
+  # Clean up TaggedPitchType
   if ("TaggedPitchType" %in% names(df)) {
     df <- df %>%
       mutate(
         TaggedPitchType = case_when(
           is.na(TaggedPitchType) | TaggedPitchType == "" | TaggedPitchType == "Undefined" ~ 
-            ifelse(!is.na(AutoPitchType) & AutoPitchType != "" & AutoPitchType != "Undefined", 
+            ifelse("AutoPitchType" %in% names(df) & !is.na(AutoPitchType) & AutoPitchType != "" & AutoPitchType != "Undefined", 
                    AutoPitchType, 
-                   ifelse(!is.na(PitchType) & PitchType != "" & PitchType != "Undefined",
+                   ifelse("PitchType" %in% names(df) & !is.na(PitchType) & PitchType != "" & PitchType != "Undefined",
                           PitchType, "Undefined")),
           TRUE ~ TaggedPitchType
         )
       )
   }
   
-  # Calculate all indicators
+  # Calculate indicators
   df <- df %>%
     mutate(
-      # Strike Zone Indicator
       StrikeZoneIndicator = ifelse(PlateLocSide >= -0.8333 & PlateLocSide <= 0.8333 & 
                                      PlateLocHeight >= 1.5 & PlateLocHeight <= 3.5, 1, 0),
-      
-      # Edge calculations
       EdgeHeightIndicator = ifelse((PlateLocHeight > 14/12 & PlateLocHeight < 22/12) |
                                      (PlateLocHeight > 38/12 & PlateLocHeight < 46/12), 1, 0),
       EdgeZoneHtIndicator = ifelse(PlateLocHeight > 16/12 & PlateLocHeight < 45.2/12, 1, 0),
@@ -1148,41 +1159,31 @@ process_tableau_pitcher_data <- function(df) {
                                     (PlateLocSide < 13.3/12 & PlateLocSide > 6.7/12), 1, 0),
       EdgeIndicator = ifelse((EdgeHeightIndicator == 1 & EdgeZoneWIndicator == 1) | 
                                (EdgeWidthIndicator == 1 & EdgeZoneHtIndicator == 1), 1, 0),
-      
       QualityPitchIndicator = ifelse(StrikeZoneIndicator == 1 | EdgeIndicator == 1, 1, 0),
-      
       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),
-      
       FPindicator = ifelse(Balls == 0 & Strikes == 0, 1, 0),
       FPSindicator = ifelse(PitchCall %in% c("StrikeCalled", "StrikeSwinging", 
                                                "FoulBallNotFieldable", "FoulBall", "InPlay") & 
                               FPindicator == 1, 1, 0),
-      
       AheadIndicator = ifelse(((Balls == 0 & Strikes == 1) | (Balls == 1 & Strikes == 1)) & 
                                 StrikeIndicator == 1, 1, 0),
-      
       ABindicator = ifelse(PlayResult %in% c("Error", "FieldersChoice", "Out", 
                                                "Single", "Double", "Triple", "HomeRun") | 
                              KorBB == "Strikeout", 1, 0),
-      
       HitIndicator = ifelse(PlayResult %in% c("Single", "Double", "Triple", "HomeRun"), 1, 0),
-      
       PAindicator = ifelse(PitchCall %in% c("InPlay", "HitByPitch", "CatchersInterference") | 
                              KorBB %in% c("Walk", "Strikeout"), 1, 0),
-      
       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),
-      
       HBPIndicator = ifelse(PitchCall == "HitByPitch", 1, 0),
       WalkIndicator = ifelse(KorBB == "Walk", 1, 0),
-      
       LHHindicator = ifelse(BatterSide == "Left", 1, 0),
       RHHindicator = ifelse(BatterSide == "Right", 1, 0)
     )
@@ -1237,12 +1238,8 @@ calculate_tableau_header_stats <- function(pitcher_df) {
                     round(100 * sum(pitcher_df$LOOindicator, na.rm = TRUE) / leadoff_opps, 0), 0)
   
   list(
-    at_bats = at_bats,
-    hits = hits,
-    xbh = xbh,
-    runs = runs,
-    bb_hbp = bb + hbp,
-    so = so,
+    at_bats = at_bats, hits = hits, xbh = xbh, runs = runs,
+    bb_hbp = bb + hbp, so = so,
     avg = sprintf("%.3f", avg),
     strike_pct = paste0(strike_pct, "%"),
     fp_k_pct = paste0(fp_k_pct, "%"),
@@ -1253,23 +1250,25 @@ calculate_tableau_header_stats <- function(pitcher_df) {
 }
 
 # =====================================================================
-# TABLE CALCULATIONS - Now handles "Undefined" pitch types
+# TABLE CALCULATIONS
 # =====================================================================
-calculate_tableau_location_data <- function(pitcher_df) {
-  # Get all pitch types including "Undefined" if that's all we have
+get_valid_pitch_types <- function(pitcher_df) {
   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"]
+    return(valid_types)
   }
   
-  if (length(filter_types) == 0) filter_types <- "Undefined"
+  filter_types <- valid_types[valid_types != "Undefined" & valid_types != "Other"]
+  if (length(filter_types) == 0) return("Undefined")
+  filter_types
+}
+
+calculate_tableau_location_data <- function(pitcher_df) {
+  filter_types <- get_valid_pitch_types(pitcher_df)
   
   pitcher_df %>%
     filter(TaggedPitchType %in% filter_types) %>%
@@ -1288,19 +1287,7 @@ calculate_tableau_location_data <- function(pitcher_df) {
 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"
+  filter_types <- get_valid_pitch_types(pitcher_df)
   
   pitcher_df %>%
     filter(TaggedPitchType %in% filter_types) %>%
@@ -1314,18 +1301,7 @@ 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"
+  filter_types <- get_valid_pitch_types(pitcher_df)
   
   pitcher_df %>%
     filter(TaggedPitchType %in% filter_types) %>%
@@ -1333,10 +1309,10 @@ calculate_tableau_velo_movement <- function(pitcher_df) {
     summarise(
       `Avg. Velo` = round(mean(RelSpeed, na.rm = TRUE), 1),
       `Max. Velo` = round(max(RelSpeed, na.rm = TRUE), 1),
-      `Avg. Spin Rate` = format(round(mean(SpinRate, na.rm = TRUE), 0), big.mark = ","),
-      `Max. Spin Rate` = format(round(max(SpinRate, na.rm = TRUE), 0), big.mark = ","),
-      `Avg. Vert Break` = round(mean(InducedVertBreak, na.rm = TRUE), 0),
-      `Avg. Horz Break` = round(mean(HorzBreak, na.rm = TRUE), 0),
+      `Avg. Spin` = format(round(mean(SpinRate, na.rm = TRUE), 0), big.mark = ","),
+      `Max. Spin` = format(round(max(SpinRate, na.rm = TRUE), 0), big.mark = ","),
+      `Avg. IVB` = round(mean(InducedVertBreak, na.rm = TRUE), 0),
+      `Avg. HB` = round(mean(HorzBreak, na.rm = TRUE), 0),
       .groups = "drop"
     )
 }
@@ -1346,66 +1322,42 @@ calculate_tableau_release_data <- function(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"
+  filter_types <- get_valid_pitch_types(pitcher_df)
   
   pitcher_df %>%
     filter(TaggedPitchType %in% filter_types) %>%
     group_by(TaggedPitchType) %>%
     summarise(
-      `Avg. Rel Height (ft.)` = round(mean(RelHeight, na.rm = TRUE), 2),
-      `Rel Ht vs. FB (in.)` = ifelse(is.na(fb_ht), NA, round((mean(RelHeight, na.rm = TRUE) - fb_ht) * 12, 0)),
-      `Avg. Rel Side (ft.)` = round(mean(RelSide, na.rm = TRUE), 2),
-      `Rel Side vs. FB (in.)` = ifelse(is.na(fb_side), NA, round((mean(RelSide, na.rm = TRUE) - fb_side) * 12, 0)),
-      `Avg. Extension (ft.)` = round(mean(Extension, na.rm = TRUE), 2),
+      `Rel Ht` = round(mean(RelHeight, na.rm = TRUE), 2),
+      `vs FB` = ifelse(is.na(fb_ht), NA, round((mean(RelHeight, na.rm = TRUE) - fb_ht) * 12, 0)),
+      `Rel Side` = round(mean(RelSide, na.rm = TRUE), 2),
+      `vs FB (S)` = ifelse(is.na(fb_side), NA, round((mean(RelSide, na.rm = TRUE) - fb_side) * 12, 0)),
+      `Ext` = round(mean(Extension, na.rm = TRUE), 2),
       .groups = "drop"
     )
 }
 
 # =====================================================================
-# LOCATION PLOT
+# LOCATION PLOT - Smaller legend, zone higher
 # =====================================================================
 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"
+  filter_types <- get_valid_pitch_types(pitcher_df)
   
   df <- pitcher_df %>%
     filter(TaggedPitchType %in% filter_types,
            !is.na(PlateLocSide), !is.na(PlateLocHeight)) %>%
     mutate(
       ResultDisplay = case_when(
-        PitchCall %in% c("BallCalled", "BallinDirt") ~ "BallCalled",
-        PlayResult == "Double" ~ "Double",
-        PitchCall %in% c("FoulBall", "FoulBallNotFieldable") ~ "FoulBall",
-        PitchCall == "HitByPitch" ~ "HitByPitch",
-        PlayResult %in% c("Sacrifice", "SacrificeFly") ~ "Sacrifice",
-        PlayResult == "Single" ~ "Single",
-        PitchCall == "StrikeCalled" ~ "StrikeCalled",
-        PitchCall == "StrikeSwinging" ~ "StrikeSwinging",
-        PlayResult == "Triple" ~ "Triple",
-        PlayResult == "HomeRun" ~ "HomeRun",
+        PitchCall %in% c("BallCalled", "BallinDirt") ~ "Ball",
+        PlayResult == "Double" ~ "2B",
+        PitchCall %in% c("FoulBall", "FoulBallNotFieldable") ~ "Foul",
+        PitchCall == "HitByPitch" ~ "HBP",
+        PlayResult %in% c("Sacrifice", "SacrificeFly") ~ "Sac",
+        PlayResult == "Single" ~ "1B",
+        PitchCall == "StrikeCalled" ~ "Called",
+        PitchCall == "StrikeSwinging" ~ "Whiff",
+        PlayResult == "Triple" ~ "3B",
+        PlayResult == "HomeRun" ~ "HR",
         PlayResult == "Out" ~ "Out",
         TRUE ~ "Other"
       )
@@ -1414,7 +1366,7 @@ 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 = 12, face = "bold", hjust = 0.5)))
+             theme(plot.title = element_text(size = 10, face = "bold", hjust = 0.5)))
   }
   
   zone_left <- -0.8333; zone_right <- 0.8333
@@ -1427,47 +1379,55 @@ create_tableau_location_plot <- function(pitcher_df, pitch_colors) {
   p <- ggplot(df, aes(x = PlateLocSide, y = PlateLocHeight)) +
     annotate("rect", xmin = shadow_left, xmax = shadow_right, 
              ymin = shadow_bottom, ymax = shadow_top, 
-             fill = NA, color = "gray30", linetype = "dashed", linewidth = 0.6) +
+             fill = NA, color = "gray30", linetype = "dashed", linewidth = 0.5) +
     annotate("rect", xmin = zone_left, xmax = zone_right, 
              ymin = zone_bottom, ymax = zone_top, 
-             fill = NA, color = "#E74C3C", linewidth = 1.2) +
+             fill = NA, color = "#E74C3C", linewidth = 1) +
     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) +
+             y = zone_bottom, yend = zone_top, color = "gray50", linetype = "dashed", linewidth = 0.3) +
     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) +
+             y = zone_bottom, yend = zone_top, color = "gray50", linetype = "dashed", linewidth = 0.3) +
     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) +
+             color = "gray50", linetype = "dashed", linewidth = 0.3) +
     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) +
-    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) +
-    annotate("segment", x = 0, xend = 0, y = 0.5, yend = shadow_top + 0.3, 
-             color = "gray60", linetype = "dotted", linewidth = 0.4) +
-    geom_point(aes(color = TaggedPitchType, shape = ResultDisplay), size = 3, stroke = 1) +
-    scale_color_manual(values = pitch_colors, name = "Pitch Type") +
+             color = "gray50", linetype = "dashed", linewidth = 0.3) +
+    # Home plate
+    annotate("polygon", x = c(-0.708, 0.708, 0.708, 0, -0.708), 
+             y = c(0.15, 0.15, 0.30, 0.50, 0.30), fill = NA, color = "black", linewidth = 0.5) +
+    # Center line
+    annotate("segment", x = 0, xend = 0, y = 0.5, yend = shadow_top + 0.2, 
+             color = "gray60", linetype = "dotted", linewidth = 0.3) +
+    geom_point(aes(color = TaggedPitchType, shape = ResultDisplay), size = 2.5, stroke = 0.8) +
+    scale_color_manual(values = pitch_colors, name = "Pitch") +
     scale_shape_manual(
-      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"
+      values = c("Ball" = 1, "2B" = 18, "Foul" = 2, "HBP" = 8,
+                 "Sac" = 3, "1B" = 19, "Called" = 4, "Whiff" = 8,
+                 "3B" = 17, "HR" = 18, "Out" = 4, "Other" = 16),
+      name = "Result"
     ) +
-    coord_fixed(xlim = c(-2, 2), ylim = c(-0.2, 4.2)) +
+    coord_fixed(xlim = c(-1.8, 1.8), ylim = c(0, 4.2)) +
     labs(title = "Location Report") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 9, face = "bold", hjust = 0.5),
       legend.position = "left",
-      legend.title = element_text(size = 7, face = "bold"),
-      legend.text = element_text(size = 6),
+      legend.title = element_text(size = 5, face = "bold"),
+      legend.text = element_text(size = 4),
+      legend.key.size = unit(0.3, "cm"),
+      legend.spacing.y = unit(0.05, "cm"),
+      legend.margin = margin(0, 0, 0, 0),
+      legend.box.margin = margin(0, -5, 0, -10),
       axis.text = element_blank(),
       axis.title = element_blank(),
       axis.ticks = element_blank(),
-      panel.grid = element_blank()
+      panel.grid = element_blank(),
+      plot.margin = margin(2, 2, 2, 2)
+    ) +
+    guides(
+      color = guide_legend(override.aes = list(size = 2), ncol = 1),
+      shape = guide_legend(override.aes = list(size = 2), ncol = 1)
     )
   
   p
@@ -1477,18 +1437,7 @@ create_tableau_location_plot <- function(pitcher_df, pitch_colors) {
 # 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"
+  filter_types <- get_valid_pitch_types(pitcher_df)
   
   df <- pitcher_df %>%
     filter(TaggedPitchType %in% filter_types,
@@ -1497,41 +1446,31 @@ create_tableau_movement_plot <- function(pitcher_df, pitch_colors) {
   if (nrow(df) == 0) {
     return(ggplot() + theme_void() + 
              labs(title = "Movement Profile") +
-             theme(plot.title = element_text(size = 12, face = "bold", hjust = 0.5)))
+             theme(plot.title = element_text(size = 10, face = "bold", hjust = 0.5)))
   }
   
   ggplot(df, aes(x = HorzBreak, y = InducedVertBreak, color = TaggedPitchType)) +
-    geom_vline(xintercept = 0, color = "black", linewidth = 0.5) +
-    geom_hline(yintercept = 0, color = "black", linewidth = 0.5) +
-    geom_point(size = 3, alpha = 0.8) +
+    geom_vline(xintercept = 0, color = "black", linewidth = 0.4) +
+    geom_hline(yintercept = 0, color = "black", linewidth = 0.4) +
+    geom_point(size = 2.5, alpha = 0.8) +
     scale_color_manual(values = pitch_colors) +
     coord_cartesian(xlim = c(-25, 25), ylim = c(-25, 25)) +
-    labs(title = "Movement Profile", x = "Horz Break", y = "Induced Vert Break") +
+    labs(title = "Movement Profile", x = "HB", y = "IVB") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 9, face = "bold", hjust = 0.5),
       legend.position = "none",
-      axis.title = element_text(size = 8),
-      axis.text = element_text(size = 7)
+      axis.title = element_text(size = 7),
+      axis.text = element_text(size = 6),
+      plot.margin = margin(2, 2, 2, 2)
     )
 }
 
 # =====================================================================
-# RELEASE PLOT - WITH MOUND
+# RELEASE PLOT
 # =====================================================================
 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"
+  filter_types <- get_valid_pitch_types(pitcher_df)
   
   df <- pitcher_df %>%
     filter(TaggedPitchType %in% filter_types,
@@ -1540,9 +1479,10 @@ create_tableau_release_plot <- function(pitcher_df, pitch_colors) {
   if (nrow(df) == 0) {
     return(ggplot() + theme_void() + 
              labs(title = "Release Plot") +
-             theme(plot.title = element_text(size = 12, face = "bold", hjust = 0.5)))
+             theme(plot.title = element_text(size = 10, face = "bold", hjust = 0.5)))
   }
   
+  # Mound arc
   mound_theta <- seq(0, pi, length.out = 100)
   mound_radius <- 3
   mound_df <- data.frame(
@@ -1555,50 +1495,72 @@ create_tableau_release_plot <- function(pitcher_df, pitch_colors) {
                  fill = "#C0392B", color = NA, inherit.aes = FALSE) +
     annotate("rect", xmin = -0.5, xmax = 0.5, ymin = 0.85, ymax = 1.05, 
              fill = "white", color = "gray40", linewidth = 0.3) +
-    geom_vline(xintercept = 0, color = "gray60", linetype = "dashed", linewidth = 0.4) +
-    geom_point(aes(color = TaggedPitchType), size = 3, alpha = 0.8) +
+    geom_vline(xintercept = 0, color = "gray60", linetype = "dashed", linewidth = 0.3) +
+    geom_point(aes(color = TaggedPitchType), size = 2.5, 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") +
+    labs(title = "Release Plot", x = "Side", y = "Height") +
     theme_minimal() +
     theme(
-      plot.title = element_text(size = 12, face = "bold", hjust = 0.5),
+      plot.title = element_text(size = 9, face = "bold", hjust = 0.5),
       legend.position = "none",
-      axis.title = element_text(size = 8),
-      axis.text = element_text(size = 7)
+      axis.title = element_text(size = 7),
+      axis.text = element_text(size = 6),
+      plot.margin = margin(2, 2, 2, 2)
     )
 }
 
 # =====================================================================
-# TABLE DRAWING FUNCTION
+# TABLE DRAWING - Compact with bigger text
 # =====================================================================
-draw_tableau_table <- function(title, data, metrics, pitch_types, pitch_colors, 
-                                x_start, y_start, col_w = 0.10, row_h = 0.016) {
+draw_tableau_table_v3 <- function(title, data, metrics, pitch_types, pitch_colors, 
+                                   x_start, y_start, col_w = 0.075, row_h = 0.014) {
   
-  grid.text(title, x = x_start + length(pitch_types) * col_w / 2, y = y_start + 0.025, 
-            gp = gpar(fontface = "bold", cex = 0.8))
+  # Title
+  grid.text(title, x = x_start + length(pitch_types) * col_w / 2, y = y_start + 0.018, 
+            gp = gpar(fontface = "bold", cex = 0.65, col = "#006F71"))
   
+  # Column headers (pitch types)
   header_y <- y_start
   for (i in seq_along(pitch_types)) {
     pt <- pitch_types[i]
     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,
+              width = col_w * 0.96, height = row_h,
               just = c("left", "center"),
-              gp = gpar(fill = col_color, col = "black", lwd = 0.5))
+              gp = gpar(fill = col_color, col = "gray60", lwd = 0.3))
+    
+    # Abbreviate long pitch names
+    pt_short <- gsub("ChangeUp", "CH", pt)
+    pt_short <- gsub("Fastball", "FB", pt_short)
+    pt_short <- gsub("Curveball", "CB", pt_short)
+    pt_short <- gsub("Slider", "SL", pt_short)
+    pt_short <- gsub("Sinker", "SI", pt_short)
+    pt_short <- gsub("Cutter", "CT", pt_short)
+    pt_short <- gsub("Splitter", "SP", pt_short)
+    pt_short <- gsub("Sweeper", "SW", pt_short)
     
-    grid.text(pt, x = x_start + (i-1)*col_w + col_w/2, y = header_y,
-              gp = gpar(col = "white", cex = 0.38, fontface = "bold"))
+    grid.text(pt_short, x = x_start + (i-1)*col_w + col_w/2, y = header_y,
+              gp = gpar(col = "white", cex = 0.42, fontface = "bold"))
   }
   
+  # Data rows
   for (m in seq_along(metrics)) {
     metric_name <- metrics[m]
     y_pos <- header_y - m * row_h
     
-    grid.text(metric_name, x = x_start - 0.015, y = y_pos, just = "right",
-              gp = gpar(cex = 0.38, fontface = "bold"))
+    # Row label - abbreviated
+    metric_short <- gsub("Usage vs. ", "", metric_name)
+    metric_short <- gsub("Avg. ", "", metric_short)
+    metric_short <- gsub("Max. ", "Max ", metric_short)
+    metric_short <- gsub("Pitch Count", "#", metric_short)
+    metric_short <- gsub(" Rate", "", metric_short)
+    
+    grid.text(metric_short, x = x_start - 0.008, y = y_pos, just = "right",
+              gp = gpar(cex = 0.42, fontface = "bold"))
     
+    # Values for each pitch type
     for (i in seq_along(pitch_types)) {
       pt <- pitch_types[i]
       idx <- which(data$TaggedPitchType == pt)
@@ -1609,18 +1571,18 @@ draw_tableau_table <- function(title, data, metrics, pitch_types, pitch_colors,
       }
       
       grid.rect(x = x_start + (i-1)*col_w, y = y_pos,
-                width = col_w * 0.95, height = row_h * 0.9,
+                width = col_w * 0.96, height = row_h * 0.92,
                 just = c("left", "center"),
-                gp = gpar(fill = "white", col = "gray80", lwd = 0.3))
+                gp = gpar(fill = "white", col = "gray80", lwd = 0.2))
       
       grid.text(val, x = x_start + (i-1)*col_w + col_w/2, y = y_pos,
-                gp = gpar(cex = 0.36))
+                gp = gpar(cex = 0.40))
     }
   }
 }
 
 # =====================================================================
-# MAIN PDF CREATION FUNCTION - PORTRAIT LAYOUT
+# MAIN PDF FUNCTION
 # =====================================================================
 create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   if (length(dev.list()) > 0) try(dev.off(), silent = TRUE)
@@ -1637,18 +1599,16 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
     return(output_file)
   }
   
-  # Get metadata
+  # Metadata - only get away team (batter team)
   game_date <- tryCatch({
     d <- unique(pitcher_df$Date)[1]
     if (inherits(d, "Date")) format(d, "%m/%d/%Y") else as.character(d)
   }, error = function(e) "NA")
   
-  pitcher_team <- unique(pitcher_df$PitcherTeam)[1]
-  if (is.na(pitcher_team)) pitcher_team <- "Unknown"
-  
+  # Get opponent team (batter team, not pitcher team)
   batter_teams <- unique(pitcher_df$BatterTeam)
-  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"
+  batter_teams <- batter_teams[!is.na(batter_teams)]
+  away_team <- if (length(batter_teams) > 0) batter_teams[1] else "Unknown"
   
   # Calculate stats
   stats <- calculate_tableau_header_stats(pitcher_df)
@@ -1657,7 +1617,6 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   velo_data <- calculate_tableau_velo_movement(pitcher_df)
   rel_data <- calculate_tableau_release_data(pitcher_df)
   
-  # 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"
@@ -1667,148 +1626,136 @@ create_tableau_pitcher_pdf <- function(game_df, pitcher_name, output_file) {
   mov_plot <- create_tableau_movement_plot(pitcher_df, tableau_pitch_colors)
   rel_plot <- create_tableau_release_plot(pitcher_df, tableau_pitch_colors)
   
-  # Create PDF - PORTRAIT (8.5 x 11)
+  # Create PDF
   pdf(output_file, width = 8.5, height = 11)
   on.exit(try(dev.off(), silent = TRUE), add = TRUE)
   
   grid.newpage()
   
   # =====================================================================
-  # HEADER BAR (Teal)
+  # HEADER BAR
   # =====================================================================
-  grid.rect(x = 0, y = 0.95, width = 1, height = 0.05, 
+  grid.rect(x = 0, y = 0.955, width = 1, height = 0.045, 
             just = c("left", "bottom"),
             gp = gpar(fill = "#006F71", col = NA))
   
-  grid.text("Pitcher Post-Game Report", x = 0.02, y = 0.975, just = "left",
-            gp = gpar(col = "white", fontface = "bold", cex = 1.3))
+  grid.text("Pitcher Post-Game Report", x = 0.02, y = 0.977, just = "left",
+            gp = gpar(col = "white", fontface = "bold", cex = 1.2))
   
   # =====================================================================
-  # INFO ROW - NO LABELS, just values
+  # INFO ROW - Date, Pitcher Name, vs Away Team only
   # =====================================================================
-  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"))
-  }
+  info_y <- 0.935
+  grid.text(paste0(game_date, "   |   ", pitcher_name, "   vs   ", away_team), 
+            x = 0.02, y = info_y, just = "left",
+            gp = gpar(cex = 0.7, fontface = "bold"))
   
   # =====================================================================
-  # STAT BOXES - SINGLE ROW matching screenshot colors
+  # STAT BOXES - Colored labels, white value backgrounds
   # =====================================================================
-  # 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
+  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)
+  
+  # Label colors (text color for the stat name)
+  label_colors <- c("#E74C3C", "#3498DB", "#3498DB", "#27AE60", "#27AE60", "#27AE60", "#00BCD4",
+                    "#E67E22", "#E67E22", "#E67E22", "#E67E22", "#E67E22")
+  
+  box_y <- 0.905
+  box_w <- 0.065
+  box_h <- 0.038
   x_start <- 0.02
   
   for (i in 1:12) {
-    x_pos <- x_start + (i-1) * (box_w + 0.005)
+    x_pos <- x_start + (i-1) * (box_w + 0.012)
     
+    # White background box with border matching label color
     grid.rect(x = x_pos, y = box_y, width = box_w, height = box_h,
               just = c("left", "center"),
-              gp = gpar(fill = stat_bg_colors[i], col = "black", lwd = 0.5))
+              gp = gpar(fill = "white", col = label_colors[i], lwd = 1.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"))
+    # Colored label at top
+    grid.text(stat_labels[i], x = x_pos + box_w/2, y = box_y + 0.010,
+              gp = gpar(col = label_colors[i], cex = 0.40, 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"))
+    # Black value below
+    grid.text(as.character(stat_values[i]), x = x_pos + box_w/2, y = box_y - 0.007,
+              gp = gpar(col = "black", cex = 0.52, fontface = "bold"))
   }
   
   # =====================================================================
-  # LOCATION PLOT (Left side - SMALLER)
+  # CHARTS - Moved left and higher
   # =====================================================================
-  pushViewport(viewport(x = 0.25, y = 0.62, width = 0.42, height = 0.26))
+  
+  # Location plot (top left) - moved left and up
+  pushViewport(viewport(x = 0.22, y = 0.66, width = 0.40, height = 0.28))
   print(loc_plot, newpage = FALSE)
   popViewport()
   
+  # Movement plot (middle left)
+  pushViewport(viewport(x = 0.22, y = 0.38, width = 0.40, height = 0.24))
+  print(mov_plot, newpage = FALSE)
+  popViewport()
+  
+  # Release plot (bottom left) - bigger
+  pushViewport(viewport(x = 0.22, y = 0.12, width = 0.40, height = 0.22))
+  print(rel_plot, newpage = FALSE)
+  popViewport()
+  
   # =====================================================================
-  # LOCATION DATA TABLE (Right side)
+  # TABLES - Farther right, more compact, bigger text
   # =====================================================================
-  draw_tableau_table(
+  
+  # Adjust table position based on number of pitch types
+  n_types <- length(pitch_types)
+  col_w <- min(0.085, 0.42 / max(1, n_types))
+  table_x <- 0.54
+  
+  # Location Data table
+  draw_tableau_table_v3(
     title = "Location Data",
     data = loc_data,
     metrics = c("Zone%", "Edge%", "Strike%", "Whiff%"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.52, y_start = 0.76,
-    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
-    row_h = 0.016
+    x_start = table_x, y_start = 0.78,
+    col_w = col_w, row_h = 0.014
   )
   
-  # =====================================================================
-  # PITCH USAGE TABLE
-  # =====================================================================
-  draw_tableau_table(
+  # Pitch Usage table
+  draw_tableau_table_v3(
     title = "Pitch Usage",
     data = usage_data,
     metrics = c("Usage vs. LHH", "Usage vs. RHH", "Pitch Count"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.52, y_start = 0.62,
-    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
-    row_h = 0.016
+    x_start = table_x, y_start = 0.66,
+    col_w = col_w, row_h = 0.014
   )
   
-  # =====================================================================
-  # MOVEMENT PLOT (Left side)
-  # =====================================================================
-  pushViewport(viewport(x = 0.25, y = 0.36, width = 0.42, height = 0.24))
-  print(mov_plot, newpage = FALSE)
-  popViewport()
-  
-  # =====================================================================
-  # VELO & MOVEMENT TABLE
-  # =====================================================================
-  draw_tableau_table(
+  # Velo & Movement table
+  draw_tableau_table_v3(
     title = "Velo & Movement",
     data = velo_data,
-    metrics = c("Avg. Velo", "Max. Velo", "Avg. Spin Rate", "Max. Spin Rate", 
-                "Avg. Vert Break", "Avg. Horz Break"),
+    metrics = c("Avg. Velo", "Max. Velo", "Avg. Spin", "Max. Spin", "Avg. IVB", "Avg. HB"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.52, y_start = 0.46,
-    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
-    row_h = 0.014
+    x_start = table_x, y_start = 0.52,
+    col_w = col_w, row_h = 0.013
   )
   
-  # =====================================================================
-  # RELEASE PLOT (Left side - BIGGER)
-  # =====================================================================
-  pushViewport(viewport(x = 0.25, y = 0.10, width = 0.42, height = 0.22))
-  print(rel_plot, newpage = FALSE)
-  popViewport()
-  
-  # =====================================================================
-  # RELEASE DATA TABLE
-  # =====================================================================
-  draw_tableau_table(
+  # Release Data table
+  draw_tableau_table_v3(
     title = "Release Data",
     data = rel_data,
-    metrics = c("Avg. Rel Height (ft.)", "Rel Ht vs. FB (in.)", 
-                "Avg. Rel Side (ft.)", "Rel Side vs. FB (in.)", 
-                "Avg. Extension (ft.)"),
+    metrics = c("Rel Ht", "vs FB", "Rel Side", "vs FB (S)", "Ext"),
     pitch_types = pitch_types,
     pitch_colors = tableau_pitch_colors,
-    x_start = 0.52, y_start = 0.22,
-    col_w = min(0.10, 0.45 / max(1, length(pitch_types))),
-    row_h = 0.014
+    x_start = table_x, y_start = 0.36,
+    col_w = col_w, row_h = 0.013
   )
   
   invisible(output_file)