Endworm attacks working, itemlabel text saving bugfix, deconstructors & fabricators need power, engine sprite, disable wire node dragging in character mode, only hit with one meleeweapon at a time, fixrequirement text overflow fix, mapentities can hace multiple categories, Gap.FindHull fix, Waypoint ladder & gap saving, stuff

2016-01-18 20:09:38 +02:00
parent 5f1cb194ab
commit 1a5b3fa66a
39 changed files with 206 additions and 152 deletions
@@ -54,6 +54,17 @@ namespace Barotrauma.Items.Components
            if (character == null || reloadTimer>0.0f) return false;
            if (!character.IsKeyDown(InputType.Aim) || hitting) return false;

+            //don't allow hitting if the character is already hitting with another weapon
+            for (int i = 0; i < 2; i++ )
+            {
+                if (character.SelectedItems[i] == null || character.SelectedItems[i] == Item) continue;
+
+                var otherWeapon = character.SelectedItems[i].GetComponent<MeleeWeapon>();
+                if (otherWeapon == null) continue;
+
+                if (otherWeapon.hitting) return false;
+            }
+
            SetUser(character);

            if (hitPos < MathHelper.Pi * 0.69f) return false;