(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -15,14 +15,15 @@ namespace Barotrauma
    {
        const float OxygenConsumption = 50.0f;
        const float GrowSpeed = 5.0f;
-        
-        private Hull hull;
+
+        protected Hull hull;
+
+        protected Vector2 position;
+        protected Vector2 size;

        private bool removed;

-        private bool removed;
-
-        private bool removed;
+        protected bool removed;

 #if CLIENT
        private List<Decal> burnDecals = new List<Decal>();
@@ -184,6 +185,16 @@ namespace Barotrauma
            }
        }

+        protected virtual void ReduceOxygen(float deltaTime)
+        {
+            hull.Oxygen -= size.X * deltaTime * OxygenConsumption;
+        }
+
+        protected virtual void AdjustXPos(float growModifier, float deltaTime)
+        {
+            position.X -= GrowSpeed * growModifier * 0.5f * deltaTime;
+        }
+
        partial void UpdateProjSpecific(float growModifier);

        private void OnChangeHull(Vector2 pos, Hull particleHull)