Fix both acc and judgements specified

app/objects/score.py

@@ -324,8 +324,6 @@ def calculate_performance(self, beatmap_id: int) -> tuple[float, float]:
             mode=mode_vn,
             mods=int(self.mods),
             combo=self.max_combo,
-            # prefer to use the score's specific params that add up to the acc
-            acc=self.acc,
             ngeki=self.ngeki,
             n300=self.n300,
             nkatu=self.nkatu,

app/usecases/performance.py

@@ -65,16 +65,8 @@ def calculate_performances(
     results: list[PerformanceResult] = []
 
     for score in scores:
-        # assert either acc OR 300/100/50/geki/katu/miss is present, but not both
-        # if (score.acc is None) == (
-        #     score.n300 is None
-        #     and score.n100 is None
-        #     and score.n50 is None
-        #     and score.ngeki is None
-        #     and score.nkatu is None
-        #     and score.nmiss is None
-        # ):
-        #     raise ValueError("Either acc OR 300/100/50/geki/katu/miss must be present")
+        if score.acc and (score.ngeki or score.nkatu or score.n50 or score.n100):
+            raise ValueError("Must not specify both accuracy and geki/katu/50s/100s.")
 
         # rosupp ignores NC and requires DT
         if score.mods is not None:

tools/recalc.py

@@ -66,7 +66,6 @@ async def recalculate_score(
     calculator = Calculator(
         mode=GameMode(score["mode"]).as_vanilla,
         mods=score["mods"],
-        acc=score["acc"],
         combo=score["max_combo"],
         n_geki=score["ngeki"],  # Mania 320s
         n300=score["n300"],