Update tools_obsidian mod to v1.0...

https://github.com/Dragonop/tools_obsidian/releases/tag/1.0

README.md

@@ -105,7 +105,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 	* [more_chests][] ([GPL][lic.gpl2.0]) -- version: [6be8145 Git][ver.more_chests] *2021-04-05*
 * tools/
 	* [compassgps][] ([WTFPL][lic.wtfpl] / [CC0][lic.cc0] / [CC BY-SA][lic.ccbysa]) -- version: [567b95f Git][ver.compassgps] *2018-09-24*
-    * [tools_obsidian][] ([LGPL / CC BY-SA][lic.tools_obsidian]) -- version: [f77fd79][ver.tools_obsidian] *2016-03-19* ([patched][patch.tools_obsidian]) ***UPDATES***
+    * [tools_obsidian][] ([LGPL / CC BY-SA][lic.tools_obsidian]) -- version: [1.0][ver.tools_obsidian] *2021-01-15*
     * [workbench][] ([LGPL / WTFPL](mods/tools/workbench/LICENSE)) -- version: [bd14f59 Git][ver.workbench] *2017-08-08*
 * transport/
   * [bike][] ([MIT][lic.bike]) -- version: [1.2][ver.bike] *2021-04-12*
@@ -512,7 +512,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.technic_armor]: https://github.com/stujones11/technic_armor/tree/694642f
 [ver.throwing]: https://github.com/PilzAdam/throwing/tree/90bcf43
 [ver.tnt]: https://github.com/PilzAdam/TNT/tree/d6a0b7d
-[ver.tools_obsidian]: https://github.com/Dragonop/tools_obsidian/tree/f77fd79
+[ver.tools_obsidian]: https://github.com/Dragonop/tools_obsidian/releases/tag/1.0
 [ver.trampoline]: https://github.com/AntumMT/mod-trampoline/tree/41366ac
 [ver.trash_can]: https://github.com/minetest-mods/trash_can/tree/423b0f2
 [ver.unifieddyes]: https://gitlab.com/VanessaE/unifieddyes/tags/2021-03-26-1
@@ -566,7 +566,6 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [patch.spawneggs]: https://github.com/AntumMT/mod-spawneggs/tree/f2cc4cc
 [patch.technic]: https://github.com/AntumMT/mp-technic/tree/cdb31be
 [patch.throwing]: https://github.com/AntumMT/mod-throwing/tree/b33ffde
-[patch.tools_obsidian]: https://github.com/AntumMT/mod-tools_obsidian/tree/2d19297
 [patch.trash_can]: https://github.com/AntumMT/mod-trash_can/tree/5a92bf4
 [patch.unifieddyes]: https://github.com/AntumMT/mod-unifieddyes/tree/3013964
 [patch.walking_light]: https://github.com/AntumMT/mod-walking_light/tree/b94ee23

mods/tools/tools_obsidian/README.md

@@ -1,29 +1,22 @@
 # tools_obsidian
-Minetest Obsidian Tools mod. Adds obsidian sword, dagger and longsword.
+Minetest Obsidian Tools mod.
+Adds the obsidian sword, dagger and longsword.  
+Also adds the obsidian axe, pickaxe, and shovel, for completeness.  
+
+Each weapon has its uses, advantages, and tradeoffs.  
+
+Obsidian Sword: Slightly stronger than a regular diamond sword, at the expense of being slightly slower.  
+Obsidian Dagger: Quick and durable, with a shorter range and low per-hit damage.  
+Obsidian Longsword: Very powerful with a long reach, slow but strong swings.  
 
 Dependencies: 
-Default
-Bucket
+default
+bucket
 
+##### License for Code 
 
-#####License for Code
+Joaquín Villalba (Dragonop) (LGPLv3)
 
-Copyright (C) 2016 Dragonop <joaco-mono@hotmail.com>
+##### License for Media
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-#####License for Textures, Models and Sounds
-
-CC-BY-SA 3.0 UNPORTED. Created by Dragonop
+CC-BY-SA 3.0 UNPORTED. Created by Joaquín Villalba (Dragonop)

mods/tools/tools_obsidian/depends.txt

@@ -1,2 +0,0 @@
-default
-bucket

mods/tools/tools_obsidian/description.txt

