Build 0.20.0.0

2022-10-27 17:54:57 +03:00
parent 05c7b1f869
commit edaf4b09fe
197 changed files with 4344 additions and 1773 deletions
@@ -442,8 +442,7 @@ namespace Barotrauma
        {
            foreach (Limb limb in Limbs)
            {
-                if (limb == null || limb.IsSevered || limb.ActiveSprite == null) { continue; }
-
+                if (limb == null || limb.IsSevered || limb.ActiveSprite == null || !limb.DoesFlip) { continue; }
                Vector2 spriteOrigin = limb.ActiveSprite.Origin;
                spriteOrigin.X = limb.ActiveSprite.SourceRect.Width - spriteOrigin.X;
                limb.ActiveSprite.Origin = spriteOrigin;                
@@ -468,7 +467,10 @@ namespace Barotrauma
            {
                var damageSound = character.GetSound(s => s.Type == CharacterSound.SoundType.Damage);
                float range = damageSound != null ? damageSound.Range * 2 : ConvertUnits.ToDisplayUnits(character.AnimController.Collider.GetSize().Length() * 10);
-                SoundPlayer.PlayDamageSound(limbJoint.Params.BreakSound, 1.0f, limbJoint.LimbA.body.DrawPosition, range: range);
+                if (!limbJoint.Params.BreakSound.IsNullOrEmpty() && !limbJoint.Params.BreakSound.Equals("none", StringComparison.OrdinalIgnoreCase))
+                {
+                    SoundPlayer.PlayDamageSound(limbJoint.Params.BreakSound, 1.0f, limbJoint.LimbA.body.DrawPosition, range: range);
+                }
            }
        }

@@ -109,6 +109,22 @@ namespace Barotrauma
            set => grainStrength = Math.Max(0, value);
        }

+        /// <summary>
+        /// Can be used to set camera shake from status effects
+        /// </summary>
+        public float CameraShake
+        {
+            get { return Screen.Selected?.Cam?.Shake ?? 0.0f; }
+            set
+            {
+                if (!MathUtils.IsValid(value)) { return; }
+                if (Screen.Selected?.Cam != null)
+                {
+                    Screen.Selected.Cam.Shake = value;
+                }
+            }
+        }
+
        private readonly List<ParticleEmitter> bloodEmitters = new List<ParticleEmitter>();
        public IEnumerable<ParticleEmitter> BloodEmitters
        {
@@ -307,7 +307,7 @@ namespace Barotrauma
            {
                if (!brokenItem.IsInteractable(character)) { continue; }
                float alpha = GetDistanceBasedIconAlpha(brokenItem);
-                if (alpha <= 0.0f) continue;
+                if (alpha <= 0.0f) { continue; }
                GUI.DrawIndicator(spriteBatch, brokenItem.DrawPosition, cam, 100.0f, GUIStyle.BrokenIcon.Value.Sprite, 
                    Color.Lerp(GUIStyle.Red, GUIStyle.Orange * 0.5f, brokenItem.Condition / brokenItem.MaxCondition) * alpha);
            }
@@ -501,7 +501,7 @@ namespace Barotrauma
                    info?.ClearSavedStatValues(statType);                        
                    for (int i = 0; i < savedStatValueCount; i++)
                    {
-                        string statIdentifier = msg.ReadString();
+                        Identifier statIdentifier = msg.ReadIdentifier();
                        float statValue = msg.ReadSingle();
                        bool removeOnDeath = msg.ReadBoolean();
                        info?.ChangeSavedStatValue(statType, statValue, statIdentifier, removeOnDeath, setValue: true);