vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/juanjp600/Barotrauma

Browse Source
This commit is contained in:
juanjp600
2017-12-15 08:36:32 -03:00
parent 4997ebf20d 8a7af2affd
commit 5e62371a09
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Content/Items/Weapons/railgun.xml
+2 -1
View File
@@ -36,11 +36,12 @@
category="Machine" category="Machine"
type="Controller" type="Controller"
linkable="true" linkable="true"
disableitemusagewhenselected="true"
> >
<Sprite texture ="railgunetc.png" depth="0.8" sourcerect="182,0,61,97"/> <Sprite texture ="railgunetc.png" depth="0.8" sourcerect="182,0,61,97"/>
<Controller UserPos="-35.0, -50.0" direction ="Right" canbeselected = "true"> <Controller UserPos="-35.0, -50.0" direction ="Right" canbeselected="true">
<limbposition limb="Head" position="-5,-62"/> <limbposition limb="Head" position="-5,-62"/>
<limbposition limb="Torso" position="-5,-108"/> <limbposition limb="Torso" position="-5,-108"/>
<limbposition limb="LeftHand" position="43,-85"/> <limbposition limb="LeftHand" position="43,-85"/>
Barotrauma/BarotraumaShared/Source/Characters/Character.cs
+8 -5
View File
@@ -926,13 +926,16 @@ namespace Barotrauma
} }
} }
for (int i = 0; i < selectedItems.Length; i++ ) if (SelectedConstruction == null || !SelectedConstruction.Prefab.DisableItemUsageWhenSelected)
{ {
if (selectedItems[i] == null) continue; for (int i = 0; i < selectedItems.Length; i++ )
if (i == 1 && selectedItems[0] == selectedItems[1]) continue; {
if (selectedItems[i] == null) continue;
if (i == 1 && selectedItems[0] == selectedItems[1]) continue;
if (IsKeyDown(InputType.Use)) selectedItems[i].Use(deltaTime, this); if (IsKeyDown(InputType.Use)) selectedItems[i].Use(deltaTime, this);
if (IsKeyDown(InputType.Aim) && selectedItems[i] != null) selectedItems[i].SecondaryUse(deltaTime, this); if (IsKeyDown(InputType.Aim) && selectedItems[i] != null) selectedItems[i].SecondaryUse(deltaTime, this);
}
} }
if (selectedConstruction != null) if (selectedConstruction != null)
Barotrauma/BarotraumaShared/Source/Items/ItemPrefab.cs
+7
View File
@@ -134,6 +134,13 @@ namespace Barotrauma
private set; private set;
} }
[Serialize(false, false)]
public bool DisableItemUsageWhenSelected
{
get;
private set;
}
public bool CanSpriteFlipX public bool CanSpriteFlipX
{ {
get { return canSpriteFlipX; } get { return canSpriteFlipX; }