2023-09-29 03:23:07 +03:00
83 changed files with 25914 additions and 25903 deletions
@@ -42,3 +42,9 @@ Generate full DD Beat Map from json files in repository (no --song-id does all)
 ```bash
 .venv/Scripts/python drs2dd.py --song-id 187
 ```
+
+Generate full DD Beat Map from Feet Saber directory (WIP)
+
+```bash
+.venv/Scripts/python fs2dd.py ...  # WIP when I have time.
+```
@@ -161,8 +161,13 @@ def create_dd_tracks_from_DRSSongData(drs_song_data: DRSSongData, target_dir: st
    if not target_dir:
        target_dir = f'{DEFAULT_TRACK_DIR}/{create_valid_filename(drs_song_data.info.title_name)}/'

-    dd_bmp = int(drs_song_data.info.bpm_max / 100)
-    dd_bps = dd_bmp / 60
+    highest_bpm = max(
+        drs_song_data.difficulties.difficulty_1a.track.info.bpm_info, key=lambda x: x.bpm,
+    ).bpm
+    # note we don't use drs_song_data.info.bpm_max as it is not always correct... sometimes higher bpms exist.
+    # not sure why.
+    dd_bpm = int(highest_bpm / 100)
+    dd_bps = dd_bpm / 60

    folder_path = TRACK_ID_TO_PATH.get(drs_song_data.song_id)
    song_path, song_length = get_drs_ogg_and_duration(folder_path)
@@ -212,7 +217,7 @@ def create_dd_tracks_from_DRSSongData(drs_song_data: DRSSongData, target_dir: st
                lineNodes=line_notes,
                roadBlockNodes=road_block_notes,
            ),
-            BPM=dd_bmp,
+            BPM=dd_bpm,
            NPS=str(round(total_note_count / song_length_f, 2)),
        )

