(f2e516dfe) v0.9.3.2

2019-09-20 20:11:18 +03:00
parent 80698b58b0
commit 9aa12bcac2
144 changed files with 1653 additions and 1559 deletions
@@ -90,6 +90,7 @@ namespace Barotrauma.Items.Components
            item.body.FarseerBody.CollisionCategories = Physics.CollisionProjectile;
            item.body.FarseerBody.CollidesWith = Physics.CollisionCharacter | Physics.CollisionWall;
            item.body.FarseerBody.OnCollision += OnCollision;
+            item.body.FarseerBody.IsBullet = true;

            if (!character.AnimController.InWater)
            {
@@ -207,9 +208,9 @@ namespace Barotrauma.Items.Components
        private void RestoreCollision()
        {
            item.body.FarseerBody.OnCollision -= OnCollision;
-
            item.body.CollisionCategories = Physics.CollisionItem;
            item.body.CollidesWith = Physics.CollisionWall;
+            item.body.FarseerBody.IsBullet = false;
        }


@@ -132,7 +132,7 @@ namespace Barotrauma.Items.Components
                return false;
            }

-            if (character.AnimController.InWater)
+            if (item.InWater)
            {
                if (UsableIn == UseEnvironment.Air)
                {
@@ -160,7 +160,8 @@ namespace Barotrauma.Items.Components
            }
            else
            {
-                rayStart = ConvertUnits.ToSimUnits(item.WorldPosition);
+                rayStart = Submarine.LastPickedPosition + Submarine.LastPickedNormal * 0.1f;
+                if (item.Submarine != null) { rayStart += item.Submarine.SimPosition; }
            }

            Vector2 rayEnd = rayStart + 
@@ -201,12 +202,12 @@ namespace Barotrauma.Items.Components
                Repair(rayStart - character.Submarine.SimPosition, rayEnd - character.Submarine.SimPosition, deltaTime, character, degreeOfSuccess, ignoredBodies);
            }
            
-            UseProjSpecific(deltaTime);
+            UseProjSpecific(deltaTime, rayStart);

            return true;
        }

-        partial void UseProjSpecific(float deltaTime);
+        partial void UseProjSpecific(float deltaTime, Vector2 raystart);

        private readonly HashSet<Character> hitCharacters = new HashSet<Character>();
        private readonly List<FireSource> fireSourcesInRange = new List<FireSource>();
@@ -1,4 +1,5 @@
 using FarseerPhysics;
+using Barotrauma.Networking;
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
@@ -19,7 +20,7 @@ namespace Barotrauma.Items.Components
        }
    }

