diff --git a/mods/armor/init.lua b/mods/armor/init.lua index 9d717e5..f213d31 100644 --- a/mods/armor/init.lua +++ b/mods/armor/init.lua @@ -35,7 +35,7 @@ function armor.update_armor(name, pl) armor.data[name][k] = v:to_string() print(armor.data[name][k]) end - pl:set_armor_groups({fleshy = p}) + pl:set_armor_groups({friendly = p}) armor.save_armor() end @@ -70,6 +70,7 @@ function armor.save_armor() end minetest.register_on_joinplayer(function(player) + player:set_armor_groups({friendly = 100}) if armor.invs[player:get_player_name()] then return end @@ -91,6 +92,7 @@ minetest.register_on_joinplayer(function(player) else armor.data[player:get_player_name()] = {} end + armor.update_armor(player:get_player_name(), player) end) diff --git a/mods/blueprint/init.lua b/mods/blueprint/init.lua index f1000fe..1b98684 100644 --- a/mods/blueprint/init.lua +++ b/mods/blueprint/init.lua @@ -23,4 +23,8 @@ end minetest.register_craftitem("blueprint:empty", { description = "Empty Blueprint", inventory_image = "blueprint_empty.png", + on_place = function(itemstack, placer, pointed_thing) + itemstack:set_name(blueprint.all[math.random(#blueprint.all)]) + return itemstack + end }) diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index 6189a9f..9667b8f 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -3,6 +3,11 @@ minetest.register_craftitem("default:string", { inventory_image = "default_string.png", }) +minetest.register_craftitem("default:wood_item", { + description = "Wood", + inventory_image = "default_wood_inv.png", +}) + minetest.register_craftitem("default:stone_item", { description = "Stone", inventory_image = "default_stone_item.png", diff --git a/mods/default/textures/default_wood_inv.png b/mods/default/textures/default_wood_inv.png new file mode 100644 index 0000000..574e0d8 Binary files /dev/null and b/mods/default/textures/default_wood_inv.png differ diff --git a/mods/furnace/init.lua b/mods/furnace/init.lua index ab70845..6dd9bb6 100644 --- a/mods/furnace/init.lua +++ b/mods/furnace/init.lua @@ -152,6 +152,26 @@ minetest.register_craftitem("furnace:copper_plate", { inventory_image = "furnace_copper_plate.png", }) +-- blocks + +minetest.register_node("furnace:iron_block", { + description = "Iron Block", + tiles = {"furnace_iron_block.png"}, + groups = {cracky = 1}, +}) + +minetest.register_node("furnace:gold_block", { + description = "Gold Block", + tiles = {"furnace_gold_block.png"}, + groups = {cracky = 1}, +}) + +minetest.register_node("furnace:copper_block", { + description = "Copper Block", + tiles = {"furnace_copper_block.png"}, + groups = {cracky = 1}, +}) + -- crafting @@ -190,3 +210,29 @@ minetest.register_craft({ {"default:wood", "default:wood", "default:wood"}, } }) + +minetest.register_craft({ + output = "furnace:iron_block", + type = "shapeless", + recipe = {"default:frame", "furnace:iron_plate", "furnace:iron_plate", "furnace:iron_plate", "furnace:iron_plate", "furnace:iron_plate", "furnace:iron_plate"} +}) + +minetest.register_craft({ + output = "furnace:gold_block", + type = "shapeless", + recipe = {"default:frame", "furnace:gold_plate", "furnace:gold_plate", "furnace:gold_plate", "furnace:gold_plate", "furnace:gold_plate", "furnace:gold_plate"} +}) + +minetest.register_craft({ + output = "furnace:copper_block", + type = "shapeless", + recipe = {"default:frame", "furnace:copper_plate", "furnace:copper_plate", "furnace:copper_plate", "furnace:copper_plate", "furnace:copper_plate", "furnace:copper_plate"} +}) + +minetest.register_node("furnace:steel_frame", { + description = "Steel Frame", + tiles = {"furnace_steel_frame.png", "furnace_steel_frame_detail.png"}, + drawtype = "glasslike_framed_optional", + paramtype = "light", + groups = {choppy = 2}, +}) diff --git a/mods/furnace/textures/furnace_copper_block.png b/mods/furnace/textures/furnace_copper_block.png new file mode 100644 index 0000000..cfb4acd Binary files /dev/null and b/mods/furnace/textures/furnace_copper_block.png differ diff --git a/mods/furnace/textures/furnace_gold_block.png b/mods/furnace/textures/furnace_gold_block.png new file mode 100644 index 0000000..8a9f0ae Binary files /dev/null and b/mods/furnace/textures/furnace_gold_block.png differ diff --git a/mods/furnace/textures/furnace_iron_block.png b/mods/furnace/textures/furnace_iron_block.png new file mode 100644 index 0000000..d12b3e6 Binary files /dev/null and b/mods/furnace/textures/furnace_iron_block.png differ diff --git a/mods/furnace/textures/furnace_steel_frame.png b/mods/furnace/textures/furnace_steel_frame.png new file mode 100644 index 0000000..721ab3b Binary files /dev/null and b/mods/furnace/textures/furnace_steel_frame.png differ diff --git a/mods/furnace/textures/furnace_steel_frame_detail.png b/mods/furnace/textures/furnace_steel_frame_detail.png new file mode 100644 index 0000000..e3b8702 Binary files /dev/null and b/mods/furnace/textures/furnace_steel_frame_detail.png differ diff --git a/mods/legendary_items/init.lua b/mods/legendary_items/init.lua index d819206..fd5bab1 100644 --- a/mods/legendary_items/init.lua +++ b/mods/legendary_items/init.lua @@ -1,5 +1,7 @@ legendary_items = {} +legendary_items.rare_weapons = {} legendary_items.register_rare_weapon = function(name, forlevel, def) + table.insert(legendary_items.rare_weapons, name) minetest.register_tool(":legendary_items:"..name, { description = def.description.."\n For Level: ".. tostring(forlevel).. "\n Damage: " .. tostring(def.damage) .. "\n Rare Item", inventory_image = def.inventory_image, @@ -13,11 +15,12 @@ legendary_items.register_rare_weapon = function(name, forlevel, def) if pointed_thing.type == "object" then if xp.player_levels[user:get_player_name()] and xp.player_levels[user:get_player_name()] > forlevel-1 then pointed_thing.ref:punch(user, 10,minetest.registered_tools[itemstack:get_name()].tool_capabilities) + itemstack:add_wear(300) print("[info]" .. user:get_player_name() .. " is fighting!") else cmsg.push_message_player(user, "[info] You have to be level "..tostring(forlevel).. " to use this weapon!") end - return nil + return itemstack end end }) diff --git a/mods/mobs/init.lua b/mods/mobs/init.lua index c076628..1e215a9 100644 --- a/mods/mobs/init.lua +++ b/mods/mobs/init.lua @@ -62,7 +62,7 @@ mobs.register_mob("mobs:angry_player", { max_drop_level = 0, groupcaps = { }, - damage_groups = {fleshy=3}, + damage_groups = {friendly=3}, }, collisionbox = {-0.3, -1, -0.3, 0.3, 0.5, 0.3}, description = "Angry Player",