From 3600f348d849c6aadd48eab36a0bc4bf7a14df02 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Thu, 28 Mar 2019 15:55:32 +0100
Subject: [PATCH] Add new item: Map

---
 README.md                     |  10 +++++++
 init.lua                      |  51 ++++++++++++++++++++++++++--------
 textures/orienteering_map.png | Bin 0 -> 2188 bytes
 3 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 textures/orienteering_map.png

diff --git a/README.md b/README.md
index 20ae47c..5ee6179 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,8 @@ Symbols:
 * O = Obsidian Shard
 * s = Stick
 * g = Glass
+* p = Paper
+* b = Black Dye
 * 1 = Altimeter
 * 2 = Triangulator
 * 3 = Compass
@@ -108,11 +110,19 @@ Symbols:
     C
 
 ### Speedometer
+
      G
     SsS
      S
 
+### Map
+
+    ppp
+    pbp
+    ppp
+
 ### Automapper
+
     GGG
     MOM
     GGG
diff --git a/init.lua b/init.lua
index 0bc07dc..9ac8e8f 100644
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,5 @@
 local S = minetest.get_translator("orienteering")
+local mod_map = minetest.get_modpath("map")
 
 local orienteering = {}
 orienteering.playerhuds = {}
@@ -119,11 +120,24 @@ minetest.register_tool("orienteering:speedometer", {
 	groups = { disable_repair = 1 },
 })
 
--- Enables minimap
+if not mod_map then
+	-- Enables minimap (surface)
+	minetest.register_tool("orienteering:map", {
+		description = S("Map"),
+		_doc_items_longdesc = S("The map allows you to view a minimap of the area around you."),
+		_doc_items_usagehelp = S("If you put a map in your hotbar, you will be able to access the minimap (only surface mode). By default, the minimap can be opened with [F7]."),
+		wield_image = "orienteering_map.png",
+		wield_scale = { x=1.5, y=1.5, z=0.15 },
+		inventory_image = "orienteering_map.png",
+		groups = { disable_repair = 1 },
+	})
+end
+
+-- Enables minimap (radar)
 minetest.register_tool("orienteering:automapper", {
 	description = S("Automapper"),
-	_doc_items_longdesc = S("The automapper automatically creates a map of the area around you and enables you to view a minimap of your surroundings. It also has a built-in radar."),
-	_doc_items_usagehelp = S("If you put an automapper in your hotbar, you will be able to access the minimap. By default the minimap can be opened with [F7]."),
+	_doc_items_longdesc = S("The automapper is a device that combines a map with a radar. It unlocks both the surface mode and radar mode of the minimap."),
+	_doc_items_usagehelp = S("If you put an automapper in your hotbar, you will be able to access the minimap. By default, the minimap can be opened with [F7]."),
 	wield_image = "orienteering_automapper_wield.png",
 	wield_scale = { x=1, y=1, z=2 },
 	inventory_image = "orienteering_automapper_inv.png",
@@ -215,19 +229,34 @@ if minetest.get_modpath("default") ~= nil then
 		}
 	})
 
-end
+	if (not mod_map) and minetest.get_modpath("dye") then
+		minetest.register_craft({
+			output = "orienteering:map",
+			recipe = {
+				{ "default:paper", "default:paper", "default:paper" },
+				{ "default:paper", "dye:black", "default:paper" },
+				{ "default:paper", "default:paper", "default:paper" },
+			}
+		})
+	end
 
--- Replace Minetest Game's mapping kit
-if minetest.get_modpath("map") then
-	minetest.unregister_item("map:mapping_kit")
-	minetest.register_alias("map:mapping_kit", "orienteering:automapper")
 end
 
 function orienteering.update_automapper(player)
-	if orienteering.tool_active(player, "orienteering:automapper") or orienteering.tool_active(player, "orienteering:quadcorder") or minetest.settings:get_bool("creative_mode") then
-		player:hud_set_flags({minimap = true})
+	if mod_map then
+		if orienteering.tool_active(player, "orienteering:automapper") or orienteering.tool_active(player, "orienteering:quadcorder") or minetest.settings:get_bool("creative_mode") then
+			player:hud_set_flags({minimap_radar = true})
+		else
+			player:hud_set_flags({minimap_radar = false})
+		end
 	else
-		player:hud_set_flags({minimap = false})
+		if orienteering.tool_active(player, "orienteering:automapper") or orienteering.tool_active(player, "orienteering:quadcorder") or minetest.settings:get_bool("creative_mode") then
+			player:hud_set_flags({minimap = true, minimap_radar = true})
+		elseif orienteering.tool_active(player, "orienteering:map") then
+			player:hud_set_flags({minimap = true, minimap_radar = false})
+		else
+			player:hud_set_flags({minimap = false, minimap_radar = false})
+		end
 	end
 end
 
diff --git a/textures/orienteering_map.png b/textures/orienteering_map.png
new file mode 100644
index 0000000000000000000000000000000000000000..c24e1fe1d7510eafc7272c7e48708ba652790f29
GIT binary patch
literal 2188
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
O0000<MNUMnLSTa2gCmLn

literal 0
HcmV?d00001