From 2585cc987335a9595d48c3b19f7ea8f516eca682 Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 28 Feb 2018 13:26:18 +0200 Subject: [PATCH] Fixed attachable objects being deattachable with the select key due to e6b7a0d3, fixed typo in ConvertInputType --- .../Content/Items/Button/button.xml | 4 +-- .../Content/Items/Electricity/signalitems.xml | 30 +++++++++---------- .../Content/Items/Weapons/explosives.xml | 2 +- .../BarotraumaShared/Source/Utils/ToolBox.cs | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml index c7a486d09..3f6353b28 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Button/button.xml @@ -26,7 +26,7 @@ - @@ -58,7 +58,7 @@ - diff --git a/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml b/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml index 503199f8a..b02f10d62 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Electricity/signalitems.xml @@ -131,7 +131,7 @@ - @@ -166,7 +166,7 @@ - @@ -200,7 +200,7 @@ - @@ -239,7 +239,7 @@ - @@ -279,7 +279,7 @@ - @@ -312,7 +312,7 @@ - @@ -346,7 +346,7 @@ - @@ -377,7 +377,7 @@ - @@ -408,7 +408,7 @@ - @@ -439,7 +439,7 @@ - @@ -473,7 +473,7 @@ - @@ -506,7 +506,7 @@ - @@ -539,7 +539,7 @@ - @@ -568,7 +568,7 @@ - @@ -601,7 +601,7 @@ - diff --git a/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml b/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml index ab1f171da..0656bba51 100644 --- a/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml +++ b/Barotrauma/BarotraumaShared/Content/Items/Weapons/explosives.xml @@ -90,7 +90,7 @@ - + diff --git a/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs b/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs index 0b58d62b7..43e1a0c24 100644 --- a/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs +++ b/Barotrauma/BarotraumaShared/Source/Utils/ToolBox.cs @@ -106,7 +106,7 @@ namespace Barotrauma public static string ConvertInputType(string inputType) { if (inputType == "ActionHit" || inputType == "Action") return "Use"; - if (inputType == "SecondarHit" || inputType == "Secondary") return "Aim"; + if (inputType == "SecondaryHit" || inputType == "Secondary") return "Aim"; return inputType; }