Merge pull request #748 from starfi5h/master

0.9.19

Author: starfi5h

.github/scripts/thunderstore_bundle.js

@@ -117,15 +117,15 @@ function generateManifest() {
   const manifest = {
     name: pluginInfo.name,
     description:
-      "With this mod you will be able to play with your friends in the same game! Now supports combat mode in game version 0.10.32",
+      "With this mod you will be able to play with your friends in the same game! Now supports combat mode in game version 0.10.33",
     version_number: pluginInfo.version,
     dependencies: [
       BEPINEX_DEPENDENCY,
       `nebula-${apiPluginInfo.name}-${apiPluginInfo.version}`,
       "PhantomGamers-IlLine-1.0.0",
-      "starfi5h-BulletTime-1.5.11", 
+      "starfi5h-BulletTime-1.5.12", 
       "starfi5h-ErrorAnalyzer-1.3.3",
-      "starfi5h-NebulaCompatibilityAssist-0.4.27"
+      "starfi5h-NebulaCompatibilityAssist-0.5.0"
     ],
     website_url: "https://github.com/NebulaModTeam/nebula"
   };

CHANGELOG.md

@@ -1,5 +1,12 @@
 ## Changelog
 
+0.9.19:
+- Add new config option `Chat View Mode` to switch between TMPro and IMGUI chat window.  
+- Sync point-to-point transport setting window in client.
+- Sync station pairing tab in client.
+- Fix InvalidTypeException when placing blueprint foundation.
+- Register enemy kill stats for kill events that broadcast from other players.
+
 0.9.18:
 - Compatible with game version 0.10.33.27026
 - **The dedicated server CLI option has changed from `-server` to `-nebula-server`**

NebulaModel/MultiplayerOptions.cs

@@ -127,9 +127,9 @@ public bool StreamerMode
     [DisplayName("Enable Other Player Sounds")]
     public bool EnableOtherPlayerSounds { get; set; } = true;
 
-    [DisplayName("Enable Unkillable Mode")]
-    [Description("The mecha will not be destroyed with this mode")]
-    public bool EnableUnkillableMode { get; set; } = false;
+    [DisplayName("Enable Invincible Mode")]
+    [Description("The mecha will not take damage in this mode")]
+    public bool EnableInvincibleMode { get; set; } = false;
 
 
     #region Chat Settings

NebulaModel/Packets/Factory/Foundation/FoundationBlueprintPastePacket.cs

@@ -1,24 +1,53 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 
 namespace NebulaModel.Packets.Factory.Foundation;
 
 public class FoundationBlueprintPastePacket
 {
     public FoundationBlueprintPastePacket() { }
 
-    public FoundationBlueprintPastePacket(int planetId, List<int> reformGridIds,
-        Dictionary<int, int> levelChanges, int reformType, int reformColor)
+    public FoundationBlueprintPastePacket(int planetId, Dictionary<int, int> levelChanges,
+        byte[] reformData)
     {
         PlanetId = planetId;
+        LevelChangesKeys = new int[levelChanges.Count];
+        LevelChangesValues = new int[levelChanges.Count];
+        var index = 0;
+        foreach (var pair in levelChanges)
+        {
+            LevelChangesKeys[index] = pair.Key;
+            LevelChangesValues[index] = pair.Value;
+            index++;
+        }
+        ReformData = reformData;
+        ReformGridIds = [];
+    }
+
+    public FoundationBlueprintPastePacket(int planetId, Dictionary<int, int> levelChanges,
+        int[] reformGridIds, int reformType, int reformColor)
+    {
+        PlanetId = planetId;
+        LevelChangesKeys = new int[levelChanges.Count];
+        LevelChangesValues = new int[levelChanges.Count];
+        var index = 0;
+        foreach (var pair in levelChanges)
+        {
+            LevelChangesKeys[index] = pair.Key;
+            LevelChangesValues[index] = pair.Value;
+            index++;
+        }
+        ReformData = [];
         ReformGridIds = reformGridIds;
-        LevelChanges = levelChanges;
         ReformType = reformType;
         ReformColor = reformColor;
     }
 
     public int PlanetId { get; set; }
-    public List<int> ReformGridIds { get; set; }
-    public Dictionary<int, int> LevelChanges { get; set; }
+    public int[] LevelChangesKeys { get; set; }
+    public int[] LevelChangesValues { get; set; }
+    public byte[] ReformData { get; set; }
+    public int[] ReformGridIds { get; set; }
     public int ReformType { get; set; }
     public int ReformColor { get; set; }
 }

NebulaNetwork/PacketProcessors/Factory/Foundation/FoundationBlueprintPasteProcessor.cs

@@ -1,5 +1,6 @@
 #region
 
+using System;
 using System.Collections.Generic;
 using NebulaAPI;
 using NebulaAPI.Packets;
@@ -31,9 +32,22 @@ protected override void ProcessPacket(FoundationBlueprintPastePacket packet, Neb
             GameMain.gpuiManager.specifyPlanet = planet;
 
             // Split BuildTool_BlueprintPaste.DetermineReforms into following functions
-            SetReform(factory, packet.ReformGridIds, packet.ReformType, packet.ReformColor);
-            AlterHeightMap(planet, packet.LevelChanges);
-            RemoveVeges(factory, packet.LevelChanges);
+            factory.platformSystem.EnsureReformData();
+            if (packet.ReformData != null && packet.ReformData.Length > 0)
+            {
+                SetReformByData(factory, packet.ReformData);
+            }
+            else if (packet.ReformGridIds != null && packet.ReformGridIds.Length > 0)
+            {
+                SetReformByGridIds(factory, packet.ReformGridIds, packet.ReformType, packet.ReformColor);
+            }
+            var levelChanges = new Dictionary<int, int>();
+            for (int i = 0; i < packet.LevelChangesKeys.Length; i++)
+            {
+                levelChanges.Add(packet.LevelChangesKeys[i], packet.LevelChangesValues[i]);
+            }
+            AlterHeightMap(planet, levelChanges);
+            RemoveVeges(factory, levelChanges);
             UpdateGeothermalStrength(factory);
             AlterVeinModels(factory);
 
@@ -42,11 +56,17 @@ protected override void ProcessPacket(FoundationBlueprintPastePacket packet, Neb
         }
     }
 
-    static void SetReform(PlanetFactory factory, List<int> reformGridIds, int brushType, int brushColor)
+    static void SetReformByData(PlanetFactory factory, byte[] reformData)
     {
-        PlatformSystem platformSystem = factory.platformSystem;
-        platformSystem.EnsureReformData();
+        // EBlueprintPasteResult.HasReform in DetermineReforms()
+        var length = Math.Min(reformData.Length, factory.platformSystem.reformData.Length);
+        Array.Copy(reformData, factory.platformSystem.reformData, length);
+    }
 
+    static void SetReformByGridIds(PlanetFactory factory, int[] reformGridIds, int brushType, int brushColor)
+    {
+        // EBlueprintPasteResult.BuildingNeedReform in DetermineReforms()
+        var platformSystem = factory.platformSystem;
         foreach (int gridId in reformGridIds)
         {
             int reformIndex = platformSystem.GetReformIndex(gridId >> 16, gridId & 65535);
@@ -57,6 +77,7 @@ static void SetReform(PlanetFactory factory, List<int> reformGridIds, int brushT
             }
         }
     }
+
     static void AlterHeightMap(PlanetData planet, Dictionary<int, int> heightLevelChanges)
     {
         PlanetRawData planetRawData = planet.data;
@@ -167,7 +188,7 @@ static void AlterVeinModels(PlanetFactory factory)
                     physics.SetPlanetPhysicsColliderDirty();
                     if (Mathf.Abs(magnitude - veinSurfaceThreshold) > 0.1f)
                     {
-                        Quaternion quaternion = Maths.SphericalRotation(pos, Random.value * 360f);
+                        Quaternion quaternion = Maths.SphericalRotation(pos, UnityEngine.Random.value * 360f);
                         GameMain.gpuiManager.AlterModel(veinPtr.modelIndex, veinPtr.modelId, veinId, pos, quaternion, false);
                     }
                     else

NebulaPatcher/Patches/Dynamic/Mecha_Patch.cs

@@ -1,6 +1,7 @@
 #region
 
 using HarmonyLib;
+using NebulaModel;
 using NebulaModel.Packets.Players;
 using NebulaWorld;
 
@@ -59,4 +60,11 @@ public static bool AddConsumptionStat_Prefix(int itemId, int itemCount)
         Multiplayer.Session.Network.SendPacket(new PlayerMechaStat(itemId, -itemCount));
         return false;
     }
+
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(Mecha.TakeDamage))]
+    public static bool TakeDamage_Prefix()
+    {
+        return !Multiplayer.IsActive || !Config.Options.EnableInvincibleMode;
+    }
 }

