Build 0.18.4.0

2022-05-31 23:13:05 +09:00
parent 077917fa5d
commit 64db1a6a44
175 changed files with 4916 additions and 2393 deletions
@@ -551,6 +551,7 @@ namespace Barotrauma
            {
                bool hasOwner = inc.ReadBoolean();
                int ownerId = hasOwner ? inc.ReadByte() : -1;
+                float humanPrefabHealthMultiplier = inc.ReadSingle();
                int balance = inc.ReadInt32();
                int rewardDistribution = inc.ReadRangedInteger(0, 100);
                byte teamID = inc.ReadByte();
@@ -573,6 +574,7 @@ namespace Barotrauma
                {
                    character.MerchantIdentifier = inc.ReadIdentifier();
                }
+                character.HumanPrefabHealthMultiplier = humanPrefabHealthMultiplier;
                character.Wallet.Balance = balance;
                character.Wallet.RewardDistribution = rewardDistribution;
                if (character.CampaignInteractionType != CampaignMode.InteractionType.None)
@@ -6,7 +6,6 @@ using Microsoft.Xna.Framework.Graphics;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Xml.Linq;

 namespace Barotrauma
 {
@@ -1345,6 +1344,7 @@ namespace Barotrauma
                {
                    UserData = item,
                    DisabledColor = Color.White * 0.1f,
+                    PlaySoundOnSelect = false,
                    OnClicked = (btn, userdata) =>
                    {
                        if (!(userdata is ItemPrefab itemPrefab)) { return false; }
@@ -1352,6 +1352,7 @@ namespace Barotrauma
                        if (item == null) { return false; }
                        Limb targetLimb = Character.AnimController.Limbs.FirstOrDefault(l => l.HealthIndex == selectedLimbIndex);
                        item.ApplyTreatment(Character.Controlled, Character, targetLimb);
+                        SoundPlayer.PlayUISound(GUISoundType.Select);
                        return true;
                    }
                };