@@ -1 +0,0 @@
-Adds obsidian dagger, sword, and longsword.

mods/tools/tools_obsidian/init.lua

@@ -1,7 +1,21 @@
-print("Obsidian tools")
+t_uses = {}
+local tool_wear_enabled = minetest.settings:get_bool("enable_tool_wear")
+if tool_wear_enabled == nil then
+	-- Default is enabled
+	tool_wear_enabled = true
+end
+
+if tool_wear_enabled then
+	t_uses.twenty = 20
+else
+	t_uses.twenty = 0
+end
+
 
 dofile(minetest.get_modpath("tools_obsidian").."/sword.lua")
+dofile(minetest.get_modpath("tools_obsidian").."/tools.lua")
 
 minetest.register_alias("sword_obsidian", "tools_obsidian:sword_obsidian")
 minetest.register_alias("longsword_obsidian", "tools_obsidian:longsword_obsidian")
-minetest.register_alias("dagger_obsidian", "tools_obsidian:dagger_obsidian")
+minetest.register_alias("dagger_obsidian", "tools_obsidian:dagger_obsidian")
+minetest.register_alias("pick_obsidian", "tools_obsidian:pick_obsidian")

mods/tools/tools_obsidian/mod.conf

@@ -1 +1,4 @@
-name = tools_obsidian
+name = tools_obsidian
+author = Dragonop
+description = Adds Obsidian Tools, and the Obsidian Dagger, Sword, and Longsword.
+depends = default, bucket

mods/tools/tools_obsidian/sword.lua

@@ -1,33 +1,21 @@
 