NebulaPatcher/Patches/Dynamic/Player_Patch.cs

@@ -159,7 +159,6 @@ public static bool Kill_Prefix(Player __instance)
     {
         if (!Multiplayer.IsActive) return true;
         if (__instance != GameMain.mainPlayer) return false;
-        if (Config.Options.EnableUnkillableMode) return false;
 
         if (__instance.isAlive)
         {

NebulaPatcher/Patches/Transpilers/BuildTool_BlueprintPaste_Transpiler.cs

@@ -93,10 +93,18 @@ private static void BroadcastReform(BuildTool_BlueprintPaste buildTool)
     {
         if (!Multiplayer.IsActive) return;
 
-        var reformTool = buildTool.player.controller.actionBuild.reformTool;
-        var brushType = (reformTool != null) ? reformTool.brushType : 0;
-        var brushColor = (reformTool != null) ? reformTool.brushColor : 0;
-        Multiplayer.Session.Network.SendPacketToLocalStar(new FoundationBlueprintPastePacket(
-            buildTool.planet.id, buildTool.reformGridIds.ToList(), buildTool.tmpModLevel, brushType, brushColor));
+        if (buildTool.hasPastedReform)
+        {
+            Multiplayer.Session.Network.SendPacketToLocalStar(new FoundationBlueprintPastePacket(
+                buildTool.planet.id, buildTool.tmpModLevel, buildTool.factory.platformSystem.reformData));
+        }
+        else
+        {
+            var reformTool = buildTool.player.controller.actionBuild.reformTool;
+            var brushType = (reformTool != null) ? reformTool.brushType : 0;
+            var brushColor = (reformTool != null) ? reformTool.brushColor : 0;
+            Multiplayer.Session.Network.SendPacketToLocalStar(new FoundationBlueprintPastePacket(
+                buildTool.planet.id, buildTool.tmpModLevel, buildTool.reformGridIds.ToArray(), brushType, brushColor));
+        }
     }
 }

version.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "assemblyVersion": {
     "precision": "build"
   },