Unstable v0.19.3.0

This commit is contained in:
Juan Pablo Arce
2022-09-02 15:10:56 -03:00
parent 28789616bd
commit 3f2c843247
336 changed files with 7152 additions and 7739 deletions
@@ -56,7 +56,7 @@ namespace Barotrauma.MapCreatures.Behavior
public void ServerWrite(IWriteMessage msg, IEventData eventData)
{
msg.Write((byte)eventData.NetworkHeader);
msg.WriteByte((byte)eventData.NetworkHeader);
switch (eventData)
{
@@ -80,51 +80,51 @@ namespace Barotrauma.MapCreatures.Behavior
break;
}
msg.Write(PowerConsumptionTimer);
msg.WriteSingle(PowerConsumptionTimer);
}
private void ServerWriteSpawn(IWriteMessage msg)
{
msg.Write(Prefab.Identifier);
msg.Write(Offset.X);
msg.Write(Offset.Y);
msg.WriteIdentifier(Prefab.Identifier);
msg.WriteSingle(Offset.X);
msg.WriteSingle(Offset.Y);
}
private void ServerWriteBranchGrowth(IWriteMessage msg, BallastFloraBranch branch, int parentId = -1)
{
var (x, y) = branch.Position;
msg.Write(parentId);
msg.Write((int)branch.ID);
msg.Write(branch.IsRootGrowth);
msg.WriteInt32(parentId);
msg.WriteInt32((int)branch.ID);
msg.WriteBoolean(branch.IsRootGrowth);
msg.WriteRangedInteger((byte)branch.Type, 0b0000, 0b1111);
msg.WriteRangedInteger((byte)branch.Sides, 0b0000, 0b1111);
msg.WriteRangedInteger(branch.FlowerConfig.Serialize(), 0, 0xFFF);
msg.WriteRangedInteger(branch.LeafConfig.Serialize(), 0, 0xFFF);
msg.Write((ushort)branch.MaxHealth);
msg.Write((int)(x / VineTile.Size));
msg.Write((int)(y / VineTile.Size));
msg.Write(branch.ParentBranch == null ? -1 : Branches.IndexOf(branch.ParentBranch));
msg.WriteUInt16((ushort)branch.MaxHealth);
msg.WriteInt32((int)(x / VineTile.Size));
msg.WriteInt32((int)(y / VineTile.Size));
msg.WriteInt32(branch.ParentBranch == null ? -1 : Branches.IndexOf(branch.ParentBranch));
}
private void ServerWriteBranchDamage(IWriteMessage msg, BallastFloraBranch branch)
{
msg.Write((int)branch.ID);
msg.Write(branch.Health);
msg.WriteInt32((int)branch.ID);
msg.WriteSingle(branch.Health);
}
private void ServerWriteInfect(IWriteMessage msg, UInt16 itemID, InfectEventData.InfectState infect, BallastFloraBranch infector = null)
{
msg.Write(itemID);
msg.Write(infect == InfectEventData.InfectState.Yes);
msg.WriteUInt16(itemID);
msg.WriteBoolean(infect == InfectEventData.InfectState.Yes);
if (infect == InfectEventData.InfectState.Yes)
{
msg.Write(infector?.ID ?? -1);
msg.WriteInt32(infector?.ID ?? -1);
}
}
private void ServerWriteBranchRemove(IWriteMessage msg, BallastFloraBranch branch)
{
msg.Write(branch.ID);
msg.WriteInt32(branch.ID);
}
public void CreateNetworkMessage(IEventData extraData)
@@ -94,8 +94,8 @@ namespace Barotrauma
msg.WriteRangedInteger(decals.Count, 0, MaxDecalsPerHull);
foreach (Decal decal in decals)
{
msg.Write(decal.Prefab.UintIdentifier);
msg.Write((byte)decal.SpriteIndex);
msg.WriteUInt32(decal.Prefab.UintIdentifier);
msg.WriteByte((byte)decal.SpriteIndex);
float normalizedXPos = MathHelper.Clamp(MathUtils.InverseLerp(0.0f, rect.Width, decal.CenterPosition.X), 0.0f, 1.0f);
float normalizedYPos = MathHelper.Clamp(MathUtils.InverseLerp(-rect.Height, 0.0f, decal.CenterPosition.Y), 0.0f, 1.0f);
msg.WriteRangedSingle(normalizedXPos, 0.0f, 1.0f, 8);
@@ -11,7 +11,7 @@ namespace Barotrauma
public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
{
msg.Write((byte)Sections.Length);
msg.WriteByte((byte)Sections.Length);
for (int i = 0; i < Sections.Length; i++)
{
msg.WriteRangedSingle(Sections[i].damage / MaxHealth, 0.0f, 1.0f, 8);
@@ -7,11 +7,11 @@ namespace Barotrauma
{
public void ServerWritePosition(IWriteMessage msg, Client c)
{
msg.Write(ID);
msg.WriteUInt16(ID);
IWriteMessage tempBuffer = new WriteOnlyMessage();
subBody.Body.ServerWrite(tempBuffer);
msg.Write((byte)tempBuffer.LengthBytes);
msg.Write(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
msg.WriteByte((byte)tempBuffer.LengthBytes);
msg.WriteBytes(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
msg.WritePadBits();
}