vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix killedbytraitor and message icon

Browse Source
This commit is contained in:
Evil Factory
2021-08-06 19:26:16 -03:00
parent bae0dbd0e5
commit 933b6dcb8f
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Characters/Character.cs
+4 -1
View File
@@ -35,7 +35,10 @@ namespace Barotrauma
var owner = GameMain.Server.ConnectedClients.Find(c => c.Character == this); var owner = GameMain.Server.ConnectedClients.Find(c => c.Character == this);
if (owner != null) if (owner != null)
{ {
GameMain.Server.SendDirectChatMessage(TextManager.FormatServerMessage("KilledByTraitorNotification"), owner, ChatMessageType.ServerMessageBoxInGame); if (!GameMain.Lua.game.overrideTraitors)
{
GameMain.Server.SendDirectChatMessage(TextManager.FormatServerMessage("KilledByTraitorNotification"), owner, ChatMessageType.ServerMessageBoxInGame);
}
} }
} }
foreach (Client client in GameMain.Server.ConnectedClients) foreach (Client client in GameMain.Server.ConnectedClients)
Barotrauma/BarotraumaServer/ServerSource/Lua/LuaClasses.cs
+2 -1
View File
@@ -142,10 +142,11 @@ namespace Barotrauma
GameMain.Server.SendTraitorMessage(client, msg, missionid, type); GameMain.Server.SendTraitorMessage(client, msg, missionid, type);
} }
public static void SendDirectChatMessage(string sendername, string text, Character sender, ChatMessageType messageType = ChatMessageType.Private, Client client = null) public static void SendDirectChatMessage(string sendername, string text, Character sender, ChatMessageType messageType = ChatMessageType.Private, Client client = null, string iconStyle = "")
{ {
ChatMessage cm = ChatMessage.Create(sendername, text, messageType, sender, client); ChatMessage cm = ChatMessage.Create(sendername, text, messageType, sender, client);
cm.IconStyle = iconStyle;
GameMain.Server.SendDirectChatMessage(cm, client); GameMain.Server.SendDirectChatMessage(cm, client);
Barotrauma/BarotraumaServer/ServerSource/Lua/LuaSetup.cs
+2 -1
View File
@@ -89,7 +89,7 @@ namespace Barotrauma
LuaScriptLoader luaScriptLoader = new LuaScriptLoader(this); LuaScriptLoader luaScriptLoader = new LuaScriptLoader(this);
LuaCustomConverters.RegisterAll(); LuaCustomConverters.RegisterAll();
UserData.RegisterType<TraitorMessageType>(); UserData.RegisterType<TraitorMessageType>();
UserData.RegisterType<JobPrefab>(); UserData.RegisterType<JobPrefab>();
UserData.RegisterType<CharacterInfo>(); UserData.RegisterType<CharacterInfo>();
@@ -122,6 +122,7 @@ namespace Barotrauma
UserData.RegisterType<AnimController>(); UserData.RegisterType<AnimController>();
UserData.RegisterType<Limb>(); UserData.RegisterType<Limb>();
UserData.RegisterType<Ragdoll>(); UserData.RegisterType<Ragdoll>();
UserData.RegisterType<ChatMessage>();
lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.LoadMethods); lua = new Script(CoreModules.Preset_SoftSandbox | CoreModules.LoadMethods);