(bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults.

2019-04-04 11:08:02 +03:00
parent 79ea41e6c9
commit 7491b06a5d
55 changed files with 594 additions and 584 deletions
@@ -79,7 +79,8 @@ namespace Barotrauma.Items.Components
                        break;
                }
            }
-
+            item.IsShootable = true;
+            item.RequireAimToUse = true;
            InitProjSpecific(element);
        }

@@ -311,7 +312,10 @@ namespace Barotrauma.Items.Components

            sinTime += deltaTime;
            character.CursorPosition = leak.Position + VectorExtensions.Forward(Item.body.TransformedRotation + (float)Math.Sin(sinTime), dist);
-            character.SetInput(InputType.Aim, false, true);
+            if (item.RequireAimToUse)
+            {
+                character.SetInput(InputType.Aim, false, true);
+            }

            // Press the trigger only when the tool is approximately facing the target.
            // If the character is climbing, ignore the check, because we cannot aim while climbing.