Add config option EnableBattleMessage

NebulaModTeam · Mar 9, 2024 · 705414f · 705414f
1 parent 031e9c6
commit 705414f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/NebulaModel/DataStructures/Chat/ChatMessageType.cs b/NebulaModel/DataStructures/Chat/ChatMessageType.cs
@@ -5,8 +5,9 @@ public enum ChatMessageType
     PlayerMessage = 0,
     SystemInfoMessage = 1,
     SystemWarnMessage = 2,
-    CommandUsageMessage = 3,
-    CommandOutputMessage = 4,
-    CommandErrorMessage = 5,
-    PlayerMessagePrivate = 6
+    BattleMessage = 3,
+    CommandUsageMessage = 4,
+    CommandOutputMessage = 5,
+    CommandErrorMessage = 6,
+    PlayerMessagePrivate = 7
 }
diff --git a/NebulaModel/MultiplayerOptions.cs b/NebulaModel/MultiplayerOptions.cs
@@ -142,6 +142,10 @@ public bool StreamerMode
     [Category("Chat")]
     public bool EnableInfoMessage { get; set; } = true;
 
+    [DisplayName("Show battle notification message")]
+    [Category("Chat")]
+    public bool EnableBattleMessage { get; set; } = true;
+
     [DisplayName("Default chat position")]
     [Category("Chat")]
     public ChatPosition DefaultChatPosition { get; set; } = ChatPosition.LeftMiddle;

diff --git a/NebulaModel/Utils/ChatUtils.cs b/NebulaModel/Utils/ChatUtils.cs
@@ -98,6 +98,9 @@ public static Color GetMessageColor(ChatMessageType messageType)
             case ChatMessageType.SystemWarnMessage:
                 return new Color(1, 0.95f, 0, 1);
 
+            case ChatMessageType.BattleMessage:
+                return Color.cyan;
+
             case ChatMessageType.CommandUsageMessage:
                 return new Color(1, 0.65f, 0, 1);
 

diff --git a/NebulaWorld/MonoBehaviours/Local/Chat/ChatWindow.cs b/NebulaWorld/MonoBehaviours/Local/Chat/ChatWindow.cs
@@ -203,6 +203,7 @@ public ChatMessage SendLocalChatMessage(string text, ChatMessageType messageType
             {
                 case ChatMessageType.SystemInfoMessage when !Config.Options.EnableInfoMessage:
                 case ChatMessageType.SystemWarnMessage when !Config.Options.EnableWarnMessage:
+                case ChatMessageType.BattleMessage when !Config.Options.EnableBattleMessage:
                     return null;
                 case ChatMessageType.PlayerMessage:
                     break;

diff --git a/NebulaWorld/SimulatedWorld.cs b/NebulaWorld/SimulatedWorld.cs
@@ -294,7 +294,7 @@ public void SpawnRemotePlayerModel(IPlayerData playerData)
             var planetname = GameMain.galaxy.PlanetById(playerData.LocalPlanetId)?.displayName ?? "In space";
             var message = string.Format("[{0:HH:mm}] {1} connected ({2})".Translate(), DateTime.Now, playerData.Username,
                 planetname);
-            SendChatMessage(message);
+            ChatManager.Instance.SendChatMessage(message, ChatMessageType.SystemInfoMessage);
         }
     }
 
@@ -308,7 +308,7 @@ public void DestroyRemotePlayerModel(ushort playerId)
             }
             // Show disconnected message
             var message = string.Format("[{0:HH:mm}] {1} disconnected".Translate(), DateTime.Now, player.Username);
-            SendChatMessage(message);
+            ChatManager.Instance.SendChatMessage(message, ChatMessageType.SystemInfoMessage);
 
             player.Destroy();
             remotePlayersModels.Remove(playerId);
@@ -584,11 +584,6 @@ public static int GetUniverseObserveLevel()
         return level;
     }
 
-    private static void SendChatMessage(string text, ChatMessageType messageType = ChatMessageType.SystemInfoMessage)
-    {
-        ChatManager.Instance.SendChatMessage(text, messageType);
-    }
-
     private sealed class ThreadSafe
     {
         internal readonly Dictionary<ushort, RemotePlayerModel> RemotePlayersModels = new();