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

Unstable v0.1300.0.0 (February 19th 2021)

Browse Source
This commit is contained in:
Joonas Rikkonen
2021-02-25 13:44:23 +02:00
parent b772654326
commit 24cbef485a
441 changed files with 21343 additions and 8562 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaServer/ServerSource/Map/Creatures/BallastFloraBehavior.cs
+5 -1
View File
@@ -58,10 +58,14 @@ namespace Barotrauma.MapCreatures.Behavior
msg.Write(branch.Health);
}
public void ServerWriteInfect(IWriteMessage msg, UInt16 itemID, bool infect)
public void ServerWriteInfect(IWriteMessage msg, UInt16 itemID, bool infect, BallastFloraBranch infector = null)
{
msg.Write(itemID);
msg.Write(infect);
if (infect)
{
msg.Write(infector?.ID ?? -1);
}
}
public void ServerWriteBranchRemove(IWriteMessage msg, BallastFloraBranch branch)
Barotrauma/BarotraumaServer/ServerSource/Map/Hull.cs
+5 -3
View File
@@ -93,7 +93,9 @@ namespace Barotrauma
behavior.ServerWriteBranchRemove(message, branch);
break;
case BallastFloraBehavior.NetworkHeader.Infect when extraData.Length >= 4 && extraData[2] is UInt16 itemID && extraData[3] is bool infect:
behavior.ServerWriteInfect(message, itemID, infect);
BallastFloraBranch infector = null;
if (extraData.Length >= 5 && extraData[4] is BallastFloraBranch b) { infector = b; }
behavior.ServerWriteInfect(message, itemID, infect, infector);
break;
}
@@ -223,7 +225,7 @@ namespace Barotrauma
byte decalIndex = msg.ReadByte();
float decalAlpha = msg.ReadRangedSingle(0.0f, 1.0f, 255);
if (decalIndex < 0 || decalIndex >= decals.Count) { return; }
if (c.Character != null && c.Character.AllowInput && c.Character.SelectedItems.Any(it => it?.GetComponent<Sprayer>() != null))
if (c.Character != null && c.Character.AllowInput && c.Character.HeldItems.Any(it => it.GetComponent<Sprayer>() != null))
{
decals[decalIndex].BaseAlpha = decalAlpha;
}
@@ -240,7 +242,7 @@ namespace Barotrauma
Color color = new Color(msg.ReadUInt32());
//TODO: verify the client is close enough to this hull to paint it, that the sprayer is functional and that the color matches
if (c.Character != null && c.Character.AllowInput && c.Character.SelectedItems.Any(it => it?.GetComponent<Sprayer>() != null))
if (c.Character != null && c.Character.AllowInput && c.Character.HeldItems.Any(it => it.GetComponent<Sprayer>() != null))
{
BackgroundSections[i].SetColorStrength(colorStrength);
BackgroundSections[i].SetColor(color);