Merge pull request #10 from sys4-fr/master

Multiple fixes and optipng textures

brewing_stand.lua

@@ -13,7 +13,7 @@ minetest.register_node("witchcraft:brewing_stand", {
 		"witchcraft_brewing_stand_side.png"
 	},
 	drawtype = "nodebox",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	drop = {
 		items = {
@@ -36,14 +36,14 @@ minetest.register_node("witchcraft:brewing_stand", {
 		}
 	},
 	on_rightclick = function(pos, node, clicker, item, _)
-		local wield_item = clicker:get_wielded_item():get_name()
+		local wield_item = item:get_name()
 		local new_item = wield_item.."_2"
 		if minetest.get_item_group(wield_item, "potion") ~= 0 then
 			minetest.set_node(pos, {name="witchcraft:brewing_stand_active", param2=node.param2})
 			item:take_item()
 			minetest.after(30, function()
-			minetest.set_node(pos, {name="witchcraft:brewing_stand_unready", param2=node.param2})
+				minetest.set_node(pos, {name="witchcraft:brewing_stand_unready", param2=node.param2})
-			minetest.add_item(pos, new_item)
+				minetest.add_item(pos, new_item)
 			end)
 		end
 	end,
@@ -59,7 +59,7 @@ minetest.register_node("witchcraft:brewing_stand_active", {
 		"witchcraft_brewing_stand_side.png"
 	},
 	drawtype = "nodebox",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	light_source = 1, 
 	drop = {
@@ -96,7 +96,7 @@ minetest.register_node("witchcraft:brewing_stand_unready", {
 	},
 	inventory_image = "witchcraft_brewing_stand_inv.png",
 	drawtype = "nodebox",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
 	light_source = 1, 
 	drop = {
@@ -120,7 +120,7 @@ minetest.register_node("witchcraft:brewing_stand_unready", {
 		}
 	},
 	on_rightclick = function(pos, node, clicker, item, _)
-		local wield_item = clicker:get_wielded_item():get_name()
+		local wield_item = item:get_name()
 		if wield_item == "default:mese_crystal_fragment" then
 			minetest.set_node(pos, {name="witchcraft:brewing_stand", param2=node.param2})
 			item:take_item()
@@ -161,4 +161,4 @@ minetest.register_craft({
 		{'group:stick', 'default:diamond', 'group:stick'},
 		{'', 'default:obsidian_shard', ''},
 	}
-})
+})

depends.txt

@@ -2,8 +2,12 @@ default
 vessels
 tnt
 fire
+playereffects
+player_monoids?
 farming?
 lightning?
 pmobs?
 hud_hunger?
-moreplants?
+hunger_ng?
+moreplants?
+horror?

license.txt

@@ -2,7 +2,7 @@
 License for Code
 ----------------
 
-Copyright (C) 2016 DOOmed <heiselong@gmx.com>
+Copyright (C) 2016 D00Med <heiselong@gmx.com>
 
 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
@@ -21,7 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 License for Textures, Models and Sounds
 ---------------------------------------
 
-CC-BY-SA 3.0 UNPORTED. Created by DOOmed
+CC-BY-SA 3.0 UNPORTED. Created by D00Med
 
 All potion bottles derived from
 vessels_glass_bottle.png (by Authors)

mod.conf

@@ -0,0 +1,3 @@
+name = witchcraft
+depends = default,vessels,tnt,fire,playereffects
+optional_depends = player_monoids,farming,lightning,pmobs,hud_hunger,hunger_ng,moreplants,horror

models/3quarters.obj

@@ -0,0 +1,19 @@
+mtllib 3 4ths.mtl
+o converted_out
+v 0.375 -0.25 -0.375
+v 0.375 -0.25 0.375
+v 0.375 0.1875 0.375
+v 0.375 0.1875 -0.375
+v -0.375 -0.25 -0.375
+v -0.375 -0.25 0.375
+v -0.375 0.1875 0.375
+v -0.375 0.1875 -0.375
+usemtl none
+s off
+g nodebox21
+f 1 2 3 4
+f 5 6 7 8
+f 1 4 8 5
+f 2 3 7 6
+f 1 2 6 5
+f 4 3 7 8

models/4th.obj

@@ -0,0 +1,19 @@
+mtllib 1 4th.mtl
+o converted_out
+v 0.375 -0.25 -0.375
+v 0.375 -0.25 0.375
+v 0.375 -0.0625 0.375
+v 0.375 -0.0625 -0.375
+v -0.375 -0.25 -0.375
+v -0.375 -0.25 0.375
+v -0.375 -0.0625 0.375
+v -0.375 -0.0625 -0.375
+usemtl none
+s off
+g nodebox21
+f 1 2 3 4
+f 5 6 7 8
+f 1 4 8 5
+f 2 3 7 6
+f 1 2 6 5
+f 4 3 7 8

models/full.obj

@@ -0,0 +1,19 @@
+mtllib full.mtl
+o converted_out
+v 0.375 -0.25 -0.375
+v 0.375 -0.25 0.375
+v 0.375 0.375 0.375
+v 0.375 0.375 -0.375
+v -0.375 -0.25 -0.375
+v -0.375 -0.25 0.375
+v -0.375 0.375 0.375
+v -0.375 0.375 -0.375
+usemtl none
+s off
+g nodebox21
+f 1 2 3 4
+f 5 6 7 8
+f 1 4 8 5
+f 2 3 7 6
+f 1 2 6 5
+f 4 3 7 8

models/half.obj

@@ -0,0 +1,19 @@
+mtllib half.mtl
+o converted_out
+v 0.375 -0.25 -0.375
+v 0.375 -0.25 0.375
+v 0.375 0.0625 0.375
+v 0.375 0.0625 -0.375
+v -0.375 -0.25 -0.375
+v -0.375 -0.25 0.375
+v -0.375 0.0625 0.375
+v -0.375 0.0625 -0.375
+usemtl none
+s off
+g nodebox21
+f 1 2 3 4
+f 5 6 7 8
+f 1 4 8 5
+f 2 3 7 6
+f 1 2 6 5
+f 4 3 7 8

readme.txt

@@ -62,4 +62,19 @@ Potion ingredients(may be slightly inaccurate):
 >gravel
 >bucket of water
 >bullrush
->bones
+>bones
+
+About the recipes:
+
+init.lua contains the pot recipes. For each pot there is a line similar to the one below, in the 'witchraft.pot' table.
+
+{"blue", "brown", "default:dirt", "blue2", "moreplants:bullrush", "red", "purple"},
+{"potion name", "result1", "ingredient1", "result2", "ingredient2", "combine potion", "combine result"}
+
+The first column of the table("blue"), is the color of the current potion pot. In the example, it is the blue pot, so the ingredients and results in the other columns
+will apply to the blue pot, ie: the blue pot must be rightclicked. It is important that the name of the pot is in the name of it's texture, eg: a blue pot has the texture "witchraft_pot_blue.png"
+
+The second and fourth columns are the two possible results after adding new ingredients. The last column is the result after combining the current potion with another.
+
+The third and fifth columns are the ingredients required. The ingredient req. to make the potion in column 2 must be in column 3, and the ingredient req. to make the potion in columns 4 must be in columns 5.
+The 6th column is the potion that can be combined with the current potion to make a new potion.

scrolls.lua

@@ -1,396 +1,412 @@
 --scrolls
 
-
 minetest.register_craftitem("witchcraft:scroll_day", {
-	description = "Scroll of day",
+		 description = "Scroll of day",
-	inventory_image = "witchcraft_scroll.png^witchcraft_sun_over.png",
+		 inventory_image = "witchcraft_scroll.png^witchcraft_sun_over.png",
-	stack_max = 1,
+		 stack_max = 1,
-	on_use = function(item)
+		 on_use = function(item)
-	minetest.set_timeofday(0.5)
+			 minetest.set_timeofday(0.5)
-	item:take_item()
+			 item:take_item()
-	return item
+			 return item
-	end,
+		 end,
 })
 
 minetest.register_craftitem("witchcraft:scroll_night", {
-	description = "Scroll of night",
+		description = "Scroll of night",
-	inventory_image = "witchcraft_scroll.png^witchcraft_moon_over.png",
+		inventory_image = "witchcraft_scroll.png^witchcraft_moon_over.png",
-	stack_max = 1,
+		stack_max = 1,
-	on_use = function(item)
+		on_use = function(item)
-	minetest.set_timeofday(0)
+			minetest.set_timeofday(0)
-	item:take_item()
+			item:take_item()
-	return item
+			return item
-	end,
+		end,
 })
 
 if minetest.get_modpath("pmobs")then
-minetest.register_craftitem("witchcraft:scroll_wild", {
+	minetest.register_craftitem("witchcraft:scroll_wild", {
-	description = "Scroll of Wild",
+		description = "Scroll of Wild",
-	inventory_image = "witchcraft_scroll.png^witchcraft_dark_over.png",
+		inventory_image = "witchcraft_scroll.png^witchcraft_dark_over.png",
-	stack_max = 1,
+		stack_max = 1,
-	on_use = function(item, placer)
+		on_use = function(item, placer)
-	local pos = placer:getpos();
+			local pos = placer:get_pos()
-	minetest.env:add_entity(pos, "pmobs:dog")
+			minetest.add_entity(pos, "pmobs:dog")
-	item:take_item()
+			item:take_item()
-	return item
+			return item
-	end,
+		end,
-})
+	})
 end
 
 minetest.register_craftitem("witchcraft:scroll_fireball", {
-	description = "Scroll of fireball",
+		description = "Scroll of fireball",
-	inventory_image = "witchcraft_scroll.png^witchcraft_fire_over.png",
+		inventory_image = "witchcraft_scroll.png^witchcraft_fire_over.png",
-	stack_max = 1,
+		stack_max = 1,
-	on_use = function(item, placer, pos)
+		on_use = function(item, placer, pointed_thing)
-	local dir = placer:get_look_dir();
+			local dir = placer:get_look_dir()
-	local playerpos = placer:getpos();
+			local playerpos = placer:get_pos()
-	local vec = {x=dir.x*7,y=dir.y*7,z=dir.z*7}
+			local entities = {}
-	local obj = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:fireball")
+			for i=1,4 do
-	obj:setvelocity(vec)
+				entities[i] = minetest.add_entity({
-	
+						x=playerpos.x+dir.x*1.5,
-		item:take_item()
+						y=playerpos.y+1.5+dir.y,
-		return item
+						z=playerpos.z+0+dir.z
-	end,
+					}, "witchcraft:fireball")
+			end
+			entities[2]:set_velocity({x=dir.x*7+0.5,y=dir.y*7,z=dir.z*7+0.5})
+			entities[3]:set_velocity({x=dir.x*7-0.5,y=dir.y*7,z=dir.z*7-0.5})
+			entities[4]:set_velocity({x=dir.x*7,y=dir.y*7-0.5,z=dir.z*7})
+			entities[1]:set_velocity({x=dir.x*7,y=dir.y*7+0.5,z=dir.z*7})
+			item:take_item()
+			return item
+		end,
 })
 
 if minetest.get_modpath("lightning") then
-minetest.register_craftitem("witchcraft:scroll_lightning", {
+	minetest.register_craftitem("witchcraft:scroll_lightning", {
-	description = "Scroll of lightning",
+			description = "Scroll of lightning",
-	inventory_image = "witchcraft_scroll.png^witchcraft_thunder_over.png",
+			inventory_image = "witchcraft_scroll.png^witchcraft_thunder_over.png",
-	stack_max = 1,
+			stack_max = 1,
-	on_use = function(item, placer, pos)
+			on_use = function(item, placer, pointed_thing)
-	local playerpos = placer:getpos();
+				local playerpos = placer:get_pos()
-	local dir = placer:get_look_dir();
+				local dir = placer:get_look_dir()
-	lightning.strike({x=playerpos.x+dir.x*2,y=playerpos.y+0+dir.y,z=playerpos.z+dir.z*2})
+				lightning.strike({x=playerpos.x+dir.x*2,y=playerpos.y+0+dir.y,z=playerpos.z+dir.z*2})
-		item:take_item()
+				item:take_item()
-		return item
+				return item
-	end,
+			end,
-})
+	})
 end
 
 minetest.register_craftitem("witchcraft:scroll_icicle", {
-	description = "Scroll of icicle",
+		description = "Scroll of icicle",
-	inventory_image = "witchcraft_scroll.png^witchcraft_ice_over.png",
+		inventory_image = "witchcraft_scroll.png^witchcraft_ice_over.png",
-	stack_max = 1,
+		stack_max = 1,
-	on_use = function(item, placer, pos)
+		on_use = function(item, placer, pointed_thing)
-	local dir = placer:get_look_dir();
+			local dir = placer:get_look_dir()
-	local playerpos = placer:getpos();
+			local playerpos = placer:get_pos()
-	local vec = {x=dir.x*7,y=dir.y*7,z=dir.z*7}
+			local vec = {x=dir.x*7,y=dir.y*7,z=dir.z*7}
-	local obj = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:ice")
+			local obj = minetest.add_entity({
-	local obj2 = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+1+dir.z}, "witchcraft:ice")
+					x=playerpos.x+dir.x*1.5,
-	local obj3 = minetest.env:add_entity({x=playerpos.x+1+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:ice")
+					y=playerpos.y+1.5+dir.y,
-	obj:setvelocity(vec)
+					z=playerpos.z+0+dir.z
-	obj2:setvelocity(vec)
+				}, "witchcraft:ice")
-	obj3:setvelocity(vec)
+			local obj2 = minetest.add_entity({
-	
+					x=playerpos.x+dir.x*1.5,
-		item:take_item()
+					y=playerpos.y+1.5+dir.y,
-		return item
+					z=playerpos.z+1+dir.z
-	end,
+				}, "witchcraft:ice")
+			local obj3 = minetest.add_entity({
+					x=playerpos.x+1+dir.x*1.5,
+					y=playerpos.y+1.5+dir.y,
+					z=playerpos.z+0+dir.z
+				}, "witchcraft:ice")
+			obj:set_velocity(vec)
+			obj2:set_velocity(vec)
+			obj3:set_velocity(vec)
+			item:take_item()
+			return item
+		end,
 })
 
-
 minetest.register_craftitem("witchcraft:scroll_nature", {
-	description = "Scroll of nature",
+		description = "Scroll of nature",
-	inventory_image = "witchcraft_scroll.png^witchcraft_leaf_over.png",
+		inventory_image = "witchcraft_scroll.png^witchcraft_leaf_over.png",
-	stack_max = 1,
+		stack_max = 1,
-	on_use = function(item, placer, pos)
+		on_use = function(item, placer, pointed_thing)
-	local dir = placer:get_look_dir();
+			local dir = placer:get_look_dir()
-	local playerpos = placer:getpos();
+			local playerpos = placer:get_pos()
-	local vec = {x=dir.x*6,y=dir.y*6,z=dir.z*6}
+			local vec = {x=dir.x*6,y=dir.y*6,z=dir.z*6}
-	local obj = minetest.env:add_entity({x=playerpos.x+dir.x*1.5,y=playerpos.y+1.5+dir.y,z=playerpos.z+0+dir.z}, "witchcraft:tree")
+			local obj = minetest.add_entity({
-	obj:setvelocity(vec)
+					x=playerpos.x+dir.x*1.5,
-	
+					y=playerpos.y+1.5+dir.y,
-		item:take_item()
+					z=playerpos.z+0+dir.z
-		return item
+				}, "witchcraft:tree")
-	end,
+			obj:set_velocity(vec)
+			item:take_item()
+			return item
+		end,
 })
 
 minetest.register_craftitem("witchcraft:scroll", {
-	description = "Blank Scroll",
+		description = "Blank Scroll",
-	inventory_image = "witchcraft_scroll.png",
+		inventory_image = "witchcraft_scroll.png",
 })
 
 minetest.register_craftitem("witchcraft:scroll_recipe", {
-	description = "Recipe Scroll",
+		description = "Recipe Scroll",
-	inventory_image = "witchcraft_scroll.png^witchcraft_writing_over.png",
+		inventory_image = "witchcraft_scroll.png^witchcraft_writing_over.png",
-	on_use = function(itemstack, user, pointed_thing)
+		on_use = function(itemstack, user, pointed_thing)									 
-    
+			local formspec = "size[10,9]"..
-	local formspec = "size[10,9]"..
+				"background[-0.6,-0.5;11.5,10.4;witchcraft_recipes.png]"											 
-		"background[-0.6,-0.5;11.5,10.4;witchcraft_recipes.png]";
+			minetest.show_formspec(user:get_player_name(), "witchcraft:scroll", formspec)	
-	
+		end,
-    minetest.show_formspec(user:get_player_name(), "witchcraft:scroll", formspec);	
-	
-	end,
 })
 
 if minetest.get_modpath("pmobs")then
-minetest.register_craft({
+	minetest.register_craft({
-	output = 'witchcraft:scroll_wild',
+			output = 'witchcraft:scroll_wild',
-	recipe = {
+			recipe = {
-		{'mobs:meat_raw'},
+				{'mobs:meat_raw'},
-		{'witchcraft:scroll'},
+				{'witchcraft:scroll'},
-	}
+			}
-})
+	})
-
 end
 
 minetest.register_craft({
-	output = 'witchcraft:scroll',
+		output = 'witchcraft:scroll',
-	recipe = {
+		recipe = {
-		{'default:paper', 'default:diamond', 'default:paper'},
+			{'default:paper', 'default:paper', ''},
-		{'default:paper', 'default:paper', 'default:paper'},
+			{'default:paper', 'default:paper', ''},
-	}
+		}
 })
 
 minetest.register_craft({
-	output = 'witchcraft:scroll_recipe',
+		output = 'witchcraft:scroll_recipe',
-	recipe = {
+		recipe = {
-		{'dye:black'},
+			{'dye:black'},
-		{'witchcraft:scroll'},
+			{'witchcraft:scroll'},
-	}
+		}
 })
 
 minetest.register_craft({
-	output = 'witchcraft:scroll_icicle',
+		output = 'witchcraft:scroll_icicle',
-	recipe = {
+		recipe = {
-		{'default:ice'},
+			{'default:ice'},
-		{'witchcraft:scroll'},
+			{'default:diamond'},
-	}
+			{'witchcraft:scroll'},
+		}
 })
 
 minetest.register_craft({
-	output = 'witchcraft:scroll_fireball',
+		output = 'witchcraft:scroll_fireball',
-	recipe = {
+		recipe = {
-		{'default:obsidian_shard'},
+			{'default:obsidian_shard'},
-		{'witchcraft:scroll'},
+			{'default:diamond'},
-	}
+			{'witchcraft:scroll'},
+		}
 })
 
 minetest.register_craft({
-	output = 'witchcraft:scroll_nature',
+		output = 'witchcraft:scroll_nature',
-	recipe = {
+		recipe = {
-		{'default:leaves'},
+			{'default:leaves'},
-		{'witchcraft:scroll'},
+			{'default:diamond'},
-	}
+			{'witchcraft:scroll'},
+		}
 })
 
 minetest.register_craft({
-	output = 'witchcraft:scroll_day',
+		output = 'witchcraft:scroll_day',
-	recipe = {
+		recipe = {
-		{'default:torch'},
+			{'default:torch'},
-		{'witchcraft:scroll'},
+			{'default:diamond'},
-	}
+			{'witchcraft:scroll'},
+		}
 })
 
 minetest.register_craft({
-	output = 'witchcraft:scroll_night',
+		output = 'witchcraft:scroll_night',
-	recipe = {
+		recipe = {
-		{'default:coal_lump'},
+			{'default:coal_lump'},
-		{'witchcraft:scroll'},
+			{'default:diamond'},
-	}
+			{'witchcraft:scroll'},
+		}
 })
 
-
 minetest.register_craft({
-	output = 'witchcraft:scroll_lightning',
+		output = 'witchcraft:scroll_lightning',
-	recipe = {
+		recipe = {
-		{'default:steel_ingot'},
+			{'default:steel_ingot'},
-		{'witchcraft:scroll'},
+			{'default:diamond'},
-	}
+			{'witchcraft:scroll'},
+		}
 })
 
-
 --scroll powers
 
 minetest.register_entity("witchcraft:fireball", {
-	textures = {"tnt_boom.png"},
+		textures = {"tnt_boom.png"},
-	velocity = 0.1,
+		velocity = 0.1,
-	damage = 2,
+		damage = 2,
-	collisionbox = {0, 0, 0, 0, 0, 0},
+		collisionbox = {0, 0, 0, 0, 0, 0},
-	on_step = function(self, obj, pos)		
+		on_step = function(self, obj, pos)		
-		local remove = minetest.after(2, function() 
+			local remove = minetest.after(2, function() 
-		self.object:remove()
-		end)
-		local pos = self.object:getpos()
-		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
-			for k, obj in pairs(objs) do
-				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "witchcraft:fireball" and obj:get_luaentity().name ~= "__builtin:item" then
-						obj:punch(self.object, 1.0, {
-							full_punch_interval=1.0,
-							damage_groups={fleshy=3},
-						}, nil)
 					self.object:remove()
+			end)
+			local pos = self.object:get_pos()
+			local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
+			for k, obj in pairs(objs) do
+				if obj:get_luaentity() then
+					if obj:get_luaentity().name ~= "witchcraft:fireball"
+						and obj:get_luaentity().name ~= "__builtin:item"
+					and obj:get_luaentity().name ~= "gauges:hp_bar" then
+						obj:punch(self.object, 1.0, {
+								full_punch_interval=1.0,
+								damage_groups={fleshy=3},
+							}, nil)
+						self.object:remove()
+						return
 					end
 				end
 			end
 			for dx=0,1 do
-						for dy=0,1 do
+				for dy=0,1 do
-							for dz=0,1 do
+					for dz=0,1 do
-								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
+						local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
-								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+						local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-								local n = minetest.env:get_node(p).name
+						local n = minetest.get_node(p).name
-								if n ~= "witchcraft:fireball" and n ~="default:dirt_with_grass" and n ~="default:dirt_with_dry_grass" and n ~="default:stone"  then	
+						if n ~= "witchcraft:fireball" and n ~="default:dirt_with_grass" then	
-									if minetest.registered_nodes[n].groups.flammable --[[or math.random(1, 100) <= 1]] then
+							if minetest.registered_nodes[n].groups.flammable then
-										minetest.env:set_node(t, {name="fire:basic_flame"})
+								minetest.set_node(t, {name="fire:basic_flame"})
-									self.object:remove()
+								self.object:remove()
-									return
+								return
-									end
-								end
 							end
 						end
 					end
-			hit_node = function(self, pos, node)
---	local pos = self.object:getpos()
-		for dx=-4,4 do
-			for dy=-4,4 do
-				for dz=-4,4 do
-					local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-					local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-					local n = minetest.env:get_node(pos).name
-					if math.random(1, 50) <= 35 then
-						minetest.env:remove_node(p)
-					end
-					if minetest.registered_nodes[n].groups.flammable or math.random(1, 100) <=5 then
-										minetest.env:set_node(t, {name="fire:basic_flame"})
-					end
 				end
 			end
-		end
-		end
 
-		local apos = self.object:getpos()
+			local vec = self.object:get_velocity()
-		local part = minetest.add_particlespawner(
+			minetest.add_particlespawner({
-			6, --amount
+				amount = 6,
-			0.3, --time
+				time = 0.3,
-			{x=apos.x-0.3, y=apos.y-0.3, z=apos.z-0.3}, --minpos
+				minpos = {x=pos.x-0.3, y=pos.y-0.3, z=pos.z-0.3},
-			{x=apos.x+0.3, y=apos.y+0.3, z=apos.z+0.3}, --maxpos
+				maxpos = {x=pos.x+0.3, y=pos.y+0.3, z=pos.z+0.3},
-			{x=-0, y=-0, z=-0}, --minvel
+				minvel = {x=-0, y=-0, z=-0},
-			{x=0, y=0, z=0}, --maxvel
+				maxvel = {x=0, y=0, z=0},
-			{x=0,y=-0.5,z=0}, --minacc
+				minacc = {x=0,y=-0.5,z=0},
-			{x=0.5,y=0.5,z=0.5}, --maxacc
+				maxacc = {x=-vec.x,y=-vec.y,z=-vec.z},
-			0.1, --minexptime
+				minexptime = 0.1,
-			0.3, --maxexptime
+				maxexptime = 0.3,
-			1, --minsize
+				minsize = 1,
-			2, --maxsize
+				maxsize = 2,
-			false, --collisiondetection
+				collisiondetection = false,
-			"witchcraft_flame.png" --texture
+				texture = "witchcraft_flame.png"
-		)
+			})
-		
+		end,
-	end,
 })
 
-
-
 minetest.register_entity("witchcraft:tree", {
-	textures = {"witchcraft_skin.png"},
+		textures = {"witchcraft_skin.png"},
-	velocity = 1,
+		velocity = 1,
-	damage = 2,
+		damage = 2,
-	collisionbox = {0, 0, 0, 0, 0, 0},
+		collisionbox = {0, 0, 0, 0, 0, 0},
-	on_step = function(self, obj, pos)		
+		on_step = function(self, obj, pos)		
-		local remove = minetest.after(2, function() 
+			local remove = minetest.after(2, function() 
-		self.object:remove()
-		end)
-		local pos = self.object:getpos()
-		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
-			for k, obj in pairs(objs) do
-				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "witchcraft:tree" and obj:get_luaentity().name ~= "__builtin:item" then
-						obj:remove()
-						local treepos = self.object:getpos()
-						default.grow_new_jungle_tree(treepos)
 					self.object:remove()
+			end)
+			local pos = self.object:get_pos()
+			local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
+			for k, obj in pairs(objs) do
+				if obj:get_luaentity() then
+					if obj:get_luaentity().name ~= "witchcraft:tree"
+						and obj:get_luaentity().name ~= "__builtin:item"
+					and obj:get_luaentity().name ~= "gauges:hp_bar" then
+						obj:remove()
+						default.grow_new_jungle_tree(pos)
+						self.object:remove()
+						return
 					end
 				end
 			end
-			for dx=0,1 do
+			
-						for dy=0,1 do
+			local n = minetest.get_node(pos).name
-							for dz=0,1 do
+			if n ~= "witchcraft:tree" and n ~="air" then	
-								local p = {x=pos.x+dx, y=pos.y, z=pos.z+dz}
+				default.grow_new_jungle_tree(pos)
-								local t = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+				self.object:remove()
-								local n = minetest.env:get_node(p).name
+			end
-								if n ~= "witchcraft:tree" and n ~="air" then	
-						local treepos = self.object:getpos()
-						default.grow_new_jungle_tree(treepos)
-						self.object:remove()
-								elseif n == "default:wood" or n =="default:tree" or n =="default:dirt_with_grass" or n =="default:dirt_with_dry_grass" then
-									self.hit_node(self, pos, node)
-									self.object:remove()
-									return
-								end
-							end
-						end
-					end
-			hit_node = function(self, pos, node)
-						local treepos = self.object:getpos()
-						default.grow_new_jungle_tree(treepos)
-		end
 
-		local apos = self.object:getpos()
+			minetest.add_particlespawner({
-		local part = minetest.add_particlespawner(
+				amount = 6,
-			6, --amount
+				time = 0.3,
-			0.3, --time
+				minpos = {x=pos.x-0.3, y=pos.y-0.3, z=pos.z-0.3},
-			{x=apos.x-0.3, y=apos.y-0.3, z=apos.z-0.3}, --minpos
+				maxpos = {x=pos.x+0.3, y=pos.y+0.3, z=pos.z+0.3},
-			{x=apos.x+0.3, y=apos.y+0.3, z=apos.z+0.3}, --maxpos
+				minvel = {x=-0, y=-0, z=-0},
-			{x=-0, y=-0, z=-0}, --minvel
+				maxvel = {x=0, y=0, z=0},
-			{x=0, y=0, z=0}, --maxvel
+				minacc = {x=0,y=-0.5,z=0},
-			{x=0,y=-0.5,z=0}, --minacc
+				maxacc = {x=0.5,y=0.5,z=0.5},
-			{x=0.5,y=0.5,z=0.5}, --maxacc
+				minexptime = 0.1,
-			0.1, --minexptime
+				maxexptime = 0.3,
-			0.3, --maxexptime
+				minsize = 1,
-			1, --minsize
+				maxsize = 2,
-			2, --maxsize
+				collisiondetection = false,
-			false, --collisiondetection
+				texture = "witchcraft_leaf_over.png"
-			"witchcraft_leaf_over.png" --texture
+			})
-		)
+		end,
-		
-	end,
 })
 
 minetest.register_entity("witchcraft:ice", {
-	visual="sprite",
+		visual="sprite",
-	visual_size={x=1,y=1},
+		visual_size={x=1,y=1},
-	physical=false,
+		physical=false,
-	textures={"witchcraft_ice.png"},
+		textures={"witchcraft_ice.png"},
-	velocity = 1,
+		velocity = 1,
-    rotate = 90,
+		rotate = 90,
-	auto_rotate = true,
+		auto_rotate = true,
-	damage = 2,
+		damage = 2,
-	collisionbox = {0, 0, 0, 0, 0, 0},
+		collisionbox = {0, 0, 0, 0, 0, 0},
-	on_step = function(self, obj, pos)		
+		on_step = function(self, obj, pos)		
-		local remove = minetest.after(2, function() 
+			local remove = minetest.after(10, function() 
-		self.object:remove()
+					self.object:remove()
-		end)
+			end)
-		local pos = self.object:getpos()
+			local pos = self.object:get_pos()
-		local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
+			local objs = minetest.get_objects_inside_radius({x=pos.x,y=pos.y,z=pos.z}, 2)	
 			for k, obj in pairs(objs) do
 				if obj:get_luaentity() ~= nil then
-					if obj:get_luaentity().name ~= "witchcraft:ice" and obj:get_luaentity().name ~= "__builtin:item" then
+					if obj:get_luaentity().name ~= "witchcraft:ice"
-					obj:punch(self.object, 1.0, {
+						and obj:get_luaentity().name ~= "__builtin:item"
-							full_punch_interval=1.0,
+					and obj:get_luaentity().name ~= "gauges:hp_bar" then
-							damage_groups={fleshy=1},
+						obj:punch(self.object, 1.0, {
-						}, nil)
+								full_punch_interval=1.0,
-					self.object:remove()
+								damage_groups={fleshy=1},
-				end
+							}, nil)
+						self.object:remove()
+						return
+					end
 				end
+			end
+			
+			local velo = self.object:get_velocity()
+			local hit = {
+				{ p = {x=pos.x+1, y=pos.y, z=pos.z},
+				  v = {x=math.abs(velo.x)*-1, y=velo.y, z=velo.z}}, -- x
+				{ p = {x=pos.x-1, y=pos.y, z=pos.z},
+				  v = {x=math.abs(velo.x), y=velo.y, z=velo.z}},
+				{ p = {x=pos.x, y=pos.y+1, z=pos.z},
+				  v = {x=velo.x, y=math.abs(velo.y)*-1, z=velo.z}}, -- y
+				{ p = {x=pos.x, y=pos.y-1, z=pos.z},
+				  v = {x=velo.x, y=math.abs(velo.y), z=velo.z}},
+				{ p = {x=pos.x, y=pos.y, z=pos.z+1},
+				  v = {x=velo.x, y=velo.y, z=math.abs(velo.z)*-1}}, -- z
+				{ p = {x=pos.x, y=pos.y, z=pos.z-1},
+				  v = {x=velo.x, y=velo.y, z=math.abs(velo.z)}}
+			}
 
-		local apos = self.object:getpos()
+			for _,h in pairs(hit) do
-		local part = minetest.add_particlespawner(
+				local n = minetest.get_node(h.p).name
-			10, --amount
+				if n ~= "air" and n~= "witchcraft:ice" then
-			0.3, --time
+					if n == "default:water_source" or n =="default:river_water_source" then
-			{x=apos.x-0.3, y=apos.y-0.3, z=apos.z-0.3}, --minpos
+						minetest.set_node(h.p, {name="default:ice"})
-			{x=apos.x+0.3, y=apos.y+0.3, z=apos.z+0.3}, --maxpos
+						h.v.y = 0
-			{x=-0, y=-0, z=-0}, --minvel
+					end
-			{x=0, y=0, z=0}, --maxvel
+					self.object:set_velocity(h.v)
-			{x=0,y=-0.5,z=0}, --minacc
+					break
-			{x=0.5,y=0.5,z=0.5}, --maxacc
+				end
-			0.1, --minexptime
+			end
-			0.3, --maxexptime
+
-			0.2, --minsize
+			minetest.add_particlespawner({
-			0.5, --maxsize
+				amount = 10,
-			false, --collisiondetection
+				time = 0.3,
-			"witchcraft_light_over.png" --texture
+				minpos = {x=pos.x-0.3, y=pos.y-0.3, z=pos.z-0.3},
-		)
+				maxpos = {x=pos.x+0.3, y=pos.y+0.3, z=pos.z+0.3},
-	end
+				minvel = {x=-0, y=-0, z=-0},
-	end
+				maxvel = {x=0, y=0, z=0},
-})
+				minacc = {x=0,y=-0.5,z=0},
+				maxacc = {x=0.5,y=0.5,z=0.5},
+				minexptime = 0.1,
+				maxexptime = 0.3,
+				minsize = 0.2,
+				maxsize = 0.5,
+				collisiondetection = false,
+				texture = "witchcraft_light_over.png"
+			})
+		end
+})