New jumping behavior controlled by physics override

doc/lua_api.txt

@@ -6092,6 +6092,9 @@ object you are working with still exists.
           (default: `false`)
         * `new_move`: use new move/sneak code. When `false` the exact old code
           is used for the specific old sneak behaviour (default: `true`)
+        * `new_jump`: use the new jump/bouncy jump code. When `false` the exact
+          old code is used for jumping and bouncy jumping behavior.
+          (default: `true`)
 * `get_physics_override()`: returns the table given to `set_physics_override`
 * `hud_add(hud definition)`: add a HUD element described by HUD def, returns ID
    number on success

src/client/content_cao.cpp

@@ -1593,6 +1593,7 @@ void GenericCAO::processMessage(const std::string &data)
 		bool sneak = !readU8(is);
 		bool sneak_glitch = !readU8(is);
 		bool new_move = !readU8(is);
+		bool new_jump = !readU8(is);
 
 
 		if(m_is_local_player)
@@ -1604,6 +1605,7 @@ void GenericCAO::processMessage(const std::string &data)
 			player->physics_override_sneak = sneak;
 			player->physics_override_sneak_glitch = sneak_glitch;
 			player->physics_override_new_move = new_move;
+			player->physics_override_new_jump = new_jump;
 		}
 	} else if (cmd == AO_CMD_SET_ANIMATION) {
 		// TODO: change frames send as v2s32 value

src/client/localplayer.cpp

@@ -444,8 +444,9 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
 	m_can_jump = ((touching_ground && !is_climbing) || sneak_can_jump) && !m_disable_jump;
 
 	// Jump key pressed while jumping off from a bouncy block
-	if (m_can_jump && control.jump && itemgroup_get(f.groups, "bouncy") &&
-		m_speed.Y >= -0.5f * BS) {
+	if ((!physics_override_new_jump && m_can_jump && control.jump && itemgroup_get(f.groups, "bouncy") && m_speed.Y >= -0.5f * BS)||
+		(physics_override_new_jump && control.jump && itemgroup_get(f.groups, "bouncy") && 
+		m_speed.Y >= -0.5f * BS && m_speed.Y <= itemgroup_get(f.groups, "bouncy"))) {
 		float jumpspeed = movement_speed_jump * physics_override_jump;
 		if (m_speed.Y > 1.0f) {
 			// Reduce boost when speed already is high
@@ -609,7 +610,8 @@ void LocalPlayer::applyControl(float dtime, Environment *env)
 				at its starting value
 			*/
 			v3f speedJ = getSpeed();
-			if (speedJ.Y >= -0.5f * BS) {
+			if ((!physics_override_new_jump && speedJ.Y >= -0.5f * BS) ||
+				(physics_override_new_jump && touching_ground && speedJ.Y >= -0.5f * BS && speedJ.Y <= 0.5f * BS)) {
 				speedJ.Y = movement_speed_jump * physics_override_jump;
 				setSpeed(speedJ);
 				m_client->getEventManager()->put(new SimpleTriggerEvent(MtEvent::PLAYER_JUMP));

src/client/localplayer.h

@@ -66,6 +66,7 @@ class LocalPlayer : public Player
 	float physics_override_gravity = 1.0f;
 	bool physics_override_sneak = true;
 	bool physics_override_sneak_glitch = false;
+	bool physics_override_new_jump = false;
 	// Temporary option for old move code
 	bool physics_override_new_move = true;
 

src/script/lua_api/l_localplayer.cpp

@@ -176,6 +176,9 @@ int LuaLocalPlayer::l_get_physics_override(lua_State *L)
 	lua_pushboolean(L, player->physics_override_new_move);
 	lua_setfield(L, -2, "new_move");
 
+	lua_pushboolean(L, player->physics_override_new_move);
+	lua_setfield(L, -2, "new_jump");
+
 	return 1;
 }
 

src/script/lua_api/l_object.cpp

@@ -386,7 +386,7 @@ int ObjectRef::l_get_armor_groups(lua_State *L)
 }
 
 // set_physics_override(self, physics_override_speed, physics_override_jump,
-//                      physics_override_gravity, sneak, sneak_glitch, new_move)
+//                      physics_override_gravity, sneak, sneak_glitch, new_move, new_jump)
 int ObjectRef::l_set_physics_override(lua_State *L)
 {
 	NO_MAP_LOCK_REQUIRED;
@@ -407,6 +407,8 @@ int ObjectRef::l_set_physics_override(lua_State *L)
 				L, 2, "sneak_glitch", co->m_physics_override_sneak_glitch);
 		co->m_physics_override_new_move = getboolfield_default(
 				L, 2, "new_move", co->m_physics_override_new_move);
+		co->m_physics_override_new_jump = getboolfield_default(
+				L, 2, "new_jump", co->m_physics_override_new_jump);
 		co->m_physics_override_sent = false;
 	} else {
 		// old, non-table format
@@ -448,6 +450,8 @@ int ObjectRef::l_get_physics_override(lua_State *L)
 	lua_setfield(L, -2, "sneak_glitch");
 	lua_pushboolean(L, co->m_physics_override_new_move);
 	lua_setfield(L, -2, "new_move");
+	lua_pushboolean(L, co->m_physics_override_new_jump);
+	lua_setfield(L, -2, "new_jump");
 	return 1;
 }
 

src/script/lua_api/l_object.h

@@ -116,7 +116,7 @@ class ObjectRef : public ModApiBase {
 	static int l_get_armor_groups(lua_State *L);
 
 	// set_physics_override(self, physics_override_speed, physics_override_jump,
-	//                      physics_override_gravity, sneak, sneak_glitch, new_move)
+	//                      physics_override_gravity, sneak, sneak_glitch, new_move, new_jump)
 	static int l_set_physics_override(lua_State *L);
 
 	// get_physics_override(self)

src/server/player_sao.cpp

@@ -339,6 +339,7 @@ std::string PlayerSAO::generateUpdatePhysicsOverrideCommand() const
 	writeU8(os, !m_physics_override_sneak);
 	writeU8(os, !m_physics_override_sneak_glitch);
 	writeU8(os, !m_physics_override_new_move);
+	writeU8(os, !m_physics_override_new_jump);
 	return os.str();
 }
 

src/server/player_sao.h

@@ -223,6 +223,7 @@ class PlayerSAO : public UnitSAO
 	bool m_physics_override_sneak = true;
 	bool m_physics_override_sneak_glitch = false;
 	bool m_physics_override_new_move = true;
+	bool m_physics_override_new_jump = false;
 	bool m_physics_override_sent = false;
 };