-local t_uses = {}
-local tool_wear_enabled = minetest.settings:get_bool("enable_tool_wear")
-if tool_wear_enabled == nil then
-	-- Default is enabled
-	tool_wear_enabled = true
-end
-
-if tool_wear_enabled then
-	t_uses.forty = 40
-else
-	t_uses.forty = 0
-end
-
-
+--sword
 minetest.register_tool("tools_obsidian:sword_obsidian", {
 	description = "Obsidian Sword",
 	inventory_image = "tools_obsidian_sword.png",
 	wield_scale = {x=1.2,y=1,z=.4},
 	tool_capabilities = {
 		full_punch_interval = 1.0,
-		max_drop_level=1,
         stack_max = 1,
         range = 4.0,
 		max_drop_level=1,
 		groupcaps={
-			snappy={times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=t_uses.forty, maxlevel=3},
+			snappy={times={[1]=1.60, [2]=0.80, [3]=0.25}, uses = t_uses.twenty*2, maxlevel=3},
 		},
-		damage_groups = {fleshy=14},
-	}
+		damage_groups = {fleshy=10},
+	},
+	sound = {breaks = "default_tool_breaks"},
+	groups = {sword = 1}
 })
 
 minetest.register_craft({
@@ -51,15 +39,16 @@ minetest.register_tool("tools_obsidian:longsword_obsidian", {
 	wield_scale = {x=2,y=1.3,z=.4},
 	tool_capabilities = {
 		full_punch_interval = 4.2,
-		max_drop_level=2,
         stack_max = 1,
-        range = 4.0,
+        range = 6.0,
 		max_drop_level=2,
 		groupcaps={
-			snappy={times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=t_uses.forty, maxlevel=3},
+			snappy={times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=t_uses.twenty*3, maxlevel=3},
 		},
 		damage_groups = {fleshy=26},
-	}
+	},
+	sound = {breaks = "default_tool_breaks"},
+	groups = {sword = 1}
 })
 
 minetest.register_craft({
@@ -82,16 +71,17 @@ minetest.register_tool("tools_obsidian:dagger_obsidian", {
 	wield_image = "tools_obsidian_dagger_wield.png",
 	wield_scale = {x=1.2,y=1,z=.4},
 	tool_capabilities = {
-		full_punch_interval = .5,
-		max_drop_level=1,
+		full_punch_interval = .4,
         stack_max = 1,
         range = 3.0,
 		max_drop_level=2,
 		groupcaps={
-			snappy={times={[1]=1.90, [2]=0.90, [3]=0.30}, uses=t_uses.forty, maxlevel=3},
+			snappy={times={[1]=1.30, [2]=0.50, [3]=0.15}, uses=t_uses.twenty*3, maxlevel=3},
 		},
-		damage_groups = {fleshy=2},
-	}
+		damage_groups = {fleshy=4},
+	},
+	sound = {breaks = "default_tool_breaks"},
+	groups = {sword = 1}
 })
 
 minetest.register_craft({
@@ -105,4 +95,4 @@ minetest.register_craft({
 			{"bucket:bucket_lava", "bucket:bucket_empty"},
 		}
 	}
-)
+)

mods/tools/tools_obsidian/tools.lua

@@ -0,0 +1,95 @@
+--pick
+minetest.register_tool("tools_obsidian:pick_obsidian", {
+	description = "Obsidian Pickaxe",
+	inventory_image = "tools_obsidian_pick.png",
+	wield_scale = {x=1.2,y=1,z=.4},
+	tool_capabilities = {
+		full_punch_interval = 0.9,
+        stack_max = 1,
+        range = 4.0,
+		max_drop_level=3,
+		groupcaps={
+			cracky = {times={[1]=1.60, [2]=0.8, [3]=0.40}, uses = t_uses.twenty*2, maxlevel=3},
+		},
+		damage_groups = {fleshy=5},
+	},
+	sound = {breaks = "default_tool_breaks"},
+	groups = {pickaxe = 1}
+})
+
+minetest.register_craft({
+		output = "tools_obsidian:pick_obsidian",
+		recipe = {
+			{"default:obsidian_shard", "default:diamond", "default:obsidian"},
+			{"default:mese_crystal_fragment", "default:mese_crystal", "default:diamond"},
+			{"bucket:bucket_lava", "default:mese_crystal_fragment", "default:obsidian_shard"}
+		},
+		replacements = {
+			{"bucket:bucket_lava", "bucket:bucket_empty"},
+		}
+	}
+)
+
+--axe
+minetest.register_tool("tools_obsidian:axe_obsidian", {
+	description = "Obsidian Axe",
+	inventory_image = "tools_obsidian_axe.png",
+	wield_scale = {x=1.2,y=1,z=.4},
+	tool_capabilities = {
+		full_punch_interval = 1,
+        stack_max = 1,
+        range = 4.5,
+		max_drop_level=2,
+		groupcaps={
+			choppy = {times={[1]=1.80, [2]=0.6, [3]=0.40}, uses = t_uses.twenty*2, maxlevel=3},
+		},
+		damage_groups = {fleshy=8},
+	},
+	sound = {breaks = "default_tool_breaks"},
+	groups = {axe = 1}
+})
+
+minetest.register_craft({
+		output = "tools_obsidian:axe_obsidian",
+		recipe = {
+			{"default:obsidian", "default:diamond",	"default:mese_crystal_fragment"},
+			{"default:obsidian", "default:mese_crystal_fragment", ""},
+			{"bucket:bucket_lava", "default:mese_crystal", ""}
+		},
+		replacements = {
+			{"bucket:bucket_lava", "bucket:bucket_empty"},
+		}
+	}
+)
+
+--shovel
+minetest.register_tool("tools_obsidian:shovel_obsidian", {
+	description = "Obsidian Shovel",
+	inventory_image = "tools_obsidian_shovel.png^[transformR90",
+	wield_scale = {x=1.2,y=1,z=.4},
+	tool_capabilities = {
+		full_punch_interval = 1.2,
+        stack_max = 1,
+        range = 4.5,
+		max_drop_level=2,
+		groupcaps={
+			crumbly = {times={[1]=0.9, [2]=0.40, [3]=0.20}, uses = t_uses.twenty*2, maxlevel=3},
+		},
+		damage_groups = {fleshy=5},
+	},
+	sound = {breaks = "default_tool_breaks"},
+	groups = {shovel = 1}
+})
+
+minetest.register_craft({
+		output = "tools_obsidian:shovel_obsidian",
+		recipe = {
+			{"default:obsidian_shard","default:obsidian","default:obsidian_shard"},
+			{"default:mese_crystal_fragment","default:diamond","default:mese_crystal_fragment"},
+			{"bucket:bucket_lava", "default:mese_crystal", ""}
+		},
+		replacements = {
+			{"bucket:bucket_lava", "bucket:bucket_empty"},
+		}
+	}
+)