From 3c174db494b75874d6db3e52a12d6e775ed9d5c3 Mon Sep 17 00:00:00 2001
From: echoes91 <ehcoes91@gmail.com>
Date: Sat, 18 Apr 2020 15:31:17 +0200
Subject: [PATCH] Update 1.1

---
 functions.lua | 14 +++++++-------
 tools.lua     | 27 ++++++++++-----------------
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/functions.lua b/functions.lua
index 15de0c0..f2d89f5 100644
--- a/functions.lua
+++ b/functions.lua
@@ -14,19 +14,19 @@ function spears_shot (itemstack, player)
 	return true
 end
 
-function spears_set_entity(kind, eq, toughness)
+function spears_set_entity(spear_type, base_damage, toughness)
 	local SPEAR_ENTITY={
 		physical = false,
 		timer=0,
 		visual = "wielditem",
 		visual_size = {x=0.15, y=0.1},
-		textures = {"spears:spear_" .. kind},
+		textures = {"spears:spear_" .. spear_type},
 		lastpos={},
 		collisionbox = {0,0,0,0,0,0},
 		on_punch = function(self, puncher)
 			if puncher then
 				if puncher:is_player() then
-					local stack = {name='spears:spear_' .. kind, wear=self.wear+65535/toughness}
+					local stack = {name='spears:spear_' .. spear_type, wear=self.wear+65535/toughness}
 					local inv = puncher:get_inventory()
 					if inv:room_for_item("main", stack) then
 						inv:add_item("main", stack)
@@ -49,22 +49,22 @@ function spears_set_entity(kind, eq, toughness)
 			if node.name ~= "air" and not (string.find(node.name, 'grass') and not string.find(node.name, 'dirt')) and not string.find(node.name, 'flowers:') and not string.find(node.name, 'farming:') then
 				self.object:remove()
 				if self.wear+65535/toughness < 65535 then
-					minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness})
+					minetest.add_item(self.lastpos, {name='spears:spear_' .. spear_type, wear=self.wear+65535/toughness})
 				end
 			elseif self.timer>0.2 then
 				local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 1)
 				for k, obj in pairs(objs) do
 					if obj:get_luaentity() ~= nil then
-						if obj:get_luaentity().name ~= "spears:spear_" .. kind .. "_entity" and obj:get_luaentity().name ~= "__builtin:item" then
+						if obj:get_luaentity().name ~= "spears:spear_" .. spear_type .. "_entity" and obj:get_luaentity().name ~= "_builtin:item" then
 							local speed = vector.length(self.object:getvelocity())
-							local damage = (speed + eq)^1.12-20
+							local damage = (speed + base_damage)^1.12-20
 							obj:punch(self.object, 1.0, {
 								full_punch_interval=1.0,
 								damage_groups={fleshy=damage},
 							}, nil)
 							self.object:remove()
 							if self.wear+65535/toughness < 65535 then
-								minetest.add_item(self.lastpos, {name='spears:spear_' .. kind, wear=self.wear+65535/toughness})
+								minetest.add_item(self.lastpos, {name='spears:spear_' .. spear_type, wear=self.wear+65535/toughness})
 							end
 						end
 					end
diff --git a/tools.lua b/tools.lua
index 1f7959c..106e753 100644
--- a/tools.lua
+++ b/tools.lua
@@ -1,47 +1,40 @@
-function spears_register_spear(kind, desc, eq, toughness, material)
+function spears_register_spear(spear_type, desc, base_damage, toughness, material)
 
-	minetest.register_tool("spears:spear_" .. kind, {
+	minetest.register_tool("spears:spear_" .. spear_type, {
 		description = desc .. " spear",
-                wield_image = "spears_spear_" .. kind .. ".png",
-		inventory_image = "spears_spear_" .. kind .. ".png^[transform4",
+                wield_image = "spears_spear_" .. spear_type .. ".png",
+		inventory_image = "spears_spear_" .. spear_type .. ".png^[transform4",
 		wield_scale= {x=2,y=1,z=1},
-		on_drop = function(itemstack, user, pointed_thing)
+		on_secondary_use = function(itemstack, user, pointed_thing)
 			spears_shot(itemstack, user)
 			if not minetest.setting_getbool("creative_mode") then
 				itemstack:take_item()
 			end
 			return itemstack
 		end,
-		on_place = function(itemstack, user, pointed_thing)
-			minetest.add_item(pointed_thing.above, itemstack)
-			if not minetest.setting_getbool("creative_mode") then
-				itemstack:take_item()
-			end
-			return itemstack
-		end,
 		tool_capabilities = {
 			full_punch_interval = 1.5,
 			max_drop_level=1,
 			groupcaps={
 				cracky = {times={[3]=2}, uses=toughness, maxlevel=1},
 			},
-			damage_groups = {fleshy=eq},
+			damage_groups = {fleshy=base_damage},
 		}
 	})
 	
-	SPEAR_ENTITY=spears_set_entity(kind, eq, toughness)
+	local SPEAR_ENTITY=spears_set_entity(spear_type, base_damage, toughness)
 	
-	minetest.register_entity("spears:spear_" .. kind .. "_entity", SPEAR_ENTITY)
+	minetest.register_entity("spears:spear_" .. spear_type .. "_entity", SPEAR_ENTITY)
 	
 	minetest.register_craft({
-		output = 'spears:spear_' .. kind,
+		output = 'spears:spear_' .. spear_type,
 		recipe = {
 			{'group:wood', 'group:wood', material},
 		}
 	})
 	
 	minetest.register_craft({
-		output = 'spears:spear_' .. kind,
+		output = 'spears:spear_' .. spear_type,
 		recipe = {
 			{material, 'group:wood', 'group:wood'},
 		}