(883c460d5) Don't require holding the aim key when using the periscope/controller. Move the RequireAimToUse from Controller component to Item. Change the use and shoot logic accordingly. TODO: fix the camera centering.

This commit is contained in:
Joonas Rikkonen
2019-04-04 11:07:14 +03:00
parent c8a7815ef8
commit 2d52a8ddf4
10 changed files with 74 additions and 32 deletions
@@ -241,6 +241,15 @@ namespace Barotrauma
[Serialize(false, false)]
public bool IsShootable { get; set; }
/// <summary>
/// If true, the user has to hold the "aim" key before use is registered.
/// </summary>
[Serialize(false, false)]
public bool RequireAimToUse
{
get; set;
}
public Color Color
{
get { return spriteColor; }
@@ -1459,6 +1468,11 @@ namespace Barotrauma
public void Use(float deltaTime, Character character = null, Limb targetLimb = null)
{
if (RequireAimToUse && !character.IsKeyDown(InputType.Aim))
{
return;
}
if (condition == 0.0f) return;
bool remove = false;