Merge remote-tracking branch 'upstream/master'

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>

.github/workflows/build.yml

@@ -0,0 +1,11 @@
+on: [push, pull_request]
+name: build
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: lint
+        uses: Roang-zero1/factorio-mod-luacheck@master
+        with:
+          luacheckrc_url: ""

.pre-commit-config.yaml

@@ -1,7 +1,8 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.3.0
+    rev: v3.3.0
     hooks:
+      - id: fix-byte-order-marker
       - id: end-of-file-fixer
       - id: trailing-whitespace
 

.travis.yml

@@ -1,15 +0,0 @@
-dist: bionic
-language: python
-
-python:
-  - 3.7.1
-
-install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qqq luarocks
-  - pip3 install pre-commit
-  - luarocks install --local luacheck
-
-script:
-  - pre-commit run --all-files
-  - $HOME/.luarocks/bin/luacheck .

README.md

@@ -1,4 +1,4 @@
-# Map Tools
+# Map Tools [![](https://github.com/minetest-mods/maptools/workflows/build/badge.svg)](https://github.com/minetest-mods/maptools/actions)
 
 Map Tools for [Minetest](https://www.minetest.net/), a free and open source infinite
 world block sandbox game.
@@ -6,7 +6,7 @@ world block sandbox game.
 ## Resources
 
 - [Forum topic](https://forum.minetest.net/viewtopic.php?f=11&t=1882)
-- [List of nodes and items available](NODES_ITEMS.md)
+- [List of nodes and items available](docs/NODES_ITEMS.md)
 
 ## Installation
 

config.lua

@@ -26,4 +26,6 @@ local function setting(settingtype, name, default)
 end
 
 -- Show Map Tools stuff in creative inventory (1 or 0):
-setting("integer", "hide_from_creative_inventory", 0)
+setting("integer", "hide_from_creative_inventory", 1)
+-- Enable crafting recipes for coins (true or false):
+setting("bool", "enable_coin_crafting", false)

craftitems.lua

@@ -16,6 +16,14 @@ minetest.register_craftitem("maptools:copper_coin", {
 	stack_max = 10000,
 })
 
+if maptools.config and maptools.config.enable_coin_crafting then
+	minetest.register_craft({
+		output = "maptools:copper_coin 10",
+		type = "shapeless",
+		recipe = { "default:copper_ingot", "default:copper_ingot" }
+	})
+end
+
 minetest.register_craftitem("maptools:silver_coin", {
 	description = S("Silver Coin"),
 	inventory_image = "maptools_silver_coin.png",
@@ -23,6 +31,16 @@ minetest.register_craftitem("maptools:silver_coin", {
 	stack_max = 10000,
 })
 
+if maptools.config and maptools.config.enable_coin_crafting then
+	if minetest.get_modpath("moreores") then
+		minetest.register_craft({
+			output = "maptools:silver_coin 10",
+			type = "shapeless",
+			recipe = { "moreores:silver_ingot", "moreores:silver_ingot" }
+		})
+	end
+end
+
 minetest.register_craftitem("maptools:gold_coin", {
 	description = S("Gold Coin"),
 	inventory_image = "maptools_gold_coin.png",
@@ -30,10 +48,18 @@ minetest.register_craftitem("maptools:gold_coin", {
 	stack_max = 10000,
 })
 
+if maptools.config and maptools.config.enable_coin_crafting then
+	minetest.register_craft({
+		output = "maptools:gold_coin 10",
+		type = "shapeless",
+		recipe = { "default:gold_ingot", "default:gold_ingot" }
+	})
+end
+
 minetest.register_craftitem("maptools:infinitefuel", {
 	description = S("Infinite Fuel"),
 	inventory_image = "maptools_infinitefuel.png",
-	stack_max = 10000,
+	stack_max = 65535,
 	groups = {not_in_creative_inventory = maptools.creative},
 })
 

default_nodes.lua

@@ -6,219 +6,135 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 local S = maptools.S
+local register_node = maptools.register_node
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
-minetest.register_node("maptools:stone", {
+register_node("maptools:stone", {
 	description = S("Unbreakable Stone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_stone.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:stonebrick", {
+register_node("maptools:stonebrick", {
 	description = S("Unbreakable Stone Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_stone_brick.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:tree", {
+register_node("maptools:tree", {
 	description = S("Unbreakable Tree"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:jungletree", {
+register_node("maptools:jungletree", {
 	description = S("Unbreakable Jungle Tree"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {
 		"default_jungletree_top.png",
 		"default_jungletree_top.png",
 		"default_jungletree.png",
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:cactus", {
+register_node("maptools:cactus", {
 	description = S("Unbreakable Cactus"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:papyrus", {
+register_node("maptools:papyrus", {
 	description = S("Unbreakable Papyrus"),
 	drawtype = "plantlike",
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_papyrus.png"},
 	inventory_image = "default_papyrus.png",
 	wield_image = "default_papyrus.png",
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}
 	},
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
+	sounds = default.node_sound_leaves_defaults()
-	sounds = default.node_sound_leaves_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:dirt", {
+register_node("maptools:dirt", {
 	description = S("Unbreakable Dirt"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_dirt.png"},
-	drop = "",
+	sounds = default.node_sound_dirt_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_dirt_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:wood", {
+register_node("maptools:wood", {
 	description = S("Unbreakable Wooden Planks"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_wood.png"},
-	drop = "",
+	sounds = default.node_sound_wood_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_wood_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:junglewood", {
+register_node("maptools:junglewood", {
 	description = S("Unbreakable Junglewood Planks"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_junglewood.png"},
-	drop = "",
+	sounds = default.node_sound_wood_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_wood_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:glass", {
+register_node("maptools:glass", {
 	description = S("Unbreakable Glass"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "glasslike",
 	tiles = {"default_glass.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
+	sounds = default.node_sound_glass_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_glass_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:leaves", {
+register_node("maptools:leaves", {
 	description = S("Unbreakable Leaves"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "allfaces_optional",
 	tiles = {"default_leaves.png"},
 	paramtype = "light",
-	drop = "",
+	sounds = default.node_sound_leaves_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_leaves_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:sand", {
+register_node("maptools:sand", {
 	description = S("Unbreakable Sand"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sand.png"},
-	drop = "",
+	sounds = default.node_sound_sand_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_sand_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:gravel", {
+register_node("maptools:gravel", {
 	description = S("Unbreakable Gravel"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_gravel.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_gravel_footstep", gain=0.35},
 		dug = {name="default_gravel_footstep", gain=0.6},
-	}),
+	})
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:clay", {
+register_node("maptools:clay", {
 	description = S("Unbreakable Clay"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_clay.png"},
-	drop = "",
+	sounds = default.node_sound_dirt_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_dirt_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:desert_sand", {
+register_node("maptools:desert_sand", {
 	description = S("Unbreakable Desert Sand"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_sand.png"},
-	drop = "",
+	sounds = default.node_sound_sand_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_sand_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:sandstone", {
+register_node("maptools:sandstone", {
 	description = S("Unbreakable Sandstone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sandstone.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:sandstone_brick", {
+register_node("maptools:sandstone_brick", {
 	description = S("Unbreakable Sandstone Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_sandstone_brick.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 -- Compatibility for change made there ^
 minetest.register_alias("maptools:sandstonebrick","maptools:sandstone_brick")
@@ -245,75 +161,48 @@ minetest.register_node("maptools:silver_sandstone_brick", {
 	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:desert_stone", {
+register_node("maptools:desert_stone", {
 	description = S("Unbreakable Desert Stone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_stone.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:desert_cobble", {
+register_node("maptools:desert_cobble", {
 	description = S("Unbreakable Desert Cobble"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_cobble.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:desert_stonebrick", {
+register_node("maptools:desert_stonebrick", {
 	description = S("Unbreakable Desert Stone Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_desert_stone_brick.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:grass", {
+register_node("maptools:grass", {
 	description = S("Unbreakable Dirt with Grass"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {
 		"default_grass.png",
 		"default_dirt.png",
 		"default_dirt.png^default_grass_side.png",
 	},
 	paramtype2 = "facedir",
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain = 0.4},
-	}),
+	})
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fullgrass", {
+register_node("maptools:fullgrass", {
 	description = S("Unbreakable Full Grass"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_grass.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
-	}),
+	})
-	on_drop = maptools.drop_msg
 })
 
 for slab_num = 1,3,1 do
-	minetest.register_node("maptools:slab_grass_" .. slab_num * 4, {
+	register_node("maptools:slab_grass_" .. slab_num * 4, {
 		description = S("Grass Slab"),
-		range = 12,
-		stack_max = 10000,
 		tiles = {
 			"default_grass.png",
 			"default_dirt.png",
@@ -327,152 +216,92 @@ for slab_num = 1,3,1 do
 		sunlight_propagates = true,
 		paramtype = "light",
 		paramtype2 = "facedir",
-		drop = "",
-		groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 		sounds = default.node_sound_dirt_defaults(
 			{footstep = {name="default_grass_footstep", gain = 0.4}}
-		),
+		)
-		on_drop = maptools.drop_msg
 	})
 end
 
-minetest.register_node("maptools:cobble", {
+register_node("maptools:cobble", {
 	description = S("Unbreakable Cobblestone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_cobble.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:mossycobble", {
+register_node("maptools:mossycobble", {
 	description = S("Unbreakable Mossy Cobblestone"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_mossycobble.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:brick", {
+register_node("maptools:brick", {
 	description = S("Unbreakable Brick"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_brick.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:coalblock", {
+register_node("maptools:coalblock", {
 	description = S("Unbreakable Coal Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_coal_block.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
 
-minetest.register_node("maptools:steelblock", {
+register_node("maptools:steelblock", {
 	description = S("Unbreakable Steel Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_steel_block.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:goldblock", {
+register_node("maptools:goldblock", {
 	description = S("Unbreakable Gold Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_gold_block.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:copperblock", {
+register_node("maptools:copperblock", {
 	description = S("Unbreakable Copper Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_copper_block.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:bronzeblock", {
+register_node("maptools:bronzeblock", {
 	description = S("Unbreakable Bronze Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_bronze_block.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:diamondblock", {
+register_node("maptools:diamondblock", {
 	description = S("Unbreakable Diamond Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"default_diamond_block.png"},
-	drop = "",
+	sounds = default.node_sound_stone_defaults()
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
 -- Farming:
 
-minetest.register_node("maptools:soil_wet", {
+register_node("maptools:soil_wet", {
 	description = "Wet Soil",
-	range = 12,
-	stack_max = 10000,
 	tiles = {
 		"default_dirt.png^farming_soil_wet.png",
 		"default_dirt.png^farming_soil_wet_side.png",
 	},
-	drop = "",
 	groups = {
-		unbreakable = 1,
-		not_in_creative_inventory = maptools.creative,
 		soil = 3,
 		wet = 1,
 		grassland = 1,
 	},
-	sounds = default.node_sound_dirt_defaults(),
+	sounds = default.node_sound_dirt_defaults()
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:desert_sand_soil_wet", {
+register_node("maptools:desert_sand_soil_wet", {
 	description = "Wet Desert Sand Soil",
-	range = 12,
-	stack_max = 10000,
-	drop = "",
 	tiles = {"farming_desert_sand_soil_wet.png", "farming_desert_sand_soil_wet_side.png"},
 	groups = {
-		unbreakable = 1,
-		not_in_creative_inventory = maptools.creative,
 		soil = 3,
 		wet = 1,
 		desert = 1,
 	},
-	sounds = default.node_sound_sand_defaults(),
+	sounds = default.node_sound_sand_defaults()
-	on_drop = maptools.drop_msg
 })
 
 -- Fence:

docs/CHANGELOG.md

@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Fixed
+
+- [The Admin Pickaxe can now dig More Ores' mithril blocks with client-side prediction (thanks to `maxlevel` being increased from 3 to 5).](https://github.com/minetest-mods/maptools/pull/30)
+
+## [2.2.0] - 2021-06-28
+
+### Changed
+
+- [Disabled crafting recipes for coins by default.](https://github.com/minetest-mods/maptools/pull/29)
+  - They can be enabled again by setting `maptools.enable_coin_crafting = true`
+    in `minetest.conf`.
+- Map Tools nodes can no longer be exploded by TNT.
+- Switched from Travis CI to GitHub Actions for continuous integration.
+
 ## [2.1.0] - 2020-06-08
 
 ### Changed
@@ -43,7 +57,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - Initial versioned release.
 
-[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.1.0...HEAD
+[Unreleased]: https://github.com/minetest-mods/maptools/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/minetest-mods/maptools/compare/v2.1.0...v2.2.0
 [2.1.0]: https://github.com/minetest-mods/maptools/compare/v2.0.0...v2.1.0
 [2.0.0]: https://github.com/minetest-mods/maptools/compare/v1.1.0...v2.0.0
 [1.1.0]: https://github.com/minetest-mods/maptools/compare/v1.0.0...v1.1.0

docs/NODES_ITEMS.md

@@ -12,29 +12,34 @@ use `-1` as the amount.
 as they cannot be removed by hand (they can only be removed with
 [WorldEdit](https://github.com/Uberi/Minetest-WorldEdit) or similar).
 
+> **Note**
+>
+> All of the nodes mentioned below have aliases which can be used as well.\
+> Here's the full aliases list: <https://github.com/minetest-mods/maptools/blob/master/aliases.lua>
+
 | Item code               | Description                                                                                                                                                            |
-| ----------------------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ----------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `maptools:{block}_u`    | Unbreakable, non-flammable, non-falling, non-decaying blocks. Most common default blocks have an unbreakable form available (`maptools:stone_u`, `maptools:wood_u`, …) |
 | `maptools:full_grass`   | Unbreakable block with the grass texture on all sides.                                                                                                                 |
-| `maptools:player_clip`  | :warning: Invisible, non-pointable block that blocks players and entities.                                                                                             |
+| `maptools:playerclip`  | :warning: Invisible, non-pointable block that blocks players and entities.                                                                                              |
-| `maptools:full_clip`    | Invisible, pointable block that blocks players and entities. Also available as a thin face (`maptools:full_clip_face`).                                                |
+| `maptools:fullclip`    | Invisible, pointable block that blocks players and entities. Also available as a thin face (`maptools:fullclip_face`).                                                  |
-| `maptools:smoke_block`  | Some smoke (doesn't damage players or entities).                                                                                                                       |
+| `maptools:smoke`        | Some smoke. Decreases visibility, but doesn't damage players or entities).                                                                                             |
-| `maptools:no_build`     | :warning: Very basic building prevention.                                                                                                                              |
+| `maptools:nobuild`     | :warning: Very basic building prevention.                                                                                                                               |
-| `maptools:no_interact`  | Prevents interacting through the block (opening chests, furnaces, attacking entities, …), but can still be walked through.                                             |
+| `maptools:nointeract`  | Prevents interacting through the block (opening chests, furnaces, attacking entities, …), but can still be walked through.                                              |
 | `maptools:damage_{1…5}` | :warning: Damaging blocks which damage players by 1 to 5 HP per second.                                                                                                |
 | `maptools:kill`         | :warning: Instant kill blocks (damages players by 20 HP per second).                                                                                                   |
-| `maptools:drowning`     | :warning: Simulates drowning in water.                                         |
+| `maptools:drowning`     | :warning: Simulates drowning in water.                                                                                                                                 |
 | `maptools:light_block`  | :warning: Invisible non-solid block, prevents light from passing through.                                                                                              |
-| `maptools:light_bulb`   | :warning: Invisible non-solid block, emitting the maximum amount of light.                                                                                             |
+| `maptools:lightbulb`   | :warning: Invisible non-solid block, emitting the maximum amount of light.                                                                                              |
 
 ## Items
 
 | Item code                        | Description                                                                                                                                       |
-| -------------------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------- |
+| -------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `maptools:admin_pick`            | A bright magenta pickaxe with infinite durability, digs everything including unbreakable blocks instantly. No drops are given when digging nodes. |
+| `maptools:pick_admin`            | A bright magenta pickaxe with infinite durability, digs everything including unbreakable blocks instantly. No drops are given when digging nodes. |
-| `maptools:admin_pick_with_drops` | Same as the admin pickaxe, but drops are given when digging nodes.                                                                                |
+| `maptools:pick_admin_with_drops` | Same as the admin pickaxe, but drops are given when digging nodes.                                                                                |
-| `maptools:infinite_fuel`         | Fuel lasting for a near-infinite time (about 50 real-life years).                                                                                 |
+| `maptools:infinitefuel`         | Fuel lasting for a near-infinite time (about 50 real-life years).                                                                                  |
-| `maptools:super_apple`           | A yellow apple which heals the player by 20 HP when used.                                                                                         |
+| `maptools:superapple`           | A yellow apple which heals the player by 20 HP when used.                                                                                          |
 | `maptools:copper_coin`           | Decorative item (can be used in mini-games).                                                                                                      |
 | `maptools:silver_coin`           | Decorative item (can be used in mini-games).                                                                                                      |
 | `maptools:gold_coin`             | Decorative item (can be used in mini-games).                                                                                                      |

init.lua

@@ -20,6 +20,25 @@ maptools.drop_msg = function(itemstack, player)
 	minetest.chat_send_player(name, S("[maptools] tools/nodes do not drop!"))
 end
 
+function maptools.register_node(name, def)
+	-- Increase the interaction range when holding Map Tools nodes to make building easier.
+	def.range = 12
+	def.stack_max = 65535
+	def.drop = ""
+	if def.groups then
+		if not def.groups.dig_immediate then
+			def.groups.unbreakable = 1
+		end
+		def.groups.not_in_creative_inventory = maptools.creative
+	else
+		def.groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative}
+	end
+	def.on_drop = maptools.drop_msg
+	-- Prevent Map Tools nodes from being exploded by TNT.
+	def.on_blast = function() end
+	minetest.register_node(name, def)
+end
+
 dofile(modpath .. "/config.lua")
 dofile(modpath .. "/aliases.lua")
 dofile(modpath .. "/craftitems.lua")

nodes.lua

@@ -6,63 +6,44 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 local S = maptools.S
+local register_node = maptools.register_node
 
 maptools.creative = maptools.config["hide_from_creative_inventory"]
 
 -- Redefine cloud so that the admin pickaxe can mine it
-minetest.register_node(":default:cloud", {
+register_node(":default:cloud", {
 	description = S("Cloud"),
 	tiles = {"default_cloud.png"},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_defaults(),
-	on_drop = maptools.drop_msg
 })
 
 -- Nodes
 
-minetest.register_node("maptools:black", {
+register_node("maptools:black", {
 	description = S("Black"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"black.png"},
-	drop = "",
 	post_effect_color = {a=255, r=0, g=0, b=0},
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:white", {
+register_node("maptools:white", {
 	description = S("White"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"white.png"},
-	drop = "",
 	post_effect_color = {a=255, r=128, g=128, b=128},
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_stone_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:playerclip", {
+register_node("maptools:playerclip", {
 	description = S("Player Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
 	pointable = false,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fake_walkable", {
+register_node("maptools:fake_walkable", {
 	description = S("Player Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
@@ -74,28 +55,18 @@ minetest.register_node("maptools:fake_walkable", {
 			{0, 0, 0, 0, 0, 0},
 		},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fullclip", {
+register_node("maptools:fullclip", {
 	description = S("Full Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_blue.png",
 	drawtype = "airlike",
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fake_walkable_pointable", {
+register_node("maptools:fake_walkable_pointable", {
 	description = S("Player Clip"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_green.png",
 	drawtype = "airlike",
 	paramtype = "light",
@@ -106,167 +77,125 @@ minetest.register_node("maptools:fake_walkable_pointable", {
 			{0, 0, 0, 0, 0, 0},
 		},
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:ignore_like", {
+register_node("maptools:ignore_like", {
 	description = S("Ignore-like"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_pink.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
+	use_texture_alpha = "clip",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:ignore_like_no_clip", {
+register_node("maptools:ignore_like_no_clip", {
 	description = S("Ignore-like (no clip)"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_violet.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	walkable = false,
 	sunlight_propagates = true,
-	drop = "",
+	use_texture_alpha = "clip",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
 
-minetest.register_node("maptools:ignore_like_no_point", {
+register_node("maptools:ignore_like_no_point", {
 	description = S("Ignore-like (no point)"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_violet.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	pointable = false,
 	sunlight_propagates = true,
-	drop = "",
+	use_texture_alpha = "clip",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:ignore_like_no_clip_no_point", {
+register_node("maptools:ignore_like_no_clip_no_point", {
 	description = S("Ignore-like (no clip, no point)"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_pink.png",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	walkable = false,
 	pointable = false,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fullclip_face", {
+register_node("maptools:fullclip_face", {
 	description = S("Full Clip Face"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_white.png",
 	drawtype = "nodebox",
 	tiles = {"invisible.png"},
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = true,
+	use_texture_alpha = "clip",
 	node_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4999, 0.5},
 	},
-	drop = "",
 	groups = {
-		unbreakable = 1,
-		not_in_creative_inventory = maptools.creative,
 		fall_damage_add_percent = -100,
 	},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:playerclip_bottom", {
+register_node("maptools:playerclip_bottom", {
 	description = S("Player Clip Bottom Face"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_orange.png",
 	drawtype = "nodebox",
 	tiles = {"invisible.png"},
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
+	use_texture_alpha = "clip",
 	node_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, -0.4999, 0.5},
 	},
-	drop = "",
 	groups = {
-		unbreakable = 1,
-		not_in_creative_inventory = maptools.creative,
 		fall_damage_add_percent = -100,
 	},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:playerclip_top", {
+register_node("maptools:playerclip_top", {
 	description = S("Player Clip Top Face"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_yellow.png",
 	drawtype = "nodebox",
 	tiles = {"invisible.png"},
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
+	use_texture_alpha = "clip",
 	node_box = {
 		type = "fixed",
 		fixed = {-0.5, 0.4999, -0.5, 0.5, 0.5, 0.5},
 	},
-	drop = "",
 	groups = {
-		unbreakable = 1,
-		not_in_creative_inventory = maptools.creative,
 		fall_damage_add_percent = -100,
 	},
-	on_drop = maptools.drop_msg
 })
 
 for pusher_num=1,10,1 do
-	minetest.register_node("maptools:pusher_" .. pusher_num, {
+	register_node("maptools:pusher_" .. pusher_num, {
 		description = S("Pusher (%s)"):format(pusher_num),
-		range = 12,
+				inventory_image = "default_steel_block.png^default_apple.png",
-		stack_max = 10000,
-		inventory_image = "default_steel_block.png^default_apple.png",
 		drawtype = "nodebox",
 		tiles = {"invisible.png"},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		sunlight_propagates = true,
+		use_texture_alpha = "clip",
 		node_box = {
 			type = "fixed",
 			fixed = {-0.5, -0.5, -0.5, 0.5, -0.4999, 0.5},
 		},
-		drop = "",
 		groups = {
-			unbreakable = 1,
-			not_in_creative_inventory = maptools.creative,
 			fall_damage_add_percent = -100,
 			bouncy = pusher_num * 100,
 		},
-		on_drop = maptools.drop_msg
 	})
 end
 
-minetest.register_node("maptools:lightbulb", {
+register_node("maptools:lightbulb", {
 	description = S("Light Bulb"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^default_mese_crystal_fragment.png",
 	drawtype = "airlike",
 	walkable = false,
@@ -274,44 +203,29 @@ minetest.register_node("maptools:lightbulb", {
 	light_source = default.LIGHT_MAX,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:nobuild", {
+register_node("maptools:nobuild", {
 	description = S("Build Prevention"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^default_flint.png",
 	drawtype = "airlike",
 	walkable = false,
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:nointeract", {
+register_node("maptools:nointeract", {
 	description = S("Interact Prevention"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^default_bush_stem.png",
 	drawtype = "airlike",
 	walkable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:climb", {
+register_node("maptools:climb", {
 	description = S("Climb Block"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^default_ladder_wood.png",
 	drawtype = "airlike",
 	walkable = false,
@@ -319,16 +233,11 @@ minetest.register_node("maptools:climb", {
 	pointable = false,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
 for damage_num=1,5,1 do
-minetest.register_node("maptools:damage_" .. damage_num, {
+register_node("maptools:damage_" .. damage_num, {
 	description = S("Damaging Block (%s)"):format(damage_num),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^farming_cotton_" .. damage_num .. ".png",
 	drawtype = "airlike",
 	walkable = false,
@@ -336,16 +245,11 @@ minetest.register_node("maptools:damage_" .. damage_num, {
 	damage_per_second = damage_num,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 end
 
-minetest.register_node("maptools:kill", {
+register_node("maptools:kill", {
 	description = S("Kill Block"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_black.png",
 	drawtype = "airlike",
 	walkable = false,
@@ -353,29 +257,19 @@ minetest.register_node("maptools:kill", {
 	damage_per_second = 20,
 	paramtype = "light",
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:smoke", {
+register_node("maptools:smoke", {
 	description = S("Smoke Block"),
-	range = 12,
-	stack_max = 10000,
 	tiles = {"maptools_smoke.png"},
 	drawtype = "allfaces_optional",
 	walkable = false,
 	paramtype = "light",
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	post_effect_color = {a=192, r=96, g=96, b=96},
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:ladder", {
+register_node("maptools:ladder", {
 	description = S("Fake Ladder"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "signlike",
 	tiles = {"default_ladder_wood.png"},
 	inventory_image = "default_ladder_wood.png",
@@ -387,16 +281,11 @@ minetest.register_node("maptools:ladder", {
 	selection_box = {
 		type = "wallmounted",
 	},
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sounds = default.node_sound_wood_defaults(),
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:permanent_fire", {
+register_node("maptools:permanent_fire", {
 	description = S("Permanent Fire"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "plantlike",
 	paramtype = "light",
 	tiles = {{
@@ -405,18 +294,13 @@ minetest.register_node("maptools:permanent_fire", {
 	}},
 	inventory_image = "fire_basic_flame.png",
 	light_source = 14,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sunlight_propagates = true,
 	walkable = false,
 	damage_per_second = 4,
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:fake_fire", {
+register_node("maptools:fake_fire", {
 	description = S("Fake Fire"),
-	range = 12,
-	stack_max = 10000,
 	drawtype = "plantlike",
 	paramtype = "light",
 	tiles = {{
@@ -425,33 +309,24 @@ minetest.register_node("maptools:fake_fire", {
 	}},
 	inventory_image = "fire_basic_flame.png",
 	light_source = 14,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sunlight_propagates = true,
 	walkable = false,
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:igniter", {
+register_node("maptools:igniter", {
 	drawtype = "airlike",
-	range = 12,
-	stack_max = 10000,
 	description = S("Igniter"),
 	paramtype = "light",
 	inventory_image = "fire_basic_flame.png",
-	drop = "",
+	groups = {igniter=2},
-	groups = {igniter=2, unbreakable = 1, not_in_creative_inventory = maptools.creative},
 	sunlight_propagates = true,
 	pointable = false,
 	walkable = false,
-	on_drop = maptools.drop_msg
 })
 
-minetest.register_node("maptools:superapple", {
+register_node("maptools:superapple", {
 	description = S("Super Apple"),
-	range = 12,
+	drawtype = "plantlike",
-	stack_max = 99,
-	drawtype = "nodebox",
 	visual_scale = 1.0,
 	tiles = {"maptools_super_apple_top.png","maptools_super_apple_bottom.png","maptools_super_apple_side.png"},
 	inventory_image = "maptools_superapple.png",
@@ -477,10 +352,8 @@ minetest.register_node("maptools:superapple", {
 	sounds = default.node_sound_defaults(),
 })
 
-minetest.register_node("maptools:drowning", {
+register_node("maptools:drowning", {
 	description = S("Drownable Air"),
-	range = 12,
-	stack_max = 10000,
 	inventory_image = "default_steel_block.png^dye_black.png",
 	drawtype = "airlike",
 	paramtype = "light",
@@ -488,7 +361,4 @@ minetest.register_node("maptools:drowning", {
 	walkable = false,
 	drowning = 1,
 	sunlight_propagates = true,
-	drop = "",
-	groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative},
-	on_drop = maptools.drop_msg
 })

settingtypes.txt

@@ -0,0 +1,3 @@
+# If `true`, enables coin crafting recipes. If `false`, disables coin crafting recipes.
+# Takes effect only at load-time; runtime changes to this setting are ignored.
+maptools.enable_coin_crafting (Enable crafting recipes for coins) bool false

tools.lua

@@ -13,13 +13,13 @@ local pick_admin_toolcaps = {
 	full_punch_interval = 0.1,
 	max_drop_level = 3,
 	groupcaps = {
-		unbreakable = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		unbreakable = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		fleshy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		fleshy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		choppy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		choppy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		bendy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		bendy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		cracky = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		cracky = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		crumbly = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		crumbly = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
-		snappy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 3},
+		snappy = {times = {[1] = 0, [2] = 0, [3] = 0}, uses = 0, maxlevel = 5},
 	},
 	damage_groups = {fleshy = 1000},
 }