diff --git a/nssm_materials.lua b/nssm_materials.lua index 3366c7e..e5d4f42 100644 --- a/nssm_materials.lua +++ b/nssm_materials.lua @@ -126,6 +126,8 @@ nssm_register_eatcraftitems ('spider_meat','Spider Meat',-1) nssm_register_eatcraftitems ('roasted_spider_meat','Roasted Spider Meat',3) nssm_register_eatcraftitems ('silk_gland','Silk Gland',-1) nssm_register_eatcraftitems ('roasted_silk_gland','Roasted Silk Gland',3) +nssm_register_eatcraftitems ('super_silk_gland','Super Silk Gland',-8) +nssm_register_eatcraftitems ('roasted_super_silk_gland','Roasted Super Silk Gland',2) --ore generation @@ -302,7 +304,7 @@ minetest.register_node("nssm:thick_web", { diggable = true, buildable_to = false, drop = "", - drowning = 0, + drowning = 2, liquid_renewable = false, liquidtype = "source", liquid_range= 0, diff --git a/nssm_weapons.lua b/nssm_weapons.lua index e8a46dd..b29854d 100644 --- a/nssm_weapons.lua +++ b/nssm_weapons.lua @@ -639,6 +639,7 @@ function nssm_register_throwitem(name, descr, def) local velocity = 15 local dir = placer:get_look_dir(); local playerpos = placer:getpos(); + posthrow = playerpos local obj = minetest.env:add_entity({x=playerpos.x+0+dir.x,y=playerpos.y+2+dir.y,z=playerpos.z+0+dir.z}, "nssm:"..name.."_bomb_flying") local vec = {x=dir.x*velocity,y=dir.y*velocity,z=dir.z*velocity} local acc = {x=0, y=-9.8, z=0} @@ -863,6 +864,31 @@ minetest.register_craft({ } }) +nssm_register_throwitem("food", "Food Bomb", { + hit_node = function(self,pos) + for dx = -1,1 do + for dy = -1,1 do + for dz = -1,1 do + local pos1 = {x = pos.x+dx, y=pos.y+dy, z=pos.z+dz} + if not minetest.is_protected(pos1, "") or not minetest.get_item_group(minetest.get_node(pos1).name, "unbreakable") == 1 then + minetest.set_node(pos1, {name="air"}) + minetest.add_item(pos1, "nssm:roasted_duck_legs") + end + end + end + end + end, +}) + +minetest.register_craft({ + output = 'nssm:food_bomb 3', + recipe = { + {'nssm:gluttonous_soul_fragment', 'nssm:black_powder', 'nssm:gluttonous_soul_fragment'}, + {'nssm:black_powder', 'nssm:gluttonous_soul_fragment', 'nssm:black_powder'}, + {'nssm:gluttonous_soul_fragment', 'nssm:black_powder', 'nssm:gluttonous_soul_fragment'}, + } +}) + nssm_register_throwitem("phoenix_fire", "Phoenix Fire Bomb", { hit_node = function(self,pos) for dx = -2,2 do @@ -905,6 +931,31 @@ minetest.register_craft({ } }) +nssm_register_throwitem("teleport", "Teleport Bomb", { + hit_node = function(self,pos,placer) + local pos1 = {x = pos.x, y=pos.y+1, z=pos.z} + local pos2 = {x = pos.x, y=pos.y+2, z=pos.z} + if not minetest.is_protected(pos1, "") or not minetest.get_item_group(minetest.get_node(pos1).name, "unbreakable") == 1 then + for _,obj in ipairs(minetest.get_objects_inside_radius(posthrow, 2)) do + if obj:is_player() then + obj:setpos(pos1) + minetest.set_node(pos1, {name="air"}) + minetest.set_node(pos2, {name="air"}) + end + end + end + end, +}) + +minetest.register_craft({ + output = 'nssm:teleport_bomb 2', + recipe = { + {'nssm:slothful_soul_fragment', 'nssm:black_powder', 'nssm:slothful_soul_fragment'}, + {'nssm:black_powder', 'nssm:slothful_soul_fragment', 'nssm:black_powder'}, + {'nssm:slothful_soul_fragment', 'nssm:black_powder', 'nssm:slothful_soul_fragment'}, + } +}) + nssm_register_throwitem("boom", "Boom Bomb", { hit_node = function(self,pos) local pos1 = {x = pos.x, y=pos.y, z=pos.z} @@ -923,6 +974,57 @@ minetest.register_craft({ } }) +nssm_register_throwitem("smoke", "Smoke Bomb", { + hit_node = function(self,pos) + local pos1 = {x = pos.x, y=pos.y, z=pos.z} + minetest.add_particlespawner({ + amount = 6000, + time = 20, + minpos = {x=pos1.x-3, y=pos1.y+0.5, z=pos1.z-3}, + maxpos = {x=pos1.x+3, y=pos1.y+0.5, z=pos1.z+3}, + minvel = {x=0.2, y=0.2, z=0.2}, + maxvel = {x=0.4, y=0.8, z=0.4}, + minacc = {x=-0.2,y=0,z=-0.2}, + maxacc = {x=0.2,y=0.1,z=0.2}, + minexptime = 6, + maxexptime = 8, + minsize = 10, + maxsize = 12, + collisiondetection = false, + vertical = false, + texture = "tnt_smoke.png",}) + end, +}) + +minetest.register_craft({ + output = 'nssm:smoke_bomb 2', + recipe = { + {'nssm:proud_soul_fragment', 'nssm:black_powder', 'nssm:proud_soul_fragment'}, + {'nssm:black_powder', 'nssm:proud_soul_fragment', 'nssm:black_powder'}, + {'nssm:proud_soul_fragment', 'nssm:black_powder', 'nssm:proud_soul_fragment'}, + } +}) + +nssm_register_throwitem("thick_web", "Thick Web Bomb", { + hit_node = function(self,pos) + local pos1 = {x = pos.x, y=pos.y+1, z=pos.z} + local pos2 = {x = pos.x, y=pos.y+2, z=pos.z} + if not minetest.is_protected(pos1, "") or not minetest.get_item_group(minetest.get_node(pos1).name, "unbreakable") == 1 then + minetest.set_node(pos1, {name="nssm:thick_web"}) + minetest.set_node(pos2, {name="nssm:thick_web"}) + end + end, +}) + +minetest.register_craft({ + output = 'nssm:thick_web_bomb 12', + recipe = { + {'nssm:super_silk_gland', 'nssm:black_powder', 'nssm:super_silk_gland'}, + {'nssm:black_powder', 'nssm:black_powder', 'nssm:black_powder'}, + {'nssm:super_silk_gland', 'nssm:black_powder', 'nssm:super_silk_gland'}, + } +}) + nssm_register_throwitem("poison", "Poison Bomb", { hit_node = function(self,pos) for dx = -1,1 do @@ -947,6 +1049,30 @@ minetest.register_craft({ } }) +nssm_register_throwitem("stone", "Cobblestone Bomb", { + hit_node = function(self,pos) + for dx = -1,1 do + for dy = 1,3 do + for dz = -1,1 do + local pos1 = {x = pos.x+dx, y=pos.y+dy, z=pos.z+dz} + if not minetest.is_protected(pos1, "") or not minetest.get_item_group(minetest.get_node(pos1).name, "unbreakable") == 1 then + minetest.set_node(pos1, {name="default:cobble"}) + end + end + end + end + end, +}) + +minetest.register_craft({ + output = 'nssm:stone_bomb 2', + recipe = { + {'default:stone', 'nssm:black_powder', 'default:stone'}, + {'nssm:black_powder', 'nssm:black_powder', 'nssm:black_powder'}, + {'default:stone', 'nssm:black_powder', 'default:stone'}, + } +}) + nssm_register_throwitem("fire_ring", "Fire Ring Bomb", { hit_node = function(self,pos) for dx = -2,2 do diff --git a/textures/food_bomb.png b/textures/food_bomb.png new file mode 100644 index 0000000..7594041 Binary files /dev/null and b/textures/food_bomb.png differ diff --git a/textures/roasted_super_silk_gland.png b/textures/roasted_super_silk_gland.png new file mode 100644 index 0000000..cb0d80c Binary files /dev/null and b/textures/roasted_super_silk_gland.png differ diff --git a/textures/smoke_bomb.png b/textures/smoke_bomb.png new file mode 100644 index 0000000..517e476 Binary files /dev/null and b/textures/smoke_bomb.png differ diff --git a/textures/stone_bomb.png b/textures/stone_bomb.png new file mode 100644 index 0000000..8740a5a Binary files /dev/null and b/textures/stone_bomb.png differ diff --git a/textures/super_silk_gland.png b/textures/super_silk_gland.png new file mode 100644 index 0000000..e3610f1 Binary files /dev/null and b/textures/super_silk_gland.png differ diff --git a/textures/teleport_bomb.png b/textures/teleport_bomb.png new file mode 100644 index 0000000..1708167 Binary files /dev/null and b/textures/teleport_bomb.png differ diff --git a/textures/thick_web_bomb.png b/textures/thick_web_bomb.png new file mode 100644 index 0000000..f536ece Binary files /dev/null and b/textures/thick_web_bomb.png differ