Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-03-13 13:32:14 -03:00
parent 3fe775405c b5ecaf0194
commit 4a229c6427
335 changed files with 11052 additions and 5179 deletions
@@ -71,6 +71,11 @@ namespace Barotrauma

            msg.WriteString(ragdollFileName);
            msg.WriteIdentifier(HumanPrefabIds.NpcIdentifier);
+            msg.WriteIdentifier(MinReputationToHire.factionId);
+            if (MinReputationToHire.factionId != default)
+            {
+                msg.WriteSingle(MinReputationToHire.reputation);
+            }
            if (Job != null)
            {
                msg.WriteUInt32(Job.Prefab.UintIdentifier);
@@ -86,7 +91,7 @@ namespace Barotrauma
                msg.WriteByte((byte)0);
            }

-            msg.WriteUInt16((ushort)ExperiencePoints);
+            msg.WriteInt32(ExperiencePoints);
            msg.WriteRangedInteger(AdditionalTalentPoints, 0, MaxAdditionalTalentPoints);
        }
    }
@@ -696,6 +696,7 @@ namespace Barotrauma
            {
                msg.WriteIdentifier(MerchantIdentifier);
            }
+            msg.WriteIdentifier(Faction);

            int msgLengthBeforeOrders = msg.LengthBytes;
            // Current orders