Merge pull request #1772 from mrkubax10/high_jump

Jump higher on trampoline when groundpounding

Author: Semphriss

src/object/trampoline.cpp

@@ -85,13 +85,29 @@ Trampoline::collision(GameObject& other, const CollisionHit& hit)
     auto player = dynamic_cast<Player*> (&other);
     //Trampoline works for player
     if (player) {
+      if (player->m_does_buttjump)
+        player->m_does_buttjump = false;
       float vy = player->get_physic().get_velocity_y();
       //player is falling down on trampoline
       if (hit.top && vy >= 0) {
         if (!(player->get_status().bonus == AIR_BONUS))
-          vy = player->get_controller().hold(Control::JUMP) ? VY_MIN : VY_INITIAL;
+        {
+          if (player->get_controller().hold(Control::JUMP))
+            vy = VY_MIN;
+          else if (player->get_controller().hold(Control::DOWN))
+            vy = VY_MIN + 100;
+          else
+            vy = VY_INITIAL;
+        }
         else
-          vy = player->get_controller().hold(Control::JUMP) ? VY_MIN - 300 : VY_INITIAL - 40;
+        {
+          if (player->get_controller().hold(Control::JUMP))
+            vy = VY_MIN - 300;
+          else if (player->get_controller().hold(Control::DOWN))
+            vy = VY_MIN - 200;
+          else
+            vy = VY_INITIAL - 40;
+        }
         player->get_physic().set_velocity_y(vy);
         SoundManager::current()->play(TRAMPOLINE_SOUND, get_pos());
         m_sprite->set_action("swinging", 1);