-    partial class Controller : ItemComponent
+    partial class Controller : ItemComponent, IServerSerializable
    {
        //where the limbs of the user should be positioned when using the controller
        private List<LimbPos> limbPositions;
@@ -270,17 +271,21 @@ namespace Barotrauma.Items.Components
        {
            if (IsToggle)
            {
-                state = !state;
+                if (GameMain.NetworkMember == null || GameMain.NetworkMember.IsServer)
+                {
+                    state = !state;
+#if SERVER
+                    item.CreateServerEvent(this);
+#endif
+                }
            }
            else
            {
                item.SendSignal(0, "1", "signal_out", picker);
            }
-
 #if CLIENT
            PlaySound(ActionType.OnUse, item.WorldPosition, picker);
 #endif
-
            return true;
        }

@@ -273,14 +273,18 @@ namespace Barotrauma.Items.Components
        {
            if (connection.Name == "set_rate")
            {
-                float tempSpeed;
-                if (float.TryParse(signal, NumberStyles.Any, CultureInfo.InvariantCulture, out tempSpeed))
+                if (float.TryParse(signal, NumberStyles.Any, CultureInfo.InvariantCulture, out float tempSpeed))
                {
-                    if (!MathUtils.IsValid(tempSpeed)) return;
-                    RechargeSpeed = MathHelper.Clamp(tempSpeed / 100.0f, 0.0f, 1.0f) * MaxRechargeSpeed;
+                    if (!MathUtils.IsValid(tempSpeed)) { return; }
+
+                    float rechargeRate = MathHelper.Clamp(tempSpeed / 100.0f, 0.0f, 1.0f);
+                    RechargeSpeed = rechargeRate * MaxRechargeSpeed;
+#if CLIENT
+                    rechargeSpeedSlider.BarScroll = rechargeRate;
+#endif
                }
            }
-            if (!connection.IsPower) return;
+            if (!connection.IsPower) { return; }

            if (connection.Name == "power_in")
            {
@@ -146,6 +146,10 @@ namespace Barotrauma.Items.Components
                currentFixerAction = FixActions.None;
 #if SERVER
                item.CreateServerEvent(this);
+#endif
+#if CLIENT
+                repairSoundChannel?.FadeOutAndDispose();
+                repairSoundChannel = null;                
 #endif
                return true;
            }
@@ -221,8 +225,8 @@ namespace Barotrauma.Items.Components

            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsClient) { return; }

-            float successFactor = requiredSkills.Count == 0 ? 1.0f : 0.0f;
-            
+            float successFactor = requiredSkills.Count == 0 ? 1.0f : DegreeOfSuccess(CurrentFixer, requiredSkills);
+
            //item must have been below the repair threshold for the player to get an achievement or XP for repairing it
            if (item.ConditionPercentage < ShowRepairUIThreshold)
            {
@@ -122,22 +122,7 @@ namespace Barotrauma.Items.Components

        public override void Update(float deltaTime, Camera cam)
        {
-#if CLIENT
-            foreach (Wire wire in DisconnectedWires)
-            {
-                if (Rand.Range(0.0f, 500.0f) < 1.0f)
-                {
-                    SoundPlayer.PlaySound("zap", item.WorldPosition, hullGuess: item.CurrentHull);
-                    Vector2 baseVel = new Vector2(0.0f, -100.0f);
-                    for (int i = 0; i < 5; i++)
-                    {
-                        var particle = GameMain.ParticleManager.CreateParticle("spark", item.WorldPosition,
-                            baseVel + Rand.Vector(100.0f), 0.0f, item.CurrentHull);
-                        if (particle != null) { particle.Size *= Rand.Range(0.5f, 1.0f); }
-                    }
-                }
-            }
-#endif
+            UpdateProjSpecific(deltaTime);

            if (user == null || user.SelectedConstruction != item)
            {
@@ -150,6 +135,8 @@ namespace Barotrauma.Items.Components
            user.AnimController.UpdateUseItem(true, item.WorldPosition + new Vector2(0.0f, 100.0f) * (((float)Timing.TotalTime / 10.0f) % 0.1f));
        }

+        partial void UpdateProjSpecific(float deltaTime);
+
        public override bool Select(Character picker)
        {
            //attaching wires to items with a body is not allowed
@@ -260,8 +247,14 @@ namespace Barotrauma.Items.Components
                    }
                }
            }
+
+#if CLIENT
+            rewireSoundChannel?.FadeOutAndDispose();
+            rewireSoundChannel = null;
+#endif
        }

+
        public void ClientWrite(IWriteMessage msg, object[] extraData = null)
        {
            foreach (Connection connection in Connections)
@@ -160,6 +160,14 @@ namespace Barotrauma.Items.Components
            item.AddTag("light");
        }

+#if CLIENT
+        public override void OnScaleChanged()
+        {
+            light.SpriteScale = Vector2.One * item.Scale;
+            light.Position = ParentBody != null ? ParentBody.Position : item.Position;
+        }
+#endif
+
        public override void OnItemLoaded()
        {
            base.OnItemLoaded();
@@ -175,7 +183,6 @@ namespace Barotrauma.Items.Components
            UpdateOnActiveEffects(deltaTime);

 #if CLIENT
-            light.SpriteScale = Vector2.One * item.Scale;
            light.ParentSub = item.Submarine;
            if (item.Container != null)
            {