Adjust mulitplier balancing, fix remaining blood ui

Flock/flock/src/logic/gameplay/PlayerController.cc

@@ -223,7 +223,7 @@ void flock::PlayerController::onHit()
     ++mMultiplierStep;
     if (mMultiplierStep >= multiplierStep && mMultiplier < maxMultiplier)
     {
-        mMultiplier += .5f;
+        mMultiplier += .2f;
         mMultiplierStep = 0;
     }
 
@@ -415,7 +415,7 @@ void flock::PlayerController::onReceiveBlood(GameEvents::BloodPickup const &)
         {
             // Upgrade
             onWeaponUpgrade();
-            mBloodLeftToUpgrade = upgradeBloodRequirements[mWeaponUpgradeLevel];
+            mBloodLeftToUpgrade = upgradeBloodRequirements[mWeaponUpgradeLevel] - mCollectedBlood;
         }
     }
     else

Flock/flock/src/logic/gameplay/PlayerController.hh

@@ -45,9 +45,9 @@ private:
     static constexpr auto weaponLightIntensityMax = 7.f;
     static constexpr auto playerWeaponRange = 300.f;
 
-    static constexpr auto comboTime = 1.f;     ///< Amount of time the multiplier lingers without kills
-    static constexpr auto multiplierStep = 40; ///< Amount of kills to reach a higher multiplier step
-    static constexpr auto maxMultiplier = 3.f; ///< The maximal multiplier
+    static constexpr auto comboTime = 3.f;     ///< Amount of time the multiplier lingers without kills
+    static constexpr auto multiplierStep = 40; ///< Amount of hits to reach a higher multiplier step
+    static constexpr auto maxMultiplier = 2.f; ///< The maximal multiplier
 
     static constexpr auto maxMouseAmplitude = 3.f; ///< Amount of distance the ship can move vertically based on mouse movement, in m/s