statuseffect setvalue, new diving suit sprite & character slowdown, welded door sprite

This commit is contained in:
Regalis
2015-09-26 00:41:43 +03:00
parent 53e729ea11
commit da00b083ed
21 changed files with 137 additions and 57 deletions
+19 -5
View File
@@ -134,10 +134,12 @@ namespace Subsurface
get { return selectedCharacter; }
}
//public AITarget AiTarget
//{
// get { return aiTarget; }
//}
private float lowPassMultiplier;
public float LowPassMultiplier
{
get { return lowPassMultiplier; }
set { lowPassMultiplier = MathHelper.Clamp(value, 0.0f, 1.0f); }
}
public float SoundRange
{
@@ -195,6 +197,12 @@ namespace Subsurface
bleeding = Math.Max(value, 0.0f);
}
}
public float SpeedMultiplier
{
get;
set;
}
public Item[] SelectedItems
{
@@ -296,7 +304,6 @@ namespace Subsurface
public Character(string file, Vector2 position, CharacterInfo characterInfo = null, bool isNetworkPlayer = false)
{
keys = new Key[Enum.GetNames(typeof(InputType)).Length];
keys[(int)InputType.Select] = new Key(false);
keys[(int)InputType.ActionHeld] = new Key(true);
@@ -319,6 +326,8 @@ namespace Subsurface
//blood = 100.0f;
aiTarget = new AITarget(this);
lowPassMultiplier = 1.0f;
Properties = ObjectProperty.GetProperties(this);
Info = characterInfo==null ? new CharacterInfo(file) : characterInfo;
@@ -499,6 +508,9 @@ namespace Subsurface
if (Math.Sign(targetMovement.X) == Math.Sign(AnimController.Dir) && GetInputState(InputType.Run))
targetMovement *= 3.0f;
targetMovement *= SpeedMultiplier;
SpeedMultiplier = 1.0f;
AnimController.TargetMovement = targetMovement;
AnimController.IsStanding = true;
@@ -740,6 +752,8 @@ namespace Subsurface
UpdateSightRange();
aiTarget.SoundRange = 0.0f;
lowPassMultiplier = MathHelper.Lerp(lowPassMultiplier, 1.0f, 0.1f);
if (needsAir)
{
if (AnimController.HeadInWater)