Stair improvements, inventory "tooltip" & condition progressbar, reactor tries to match the highest load of the connected junction boxes (instead of the sum of the loads)

This commit is contained in:
Regalis
2015-11-25 17:58:17 +02:00
parent 4b5126675c
commit f1e1b0b4f0
9 changed files with 65 additions and 187 deletions

View File

@@ -6,8 +6,6 @@ namespace Barotrauma
{
class AnimController : Ragdoll
{
public bool IsStanding;
public enum Animation { None, Climbing, UsingConstruction, Struggle };
public Animation Anim;
@@ -32,7 +30,7 @@ namespace Barotrauma
get { return stunTimer; }
set
{
if (float.IsNaN(value) || float.IsInfinity(value)) return;
if (!MathUtils.IsValid(value)) return;
stunTimer = value;
}
}