From b706504fb2108fead54033dff2daf167fda1fe74 Mon Sep 17 00:00:00 2001
From: David G <kestral246@gmail.com>
Date: Sat, 12 Sep 2020 10:00:43 -0700
Subject: [PATCH] Make flint pickaxe mandatory.

---
 README.md        | 11 +++------
 init.lua         | 59 +++++++++++++++++++++---------------------------
 settingtypes.txt |  6 -----
 3 files changed, 29 insertions(+), 47 deletions(-)
 delete mode 100644 settingtypes.txt

diff --git a/README.md b/README.md
index dc545ee..2cabc3e 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ Additional notes
 
 - A scaffold node is provided to support the cobble and cut\_stone nodes while digging and mortaring them.
 
-- Finally, for consistency, dirt nodes are also made falling, and the wooden pickaxe has optionally been removed and replaced with a flint pickaxe.
+- Finally, for consistency, dirt nodes are also made falling, and the wooden pickaxe has been removed and replaced with a flint pickaxe.
 
 
 Craft Recipes
@@ -72,17 +72,12 @@ Craft Recipes
 Early Game Considerations
 -------------------------
 
-By default, the wooden pickaxe has been removed. There are two other ways to get started digging stone:
+Since the wooden pickaxe has been removed, other ways are needed to get started digging stone:
 
 - Find three flints (in gravel) and make a flint pickaxe.
 
-- Find a dungeon that has cobble floors, and make a stone pickaxe (cobble can be picked up by hand).
+- Find a dungeon that has cobble floors, and make a stone pickaxe (cobble can be picked up by hand). *[But only if stonebrick\_dungeons mod is using its default to keep cobble floors.]*
 
-However, there are two configuration options that could change this:
-
-- quarry\_replace\_wooden\_pickaxe = false, will keep wooden pickaxe in game.
-
-- stonebrick\_dungeons\_change\_floor = true, will get rid of cobble floors in dungeons.
 
 Dependencies
 ------------
diff --git a/init.lua b/init.lua
index e16f695..518e808 100644
--- a/init.lua
+++ b/init.lua
@@ -1,9 +1,6 @@
 -- Quarry Mechanics [quarry]
 -- by David_G [kestral246@gmail.com]
--- 2020-04-15
-
--- Optionally replace wooden pickaxe with flint one.
-local replace_wooden_pickaxe = minetest.settings:get_bool("quarry_replace_wooden_pickaxe", true)
+-- 2020-09-12
 
 -- Other overrides.
 dofile(minetest.get_modpath("quarry").."/falling_nodes.lua")
@@ -503,27 +500,25 @@ minetest.register_tool("quarry:trowel_and_mortar", {
 	sound = {breaks = "default_tool_breaks"},
 })
 
--- Optional flint pickaxe.
-if replace_wooden_pickaxe then
-	minetest.register_tool("quarry:pick_flint", {
-		description = "Flint Pickaxe",
-		inventory_image = "quarry_flint_pick.png",
-		tool_capabilities = {
-			full_punch_interval = 1.2,
-			max_drop_level=0,
-			groupcaps={
-				cracky = {times={[3]=1.6}, uses=4, maxlevel=1},
-			},
-			damage_groups = {fleshy=2},
+-- Add flint pickaxe.
+minetest.register_tool("quarry:pick_flint", {
+	description = "Flint Pickaxe",
+	inventory_image = "quarry_flint_pick.png",
+	tool_capabilities = {
+		full_punch_interval = 1.2,
+		max_drop_level=0,
+		groupcaps={
+			cracky = {times={[3]=1.6}, uses=4, maxlevel=1},
 		},
-		sound = {breaks = "default_tool_breaks"},
-		groups = {pickaxe = 1}
-	})
+		damage_groups = {fleshy=2},
+	},
+	sound = {breaks = "default_tool_breaks"},
+	groups = {pickaxe = 1}
+})
 
-	-- Get rid of wood pickaxe.
-	minetest.unregister_item("default:pick_wood")
-	minetest.clear_craft({output = "default:pick_wood"})
-end
+-- Get rid of wood pickaxe.
+minetest.unregister_item("default:pick_wood")
+minetest.clear_craft({output = "default:pick_wood"})
 
 -- These stone nodes can no longer be crafted directly.
 for _,nodename in pairs({
@@ -589,13 +584,11 @@ minetest.register_craft({
 	replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}},
 })
 
-if replace_wooden_pickaxe then
-	minetest.register_craft({
-		output = "quarry:pick_flint",
-		recipe = {
-				{"default:flint", "default:flint", "default:flint"},
-				{"", "group:stick", ""},
-				{"", "group:stick", ""}
-		}
-	})
-end
+minetest.register_craft({
+	output = "quarry:pick_flint",
+	recipe = {
+			{"default:flint", "default:flint", "default:flint"},
+			{"", "group:stick", ""},
+			{"", "group:stick", ""}
+	}
+})
diff --git a/settingtypes.txt b/settingtypes.txt
deleted file mode 100644
index 044251f..0000000
--- a/settingtypes.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file contains settings for quarry that can be changed in
-# minetest.conf
-
-#    Get rid of wooden pickaxe and replace it with a flint pickaxe.
-#    (default = true)
-quarry_replace_wooden_pickaxe (Replace wooden pickaxe) bool true