diff --git a/mods/classes/init.lua b/mods/classes/init.lua index d724d10..e6f4a8f 100644 --- a/mods/classes/init.lua +++ b/mods/classes/init.lua @@ -16,11 +16,10 @@ classes.register_weapon = function(name,fromLevel,levels, def) on_use = function(itemstack, user, pointed_thing) if user == nil then return end if minetest.registered_tools[itemstack:get_name()].class then print(minetest.registered_tools[itemstack:get_name()].class) end - if classes.selected[user:get_player_name()] == minetest.registered_tools[itemstack:get_name()].class then - print("use") + if classes.selected[user:get_player_name()] == minetest.registered_tools[itemstack:get_name()].class then if pointed_thing.type == "object" then pointed_thing.ref:punch(user, 10,minetest.registered_tools[itemstack:get_name()].tool_capabilities) - print("hit!!") + print("[info]" .. user:get_player_name() .. " is fighting!") return nil end else diff --git a/mods/classes/init.lua~ b/mods/classes/init.lua~ index d724d10..6d486fd 100644 --- a/mods/classes/init.lua~ +++ b/mods/classes/init.lua~ @@ -16,11 +16,10 @@ classes.register_weapon = function(name,fromLevel,levels, def) on_use = function(itemstack, user, pointed_thing) if user == nil then return end if minetest.registered_tools[itemstack:get_name()].class then print(minetest.registered_tools[itemstack:get_name()].class) end - if classes.selected[user:get_player_name()] == minetest.registered_tools[itemstack:get_name()].class then - print("use") + if classes.selected[user:get_player_name()] == minetest.registered_tools[itemstack:get_name()].class then if pointed_thing.type == "object" then pointed_thing.ref:punch(user, 10,minetest.registered_tools[itemstack:get_name()].tool_capabilities) - print("hit!!") + print("") return nil end else diff --git a/mods/decoration/LICENSE.txt b/mods/decoration/LICENSE.txt new file mode 100644 index 0000000..cca02cd --- /dev/null +++ b/mods/decoration/LICENSE.txt @@ -0,0 +1,16 @@ +License for Code +---------------- + +Copyright (C) 2015 cd2 (cdqwertz) + +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. + +http://www.gnu.org/licenses/lgpl-2.1.html + +License for Media +----------------- + +CC-BY-SA 3.0 UNPORTED. Created by cd2 (cdqwertz) diff --git a/mods/decoration/init.lua b/mods/decoration/init.lua index e69de29..cb76255 100644 --- a/mods/decoration/init.lua +++ b/mods/decoration/init.lua @@ -0,0 +1,26 @@ +minetest.register_node("decoration:stalagmite", { + description = "Stalagmite", + tiles = {"decoration_stalagmite.png"}, + drawtype = "plantlike", + paramtype = "light", + inventory_image = "decoration_stalagmite.png", + buildable_to = true, + walkable = false, + groups = {crumbly = 3}, + drop = "default:stone_item", +}) + +minetest.register_node("decoration:pick", { + description = "Decorative Pick", + tiles = {"decoration_pick.png"}, + drawtype = "signlike", + paramtype = "light", + paramtype2 = "wallmounted", + selection_box = { + type = "wallmounted", + }, + inventory_image = "decoration_pick.png", + wield_image = "decoration_pick.png", + walkable = false, + groups = {crumbly = 3}, +}) diff --git a/mods/decoration/init.lua~ b/mods/decoration/init.lua~ index e69de29..cb76255 100644 --- a/mods/decoration/init.lua~ +++ b/mods/decoration/init.lua~ @@ -0,0 +1,26 @@ +minetest.register_node("decoration:stalagmite", { + description = "Stalagmite", + tiles = {"decoration_stalagmite.png"}, + drawtype = "plantlike", + paramtype = "light", + inventory_image = "decoration_stalagmite.png", + buildable_to = true, + walkable = false, + groups = {crumbly = 3}, + drop = "default:stone_item", +}) + +minetest.register_node("decoration:pick", { + description = "Decorative Pick", + tiles = {"decoration_pick.png"}, + drawtype = "signlike", + paramtype = "light", + paramtype2 = "wallmounted", + selection_box = { + type = "wallmounted", + }, + inventory_image = "decoration_pick.png", + wield_image = "decoration_pick.png", + walkable = false, + groups = {crumbly = 3}, +}) diff --git a/mods/decoration/textures/decoration_pick.png b/mods/decoration/textures/decoration_pick.png new file mode 100644 index 0000000..7206194 Binary files /dev/null and b/mods/decoration/textures/decoration_pick.png differ diff --git a/mods/decoration/textures/decoration_stalagmite.png b/mods/decoration/textures/decoration_stalagmite.png new file mode 100644 index 0000000..276e6db Binary files /dev/null and b/mods/decoration/textures/decoration_stalagmite.png differ diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index fecf657..aa1205d 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -286,7 +286,7 @@ minetest.register_node("default:plant_grass", { tiles = {"default_plant_grass.png"}, drawtype = "plantlike", paramtype = "light", - invetory_image = "default_plant_grass.png", + inventory_image = "default_plant_grass.png", buildable_to = true, walkable = false, groups = {crumbly = 3, plant = 1}, @@ -297,7 +297,7 @@ minetest.register_node("default:flower_1", { tiles = {"default_flower_1.png"}, drawtype = "plantlike", paramtype = "light", - invetory_image = "default_flower_1.png", + inventory_image = "default_flower_1.png", buildable_to = true, walkable = false, groups = {crumbly = 3, plant = 1}, @@ -308,7 +308,7 @@ minetest.register_node("default:flower_2", { tiles = {"default_flower_2.png"}, drawtype = "plantlike", paramtype = "light", - invetory_image = "default_flower_2.png", + inventory_image = "default_flower_2.png", light_source = 10, buildable_to = true, walkable = false, diff --git a/mods/default/nodes.lua~ b/mods/default/nodes.lua~ index fac39a9..aa1205d 100644 --- a/mods/default/nodes.lua~ +++ b/mods/default/nodes.lua~ @@ -286,7 +286,7 @@ minetest.register_node("default:plant_grass", { tiles = {"default_plant_grass.png"}, drawtype = "plantlike", paramtype = "light", - invetory_image = "default_plant_grass.png", + inventory_image = "default_plant_grass.png", buildable_to = true, walkable = false, groups = {crumbly = 3, plant = 1}, @@ -297,7 +297,7 @@ minetest.register_node("default:flower_1", { tiles = {"default_flower_1.png"}, drawtype = "plantlike", paramtype = "light", - invetory_image = "default_flower_1.png", + inventory_image = "default_flower_1.png", buildable_to = true, walkable = false, groups = {crumbly = 3, plant = 1}, @@ -308,7 +308,7 @@ minetest.register_node("default:flower_2", { tiles = {"default_flower_2.png"}, drawtype = "plantlike", paramtype = "light", - invetory_image = "default_flower_2.png", + inventory_image = "default_flower_2.png", light_source = 10, buildable_to = true, walkable = false, @@ -338,7 +338,7 @@ minetest.register_node("default:frame_with_stonebrick", { }) minetest.register_node("default:frame_with_log", { - description = "Frame with Stonebrick", + description = "Frame with Log", tiles = {"default_log.png^default_frame.png"}, groups = {choppy = 3}, }) @@ -359,14 +359,8 @@ minetest.register_node("default:glass_with_wood", { groups = {crumbly = 3}, }) -minetest.register_node("default:glass_with_wood", { - description = "Glass with Wood", - tiles = {"default_wood.png^default_glass.png"}, - groups = {crumbly = 3}, -}) - minetest.register_node("default:glass_with_log", { - description = "Glass with Wood", + description = "Glass with Log", tiles = {"default_log.png^default_glass.png"}, groups = {crumbly = 3}, })