@@ -236,7 +241,7 @@ def create_dd_tracks_from_DRSSongData(drs_song_data: DRSSongData, target_dir: st
        SongName=drs_song_data.info.title_name,
        SongLength=song_length,
        SongAuthorName=drs_song_data.info.artist_name,
-        Bpm=str(dd_bmp),
+        Bpm=str(dd_bpm),
        SongPath=os.path.basename(song_path),
        CoverPath=os.path.basename(song_cover_path or '') or None,
        DRS_Easy=os.path.basename(easy_no_blocks),
@@ -3,7 +3,7 @@
    "SongName": "50th Memorial Songs -Flagship medley-",
    "SongLength": "112.335465",
    "SongAuthorName": "BEMANI Sound Team",
-    "Bpm": "135",
+    "Bpm": "175",
    "SongPath": "133.ogg",
    "CreateTicks": 636917472000000000,
    "CreateTime": "636917472000000000",
@@ -3,7 +3,7 @@
    "SongName": "7 to Smoke",
    "SongLength": "110.628458",
    "SongAuthorName": "lapix",
-    "Bpm": "120",
+    "Bpm": "128",
    "SongPath": "272.ogg",
    "CreateTicks": 637631136000000000,
    "CreateTime": "637631136000000000",
@@ -3,7 +3,7 @@
    "SongName": "Crystal Clear",
    "SongLength": "114.680454",
    "SongAuthorName": "Stessie",
-    "Bpm": "124",
+    "Bpm": "123",
    "SongPath": "304.ogg",
    "CreateTicks": 637720992000000000,
    "CreateTime": "637720992000000000",
@@ -3,7 +3,7 @@
    "SongName": "Jetcoaster Windy",
    "SongLength": "124.481474",
    "SongAuthorName": "BEMANI Sound Team \"dj TAKA\" feat.\u306e\u306e",
-    "Bpm": "268",
+    "Bpm": "134",
    "SongPath": "230.ogg",
    "CreateTicks": 637376256000000000,
    "CreateTime": "637376256000000000",
@@ -3,7 +3,7 @@
    "SongName": "LIKE A VAMPIRE",
    "SongLength": "125.220454",
    "SongAuthorName": "koyomi,\u661f\u91ce\u594f\u5b50 by BEMANI Sound Team \"TAKA\"",
-    "Bpm": "276",
+    "Bpm": "138",
    "SongPath": "293.ogg",
    "CreateTicks": 637643232000000000,
    "CreateTime": "637643232000000000",
@@ -3,7 +3,7 @@
    "SongName": "Tropical White",
    "SongLength": "109.890454",
    "SongAuthorName": "\u661f\u5bae\u3068\u3068+TEMPLIME",
-    "Bpm": "128",
+    "Bpm": "132",
    "SongPath": "356.ogg",
    "CreateTicks": 638053632000000000,
    "CreateTime": "638053632000000000",
@@ -3,7 +3,7 @@
    "SongName": "U.S.A.",
    "SongLength": "106.593469",
    "SongAuthorName": "DA PUMP",
-    "Bpm": "140",
+    "Bpm": "139",
    "SongPath": "103.ogg",
    "CreateTicks": 636788736000000000,
    "CreateTime": "636788736000000000",
@@ -3,7 +3,7 @@
    "SongName": "Where's The Party At",
    "SongLength": "109.291474",
    "SongAuthorName": "Mosh 'N' Smash",
-    "Bpm": "128",
+    "Bpm": "150",
    "SongPath": "32.ogg",
    "CreateTicks": 636603840000000000,
    "CreateTime": "636603840000000000",
@@ -3,7 +3,7 @@
    "SongName": "You You You",
    "SongLength": "106.208458",
    "SongAuthorName": "D.watt feat. \u7d21\u97f3\u308c\u3044",
-    "Bpm": "143",
+    "Bpm": "146",
    "SongPath": "337.ogg",
    "CreateTicks": 637866144000000000,
    "CreateTime": "637866144000000000",
@@ -1,367 +1,367 @@
 {
    "BeatMapIdList": [
-        2,
        1,
-        17,
        5,
        10,
+        2,
+        17,
+        28,
+        19,
+        25,
        6,
        14,
-        22,
-        28,
        26,
-        25,
-        23,
-        19,
-        24,
+        22,
        27,
        21,
-        32,
+        23,
+        24,
        33,
+        35,
        34,
        29,
-        35,
-        36,
-        37,
-        42,
-        43,
-        41,
+        32,
        39,
+        42,
        38,
+        36,
+        41,
        44,
-        45,
        46,
+        43,
+        37,
        40,
+        45,
        47,
-        49,
-        50,
        48,
        51,
-        52,
        54,
-        62,
+        49,
+        50,
        53,
-        55,
-        63,
+        52,
        64,
+        55,
        60,
-        65,
+        63,
+        62,
        59,
-        66,
        61,
+        65,
+        66,
        67,
        68,
        69,
-        70,
-        71,
        72,
-        73,
-        74,
+        81,
        75,
+        73,
+        71,
        76,
        77,
+        74,
+        70,
        79,
-        81,
-        87,
-        80,
-        84,
-        88,
        82,
-        89,
-        92,
-        91,
+        80,
        83,
-        85,
-        93,
-        86,
+        88,
+        89,
+        91,
+        87,
+        84,
        94,
+        92,
+        93,
+        85,
+        86,
+        95,
+        97,
        90,
        96,
        98,
-        95,
        99,
-        97,
-        100,
-        101,
-        107,
        103,
-        106,
-        104,
-        109,
-        108,
        105,
+        100,
+        107,
+        104,
+        101,
+        108,
+        106,
+        109,
+        111,
+        112,
+        113,
        102,
        110,
-        113,
-        116,
-        114,
-        111,
        115,
-        119,
-        112,
+        114,
+        116,
        117,
-        122,
+        119,
        120,
-        118,
-        121,
        123,
+        118,
        124,
-        125,
-        126,
-        127,
+        121,
        129,
+        127,
+        125,
        128,
-        131,
+        122,
        130,
+        126,
+        131,
        132,
        133,
        134,
-        138,
        135,
-        139,
        136,
        140,
-        144,
        143,
+        138,
        146,
-        145,
        141,
-        142,
-        149,
-        148,
+        139,
        147,
+        144,
+        142,
+        145,
+        149,
        150,
-        151,
+        148,
+        153,
        154,
-        155,
+        151,
        157,
        152,
        156,
-        153,
-        158,
        159,
-        161,
+        155,
        160,
-        166,
-        162,
-        163,
+        158,
        165,
        164,
-        168,
-        169,
-        173,
+        161,
+        163,
+        162,
        167,
-        174,
+        168,
+        166,
        170,
-        172,
-        171,
-        177,
-        176,
-        175,
        178,
+        169,
+        174,
+        173,
+        171,
+        176,
+        172,
+        177,
+        175,
        180,
        181,
-        184,
+        179,
        185,
        182,
-        179,
-        183,
-        187,
        186,
+        183,
+        192,
+        184,
+        187,
+        193,
+        194,
        189,
        188,
-        192,
-        190,
-        193,
        191,
+        190,
        195,
-        200,
-        197,
-        194,
-        199,
-        202,
        196,
-        201,
+        197,
+        199,
+        200,
        198,
        203,
+        202,
+        201,
+        208,
        205,
+        207,
        204,
        209,
-        208,
-        207,
-        210,
-        214,
-        213,
        206,
        212,
-        215,
+        210,
+        213,
        211,
+        214,
+        215,
        216,
-        219,
-        217,
        218,
+        217,
        220,
-        224,
-        221,
        222,
+        219,
+        221,
+        224,
+        223,
+        225,
        230,
        226,
-        225,
-        227,
-        223,
        229,
        228,
-        232,
+        227,
        231,
+        232,
        233,
-        234,
-        235,
-        236,
        238,
        237,
-        244,
+        234,
+        235,
        239,
-        245,
        240,
-        242,
+        236,
        246,
-        250,
-        243,
-        248,
        241,
+        242,
        247,
-        251,
-        252,
+        245,
+        244,
+        243,
+        250,
        249,
-        253,
+        248,
+        251,
        255,
-        258,
-        257,
        256,
        254,
+        252,
+        253,
+        257,
        259,
-        260,
        261,
-        263,
        264,
-        266,
        262,
+        260,
+        258,
+        263,
+        268,
+        266,
        265,
        267,
-        268,
-        271,
        269,
        272,
-        273,
-        274,
+        271,
        270,
-        276,
+        273,
        275,
+        274,
        278,
+        276,
        277,
        279,
-        281,
-        282,
-        283,
        280,
+        281,
+        283,
+        282,
        284,
        286,
        285,
        287,
        288,
-        289,
-        290,
-        294,
-        291,
-        295,
-        292,
-        297,
        293,
+        291,
+        294,
+        290,
+        292,
+        289,
        296,
+        297,
        301,
-        299,
        300,
+        295,
+        299,
        303,
        302,
        305,
-        310,
-        307,
+        311,
        306,
        304,
+        310,
        308,
-        313,
+        307,
        309,
-        314,
-        311,
        312,
-        316,
+        314,
        315,
+        316,
+        313,
        317,
-        321,
-        320,
-        322,
        318,
-        324,
-        328,
-        325,
-        319,
+        320,
+        321,
+        322,
        326,
+        324,
+        319,
        323,
+        325,
+        328,
        327,
-        329,
        330,
        331,
        332,
+        329,
        333,
-        335,
        334,
-        337,
-        342,
-        339,
-        340,
        336,
-        341,
+        337,
+        335,
        338,
+        339,
+        341,
+        340,
+        342,
+        345,
        343,
        344,
-        345,
-        349,
        346,
        347,
        350,
+        349,
        348,
        352,
-        356,
-        361,
-        353,
-        359,
        354,
+        359,
+        356,
        360,
-        363,
-        357,
-        362,
        364,
-        365,
-        366,
-        367,
-        368,
        372,
-        370,
-        369,
-        378,
+        357,
        373,
-        374,
-        371,
-        377,
-        379,
-        376,
-        381,
+        353,
        375,
-        380,
-        383
+        362,
+        374,
+        361,
+        363,
+        367,
+        365,
+        369,
+        376,
+        368,
+        366,
+        378,
+        381,
+        377,
+        371,
+        379,
+        370,
+        383,
+        380
    ],
    "OstId": 2022121400,
    "OstName": "DANCERUSH STARDOM",
    "CoverPath": "DANCERUSH_STARDOM.jpg",
-    "CreateTime": 638307648000000000
+    "CreateTime": 638314560000000000
 }
@@ -3,7 +3,7 @@
    "SongName": "\u30aa\u30cd\u30ac\u30a4\u30fb\u30c7\u30a3\u30b9\u30b3\u30fb\u30df\u30e5\u30fc\u30b8\u30c3\u30af",
    "SongLength": "112.261474",
    "SongAuthorName": "\u661f\u91ce\u594f\u5b50 Prod by.uno",
-    "Bpm": "124",
+    "Bpm": "123",
    "SongPath": "267.ogg",
    "CreateTicks": 637606080000000000,
    "CreateTime": "637606080000000000",
@@ -3,7 +3,7 @@
    "SongName": "\u30b9\u30fc\u30d1\u30fc\u6226\u6e6f\u30d0\u30d0\u30f3\u30d0\u30fc\u30f3",
    "SongLength": "126.340454",
    "SongAuthorName": "\u3059\u308f\u3072\u3067\u304a,\u79cb\u6210,\u304b\u307c\u3061\u3083,\u85cd\u6708\u306a\u304f\u308b,NU-KO by BEMANI Sound Team \"\u516b\u6238\u4e80\u751f\u7f85\"",
-    "Bpm": "188",
+    "Bpm": "187",
    "SongPath": "294.ogg",
    "CreateTicks": 637643232000000000,
    "CreateTime": "637643232000000000",
@@ -3,7 +3,7 @@
    "SongName": "\u30cf\u30c3\u30d4\u30fc\u30b7\u30f3\u30bb\u30b5\u30a4\u30b6",
    "SongLength": "98.271474",
    "SongAuthorName": "EasyPop",
-    "Bpm": "130",
+    "Bpm": "127",
    "SongPath": "2.ogg",
    "CreateTicks": 636113088000000000,
    "CreateTime": "636113088000000000",
@@ -3,7 +3,7 @@
    "SongName": "\u30d4\u30a2\u30ce\u4f53\u64cd\u7b2c\u4e00",
    "SongLength": "149.282472",
    "SongAuthorName": "\u30ce\u30b9\u30bf\u30eb\u30b8\u30a2\u6f14\u594f\u5354\u4f1a\u266a",
-    "Bpm": "146",
+    "Bpm": "154",
    "SongPath": "265.ogg",
    "CreateTicks": 637528320000000000,
    "CreateTime": "637528320000000000",
@@ -3,7 +3,7 @@
    "SongName": "\u30e6\u30e1\u30d6\u30ad",
    "SongLength": "114.003469",
    "SongAuthorName": "\u7d2b\u5d0e \u96ea,Risa Yuzuki,709sec. by BEMANI Sound Team \"PHQUASE & SYUNN\"",
-    "Bpm": "200",
+    "Bpm": "100",
    "SongPath": "292.ogg",
    "CreateTicks": 637655328000000000,
    "CreateTime": "637655328000000000",
@@ -3,7 +3,7 @@
    "SongName": "\u2020\u6e1a\u306e\u5c0f\u60aa\u9b54\u30e9\u30f4\u30ea\u30a3\uff5e\u30ec\u30a4\u30c7\u30a3\u30aa\u2020 (STARDOM Remix) SPONGEBOB EDITION",
    "SongLength": "112.152472",
    "SongAuthorName": "kors k",
-    "Bpm": "107",
+    "Bpm": "214",
    "SongPath": "201.ogg",
    "CreateTicks": 637200864000000000,
    "CreateTime": "637200864000000000",
@@ -3,7 +3,7 @@
    "SongName": "\u2020\u6e1a\u306e\u5c0f\u60aa\u9b54\u30e9\u30f4\u30ea\u30a3\uff5e\u30ec\u30a4\u30c7\u30a3\u30aa\u2020 (STARDOM Remix)",
    "SongLength": "112.152472",
    "SongAuthorName": "kors k",
-    "Bpm": "107",
+    "Bpm": "214",
    "SongPath": "77.ogg",
    "CreateTicks": 636670368000000000,
    "CreateTime": "636670368000000000",