(052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0

2019-04-16 17:11:49 +03:00
parent edb8c39c58
commit bd07acf26d
121 changed files with 1546 additions and 1777 deletions
@@ -58,6 +58,13 @@ namespace Barotrauma.Items.Components
            set;
        }

+        [Serialize(true, true)]
+        public bool Aimable
+        {
+            get;
+            set;
+        }
+
        [Serialize(false, false)]
        public bool ControlPose
        {
@@ -11,12 +11,6 @@ namespace Barotrauma.Items.Components
    {
        private float lastSentDeattachTimer;

-        private PhysicsBody trigger;
-
-        private Holdable holdable;
-
-        private float deattachTimer;
-
        [Serialize(1.0f, false)]
        public float DeattachDuration
        {
@@ -55,7 +49,13 @@ namespace Barotrauma.Items.Components
 #endif
            }
        }
-                
+
+        private PhysicsBody trigger;
+
+        private Holdable holdable;
+
+        private float deattachTimer;
+        
        public LevelResource(Item item, XElement element) : base(item, element)
        {
            IsActive = true;
@@ -142,6 +142,8 @@ namespace Barotrauma.Items.Components
                    pickTimer / requiredTime,
                    Color.Red, Color.Green);
 #endif
+
+                picker.AnimController.UpdateUseItem(true, item.WorldPosition + new Vector2(0.0f, 100.0f) * ((pickTimer / 10.0f) % 0.1f));
                
                picker.AnimController.UpdateUseItem(true, item.WorldPosition + new Vector2(0.0f, 100.0f) * ((pickTimer / 10.0f) % 0.1f));
                pickTimer += CoroutineManager.DeltaTime;
@@ -322,7 +322,6 @@ namespace Barotrauma.Items.Components
            // If the character is climbing, ignore the check, because we cannot aim while climbing.
            if (VectorExtensions.Angle(VectorExtensions.Forward(item.body.TransformedRotation), fromItemToLeak) < MathHelper.PiOver4)
            {
-                character.SetInput(InputType.Shoot, false, true);
                Use(deltaTime, character);
            }
            else
@@ -338,11 +337,11 @@ namespace Barotrauma.Items.Components
                sinTime = 0;
                if (!leak.FlowTargetHull.ConnectedGaps.Any(g => !g.IsRoomToRoom && g.Open > 0.0f))
                {
-                    character.Speak(TextManager.Get("DialogLeaksFixed").Replace("[roomname]", leak.FlowTargetHull.DisplayName), null, 0.0f, "leaksfixed", 10.0f);
+                    character.Speak(TextManager.Get("DialogLeaksFixed").Replace("[roomname]", leak.FlowTargetHull.RoomName), null, 0.0f, "leaksfixed", 10.0f);
                }
                else
                {
-                    character.Speak(TextManager.Get("DialogLeakFixed").Replace("[roomname]", leak.FlowTargetHull.DisplayName), null, 0.0f, "leakfixed", 10.0f);
+                    character.Speak(TextManager.Get("DialogLeakFixed").Replace("[roomname]", leak.FlowTargetHull.RoomName), null, 0.0f, "leakfixed", 10.0f);
                }
            }