From 2c0ebde983aa8e485aeb678888d46139db00892e Mon Sep 17 00:00:00 2001
From: Echoes91 <echoes91@gmail.com>
Date: Wed, 6 Jan 2016 22:05:49 +0100
Subject: [PATCH] beta1

---
 defaults.lua                     |   2 ++
 functions.lua                    |   4 ++--
 textures/spears_spear_bronze.png | Bin 0 -> 247 bytes
 textures/spears_spear_copper.png | Bin 0 -> 256 bytes
 tools.lua                        |  11 ++++++++++-
 5 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 textures/spears_spear_bronze.png
 create mode 100644 textures/spears_spear_copper.png

diff --git a/defaults.lua b/defaults.lua
index fbee808..62bf9bd 100644
--- a/defaults.lua
+++ b/defaults.lua
@@ -1,4 +1,6 @@
 DISABLE_STONE_SPEAR = false
 DISABLE_STEEL_SPEAR = false
+DISABLE_COPPER_SPEAR = false
+DISABLE_BRONZE_SPEAR = false
 DISABLE_DIAMOND_SPEAR = false
 DISABLE_OBSIDIAN_SPEAR = false
diff --git a/functions.lua b/functions.lua
index 04f5d60..1640781 100644
--- a/functions.lua
+++ b/functions.lua
@@ -3,7 +3,7 @@ function spears_shot (itemstack, player)
 	local playerpos = player:getpos()
 	local obj = minetest.add_entity({x=playerpos.x,y=playerpos.y+1.5,z=playerpos.z}, spear)
 	local dir = player:get_look_dir()
-	local sp = 14
+	local sp = 16
 	local dr = .3
 	local gravity = 9.8
 	obj:setvelocity({x=dir.x*sp, y=dir.y*sp, z=dir.z*sp})
@@ -57,7 +57,7 @@ function spears_set_entity(kind, eq, toughness)
 					if obj:get_luaentity() ~= nil then
 						if obj:get_luaentity().name ~= "spears:spear_" .. kind .. "_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 + eq)^1.12-10
 							obj:punch(self.object, 1.0, {
 								full_punch_interval=1.0,
 								damage_groups={fleshy=damage},
diff --git a/textures/spears_spear_bronze.png b/textures/spears_spear_bronze.png
new file mode 100644
index 0000000000000000000000000000000000000000..3993e457ba172f7f7fa6846e9afc84b0acf10f4c
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<tP3o-U3d7QM+85qTf#XUYHnzl>@Bf1VVEWtG46jSXg07#9?7GMtdi
zak-key3O7Hz9EP|$G);JMcly1z`)?iQOm#f)qiA~7jhXNzRW*|=XJk*qRL4Ii49?*
zKm1oIN_2UcvaDtb;yI}4xkj<VSN)hkQ=Li*N1$Twd4WZbrKc;pNH?4on8b4+jpHQS
i0%@mdj0VmUK)^8VSxkO>Pi8OBkqn-$elF{r5}E)iD^8OD

literal 0
HcmV?d00001

diff --git a/textures/spears_spear_copper.png b/textures/spears_spear_copper.png
new file mode 100644
index 0000000000000000000000000000000000000000..56b1ff9f9acd0295f5a845c9876a3f45f85b0b55
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
za0`PlBg3pY5<tO4o-U3d7QM+e7MkDwUt7&Dd9Q%W;EL~!BPSe`5@wY@uwriB!ow`C
zF6|uLc)xxUZ^ik;$3MJyY0akRXV&&v{rtpL^BX5NHa05ipL_ZL=HurQJfSlr=hZz(
ziKzd>c`?p0Fk`LOhxsAS1|k!)IKo($NHhgcig5lg%dba~<*&yHfkjSI^A%l=o9j7y
wc>TV?qiFegfwa>m#usf9QW?$&umJ(XR;yTzWuZI10bR@B>FVdQ&MBb@0HLs1b^rhX

literal 0
HcmV?d00001

diff --git a/tools.lua b/tools.lua
index 044fe22..1f7959c 100644
--- a/tools.lua
+++ b/tools.lua
@@ -2,7 +2,8 @@ function spears_register_spear(kind, desc, eq, toughness, material)
 
 	minetest.register_tool("spears:spear_" .. kind, {
 		description = desc .. " spear",
-		inventory_image = "spears_spear_" .. kind .. ".png",
+                wield_image = "spears_spear_" .. kind .. ".png",
+		inventory_image = "spears_spear_" .. kind .. ".png^[transform4",
 		wield_scale= {x=2,y=1,z=1},
 		on_drop = function(itemstack, user, pointed_thing)
 			spears_shot(itemstack, user)
@@ -55,6 +56,14 @@ if not DISABLE_STEEL_SPEAR then
 	spears_register_spear('steel', 'Steel', 6, 30, 'default:steel_ingot')
 end
 
+if not DISABLE_COPPER_SPEAR then
+	spears_register_spear('copper', 'Copper', 5, 35, 'default:copper_ingot')
+end
+
+if not DISABLE_BRONZE_SPEAR then
+	spears_register_spear('bronze', 'Bronze', 6, 35, 'default:bronze_ingot')
+end
+
 if not DISABLE_OBSIDIAN_SPEAR then
 	spears_register_spear('obsidian', 'Obsidian', 8, 30, 'default:obsidian')
 end