From 15d729c351bae663e022ac5528c639e8e8a9b02b Mon Sep 17 00:00:00 2001
From: SmallJoker <mk939@ymail.com>
Date: Tue, 6 Jun 2023 19:41:03 +0200
Subject: [PATCH] Waypoints: Add teleportation button

This also adds button click sounds and makes use of the teleport sound for consistency.
---
 README.md                |   3 +++
 textures/ui_teleport.png | Bin 0 -> 2217 bytes
 waypoints.lua            |  55 +++++++++++++++++++++++++++------------
 3 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 textures/ui_teleport.png

diff --git a/README.md b/README.md
index 8c64ab1..e71fb42 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,9 @@ From http://www.clker.com (Public Domain, CC-BY-4.0):
   * [`ui_pencil_icon.pnc`](http://www.clker.com/clipart-2256.html)
   * [`ui_waypoint_set_icon.png`](http://www.clker.com/clipart-larger-flag.html)
 
+From https://www.svgrepo.com (CC-BY)
+  * [`ui_teleport.png`](https://www.svgrepo.com/svg/321565/teleport)
+
 Everaldo Coelho (YellowIcon) (LGPL v2.1+):
 
   * [`ui_craftguide_icon.png` / `ui_craft_icon.png`](http://commons.wikimedia.org/wiki/File:Advancedsettings.png)
diff --git a/textures/ui_teleport.png b/textures/ui_teleport.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ea5d20315d0c6c49a0c11e534600daea13bb58e
GIT binary patch
literal 2217
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
WC<M*CDbD*v0xZy2v&SaH-~SDGBaoy3

literal 0
HcmV?d00001

diff --git a/waypoints.lua b/waypoints.lua
index 1496cdd..8dbb175 100644
--- a/waypoints.lua
+++ b/waypoints.lua
@@ -140,36 +140,49 @@ ui.register_page("waypoints", {
 
 		-- Main buttons:
 		local btnlist = {
-			set_waypoint = {
-				"ui_waypoint_set_icon.png",
-				S("Set waypoint to current location")
-			},
-			toggle_waypoint = {
+			-- 1. formspec name
+			-- 2. button image
+			-- 3. translation text
+			{
+				"toggle_waypoint",
 				waypoint.active and "ui_on_icon.png" or "ui_off_icon.png",
 				waypoint.active and S("Hide waypoint") or S("Show waypoint")
 			},
-			toggle_display_pos = {
+			{
+				"rename_waypoint",
+				"ui_pencil_icon.png",
+				S("Edit waypoint name")
+			},
+			{
+				"set_waypoint",
+				"ui_waypoint_set_icon.png",
+				S("Set waypoint to current location")
+			},
+			{
+				"toggle_display_pos",
 				waypoint.display_pos and "ui_green_icon_background.png^ui_xyz_icon.png" or "ui_red_icon_background.png^ui_xyz_icon.png^(ui_no.png^[transformR90)",
 				waypoint.display_pos and S("Hide coordinates") or S("Show coordinates")
 			},
-			toggle_color = {
+			{
+				"toggle_color",
 				"ui_circular_arrows_icon.png",
 				S("Change color of waypoint display")
 			},
-			rename_waypoint = {
-				"ui_pencil_icon.png",
-				S("Edit waypoint name")
-			}
 		}
+		if minetest.get_player_privs(player_name).teleport then
+			table.insert(btnlist, {
+				"teleport_waypoint",
+				"ui_teleport.png",
+				S("Teleport to waypoint")
+			})
+		end
 
-		local x = 4
-		for name, def in pairs(btnlist) do
+		for i, def in pairs(btnlist) do
 			formspec[n] = string.format("image_button[%f,%f;%f,%f;%s;%s%i;]",
-				wp_buttons_rj - ui.style_full.btn_spc * x, wp_bottom_row,
+				wp_buttons_rj + ui.style_full.btn_spc * (i - #btnlist), wp_bottom_row,
 				ui.style_full.btn_size, ui.style_full.btn_size,
-				def[1], name, sel)
-			formspec[n+1] = "tooltip["..name..sel..";"..F(def[2]).."]"
-			x = x - 1
+				def[2], def[1], sel)
+			formspec[n+1] = "tooltip["..def[1]..sel..";"..F(def[3]).."]"
 			n = n + 2
 		end
 
@@ -313,6 +326,13 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			update_formspec = true
 		end
 
+		if fields["teleport_waypoint" .. i] and waypoint.world_pos then
+			if minetest.get_player_privs(player_name).teleport then
+				minetest.sound_play("teleport", {to_player = player_name})
+				player:set_pos(waypoint.world_pos)
+			end
+		end
+
 		if hit then
 			-- Save first
 			waypoints.data[i] = waypoint
@@ -323,6 +343,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			update_hud(player, waypoints, temp, i)
 		end
 		if update_formspec then
+			minetest.sound_play("ui_click", {to_player=player_name, gain = 0.1})
 			ui.set_inventory_formspec(player, "waypoints")
 		end