Merge pull request #5 from thomasasfk/tafk-feet-saber-wip

Feet Saber is real!
thomasasfk · Oct 8, 2023 · d0c20f7 · d0c20f7
2 parents 72de768 + 85f9b55
commit d0c20f7
Show file tree

Hide file tree

Showing 6 changed files with 396 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -59,5 +59,7 @@ Generate full DD Beat Map from json files in repository (no --song-id does all)
 Generate full DD Beat Map from Feet Saber directory (WIP)
 
 ```bash
-.venv/Scripts/python fs2dd.py ...  # WIP when I have time.
+.venv/Scripts/python fs2dd.py --fs-map-dir "path/to/map/folder"
+.venv/Scripts/python fs2dd.py --fs-map-id 229ed
+.venv/Scripts/python fs2dd.py --fs-playlist-id 3474
 ```
diff --git a/drs2dd.py b/drs2dd.py
@@ -22,8 +22,8 @@
 from model.dancedash import DDRoadBlockNode
 from model.dancedash import DDSphereNode
 from model.dancedash import DRS2DD_MAP_PREFIX
-from model.dancedash import DRS_TO_DDS_LINE_NOTE_TYPE
-from model.dancedash import DRS_TO_DDS_NOTE_TYPE
+from model.dancedash import DRS_TO_DD_LINE_NOTE_TYPE
+from model.dancedash import DRS_TO_DD_NOTE_TYPE
 from model.dancedash import ORDER_COUNT_PER_BEAT
 from model.dancedash import X_Y
 from model.dancerush import ALBUM_NAME
@@ -63,7 +63,7 @@ def map_sphere_nodes(
                 noteOrder=round(bps * seconds * ORDER_COUNT_PER_BEAT),
                 time=seconds / total_time_seconds,
                 position=X_Y(x=track_step.position_info.to_dance_dash_x, y=0),
-                noteType=DRS_TO_DDS_NOTE_TYPE[track_step.kind],
+                noteType=DRS_TO_DD_NOTE_TYPE[track_step.kind],
             ),
         )
     return spheres
@@ -108,7 +108,7 @@ def map_line_nodes(
                     noteOrder=round(bps * seconds * ORDER_COUNT_PER_BEAT),
                     time=seconds / total_time_seconds,
                     position=X_Y(x=drs_track_point.to_dance_dash_x, y=0),
-                    noteType=DRS_TO_DDS_LINE_NOTE_TYPE[track_step.kind],
+                    noteType=DRS_TO_DD_LINE_NOTE_TYPE[track_step.kind],
                 ),
             )