diff --git a/Qwilight/Assets/Language.json b/Qwilight/Assets/Language.json
index b7997a4..2fb9ac4 100644
--- a/Qwilight/Assets/Language.json
+++ b/Qwilight/Assets/Language.json
@@ -3571,6 +3571,10 @@
"ko-KR": "{0} 콤보 이하",
"en-US": "{0} Combo or less"
},
+ "WwwLevelClause": {
+ "ko-KR": "본 도전과제와 클리어 보상들은 공식 디스코드에서 제보받은 사용자 지정 도전과제로 개발자와 무관합니다.",
+ "en-US": "These challenges and clear rewards are custom challenges reported on the official Discord, independent of the developer."
+ },
"WwwLevelClearAvatars": {
"ko-KR": "클리어한 플레이어들",
"en-US": "Players who cleared"
diff --git a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.1.4.msix b/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.1.4.msix
deleted file mode 100644
index 8c90a26..0000000
--- a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.1.4.msix
+++ /dev/null
Binary files differ
diff --git a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.DDLM.1.4.msix b/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.DDLM.1.4.msix
deleted file mode 100644
index eaad296..0000000
--- a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.DDLM.1.4.msix
+++ /dev/null
Binary files differ
diff --git a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.Main.1.4.msix b/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.Main.1.4.msix
deleted file mode 100644
index 804259d..0000000
--- a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.Main.1.4.msix
+++ /dev/null
Binary files differ
diff --git a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.Singleton.1.4.msix b/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.Singleton.1.4.msix
deleted file mode 100644
index 0a7848d..0000000
--- a/Qwilight/Assets/MSIX/Microsoft.WindowsAppRuntime.Singleton.1.4.msix
+++ /dev/null
Binary files differ
diff --git a/Qwilight/Compute/DefaultCompute.cs b/Qwilight/Compute/DefaultCompute.cs
index 013311e..d56b03f 100644
--- a/Qwilight/Compute/DefaultCompute.cs
+++ b/Qwilight/Compute/DefaultCompute.cs
@@ -3962,7 +3962,7 @@
var eventNoteID = EventNoteEntryItem?.EventNoteID;
if (string.IsNullOrEmpty(eventNoteID))
{
- if (ModeComponentValue.CanSetHandled)
+ if (new[] { TotallyLevyingAudioMultiplier }.Concat(Comment.AudioMultipliers.Select(audioMultiplier => audioMultiplier.AudioMultiplier)).Min() >= 1.0 && ModeComponentValue.CanSetHandled)
{
if (NoteFile.HandledValue != BaseNoteFile.Handled.Band1)
{
@@ -3979,17 +3979,20 @@
NoteFile.HandledValue = BaseNoteFile.Handled.F;
}
}
- else if (ModeComponentValue.HandlingHitPointsModeValue == ModeComponent.HitPointsMode.Highest)
+ else
{
- NoteFile.HandledValue = BaseNoteFile.Handled.HighestClear;
- }
- else if (ModeComponentValue.HandlingHitPointsModeValue == ModeComponent.HitPointsMode.Higher && NoteFile.HandledValue != BaseNoteFile.Handled.HighestClear)
- {
- NoteFile.HandledValue = BaseNoteFile.Handled.HigherClear;
- }
- else if (NoteFile.HandledValue != BaseNoteFile.Handled.HigherClear && NoteFile.HandledValue != BaseNoteFile.Handled.HighestClear)
- {
- NoteFile.HandledValue = BaseNoteFile.Handled.Clear;
+ switch (ModeComponentValue.HandlingHitPointsModeValue)
+ {
+ case ModeComponent.HitPointsMode.Highest:
+ NoteFile.HandledValue = BaseNoteFile.Handled.HighestClear;
+ break;
+ case ModeComponent.HitPointsMode.Higher when NoteFile.HandledValue != BaseNoteFile.Handled.HighestClear:
+ NoteFile.HandledValue = BaseNoteFile.Handled.HigherClear;
+ break;
+ case ModeComponent.HitPointsMode.Default when NoteFile.HandledValue != BaseNoteFile.Handled.HigherClear && NoteFile.HandledValue != BaseNoteFile.Handled.HighestClear:
+ NoteFile.HandledValue = BaseNoteFile.Handled.Clear;
+ break;
+ }
}
}
DB.Instance.SetHandled(NoteFile);
diff --git a/Qwilight/Qwilight.csproj b/Qwilight/Qwilight.csproj
index 9e14a5a..721ac88 100644
--- a/Qwilight/Qwilight.csproj
+++ b/Qwilight/Qwilight.csproj
@@ -156,18 +156,6 @@
Always
-
- Always
-
-
- Always
-
-
- Always
-
-
- Always
-
Always
diff --git a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs
index 0680db2..5223b92 100644
--- a/Qwilight/System/LanguageSystem/LanguageSystem.g.cs
+++ b/Qwilight/System/LanguageSystem/LanguageSystem.g.cs
@@ -895,6 +895,7 @@
public string WwwLevelAudioMultiplierContents1 { get; set; }
public string WwwLevelBandContents0 { get; set; }
public string WwwLevelBandContents1 { get; set; }
+ public string WwwLevelClause { get; set; }
public string WwwLevelClearAvatars { get; set; }
public string WwwLevelClearAwards { get; set; }
public string WwwLevelClearAwardsEdge { get; set; }
diff --git a/Qwilight/View/QwilightClass.xaml.cs b/Qwilight/View/QwilightClass.xaml.cs
index dd7d7ec..87f0b84 100644
--- a/Qwilight/View/QwilightClass.xaml.cs
+++ b/Qwilight/View/QwilightClass.xaml.cs
@@ -77,10 +77,6 @@
exe.WaitForExit();
if (!Bootstrap.TryInitialize(65540U, out _))
{
- HandleMSIX("Microsoft.WindowsAppRuntime.1.4.msix");
- HandleMSIX("Microsoft.WindowsAppRuntime.DDLM.1.4.msix");
- HandleMSIX("Microsoft.WindowsAppRuntime.Main.1.4.msix");
- HandleMSIX("Microsoft.WindowsAppRuntime.Singleton.1.4.msix");
Bootstrap.Initialize(65540U, null, default, Bootstrap.InitializeOptions.OnNoMatch_ShowUI);
}
}
diff --git a/Qwilight/View/VoteWindow.xaml b/Qwilight/View/VoteWindow.xaml
index db2483b..72e31ad 100644
--- a/Qwilight/View/VoteWindow.xaml
+++ b/Qwilight/View/VoteWindow.xaml
@@ -11,15 +11,14 @@
-
+
-
-
+
@@ -73,6 +72,7 @@
+
diff --git a/Qwilight/View/WwwLevelWindow.xaml b/Qwilight/View/WwwLevelWindow.xaml
index 989960e..eebf82e 100644
--- a/Qwilight/View/WwwLevelWindow.xaml
+++ b/Qwilight/View/WwwLevelWindow.xaml
@@ -11,6 +11,7 @@
+
@@ -476,6 +477,7 @@
+