Dynamic AUF

Author: Fantomas42

term_timer/config.py

@@ -2,6 +2,7 @@
 from importlib.util import find_spec
 from typing import Any
 
+from cubing_algs.constants import OPPOSITE_FACES
 from cubing_algs.parsing import parse_moves
 from cubing_algs.vcube import VCube
 
@@ -84,6 +85,8 @@ def load_config() -> dict[str, Any]:
 
 CUBE_METHOD = CUBE_CONFIG.get('method')
 
+AUF_MOVE = OPPOSITE_FACES[CUBE_ORIENTATION[0]]
+
 TRAINER_STEP = TRAINER_CONFIG.get('step')
 
 DEBUG = bool(os.getenv('TERM_TIMER_DEBUG', None))

term_timer/formatter.py

@@ -1,11 +1,11 @@
 import difflib
 
-from cubing_algs.constants import AUF_CHAR
 from cubing_algs.constants import INNER_MOVES
 from cubing_algs.constants import OUTER_WIDE_MOVES
 from cubing_algs.constants import PAUSE_CHAR
 from cubing_algs.constants import ROTATIONS
 
+from term_timer.config import AUF_MOVE
 from term_timer.constants import DNF
 from term_timer.constants import MS_TO_NS_FACTOR
 from term_timer.constants import SECOND
@@ -195,7 +195,7 @@ def format_alg_aufs(algorithm: str, pre_auf: int, post_auf: int) -> str:
     if pre_auf and algorithm:
         algorithm_parts = algorithm.split(' ')
         for i, move in enumerate(algorithm_parts):
-            if move[0] == AUF_CHAR:
+            if move[0] == AUF_MOVE:
                 algorithm_parts[i] = f'[pre-auf]{ move }[/pre-auf]'
             elif move != PAUSE_CHAR:
                 break
@@ -204,7 +204,7 @@ def format_alg_aufs(algorithm: str, pre_auf: int, post_auf: int) -> str:
     if post_auf and algorithm:
         algorithm_parts = list(reversed(algorithm.split(' ')))
         for i, move in enumerate(algorithm_parts):
-            if move[0] == AUF_CHAR:
+            if move[0] == AUF_MOVE:
                 algorithm_parts[i] = f'[post-auf]{ move }[/post-auf]'
             elif move != PAUSE_CHAR:
                 break

term_timer/methods/base.py

@@ -3,14 +3,12 @@
 from typing import ClassVar
 
 from cubing_algs.algorithm import Algorithm
-from cubing_algs.constants import AUF_CHAR
 from cubing_algs.constants import INITIAL_STATE
 from cubing_algs.masks import FULL_MASK
 from cubing_algs.parsing import parse_moves
 from cubing_algs.transform.auf import remove_auf_moves
 from cubing_algs.vcube import VCube
 
-from term_timer.config import CUBE_ORIENTATION_MOVES
 from term_timer.constants import MS_TO_NS_FACTOR
 from term_timer.transform import humanize_moves
 from term_timer.transform import prettify_moves
@@ -25,10 +23,7 @@
 F2L_FACE     = '111111000'  # noqa: E221
 FULL_FACE    = '1' * 9      # noqa: E221
 
-AUF_MOVE = reorient_moves(
-    CUBE_ORIENTATION_MOVES,
-    parse_moves(AUF_CHAR),
-)[0].base_move
+AUF_MOVE = 'D'  # Because actually AUF is based on a URFDLB cube and moves
 
 STEPS_CONFIG = {
     'Cross': {