Merge Nicogo1705/multibonk/main into dev

Multibonk/Game/EventHandlerExecutor.cs

@@ -1,5 +1,4 @@
 using Multibonk.Game.Handlers;
-using UnityEngine.UIElements;
 
 namespace Multibonk.Game
 {

Multibonk/Game/GameFunctions.cs

@@ -101,4 +101,3 @@ public void Rotate(Vector3 rotation)
         }
     }
 }
-

Multibonk/Game/GamePatchFlags.cs

@@ -15,9 +15,16 @@ public static class GamePatchFlags
 
         public static int Seed { get; set; } = _rng.Next(int.MinValue, int.MaxValue);
 
-        public static bool AllowStartMapCall { get; set; } = false; 
+        public static bool AllowStartMapCall { get; set; } = false;
 
         public static Vector3 LastPlayerPosition { get; set; }
         public static Quaternion LastPlayerRotation { get; set; }
+
+        public static GameplayRulesSnapshot GameplayRules { get; private set; } = GameplayRulesSnapshot.FromPreferences();
+
+        public static void SetGameplayRules(GameplayRulesSnapshot snapshot)
+        {
+            GameplayRules = snapshot;
+        }
     }
 }

Multibonk/Game/GameplayRulesSnapshot.cs

@@ -0,0 +1,53 @@
+using System;
+
+namespace Multibonk.Game
+{
+    public readonly struct GameplayRulesSnapshot : IEquatable<GameplayRulesSnapshot>
+    {
+        public bool PvpEnabled { get; }
+        public bool ReviveEnabled { get; }
+        public float ReviveDelaySeconds { get; }
+        public Preferences.LootDistributionMode XpSharingMode { get; }
+        public Preferences.LootDistributionMode GoldSharingMode { get; }
+        public Preferences.LootDistributionMode ChestSharingMode { get; }
+
+        public GameplayRulesSnapshot(
+            bool pvpEnabled,
+            bool reviveEnabled,
+            float reviveDelaySeconds,
+            Preferences.LootDistributionMode xpSharingMode,
+            Preferences.LootDistributionMode goldSharingMode,
+            Preferences.LootDistributionMode chestSharingMode)
+        {
+            PvpEnabled = pvpEnabled;
+            ReviveEnabled = reviveEnabled;
+            ReviveDelaySeconds = reviveDelaySeconds;
+            XpSharingMode = xpSharingMode;
+            GoldSharingMode = goldSharingMode;
+            ChestSharingMode = chestSharingMode;
+        }
+
+        public static GameplayRulesSnapshot FromPreferences() => new GameplayRulesSnapshot(
+            Preferences.PvpEnabled.Value,
+            Preferences.ReviveEnabled.Value,
+            Preferences.ReviveTimeSeconds.Value,
+            Preferences.GetXpSharingMode(),
+            Preferences.GetGoldSharingMode(),
+            Preferences.GetChestSharingMode());
+
+        public bool Equals(GameplayRulesSnapshot other) =>
+            PvpEnabled == other.PvpEnabled &&
+            ReviveEnabled == other.ReviveEnabled &&
+            Math.Abs(ReviveDelaySeconds - other.ReviveDelaySeconds) < 0.001f &&
+            XpSharingMode == other.XpSharingMode &&
+            GoldSharingMode == other.GoldSharingMode &&
+            ChestSharingMode == other.ChestSharingMode;
+
+        public override bool Equals(object? obj) => obj is GameplayRulesSnapshot other && Equals(other);
+
+        public override int GetHashCode() => HashCode.Combine(PvpEnabled, ReviveEnabled, ReviveDelaySeconds, XpSharingMode, GoldSharingMode, ChestSharingMode);
+
+        public override string ToString() =>
+            $"PvP={(PvpEnabled ? "Enabled" : "Disabled")}, Revive={(ReviveEnabled ? "Enabled" : "Disabled")} ({ReviveDelaySeconds:0.##}s), XP={XpSharingMode}, Gold={GoldSharingMode}, Chest={ChestSharingMode}";
+    }
+}

Multibonk/Game/Handlers/GameDispatcher.cs

