simplifications to GameMode

osuAkatsuki · Jul 5, 2022 · e5a8707 · cmyui · Jul 5, 2022 · e5a8707
1 parent dc660e8
commit e5a8707
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/app/constants/gamemodes.py b/app/constants/gamemodes.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import functools
 from enum import IntEnum
 from enum import unique
 from typing import Union
@@ -49,7 +48,6 @@ class GameMode(IntEnum):
     AUTOPILOT_MANIA = 11  # unused
 
     @classmethod
-    @functools.lru_cache(maxsize=32)
     def from_params(cls, mode_vn: int, mods: Union[int, GameMode]) -> GameMode:
         mode = mode_vn
 
@@ -60,14 +58,9 @@ def from_params(cls, mode_vn: int, mods: Union[int, GameMode]) -> GameMode:
 
         return cls(mode)
 
-    @functools.cached_property
+    @property
     def as_vanilla(self) -> int:
-        if self.value & self.AUTOPILOT_OSU:
-            return self.value - 8
-        elif self.value & self.RELAX_OSU:
-            return self.value - 4
-        else:
-            return self.value
+        return self.value % 4
 
     def __repr__(self) -> str:
         return GAMEMODE_REPR_LIST[self.value]