From 77c94087211a9ca41dcfa5bc2d6732f1cdf33425 Mon Sep 17 00:00:00 2001
From: paramat <paramat@users.noreply.github.com>
Date: Mon, 7 Aug 2017 04:27:19 +0100
Subject: [PATCH] Player API: Integrate settable player step height

Split some long lines.
Some nearby code cleanup.
---
 game_api.txt             |  6 ++++--
 mods/player_api/api.lua  |  6 ++++--
 mods/player_api/init.lua | 22 ++++++++++++++--------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/game_api.txt b/game_api.txt
index 7ea919e6..7c3c04cd 100644
--- a/game_api.txt
+++ b/game_api.txt
@@ -312,7 +312,8 @@ The player API can register player models and update the player's appearence
 * `player_api.set_textures(player, textures)`
 	* Sets player textures
 	* `player`: PlayerRef
-	* `textures`: array of textures, If `textures` is nil, the default textures from the model def are used
+	* `textures`: array of textures, If `textures` is nil the default
+	  textures from the model def are used
 
 * `player_api.get_animation(player)`
 	* Returns a table containing fields `model`, `textures` and `animation`.
@@ -331,7 +332,8 @@ The player API can register player models and update the player's appearence
 			bar = {x = 20, y = 39},
 		-- ...
 		},
-		collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3}, -- In nodes from centre of feet
+		collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3}, -- In nodes from feet position
+		stepheight = 0.6, -- In nodes
 	}
 
 
diff --git a/mods/player_api/api.lua b/mods/player_api/api.lua
index 00fa2aef..c79aedc3 100644
--- a/mods/player_api/api.lua
+++ b/mods/player_api/api.lua
@@ -44,15 +44,17 @@ function player_api.set_model(player, model_name)
 			mesh = model_name,
 			textures = player_textures[name] or model.textures,
 			visual = "mesh",
-			visual_size = model.visual_size or {x=1, y=1},
+			visual_size = model.visual_size or {x = 1, y = 1},
 			collisionbox = model.collisionbox or {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3},
+			stepheight = model.stepheight or 0.6,
 		})
 		player_api.set_animation(player, "stand")
 	else
 		player:set_properties({
-			textures = { "player.png", "player_back.png", },
+			textures = {"player.png", "player_back.png"},
 			visual = "upright_sprite",
 			collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.75, 0.3},
+			stepheight = 0.6,
 		})
 	end
 	player_model[name] = model_name
diff --git a/mods/player_api/init.lua b/mods/player_api/init.lua
index 61d43bd4..203f60e0 100644
--- a/mods/player_api/init.lua
+++ b/mods/player_api/init.lua
@@ -6,22 +6,28 @@ player_api.register_model("character.b3d", {
 	textures = {"character.png", },
 	animations = {
 		-- Standard animations.
-		stand     = { x=  0, y= 79, },
-		lay       = { x=162, y=166, },
-		walk      = { x=168, y=187, },
-		mine      = { x=189, y=198, },
-		walk_mine = { x=200, y=219, },
-		sit       = { x= 81, y=160, },
+		stand     = {x = 0,   y = 79},
+		lay       = {x = 162, y = 166},
+		walk      = {x = 168, y = 187},
+		mine      = {x = 189, y = 198},
+		walk_mine = {x = 200, y = 219},
+		sit       = {x = 81,  y = 160},
 	},
 	collisionbox = {-0.3, 0.0, -0.3, 0.3, 1.77, 0.3},
+	stepheight = 0.6,
 })
 
 -- Update appearance when the player joins
 minetest.register_on_joinplayer(function(player)
 	player_api.player_attached[player:get_player_name()] = false
 	player_api.set_model(player, "character.b3d")
-	player:set_local_animation({x=0, y=79}, {x=168, y=187}, {x=189, y=198}, {x=200, y=219}, 30)
-
+	player:set_local_animation(
+		{x = 0,   y = 79},
+		{x = 168, y = 187},
+		{x = 189, y = 198},
+		{x = 200, y = 219},
+		30
+	)
 	player:hud_set_hotbar_image("gui_hotbar.png")
 	player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
 end)
-- 
2.25.1