From f28e61b3032170c06757c78a690851a77211f507 Mon Sep 17 00:00:00 2001
From: Justin Edmund <justin@jedmund.com>
Date: Mon, 15 Dec 2025 09:50:53 -0800
Subject: [PATCH] add Holiday to CHARACTER_SERIES enum

---
 app/models/concerns/granblue_enums.rb | 17 +++++++++--------
 lib/granblue/parsers/wiki.rb          | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/models/concerns/granblue_enums.rb b/app/models/concerns/granblue_enums.rb
index bd36992..fabfe32 100644
--- a/app/models/concerns/granblue_enums.rb
+++ b/app/models/concerns/granblue_enums.rb
@@ -32,14 +32,14 @@ module GranblueEnums
     None: 6
   }.freeze
 
-  # Character seasons - represents gacha availability window (when you can pull)
+  # Character seasons - display disambiguation for seasonal variants (e.g., "Vane [Halloween]")
+  # If no season, value should be nil (not a default value)
   CHARACTER_SEASONS = {
-    Standard: 1,
-    Valentine: 2,
-    Formal: 3,
-    Summer: 4,
-    Halloween: 5,
-    Holiday: 6
+    Valentine: 1,
+    Formal: 2,
+    Summer: 3,
+    Halloween: 4,
+    Holiday: 5
   }.freeze
 
   # Character series - represents character identity/pool membership (can have multiple)
@@ -58,7 +58,8 @@ module GranblueEnums
     Valentine: 12,
     Halloween: 13,
     Formal: 14,
-    Event: 15
+    Holiday: 15,
+    Event: 16
   }.freeze
 
   # Gacha promotions - which pools/banners a weapon or summon appears in
diff --git a/lib/granblue/parsers/wiki.rb b/lib/granblue/parsers/wiki.rb
index 60842e6..2a3393f 100644
--- a/lib/granblue/parsers/wiki.rb
+++ b/lib/granblue/parsers/wiki.rb
@@ -93,18 +93,19 @@ module Granblue
         'valentine' => 12,  # Valentine
         'halloween' => 13,  # Halloween
         'formal' => 14,     # Formal
-        'event' => 15       # Event
+        'holiday' => 15,    # Holiday
+        'event' => 16       # Event
       }.freeze
 
       # Maps wiki seasonal indicators to CHARACTER_SEASONS enum values
-      # Determined from page name suffix or |obtain= field
+      # Used for display disambiguation (e.g., "Vane [Halloween]")
+      # If no season matches, value should be nil
       self.character_seasons = {
-        'standard' => 1,    # Standard (year-round in their pool)
-        'valentine' => 2,   # Valentine
-        'formal' => 3,      # Formal
-        'summer' => 4,      # Summer (includes Yukata)
-        'halloween' => 5,   # Halloween
-        'holiday' => 6      # Holiday
+        'valentine' => 1,   # Valentine
+        'formal' => 2,      # Formal
+        'summer' => 3,      # Summer (includes Yukata)
+        'halloween' => 4,   # Halloween
+        'holiday' => 5      # Holiday
       }.freeze
 
       # Maps wiki |obtain= values to PROMOTIONS enum values for weapons/summons