most of S21 data

Author: subtractionsoup

data.py

@@ -123,6 +123,7 @@ def _generate_next_value_(name, start, count, last_values):
     FORCE = auto()
     GAUDY = auto()
     GRAVITY = auto()
+    GREEN_LIGHT = auto()
     GRIND_RAIL = auto()
     GROWTH = auto()
     GUARDED = auto()
@@ -364,6 +365,7 @@ class EventType(IntEnum):
     A_BLOOD_TYPE = 198
     PLAYER_SOUL_INCREASED = 199
     BALLPARK_MOD_RATIFIED = 203
+    SMASH = 204
     HYPE_BUILT = 206
     PRACTICING_MODERATION = 208
     RUNS_SCORED = 209
@@ -382,6 +384,7 @@ class EventType(IntEnum):
     VOICEMAIL = 228
     THIEVES_GUILD_ITEM = 230
     THIEVES_GUILD_PLAYER = 231
+    TUMBLEWEED_SOUNDS = 232
     TRADER_TRAITOR = 233
     TRADE_FAILED = 234
     TRADE_SUCCESS = 236
@@ -831,7 +834,16 @@ class PlayerData(TeamOrPlayerMods):
     @classmethod
     def from_chron(cls, data: Dict[str, Any], last_update_time: str, prev_player_data: Optional["PlayerData"]):
         data_state = data.get("state", {})
-        items = [ItemData.from_dict(item) for item in data.get("items") or []]
+        items = []
+        for item in data.get("items") or []:
+            # Thanks, Parker
+            if isinstance(item, str):
+                i = ItemData.null()
+                i.id = item
+                items.append(i)
+            else:
+                items.append(ItemData.from_dict(item))
+            
         player_data = PlayerData(
             id=data["id"],
             last_update_time=last_update_time,
@@ -889,7 +901,7 @@ def multiplied(self, stat: str, multiplier: float) -> float:
         full_stat = getattr(self, stat)
         item_stat = full_stat - raw_stat
         return raw_stat * multiplier + item_stat
-    
+
     def undefined(self) -> bool:
         # todo: actually *do* the rolls...
         return self.has_mod(Mod.SCATTERED) and self.has_mod(Mod.UNDEFINED)

formulas.py

@@ -130,6 +130,11 @@ def get_multiplier(
             multiplier += 0.5
         elif mod == Mod.MINIMIZED:
             return 0.00001 #Apparently this should just be 0, but it turns out that one of our formulas divides by an attribute. Let's not divide by zero shall we
+        elif mod == Mod.GREEN_LIGHT:
+            if meta.weather == Weather.POLARITY_PLUS:
+                multiplier += 0.5
+            elif meta.weather == Weather.POLARITY_MINUS:
+                multiplier -= 0.5
 
     if player.bat == "NIGHT_VISION_GOGGLES" and meta.weather == Weather.ECLIPSE:
         # Blessing description: Item. Random player on your team hits 50% better during Solar Eclipses.

item_gen.py

@@ -631,7 +631,12 @@ class ItemRollType(Enum):
         ItemRollType.CHEST: lambda x: 0 if x < 0.05 else 1 if x < 0.55 else 2 if x < 0.95 else 3,
         ItemRollType.GLITTER: lambda x: 0 if x < 0.5 else 1 if x < 0.9 else 2,
         ItemRollType.PRIZE: lambda x: 1 if x < 0.47 else 2 if x < 0.95 else 3, # todo: check this for sure, we have a 0.4601 that's definitely only *one* element (2021-07-20T15:00:08.612Z)
-    }
+    },
+    (23, 0): {
+        ItemRollType.CHEST: lambda x: 0 if x < 0.05 else 1 if x < 0.55 else 2 if x < 0.95 else 3,
+        ItemRollType.GLITTER: lambda x: 0 if x < 0.35 else 1 if x < 0.9 else 2,
+        ItemRollType.PRIZE: lambda x: 1 if x < 0.45 else 2 if x < 0.95 else 3,
+    },
 }
 
 
@@ -897,6 +902,24 @@ class ItemRollType(Enum):
     ),
 }
 
+# Very unsure about this, but there's a Helmet of Wisdom that drops in glitter and the roll doesn't work with the other pool. But the community chest drop a few games earlier needs the old pool.
+SUFFIX_POOL_GLITTER = {(20, 0): (
+        "Unknown",
+        "Blaserunning",
+        "Fourtitude",
+        "Unknown",
+        "Stamina",
+        "Vanity",
+        "Vitality",
+        "Intelligence",
+        "Strength",
+        "Charisma",
+        "Wisdom",
+        "Dexterity",
+        "the Feast",
+        "the Famine",
+    ),
+}
 
 DELTA = 0.00000000000001
 
@@ -965,7 +988,7 @@ def roll_item(
     prefix_pool = list(get_pool_for_day(prefix_pool, season, day))
     post_prefix_pool = POST_PREFIX_POOL_GLITTER if roll_type == ItemRollType.GLITTER else POST_PREFIX_POOL_CHEST
     post_prefix_pool = get_pool_for_day(post_prefix_pool, season, day)
-    suffix_pool = get_pool_for_day(SUFFIX_POOL, season, day)
+    suffix_pool = get_pool_for_day(SUFFIX_POOL_GLITTER if roll_type == ItemRollType.GLITTER and season >= 20 else SUFFIX_POOL, season, day)
     for _ in range(num_elements):
         value = roll(f"pre-prefix???")
         if value < 0.25: