Merge pull request #123 from Zingabopp/dev

bug fixes

Author: Goobwabber

MultiplayerExtensions/HarmonyPatches/InstallerPatches.cs

@@ -109,16 +109,13 @@ internal static void Prefix(ref GameplayCoreInstaller __instance, ref IConnected
             else
                 newModifiers = hostPlayer?.lastModifiers;
 
-            if (Plugin.Config.LagReducer && newModifiers != null)
-                newModifiers = newModifiers.CopyWith(zenMode: true);
-
             if (newModifiers == null)
                 newModifiers = ____sceneSetupData.gameplayModifiers;
 
             ____sceneSetupData = new GameplayCoreSceneSetupData(
                 ____sceneSetupData.difficultyBeatmap,
                 ____sceneSetupData.previewBeatmapLevel,
-                newModifiers.CopyWith(zenMode: true),
+                newModifiers.CopyWith(zenMode: Plugin.Config.LagReducer),
                 ____sceneSetupData.playerSpecificSettings,
                 ____sceneSetupData.practiceSettings,
                 ____sceneSetupData.useTestNoteCutSoundEffects,

MultiplayerExtensions/MultiplayerExtensions.csproj

@@ -4,7 +4,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>MultiplayerExtensions</AssemblyName>
-    <AssemblyVersion>0.4.9</AssemblyVersion>
+    <AssemblyVersion>0.5.0</AssemblyVersion>
     <TargetFramework>net472</TargetFramework>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>

MultiplayerExtensions/OverrideClasses/GameStateControllerStub.cs

@@ -185,11 +185,19 @@ private void handleLevelFinished(MultiplayerLevelScenesTransitionSetupDataSO sce
         {
             if (resultsData.localPlayerResultData.levelCompletionResults == null)
                 return;
-            
-            string? hash = Utilities.Utils.LevelIdToHash(sceneSetupData.previewBeatmapLevel.levelID);
-            
+
+            string difficulty = sceneSetupData.beatmapDifficulty.ToString();
+            string characteristic = sceneSetupData.beatmapCharacteristic.serializedName;
+            int timePlayed = (int)Math.Floor(resultsData.localPlayerResultData.levelCompletionResults.endSongTime);
+            bool pass = resultsData.localPlayerResultData.levelCompletionResults.levelEndStateType == LevelCompletionResults.LevelEndStateType.Cleared;
+            int cutNotes = resultsData.localPlayerResultData.levelCompletionResults.badCutsCount + resultsData.localPlayerResultData.levelCompletionResults.notGoodCount + resultsData.localPlayerResultData.levelCompletionResults.okCount + resultsData.localPlayerResultData.levelCompletionResults.goodCutsCount;
+            int missedNotes = resultsData.localPlayerResultData.levelCompletionResults.missedCount;
+            int score = resultsData.localPlayerResultData.levelCompletionResults.rawScore;
+            double accuracy = score != 0 ? Math.Floor(100 *((double)ScoreModel.MaxRawScoreForNumberOfNotes(sceneSetupData.difficultyBeatmap.beatmapData.cuttableNotesType) / score))/100 : 0;
+            string ? hash = Utilities.Utils.LevelIdToHash(sceneSetupData.previewBeatmapLevel.levelID);
             if (hash != null)
-                _ = Statistics.PlayMap(hash, sceneSetupData.beatmapDifficulty.ToString(), sceneSetupData.beatmapCharacteristic.serializedName, (int)Math.Floor(resultsData.localPlayerResultData.levelCompletionResults.endSongTime), (int)ExtendedPlayerManager.localPlatform, MPState.CurrentMasterServer.hostname);
+                _ = Statistics.PlayMap(ExtendedPlayerManager.localPlatformID, (int)ExtendedPlayerManager.localPlatform, MPState.CurrentMasterServer.hostname, hash, difficulty, characteristic, timePlayed, pass, cutNotes, missedNotes, score, accuracy);
+                //_ = Statistics.PlayMap(hash, sceneSetupData.beatmapDifficulty.ToString(), sceneSetupData.beatmapCharacteristic.serializedName, (int)Math.Floor(resultsData.localPlayerResultData.levelCompletionResults.endSongTime), (int)ExtendedPlayerManager.localPlatform, MPState.CurrentMasterServer.hostname);
         }
 
         private bool starting;

MultiplayerExtensions/Sessions/SessionManager.cs

@@ -36,7 +36,7 @@ public void Dispose()
         private void HandleConnected()
         {
             MPState.LocalPlayerIsHost = _sessionManager.localPlayer.isConnectionOwner;
-            _ = Statistics.UseMaster(MPState.CurrentMasterServer.hostname, (int)ExtendedPlayerManager.localPlatform, ExtendedPlayerManager.localPlatformID, MPState.LocalPlayerIsHost);
+            _ = Statistics.UseMaster(ExtendedPlayerManager.localPlatformID, (int)ExtendedPlayerManager.localPlatform, MPState.CurrentMasterServer.hostname, MPState.LocalPlayerIsHost);
         }
 
         private void HandlePlayerStateChanged(IConnectedPlayer player)

MultiplayerExtensions/Utilities/Config.cs

@@ -13,6 +13,7 @@ public class PluginConfig
         public virtual bool HostPick { get; set; } = true;
         public virtual string Color { get; set; } = "#08C0FF";
         public virtual int MaxPlayers { get; set; } = 10;
+        public virtual bool ReportMasterServer { get; set; } = true;
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public virtual DebugConfig? DebugConfig { get; set; }

MultiplayerExtensions/Utilities/Statistics.cs

@@ -64,16 +64,18 @@ public static async Task<bool> AddUser(string userId, int platform)
             return await PerformWebRequest("POST", $"/adduser?userId={userId}&platform={platform}") != null;
         }
 
-        public static async Task<bool> PlayMap(string hash, string difficulty, string characteristic, int timePlayed, int platform, string hostname)
+        public static async Task<bool> PlayMap(string? userId, int platform, string hostname, string hash, string difficulty, string characteristic, int timePlayed, bool pass, int cutNotes, int missedNotes, int score, double accuracy)
         {
-            return await PerformWebRequest("POST", $"/playmap?hash={hash}&difficulty={difficulty}&characteristic={characteristic}&timePlayed={timePlayed}&platform={platform}&hostname={hostname}") != null;
+            if (userId != null)
+                return await PerformWebRequest("POST", $"/playmap?userId={userId}&platform={platform}&hostname={hostname}&hash={hash}&difficulty={difficulty}&characteristic={characteristic}&timePlayed={timePlayed}&pass={pass}&cutNotes={cutNotes}&missedNotes={missedNotes}&score={score}&accuracy={accuracy}") != null;
+            return true;
         }
 
-        public static async Task<bool> UseMaster(string hostname, int platform, string? userId = null, bool host = false)
+        public static async Task<bool> UseMaster(string? userId, int platform, string hostname, bool host = false)
         {
             if (userId != null)
-                return await PerformWebRequest("POST", $"/usemaster?hostname={hostname}&userId={userId}&platform={platform}&host={host}") != null;
-            return await PerformWebRequest("POST", $"/usemaster?hostname={hostname}&platform={platform}&host={host}") != null;
+                return await PerformWebRequest("POST", $"/usemaster?userId={userId}&hostname={hostname}&platform={platform}&host={host}&disableNewMaster={!Plugin.Config.ReportMasterServer}") != null;
+            return true;
         }
     }
 }

MultiplayerExtensions/manifest.json

@@ -3,7 +3,7 @@
   "id": "MultiplayerExtensions",
   "name": "MultiplayerExtensions",
   "author": "Zingabopp and Goobwabber",
-  "version": "0.4.9",
+  "version": "0.5.0",
   "description": "Expands the functionality of Beat Saber Multiplayer.",
   "gameVersion": "1.16.1",
   "dependsOn": {