Make flint pickaxe mandatory.

README.md

@@ -19,9 +19,29 @@ What do I mean by that?
 - For building, a Trowel and Mortar tool is provided. It can mortar placed cobble nodes into stonebrick nodes, and mortar placed cut\_stone nodes back into stone nodes.
 
 
+Special notes
+-------------
+
+**What happens when this mod is installed in an existing world?**
+
+- Existing cobble nodes will fall when touched. This is problematic since dungeons have cobble ceilings.
+
+- Hamlet's stonebrick\_dungeons is a required dependency to deal with this problem, but it only works on newly-made dungeons, not preexisting ones.
+
+- In addition, quarry currently only supports Minetest default game. It's likely that there are other mods that will conflict with this mod.
+
+**What happens when this mod is removed from a world?**
+
+- Cobble will stop being a falling node.
+
+- And just like every other mod, all tools and nodes defined in this mod will become unknown.
+ 
+
 Additional notes
 ----------------
 
+- **New:** default:gravel now turns into quarry:gravel when dug. This is to prevent digging through the same gravel nodes over and over to find flint. (The texture is slightly lighter.)
+
 - Cobble cannot be converted back into stone by melting it in a furnace.
 
 - A Quarry Hammer is only able to cut out a stone if it has at least two faces open to the air (to be able to cut all its sides with the implied chisel).
@@ -36,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
@@ -52,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
 ------------

falling_nodes.lua

@@ -4,11 +4,40 @@
 --   by hand, so shovels aren't really necessary.
 -- Setting crumbly = 2 for both, makes switching to shovels advantageous,
 --   at the cost of making stone even more difficult to work.
+--
+-- In addition, digging gravel now drops quarry:gravel, which doesn't drop flint.
+-- That way, player can't just keep redigging their gravel inventory to get more flints.
+-- 2020-06-24
 
+-- Only check for flint drop one time.
 minetest.override_item("default:gravel", {
 	groups = {crumbly = 3, falling_node = 1},
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {"default:flint"}, rarity = 16},
+			{items = {"quarry:gravel"}}
+		}
+	}
 })
 
+-- Replacement gravel that doesn't drop flint.
+minetest.register_node("quarry:gravel", {
+	description = ("Gravel"),
+	tiles = {"quarry_gravel.png"},
+	groups = {crumbly = 3, falling_node = 1},
+	sounds = default.node_sound_gravel_defaults(),
+})
+
+-- Add additional gunpowder recipe that uses quarry:gravel.
+if minetest.get_modpath("tnt") ~= nil then
+	minetest.register_craft({
+		output = "tnt:gunpowder 5",
+		type = "shapeless",
+		recipe = {"default:coal_lump", "quarry:gravel"}
+	})
+end
+
 -- Make dirt nodes also falling.
 
 minetest.override_item("default:dirt", {

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", ""}
+	}
+})

mod.conf

@@ -1,3 +1,4 @@
 name = quarry
 description = Adds quarry mechanics to stone nodes.
 depends = default, bucket, stairs, stonebrick_dungeons
+optional_depends = tnt

settingtypes.txt

@@ -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