diff --git a/BetterGiveUp/Assembly-CSharp.BetterGiveUp.mm.csproj b/BetterGiveUp/Assembly-CSharp.BetterGiveUp.mm.csproj deleted file mode 100644 index 01fef46..0000000 --- a/BetterGiveUp/Assembly-CSharp.BetterGiveUp.mm.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - net35 - Assembly-CSharp.BetterGiveUp.mm - 7EVENDAYS⇔HOLIDAYS - Forfeit and restart in mu3 - 1.6.0 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - - - - - - - diff --git a/BetterGiveUp/BetterGiveUp.csproj b/BetterGiveUp/BetterGiveUp.csproj new file mode 100644 index 0000000..22c60a2 --- /dev/null +++ b/BetterGiveUp/BetterGiveUp.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.BetterGiveUp.mm + Forfeit (red menu) and restart (yellow menu) + + + \ No newline at end of file diff --git a/BetterGiveUp/MU3.Game/patch_GameLED.cs b/BetterGiveUp/MU3.Game/patch_GameLED.cs index 191030e..2374d62 100644 --- a/BetterGiveUp/MU3.Game/patch_GameLED.cs +++ b/BetterGiveUp/MU3.Game/patch_GameLED.cs @@ -1,13 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - -using System.Collections.Generic; +using System.Collections.Generic; namespace MU3.Game; -public class patch_GameLED: GameLED { +class patch_GameLED: GameLED { private patch_ButtonList _buttonList = new(); public extern void orig_initialize(); diff --git a/BetterGiveUp/MU3.Notes/patch_FieldObject.cs b/BetterGiveUp/MU3.Notes/patch_FieldObject.cs index ad62644..790342d 100644 --- a/BetterGiveUp/MU3.Notes/patch_FieldObject.cs +++ b/BetterGiveUp/MU3.Notes/patch_FieldObject.cs @@ -1,14 +1,9 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - -using UnityEngine; +using UnityEngine; namespace MU3.Notes; -public class patch_FieldObject: FieldObject { - public class patch_BarNotes { - public class patch_Bar: BarNotes.Bar { +class patch_FieldObject: FieldObject { + class patch_BarNotes { + class patch_Bar: BarNotes.Bar { public extern void orig_update(NotesManager mgr, float width = 1f); public new void update(NotesManager mgr, float width = 1f) { diff --git a/BetterGiveUp/MU3.Notes/patch_NotesManager.cs b/BetterGiveUp/MU3.Notes/patch_NotesManager.cs index 234c4e4..413f918 100644 --- a/BetterGiveUp/MU3.Notes/patch_NotesManager.cs +++ b/BetterGiveUp/MU3.Notes/patch_NotesManager.cs @@ -1,13 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - -using UnityEngine; +using UnityEngine; namespace MU3.Notes; -public class patch_NotesManager: NotesManager { +class patch_NotesManager: NotesManager { public extern void orig_reset(); public extern Vector3 orig_getEnemyPos(); diff --git a/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs b/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs index f42fd7c..11faa97 100644 --- a/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs +++ b/BetterGiveUp/MU3.Sequence/patch_PlayMusic.cs @@ -1,9 +1,4 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - -using MU3.Battle; +using MU3.Battle; using MU3.Game; using MU3.Notes; using MU3.Util; @@ -12,7 +7,7 @@ using UnityEngine; namespace MU3.Sequence; -public class patch_PlayMusic: PlayMusic { +class patch_PlayMusic: PlayMusic { private static readonly TimeSpan HOLD_DURATION = TimeSpan.FromSeconds(1.0f); private static readonly TimeSpan ROLL_DURATION = TimeSpan.FromSeconds(0.5f); public static bool QuickSkip = false; diff --git a/BetterGiveUp/MU3/patch_Scene_32_PrePlayMusic_MusicSelect.cs b/BetterGiveUp/MU3/patch_Scene_32_PrePlayMusic_MusicSelect.cs index 79d7e13..caec8e9 100644 --- a/BetterGiveUp/MU3/patch_Scene_32_PrePlayMusic_MusicSelect.cs +++ b/BetterGiveUp/MU3/patch_Scene_32_PrePlayMusic_MusicSelect.cs @@ -1,14 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 -#pragma warning disable CS0414 - -using MU3.Sequence; +using MU3.Sequence; namespace MU3; -public class patch_Scene_32_PrePlayMusic_MusicSelect: Scene_32_PrePlayMusic_MusicSelect { +class patch_Scene_32_PrePlayMusic_MusicSelect: Scene_32_PrePlayMusic_MusicSelect { private bool _playVoice; private extern void orig_Enter_Select(); private void Enter_Select() { diff --git a/BetterGiveUp/MU3/patch_Scene_37_Result.cs b/BetterGiveUp/MU3/patch_Scene_37_Result.cs index d79dd1a..23f4b26 100644 --- a/BetterGiveUp/MU3/patch_Scene_37_Result.cs +++ b/BetterGiveUp/MU3/patch_Scene_37_Result.cs @@ -1,14 +1,9 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Sequence; using MU3.Util; namespace MU3; -public class patch_Scene_37_Result: Scene_37_Result { +class patch_Scene_37_Result: Scene_37_Result { private Mode mode_; private extern void orig_Init_Init(); private enum State { @@ -25,7 +20,6 @@ public class patch_Scene_37_Result: Scene_37_Result { CardCharaEnd, End } - private void Init_Init() { orig_Init_Init(); if(patch_PlayMusic.QuickSkip) { diff --git a/BetterGiveUp/MU3/patch_Scene_38_End.cs b/BetterGiveUp/MU3/patch_Scene_38_End.cs index c4cfe78..060dc85 100644 --- a/BetterGiveUp/MU3/patch_Scene_38_End.cs +++ b/BetterGiveUp/MU3/patch_Scene_38_End.cs @@ -1,15 +1,9 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable CS0414 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Sequence; using MU3.Util; namespace MU3; -public class patch_Scene_38_End: Scene_38_End { +class patch_Scene_38_End: Scene_38_End { private Mode mode_; private extern void orig_Init_Init(); private int result_; diff --git a/ExportChartData/Assembly-CSharp.ExportChartData.mm.csproj b/ExportChartData/Assembly-CSharp.ExportChartData.mm.csproj deleted file mode 100644 index 892908a..0000000 --- a/ExportChartData/Assembly-CSharp.ExportChartData.mm.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - net35 - Assembly-CSharp.ExportChartData.mm - 7EVENDAYS⇔HOLIDAYS - Export mu3 chart data - 1.3.0 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - - - - - - - - diff --git a/ExportChartData/ExportChartData.csproj b/ExportChartData/ExportChartData.csproj new file mode 100644 index 0000000..72e8824 --- /dev/null +++ b/ExportChartData/ExportChartData.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.ExportChartData.mm + Export chart data to charts.csv + + + \ No newline at end of file diff --git a/ExportChartData/MU3.Data/patch_DataManager.cs b/ExportChartData/MU3.Data/patch_DataManager.cs index 0d2df3a..f3aa6b0 100644 --- a/ExportChartData/MU3.Data/patch_DataManager.cs +++ b/ExportChartData/MU3.Data/patch_DataManager.cs @@ -1,13 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - -using System.IO; +using System.IO; namespace MU3.Data; -public class patch_DataManager: DataManager { +class patch_DataManager: DataManager { private extern void orig_linkFumenAnalysisData(); private const string SEPARATOR = "$"; private string PrintHeader() { diff --git a/InfiniteGP/Assembly-CSharp.InfiniteGP.mm.csproj b/InfiniteGP/Assembly-CSharp.InfiniteGP.mm.csproj deleted file mode 100644 index 1eb3262..0000000 --- a/InfiniteGP/Assembly-CSharp.InfiniteGP.mm.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - net35 - Assembly-CSharp.InfiniteGP.mm - 7EVENDAYS⇔HOLIDAYS - Infinite GP in mu3 - 1.6.0 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - ..\Common\UnityEngine.UI.dll - - - - - - - \ No newline at end of file diff --git a/InfiniteGP/InfiniteGP.csproj b/InfiniteGP/InfiniteGP.csproj new file mode 100644 index 0000000..5c702f3 --- /dev/null +++ b/InfiniteGP/InfiniteGP.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.InfiniteGP.mm + Remove credits and GP + + + \ No newline at end of file diff --git a/InfiniteGP/MU3.User/patch_UserManager.cs b/InfiniteGP/MU3.User/patch_UserManager.cs index df5d889..fe6d02f 100644 --- a/InfiniteGP/MU3.User/patch_UserManager.cs +++ b/InfiniteGP/MU3.User/patch_UserManager.cs @@ -1,9 +1,6 @@ -#pragma warning disable CS0649 -#pragma warning disable IDE1006 +namespace MU3.User; -namespace MU3.User; - -public class patch_UserManager: UserManager { +class patch_UserManager: UserManager { public new const int DefaultGP = 666; private int _gp; private OnUpdate _onUpdateGP; diff --git a/InfiniteGP/MU3/patch_Scene_25_Login.cs b/InfiniteGP/MU3/patch_Scene_25_Login.cs index 43b4ec0..05466ea 100644 --- a/InfiniteGP/MU3/patch_Scene_25_Login.cs +++ b/InfiniteGP/MU3/patch_Scene_25_Login.cs @@ -1,13 +1,10 @@ -#pragma warning disable CS0649 -#pragma warning disable CS0626 - using MU3.Util; namespace MU3; -public class patch_Scene_25_Login: Scene_25_Login { - private enum State { +class patch_Scene_25_Login: Scene_25_Login { + public enum State { Login = 2 } private Mode mode_; diff --git a/InfiniteGP/MU3/patch_UIMoneyExchange.cs b/InfiniteGP/MU3/patch_UIMoneyExchange.cs index 43ec509..fb99561 100644 --- a/InfiniteGP/MU3/patch_UIMoneyExchange.cs +++ b/InfiniteGP/MU3/patch_UIMoneyExchange.cs @@ -1,12 +1,9 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 - using MU3.CustomUI; using UnityEngine; namespace MU3; -public class patch_UICredit: UICredit { +class patch_UICredit: UICredit { private Animator gpAnimator_; private GameObject creditRoot_; private MU3UICounter credit_; diff --git a/LockSelectionTime/Assembly-CSharp.LockSelectionTime.mm.csproj b/LockSelectionTime/Assembly-CSharp.LockSelectionTime.mm.csproj deleted file mode 100644 index 6f1d601..0000000 --- a/LockSelectionTime/Assembly-CSharp.LockSelectionTime.mm.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - net35 - Assembly-CSharp.LockSelectionTime.mm - 7EVENDAYS⇔HOLIDAYS - Lock selection time in mu3 - 1.5.0 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - ..\Common\UnityEngine.UI.dll - - - - - - - \ No newline at end of file diff --git a/LockSelectionTime/LockSelectionTime.csproj b/LockSelectionTime/LockSelectionTime.csproj new file mode 100644 index 0000000..5a5081e --- /dev/null +++ b/LockSelectionTime/LockSelectionTime.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.LockSelectionTime.mm + Disable all timers + + + \ No newline at end of file diff --git a/LockSelectionTime/MU3/patch_SystemUI.cs b/LockSelectionTime/MU3/patch_SystemUI.cs index ab03f6f..ea64caa 100644 --- a/LockSelectionTime/MU3/patch_SystemUI.cs +++ b/LockSelectionTime/MU3/patch_SystemUI.cs @@ -1,9 +1,7 @@ -#pragma warning disable CS0626 - namespace MU3; -public class patch_SystemUI: SystemUI { - public class patch_Timer: SystemUI.Timer { +class patch_SystemUI: SystemUI { + class patch_Timer: Timer { public patch_Timer(UITimer timer) : base(timer) { /* nop */ } public new void execute() { /* nop */ } public extern bool orig_get_show(); diff --git a/LockSelectionTime/MU3/patch_UITimer.cs b/LockSelectionTime/MU3/patch_UITimer.cs index 04e26c8..8f42fe8 100644 --- a/LockSelectionTime/MU3/patch_UITimer.cs +++ b/LockSelectionTime/MU3/patch_UITimer.cs @@ -1,10 +1,8 @@ -#pragma warning disable CS0626 - using UnityEngine; namespace MU3; -public class patch_UITimer: UITimer { +class patch_UITimer: UITimer { public new void update() { /* nop */ } public new void update(float externalCounter) { /* nop */ } public extern void orig_initialize(float counter); diff --git a/Pause/Assembly-CSharp.Pause.mm.csproj b/Mu3Mods.csproj similarity index 82% rename from Pause/Assembly-CSharp.Pause.mm.csproj rename to Mu3Mods.csproj index 3ad10cd..05d3cf2 100644 --- a/Pause/Assembly-CSharp.Pause.mm.csproj +++ b/Mu3Mods.csproj @@ -1,13 +1,12 @@ - + net35 - Assembly-CSharp.Pause.mm 7EVENDAYS⇔HOLIDAYS - Pause in mu3 - 1.6.0 + 1.8.0 true latest x64 + IDE0044,IDE0051,IDE0052,IDE1006,CS0414,CS0649,CS0626 @@ -15,10 +14,11 @@ ..\Common\UnityEngine.dll ..\Common\UnityEngine.UI.dll ..\Common\Assembly-CSharp-firstpass.dll + - + \ No newline at end of file diff --git a/MiscMods.sln b/Mu3Mods.sln similarity index 66% rename from MiscMods.sln rename to Mu3Mods.sln index a1043bb..36bcba6 100644 --- a/MiscMods.sln +++ b/Mu3Mods.sln @@ -3,25 +3,25 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34728.123 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.BetterGiveUp.mm", "BetterGiveUp\Assembly-CSharp.BetterGiveUp.mm.csproj", "{003AD3C6-07CA-4824-B4BD-4BEF6F3D8997}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BetterGiveUp", "BetterGiveUp\BetterGiveUp.csproj", "{003AD3C6-07CA-4824-B4BD-4BEF6F3D8997}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.NaiveRating.mm", "NaiveRating\Assembly-CSharp.NaiveRating.mm.csproj", "{1FEA698E-DF5E-46CF-8023-F2B2F57885C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NaiveRating", "NaiveRating\NaiveRating.csproj", "{1FEA698E-DF5E-46CF-8023-F2B2F57885C5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.ExportChartData.mm", "ExportChartData\Assembly-CSharp.ExportChartData.mm.csproj", "{8BFC37B1-C6C8-492A-B8DC-99BD1F1B9576}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExportChartData", "ExportChartData\ExportChartData.csproj", "{8BFC37B1-C6C8-492A-B8DC-99BD1F1B9576}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.SkipNotice.mm", "SkipNotice\Assembly-CSharp.SkipNotice.mm.csproj", "{A1F32CB9-56C2-458A-B369-C61BD3A6AFBB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkipNotice", "SkipNotice\SkipNotice.csproj", "{A1F32CB9-56C2-458A-B369-C61BD3A6AFBB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.SkipPreMusicRitual.mm", "SkipPreMusicRitual\Assembly-CSharp.SkipPreMusicRitual.mm.csproj", "{BB9CB905-9989-466C-9A91-D2F323005237}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkipPreMusicRitual", "SkipPreMusicRitual\SkipPreMusicRitual.csproj", "{BB9CB905-9989-466C-9A91-D2F323005237}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.InfiniteGP.mm", "InfiniteGP\Assembly-CSharp.InfiniteGP.mm.csproj", "{990DCB96-7A47-45B9-B7CB-A6B2A1B6864A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InfiniteGP", "InfiniteGP\InfiniteGP.csproj", "{990DCB96-7A47-45B9-B7CB-A6B2A1B6864A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.LockSelectionTime.mm", "LockSelectionTime\Assembly-CSharp.LockSelectionTime.mm.csproj", "{66DE85AD-58AD-467C-B1C0-6B98BB27265D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LockSelectionTime", "LockSelectionTime\LockSelectionTime.csproj", "{66DE85AD-58AD-467C-B1C0-6B98BB27265D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.SkipLoginReward.mm", "SkipLoginReward\Assembly-CSharp.SkipLoginReward.mm.csproj", "{6E078B7E-7965-4CFF-9590-5C27A009BA7A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SkipLoginReward", "SkipLoginReward\SkipLoginReward.csproj", "{6E078B7E-7965-4CFF-9590-5C27A009BA7A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.Pause.mm", "Pause\Assembly-CSharp.Pause.mm.csproj", "{627B3AA0-25E2-4C3E-A211-66BAB0E997E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pause", "Pause\Pause.csproj", "{627B3AA0-25E2-4C3E-A211-66BAB0E997E2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Assembly-CSharp.UnlockAndSetJewelBoostNine.mm", "UnlockAndSetJewelBoostNine\Assembly-CSharp.UnlockAndSetJewelBoostNine.mm.csproj", "{70C775D7-8C47-4CFE-B91D-6AAEB17389F2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnlockAndSetJewelBoostNine", "UnlockAndSetJewelBoostNine\UnlockAndSetJewelBoostNine.csproj", "{70C775D7-8C47-4CFE-B91D-6AAEB17389F2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NaiveRating/Assembly-CSharp.NaiveRating.mm.csproj b/NaiveRating/Assembly-CSharp.NaiveRating.mm.csproj deleted file mode 100644 index 752d61e..0000000 --- a/NaiveRating/Assembly-CSharp.NaiveRating.mm.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - net35 - Assembly-CSharp.NaiveRating.mm - 7EVENDAYS⇔HOLIDAYS - Better rating for mu3 - 1.5.0 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - ..\Common\UnityEngine.UI.dll - - - - - - - - \ No newline at end of file diff --git a/NaiveRating/MU3.Data/patch_GameData.cs b/NaiveRating/MU3.Data/patch_GameData.cs index 7bad8b0..312e15f 100644 --- a/NaiveRating/MU3.Data/patch_GameData.cs +++ b/NaiveRating/MU3.Data/patch_GameData.cs @@ -1,13 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.DB; namespace MU3.Data; -public class patch_GameData: GameData { +class patch_GameData: GameData { public extern static RatingColorID orig_getRatingColorIDFromRating100(int rating100); public static new RatingColorID getRatingColorIDFromRating100(int rating100) { return orig_getRatingColorIDFromRating100(NaiveRating.Get()); diff --git a/NaiveRating/MU3.User/patch_UserManager.cs b/NaiveRating/MU3.User/patch_UserManager.cs index 43fa544..db80a0a 100644 --- a/NaiveRating/MU3.User/patch_UserManager.cs +++ b/NaiveRating/MU3.User/patch_UserManager.cs @@ -1,13 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Game; namespace MU3.User; -public class patch_UserManager: UserManager { +class patch_UserManager: UserManager { public extern void orig_updateUserRating(SessionInfo sessionInfo, SessionResult result); public new void updateUserRating(SessionInfo sessionInfo, SessionResult result) { NaiveRating.PrevRating = NaiveRating.Get(); diff --git a/NaiveRating/MU3.User/patch_UserUtil.cs b/NaiveRating/MU3.User/patch_UserUtil.cs index 4b08ab5..765dc82 100644 --- a/NaiveRating/MU3.User/patch_UserUtil.cs +++ b/NaiveRating/MU3.User/patch_UserUtil.cs @@ -1,8 +1,3 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MonoMod; namespace MU3.User; diff --git a/NaiveRating/MU3/NaiveRating.cs b/NaiveRating/MU3/NaiveRating.cs index 6cf3bbc..bc3b5dd 100644 --- a/NaiveRating/MU3/NaiveRating.cs +++ b/NaiveRating/MU3/NaiveRating.cs @@ -1,8 +1,3 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Data; using MU3.DataStudio; using MU3.User; diff --git a/NaiveRating/MU3/patch_ANM_SWH_Profile.cs b/NaiveRating/MU3/patch_ANM_SWH_Profile.cs index b42c227..b3d596c 100644 --- a/NaiveRating/MU3/patch_ANM_SWH_Profile.cs +++ b/NaiveRating/MU3/patch_ANM_SWH_Profile.cs @@ -1,11 +1,9 @@ -#pragma warning disable CS0626 - using MU3.User; using MU3.Util; namespace MU3; -public class patch_ANM_SWH_Profile: ANM_SWH_Profile { +class patch_ANM_SWH_Profile: ANM_SWH_Profile { public extern void orig_setUpLogin(); // Fixes login display diff --git a/NaiveRating/MU3/patch_Scene_37_Result_Score.cs b/NaiveRating/MU3/patch_Scene_37_Result_Score.cs index be365d4..663c96b 100644 --- a/NaiveRating/MU3/patch_Scene_37_Result_Score.cs +++ b/NaiveRating/MU3/patch_Scene_37_Result_Score.cs @@ -1,13 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Sequence; namespace MU3; -public class patch_Scene_37_Result_Score: Scene_37_Result_Score { +class patch_Scene_37_Result_Score: Scene_37_Result_Score { private PlayInfo playInfo_; private extern void orig_TechRating_Init(); diff --git a/NaiveRating/NaiveRating.csproj b/NaiveRating/NaiveRating.csproj new file mode 100644 index 0000000..8bf04e3 --- /dev/null +++ b/NaiveRating/NaiveRating.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.NaiveRating.mm + Best45 rating + + + \ No newline at end of file diff --git a/Pause/MU3.Battle/patch_GameEngine.cs b/Pause/MU3.Battle/patch_GameEngine.cs index c2cf2fe..d213448 100644 --- a/Pause/MU3.Battle/patch_GameEngine.cs +++ b/Pause/MU3.Battle/patch_GameEngine.cs @@ -1,10 +1,8 @@ -#pragma warning disable CS0626 - using MU3.Sequence; namespace MU3.Battle; -public class patch_GameEngine: GameEngine { +class patch_GameEngine: GameEngine { public extern void orig_reset(); public new void reset() { orig_reset(); diff --git a/Pause/MU3.Game/patch_GameBGM.cs b/Pause/MU3.Game/patch_GameBGM.cs index 0c94ca9..e1701b5 100644 --- a/Pause/MU3.Game/patch_GameBGM.cs +++ b/Pause/MU3.Game/patch_GameBGM.cs @@ -1,11 +1,9 @@ -#pragma warning disable CS0649 - using MU3.Sound; using MU3.Util; namespace MU3.Game; -public class patch_GameBGM: GameBGM { +class patch_GameBGM: GameBGM { private patch_SoundManager psm => ((patch_SoundManager)Singleton.instance); private HandleInfo _handle; public void pause(bool val) { diff --git a/Pause/MU3.Sequence/patch_PlayMusic.cs b/Pause/MU3.Sequence/patch_PlayMusic.cs index ed648a7..8a19624 100644 --- a/Pause/MU3.Sequence/patch_PlayMusic.cs +++ b/Pause/MU3.Sequence/patch_PlayMusic.cs @@ -1,16 +1,11 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - -using MU3.Battle; +using MU3.Battle; using MU3.Game; using MU3.Notes; using MU3.Util; namespace MU3.Sequence; -public class patch_PlayMusic: PlayMusic { +class patch_PlayMusic: PlayMusic { private static readonly float PAUSE_CD = 5f; private static readonly float UNPAUSE_CD = 0.5f; private GameEngine _gameEngine; diff --git a/Pause/MU3.Sound/patch_SoundManager.cs b/Pause/MU3.Sound/patch_SoundManager.cs index 01f28b9..d28b2a1 100644 --- a/Pause/MU3.Sound/patch_SoundManager.cs +++ b/Pause/MU3.Sound/patch_SoundManager.cs @@ -1,9 +1,6 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 - namespace MU3.Sound; -public class patch_SoundManager: SoundManager { +class patch_SoundManager: SoundManager { private extern HandleInfo orig_getHandle(Priority priority); private HandleInfo getHandle(Priority priority) => orig_getHandle(priority); private patch_SoundPlayer[] _soundPlayers; diff --git a/Pause/MU3.Sound/patch_SoundPlayer.cs b/Pause/MU3.Sound/patch_SoundPlayer.cs index 60d8569..cd6e6a1 100644 --- a/Pause/MU3.Sound/patch_SoundPlayer.cs +++ b/Pause/MU3.Sound/patch_SoundPlayer.cs @@ -1,6 +1,3 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 - namespace MU3.Sound; class patch_SoundPlayer: SoundPlayer { diff --git a/Pause/Pause.csproj b/Pause/Pause.csproj new file mode 100644 index 0000000..4d49fd0 --- /dev/null +++ b/Pause/Pause.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.Pause.mm + Enables pausing the game with the service button + + + \ No newline at end of file diff --git a/Pause/patch_GameDeviceManager.cs b/Pause/patch_GameDeviceManager.cs index bcc9559..289155d 100644 --- a/Pause/patch_GameDeviceManager.cs +++ b/Pause/patch_GameDeviceManager.cs @@ -1,8 +1,6 @@ -#pragma warning disable CS0626 - using MU3.Sequence; -public class patch_GameDeviceManager: GameDeviceManager { +class patch_GameDeviceManager: GameDeviceManager { private extern void orig_update(); private void update() { if(!patch_PlayMusic.Paused) { diff --git a/SkipLoginReward/Assembly-CSharp.SkipLoginReward.mm.csproj b/SkipLoginReward/Assembly-CSharp.SkipLoginReward.mm.csproj deleted file mode 100644 index c91fc4f..0000000 --- a/SkipLoginReward/Assembly-CSharp.SkipLoginReward.mm.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - net35 - Assembly-CSharp.SkipLoginReward.mm - 7EVENDAYS⇔HOLIDAYS - Skip bullshit in mu3 that some individuals may consider useful - 1.5.1 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - - - - - - - diff --git a/SkipLoginReward/MU3/patch_Scene_30_NoticeReward.cs b/SkipLoginReward/MU3/patch_Scene_30_NoticeReward.cs index 975aaa4..a472405 100644 --- a/SkipLoginReward/MU3/patch_Scene_30_NoticeReward.cs +++ b/SkipLoginReward/MU3/patch_Scene_30_NoticeReward.cs @@ -1,12 +1,8 @@ -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Util; namespace MU3; -public class patch_Scene_30_NoticeReward: Scene_30_NoticeReward { +class patch_Scene_30_NoticeReward: Scene_30_NoticeReward { private Mode _mode; private enum State { RankingReward = 2, diff --git a/SkipLoginReward/SkipLoginReward.csproj b/SkipLoginReward/SkipLoginReward.csproj new file mode 100644 index 0000000..90b6bcc --- /dev/null +++ b/SkipLoginReward/SkipLoginReward.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.SkipLoginReward.mm + Skip event/login rewards + + + \ No newline at end of file diff --git a/SkipNotice/Assembly-CSharp.SkipNotice.mm.csproj b/SkipNotice/Assembly-CSharp.SkipNotice.mm.csproj deleted file mode 100644 index 01a88bb..0000000 --- a/SkipNotice/Assembly-CSharp.SkipNotice.mm.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - net35 - Assembly-CSharp.SkipNotice.mm - 7EVENDAYS⇔HOLIDAYS - Skip bullshit in mu3 - 1.5.1 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - - - - - - - \ No newline at end of file diff --git a/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs b/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs index 59e969a..a4f4590 100644 --- a/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs +++ b/SkipNotice/MU3/patch_Scene_30_NoticeReward.cs @@ -1,12 +1,8 @@ -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Util; namespace MU3; -public class patch_Scene_30_NoticeReward: Scene_30_NoticeReward { +class patch_Scene_30_NoticeReward: Scene_30_NoticeReward { private Mode _mode; private enum State { RankingReward = 2, diff --git a/SkipNotice/SkipNotice.csproj b/SkipNotice/SkipNotice.csproj new file mode 100644 index 0000000..52fc144 --- /dev/null +++ b/SkipNotice/SkipNotice.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.SkipNotice.mm + Skip event/safety notice + + + \ No newline at end of file diff --git a/SkipPreMusicRitual/Assembly-CSharp.SkipPreMusicRitual.mm.csproj b/SkipPreMusicRitual/Assembly-CSharp.SkipPreMusicRitual.mm.csproj deleted file mode 100644 index 49ec052..0000000 --- a/SkipPreMusicRitual/Assembly-CSharp.SkipPreMusicRitual.mm.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - net35 - Assembly-CSharp.SkipPreMusicRitual.mm - 7EVENDAYS⇔HOLIDAYS - Skip more bullshit in mu3 - 1.3.0 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - - - - - - - diff --git a/SkipPreMusicRitual/MU3.Battle/patch_GameEngine.cs b/SkipPreMusicRitual/MU3.Battle/patch_GameEngine.cs index b9230cc..095b18c 100644 --- a/SkipPreMusicRitual/MU3.Battle/patch_GameEngine.cs +++ b/SkipPreMusicRitual/MU3.Battle/patch_GameEngine.cs @@ -1,6 +1,6 @@ namespace MU3.Battle; -public class patch_GameEngine: GameEngine { +class patch_GameEngine: GameEngine { public new bool isStartCutsceneFinish() { return true; } diff --git a/SkipPreMusicRitual/MU3.Sequence/patch_PlayMusic.cs b/SkipPreMusicRitual/MU3.Sequence/patch_PlayMusic.cs index 1c9a514..0c1ebc6 100644 --- a/SkipPreMusicRitual/MU3.Sequence/patch_PlayMusic.cs +++ b/SkipPreMusicRitual/MU3.Sequence/patch_PlayMusic.cs @@ -1,13 +1,8 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE0051 -#pragma warning disable IDE1006 - using MU3.Battle; namespace MU3.Sequence; -public class patch_PlayMusic: PlayMusic { +class patch_PlayMusic: PlayMusic { private GameEngine _gameEngine; private extern void orig_Execute_StartCutscene(); diff --git a/SkipPreMusicRitual/MU3/patch_BattleUI.cs b/SkipPreMusicRitual/MU3/patch_BattleUI.cs index 4fbfa69..3322980 100644 --- a/SkipPreMusicRitual/MU3/patch_BattleUI.cs +++ b/SkipPreMusicRitual/MU3/patch_BattleUI.cs @@ -4,7 +4,7 @@ using UnityEngine; namespace MU3; -public class patch_BattleUI: BattleUI { +class patch_BattleUI: BattleUI { private System.Collections.IEnumerator playReadyProc(Action onFinish) { if(!SystemUI.Exists) { onFinish(); diff --git a/SkipPreMusicRitual/SkipPreMusicRitual.csproj b/SkipPreMusicRitual/SkipPreMusicRitual.csproj new file mode 100644 index 0000000..f75d9df --- /dev/null +++ b/SkipPreMusicRitual/SkipPreMusicRitual.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.SkipPreMusicRitual.mm + Skip "Are you ready? Let's shoot" + + + diff --git a/UnlockAndSetJewelBoostNine/Assembly-CSharp.UnlockAndSetJewelBoostNine.mm.csproj b/UnlockAndSetJewelBoostNine/Assembly-CSharp.UnlockAndSetJewelBoostNine.mm.csproj deleted file mode 100644 index ec7a065..0000000 --- a/UnlockAndSetJewelBoostNine/Assembly-CSharp.UnlockAndSetJewelBoostNine.mm.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - net35 - Assembly-CSharp.UnlockAndSetJewelBoostNine.mm - 7EVENDAYS⇔HOLIDAYS - Unlock and set the jewel boost to max - 1.7.0 - true - latest - x64 - - - - ..\Common\mscorlib.dll - ..\Common\UnityEngine.dll - - - - - - - diff --git a/UnlockAndSetJewelBoostNine/MU3/patch_Scene_32_PrePlayMusic_Confirm.cs b/UnlockAndSetJewelBoostNine/MU3/patch_Scene_32_PrePlayMusic_Confirm.cs index ed2b777..ace6358 100644 --- a/UnlockAndSetJewelBoostNine/MU3/patch_Scene_32_PrePlayMusic_Confirm.cs +++ b/UnlockAndSetJewelBoostNine/MU3/patch_Scene_32_PrePlayMusic_Confirm.cs @@ -1,15 +1,10 @@ -#pragma warning disable CS0626 -#pragma warning disable CS0649 -#pragma warning disable IDE1006 -#pragma warning disable CS0414 - -using MU3.DB; +using MU3.DB; using MU3.User; using MU3.Util; namespace MU3; -public class patch_Scene_32_PrePlayMusic_Confirm: Scene_32_PrePlayMusic_Confirm { +class patch_Scene_32_PrePlayMusic_Confirm: Scene_32_PrePlayMusic_Confirm { private extern void orig_createSelector(); private JewelBoostID getMaxBoost() { return JewelBoostID.Nine; diff --git a/UnlockAndSetJewelBoostNine/UnlockAndSetJewelBoostNine.csproj b/UnlockAndSetJewelBoostNine/UnlockAndSetJewelBoostNine.csproj new file mode 100644 index 0000000..629f905 --- /dev/null +++ b/UnlockAndSetJewelBoostNine/UnlockAndSetJewelBoostNine.csproj @@ -0,0 +1,7 @@ + + + Assembly-CSharp.UnlockAndSetJewelBoostNine.mm + Unlock and set the jewel boost to max + + +