@@ -1,5 +1,5 @@
-using System.Collections.Concurrent;
-using MelonLoader;
+using MelonLoader;
+using System.Collections.Concurrent;
 
 namespace Multibonk.Game.Handlers
 {

Multibonk/Game/Handlers/Logic/GameplayRuleSynchronizer.cs

@@ -0,0 +1,48 @@
+using MelonLoader;
+using UnityEngine;
+
+namespace Multibonk.Game.Handlers.Logic
+{
+    public class GameplayRuleSynchronizer : GameEventHandler
+    {
+        private GameplayRulesSnapshot lastSnapshot;
+        private float lastLogTime;
+
+        public GameplayRuleSynchronizer()
+        {
+            lastSnapshot = GameplayRulesSnapshot.FromPreferences();
+            GamePatchFlags.SetGameplayRules(lastSnapshot);
+            GameEvents.GameLoadedEvent += ApplyRulesToWorld;
+            GameEvents.ConfirmMapEvent += ApplyRulesToWorld;
+        }
+
+        public override void Update()
+        {
+            if (Time.frameCount % 60 != 0)
+            {
+                return;
+            }
+
+            var current = GameplayRulesSnapshot.FromPreferences();
+            if (current.Equals(lastSnapshot))
+            {
+                return;
+            }
+
+            lastSnapshot = current;
+            GamePatchFlags.SetGameplayRules(current);
+            ApplyRulesToWorld();
+        }
+
+        private void ApplyRulesToWorld()
+        {
+            GamePatchFlags.SetGameplayRules(lastSnapshot);
+
+            if (Time.time - lastLogTime > 5f)
+            {
+                MelonLogger.Msg($"Applied gameplay rules: {lastSnapshot}.");
+                lastLogTime = Time.time;
+            }
+        }
+    }
+}

Multibonk/Game/Handlers/Logic/UpdateNetworkPlayerAnimationsEventHandler.cs

@@ -6,15 +6,15 @@ namespace Multibonk.Game.Handlers.Logic
 {
     public class UpdateNetworkPlayerAnimationsEventHandler : GameEventHandler
     {
-        public UpdateNetworkPlayerAnimationsEventHandler() 
-        { 
+        public UpdateNetworkPlayerAnimationsEventHandler()
+        {
 
         }
 
 
         public override void FixedUpdate()
         {
-            foreach(var player in GamePatchFlags.PlayersCache.Values)
+            foreach (var player in GamePatchFlags.PlayersCache.Values)
             {
                 if (player.PlayerObject.IsNullOrDestroyed())
                     continue;

Multibonk/Game/Handlers/NetworkNotify/GameLoadedEventHandler.cs

@@ -1,12 +1,7 @@
 using Il2Cpp;
 using Il2CppAssets.Scripts.Actors.Player;
-using Il2CppInterop.Runtime.InteropTypes.Arrays;
-using MelonLoader;
 using Multibonk.Networking.Comms.Base.Packet;
 using Multibonk.Networking.Lobby;
-using UnityEngine;
-using static Il2Cpp.AnimatedMeshScriptableObject;
-using static MelonLoader.MelonLaunchOptions;
 
 namespace Multibonk.Game.Handlers.NetworkNotify
 {

Multibonk/Game/Handlers/NetworkNotify/PlayerMovementEventHandler.cs

@@ -1,7 +1,7 @@
-using Multibonk.Networking.Comms.Base.Packet.Multibonk.Networking.Comms.Base.Packet;
-using Multibonk.Networking.Comms.Base.Packet;
-using Multibonk.Networking.Lobby;
+using Multibonk.Networking.Comms.Base.Packet;
+using Multibonk.Networking.Comms.Base.Packet.Multibonk.Networking.Comms.Base.Packet;
 using Multibonk.Networking.Comms.Multibonk.Networking.Comms;
+using Multibonk.Networking.Lobby;
 
 namespace Multibonk.Game.Handlers.NetworkNotify
 {

Multibonk/Game/Patches/MainMenuPatches.cs

@@ -1,7 +1,4 @@
-
-
-using System.Runtime.CompilerServices;
-using HarmonyLib;
+using HarmonyLib;
 using Il2Cpp;
 using Il2CppAssets.Scripts.Actors.Player;
 using Il2CppRewired.Utils;

Multibonk/Multibonk.cs

@@ -1,17 +1,18 @@
 using MelonLoader;
-using Multibonk.UserInterface.Window;
 using Microsoft.Extensions.DependencyInjection;
-using Multibonk.Networking.Lobby;
-using Multibonk.Networking.Comms.Server.Protocols;
+using Multibonk.Game;
+using Multibonk.Game.Handlers;
+using Multibonk.Game.Handlers.Logic;
+using Multibonk.Game.Handlers.NetworkNotify;
+using Multibonk.Networking.Comms.Base;
+using Multibonk.Networking.Comms.Client.Handlers;
 using Multibonk.Networking.Comms.Client.Protocols;
 using Multibonk.Networking.Comms.Multibonk.Networking.Comms;
 using Multibonk.Networking.Comms.Server.Handlers;
-using Multibonk.Networking.Comms.Client.Handlers;
-using Multibonk.Game.Handlers;
-using Multibonk.Game;
-using Multibonk.Networking.Comms.Base;
-using Multibonk.Game.Handlers.NetworkNotify;
-using Multibonk.Game.Handlers.Logic;
+using Multibonk.Networking.Comms.Server.Protocols;
+using Multibonk.Networking.Lobby;
+using Multibonk.Networking.Steam;
+using Multibonk.UserInterface.Window;
 
 namespace Multibonk
 {
@@ -22,7 +23,7 @@ public class MultibonkMod : MelonMod
 
         public override void OnGUI()
         {
-            if(manager != null)
+            if (manager != null)
                 manager.OnGUI();
 
         }
@@ -52,6 +53,7 @@ public override void OnInitializeMelon()
             services.AddSingleton<IGameEventHandler, PlayerMovementEventHandler>();
             services.AddSingleton<IGameEventHandler, StartGameEventHandler>();
             services.AddSingleton<IGameEventHandler, UpdateNetworkPlayerAnimationsEventHandler>();
+            services.AddSingleton<IGameEventHandler, GameplayRuleSynchronizer>();
             services.AddSingleton<IGameEventHandler, GameDispatcher>();
 
             services.AddSingleton<EventHandlerExecutor>();
@@ -76,11 +78,14 @@ public override void OnInitializeMelon()
 
             // Packet Handlers cannot call services. Otherwise, it will cause circular dependency
             services.AddSingleton<NetworkService>();
+            services.AddSingleton<SteamTunnelService>();
+            services.AddSingleton<SteamTunnelCallbackBinder>();
             services.AddSingleton<LobbyService>();
 
             services.AddSingleton<ClientLobbyWindow>();
             services.AddSingleton<ConnectionWindow>();
             services.AddSingleton<HostLobbyWindow>();
+            services.AddSingleton<OptionsWindow>();
 
             services.AddSingleton<UIManager>();
 
@@ -91,6 +96,8 @@ public override void OnInitializeMelon()
 
             var _lobbyContext = serviceProvider.GetService<LobbyContext>();
 
+            serviceProvider.GetService<SteamTunnelCallbackBinder>();
+
             base.OnInitializeMelon();
         }
     }