From 1b0599011b21f37cf37f759b6325da68e47928cd Mon Sep 17 00:00:00 2001 From: 544146 Date: Sat, 16 Sep 2023 05:19:23 +0100 Subject: [PATCH] Ran pre-commit --- DanceDashLaunchHelper/DanceDashLaunchHelper.csproj | 4 ++-- DanceDashLaunchHelper/Folder.DotSettings.user | 2 +- DanceDashLaunchHelper/NuGet.Config | 2 +- DanceDashLaunchHelper/Plugin.cs | 10 +++++----- DanceDashLaunchHelper/README.md | 2 +- README.md | 4 ++-- drs2dd.py | 2 +- model/dancedash.py | 3 ++- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/DanceDashLaunchHelper/DanceDashLaunchHelper.csproj b/DanceDashLaunchHelper/DanceDashLaunchHelper.csproj index 3f5ca3c0..3209a1ed 100644 --- a/DanceDashLaunchHelper/DanceDashLaunchHelper.csproj +++ b/DanceDashLaunchHelper/DanceDashLaunchHelper.csproj @@ -14,11 +14,11 @@ - + - + ..\Dance Dash_Data\Managed\DDVR.dll diff --git a/DanceDashLaunchHelper/Folder.DotSettings.user b/DanceDashLaunchHelper/Folder.DotSettings.user index ac94d140..943a3a20 100644 --- a/DanceDashLaunchHelper/Folder.DotSettings.user +++ b/DanceDashLaunchHelper/Folder.DotSettings.user @@ -1,4 +1,4 @@  True True - <AssemblyExplorer /> \ No newline at end of file + <AssemblyExplorer /> diff --git a/DanceDashLaunchHelper/NuGet.Config b/DanceDashLaunchHelper/NuGet.Config index 1864ded5..fffd9183 100644 --- a/DanceDashLaunchHelper/NuGet.Config +++ b/DanceDashLaunchHelper/NuGet.Config @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/DanceDashLaunchHelper/Plugin.cs b/DanceDashLaunchHelper/Plugin.cs index cdbdbe93..04895adb 100644 --- a/DanceDashLaunchHelper/Plugin.cs +++ b/DanceDashLaunchHelper/Plugin.cs @@ -22,7 +22,7 @@ namespace DanceDashLaunchHelper } } - + // when we first start the game, we set the ready button to be interactable & click it programmatically [HarmonyPatch(typeof(ControllerSwitchUI), "Start")] class ControllerSwitchUI_Start_Patch @@ -49,7 +49,7 @@ namespace DanceDashLaunchHelper Traverse.Create(__instance).Method("OnToggleHpChange", true).GetValue(); } } - + // this patch is bad, it hijacks init and toggles the albums and invokes them as true, happens to // toggle on the last album (custom songs) purely based on the order of execution, but again, this sucks [HarmonyPatch(typeof(VolListItem), "Init")] @@ -63,7 +63,7 @@ namespace DanceDashLaunchHelper __instance.Invoke(true); } } - + // hijacks the ost selection happening as a side effect of VolListItem_Init_Patch, and clicks the play button [HarmonyPatch(typeof(PanelSelect), "OnSelectOst")] class PanelSelect_OnSelectOst_Patch @@ -135,5 +135,5 @@ namespace DanceDashLaunchHelper return false; } } - -} \ No newline at end of file + +} diff --git a/DanceDashLaunchHelper/README.md b/DanceDashLaunchHelper/README.md index 0648b366..8e70a8f3 100644 --- a/DanceDashLaunchHelper/README.md +++ b/DanceDashLaunchHelper/README.md @@ -1,4 +1,4 @@ # DanceDashLaunchHelper - Read comments in [Plugin.cs](Plugin.cs) -- First time writing one of these so todo on the README \ No newline at end of file +- First time writing one of these so todo on the README diff --git a/README.md b/README.md index 0b743ccd..2fd13f8c 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ python -m pip install -r requirements.txt pre-commit install ``` ---- +--- Usage: @@ -45,4 +45,4 @@ yt-dlp -f bv[ext=webm] https://youtu.be/o7I0scmptmo -o "drs_video.webm" # grab song-id from "resources\data.json" or https://arcade-songs.zetaraku.dev/drs/ .venv/Scripts/python drs2dd.py "drs_video.webm" --song-id "BOOMBAYAH-JP Ver.-" -``` \ No newline at end of file +``` diff --git a/drs2dd.py b/drs2dd.py index 23b710d6..6eff263d 100644 --- a/drs2dd.py +++ b/drs2dd.py @@ -13,7 +13,6 @@ from model.dancedash import create_note_sphere from model.dancedash import DDBeatMap from model.dancedash import LEFT_NOTE from model.dancedash import RIGHT_NOTE -from util import ORDER_COUNT_PER_BEAT from util import crop_frame from util import find_l from util import find_r @@ -21,6 +20,7 @@ from util import find_stage from util import get_song_metadata_remote from util import map_position_to_dd_x from util import NOTE_SEARCH_AREA +from util import ORDER_COUNT_PER_BEAT from util import SIGN_SEARCH_AREA from util import WORKING_RESOLUTION diff --git a/model/dancedash.py b/model/dancedash.py index 2e637cc6..de06b4de 100644 --- a/model/dancedash.py +++ b/model/dancedash.py @@ -117,7 +117,8 @@ class DDBeatMap: ), beatSubs=beat_subs, BPM=bpm, - songStartOffset=-0.4, # -0.4 is arbitrary, figure out a better value. (because we detect notes early) + # -0.4 is arbitrary, figure out a better value. (because we detect notes early) + songStartOffset=-0.4, NPS='0.0', developerMode=False, noteSpeed=1.0,