Unstable 0.1500.4.0 (Shrek edition)

2021-09-23 21:29:31 +09:00
parent 5a6bbcc79e
commit 3043a9a7bc
124 changed files with 3571 additions and 1848 deletions
@@ -70,6 +70,8 @@ namespace Barotrauma.Items.Components
        public bool HasPower => IsActive && Voltage >= MinVoltage;
        public bool IsAutoControlled => pumpSpeedLockTimer > 0.0f || isActiveLockTimer > 0.0f;

+        private const float TinkeringSpeedIncrease = 1.5f;
+
        public Pump(Item item, XElement element)
            : base(item, element)
        {
@@ -108,7 +110,7 @@ namespace Barotrauma.Items.Components

            if (item.GetComponent<Repairable>() is Repairable repairable && repairable.IsTinkering)
            {
-                currFlow *= 2.5f;
+                currFlow *= 1f + repairable.TinkeringStrength * TinkeringSpeedIncrease;
            }

            //less effective when in a bad condition