Add disable_repair group to prevent tool repair (#7381)

Wuzzy2 · paramat · commit 40ab3e011de5 · 2018-10-16T05:25:34.000+01:00
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
@@ -1551,6 +1551,8 @@ Special groups
   connect to each other
 * `slippery`: Players and items will slide on the node.
   Slipperiness rises steadily with `slippery` value, starting at 1.
+* `disable_repair`: If set to 1 for a tool, it cannot be repaired using the
+  `"toolrepair"` crafting recipe
 
 
 Known damage and digging time defining groups
@@ -6156,6 +6158,8 @@ Used by `minetest.register_craft`.
         additional_wear = -0.02,
     }
 
+Note: Tools with group `disable_repair=1` will not repairable by this recipe.
+
 ### Cooking
 
     {
diff --git a/games/minimal/mods/experimental/init.lua b/games/minimal/mods/experimental/init.lua
@@ -615,6 +615,34 @@ minetest.register_craftitem("experimental:tester_tool_2", {
 	end,
 })
 
+-- Test the disable_repair=1 group
+minetest.register_tool("experimental:unrepairable_tool", {
+	description = "Unrepairable Tool",
+	wield_image = "default_stone.png",
+	inventory_image = "default_stone.png",
+	tool_capabilities = {
+		groupcaps = {
+			cracky = {
+				times = {3, 2, 1},
+			}
+		}
+	},
+	groups = { disable_repair = 1 }
+})
+
+minetest.register_tool("experimental:repairable_tool", {
+	description = "Repairable Tool",
+	wield_image = "default_dirt.png",
+	inventory_image = "default_dirt.png",
+	tool_capabilities = {
+		groupcaps = {
+			cracky = {
+				times = {3, 2, 1},
+			}
+		}
+	},
+})
+
 minetest.register_craft({
 	output = 'experimental:tester_tool_2',
 	recipe = {
diff --git a/src/craftdef.cpp b/src/craftdef.cpp
@@ -579,7 +579,7 @@ static ItemStack craftToolRepair(
 	IItemDefManager *idef = gamedef->idef();
 	if (item1.count != 1 || item2.count != 1 || item1.name != item2.name
 			|| idef->get(item1.name).type != ITEM_TOOL
-			|| idef->get(item2.name).type != ITEM_TOOL) {
+			|| itemgroup_get(idef->get(item1.name).groups, "disable_repair") == 1) {
 		// Failure
 		return ItemStack();
 	}

Original file line number	Diff line number	Diff line change
`@@ -1551,6 +1551,8 @@ Special groups`
`1551`	`1551`	`connect to each other`
`1552`	`1552`	* `slippery`: Players and items will slide on the node.
`1553`	`1553`	Slipperiness rises steadily with `slippery` value, starting at 1.
	`1554`	+* `disable_repair`: If set to 1 for a tool, it cannot be repaired using the
	`1555`	+ `"toolrepair"` crafting recipe
`1554`	`1556`
`1555`	`1557`
`1556`	`1558`	`Known damage and digging time defining groups`
@@ -6156,6 +6158,8 @@ Used by `minetest.register_craft`.
`6156`	`6158`	`additional_wear = -0.02,`
`6157`	`6159`	`}`
`6158`	`6160`
	`6161`	+Note: Tools with group `disable_repair=1` will not repairable by this recipe.
	`6162`	`+`
`6159`	`6163`	`### Cooking`
`6160`	`6164`
`6161`	`6165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ static ItemStack craftToolRepair(`
`579`	`579`	`IItemDefManager *idef = gamedef->idef();`
`580`	`580`	`if (item1.count != 1 \|\| item2.count != 1 \|\| item1.name != item2.name`
`581`	`581`	`\|\| idef->get(item1.name).type != ITEM_TOOL`
`582`		`- \|\| idef->get(item2.name).type != ITEM_TOOL) {`
	`582`	`+ \|\| itemgroup_get(idef->get(item1.name).groups, "disable_repair") == 1) {`
`583`	`583`	`// Failure`
`584`	`584`	`return ItemStack();`
`585`	`585`	`}`