From 48e8ec11c2ea33e30e2253c16ee11e88c30561c4 Mon Sep 17 00:00:00 2001 From: cale Date: Sun, 6 Mar 2016 20:21:40 +0100 Subject: [PATCH] added iron/copper/gold block + updated blueprint mod --- mods/armor/init.lua | 4 +- mods/blueprint/init.lua | 4 ++ mods/default/craftitems.lua | 5 ++ mods/default/textures/default_wood_inv.png | Bin 0 -> 222 bytes mods/furnace/init.lua | 46 ++++++++++++++++++ .../furnace/textures/furnace_copper_block.png | Bin 0 -> 198 bytes mods/furnace/textures/furnace_gold_block.png | Bin 0 -> 198 bytes mods/furnace/textures/furnace_iron_block.png | Bin 0 -> 191 bytes mods/furnace/textures/furnace_steel_frame.png | Bin 0 -> 219 bytes .../textures/furnace_steel_frame_detail.png | Bin 0 -> 348 bytes mods/legendary_items/init.lua | 5 +- mods/mobs/init.lua | 2 +- 12 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 mods/default/textures/default_wood_inv.png create mode 100644 mods/furnace/textures/furnace_copper_block.png create mode 100644 mods/furnace/textures/furnace_gold_block.png create mode 100644 mods/furnace/textures/furnace_iron_block.png create mode 100644 mods/furnace/textures/furnace_steel_frame.png create mode 100644 mods/furnace/textures/furnace_steel_frame_detail.png 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 0000000000000000000000000000000000000000..574e0d8f708720add7c4a085703f27b3b6104c08 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#0W+HrhlRV+#brPt$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3gTe~DWM4fFZe;n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cfb4acdf6bfff5b7c651ce4ed500c1a20c1e3575 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8pdfpR zr>`sf17CFWVj6pjFeBuiW)N}Tg^b5rw57@Uhz6H8K46v{J8G8EiBeFMT9`NV;W z96VhdLp+YZJ!{CzpuppLkbh-;;F{6{PV82b7chwWO5Bs&vF%yFOdfO3?{9W3UM;~0 h0|)gRQ!6q*FnHYITJp#}{58-l22WQ%mvv4FO#oo+H^=}0 literal 0 HcmV?d00001 diff --git a/mods/furnace/textures/furnace_gold_block.png b/mods/furnace/textures/furnace_gold_block.png new file mode 100644 index 0000000000000000000000000000000000000000..8a9f0aea7b6241bf25bc6e00733ca321430d1fb3 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1SJ1Ryj={WI14-?iy0WWg+Z8+Vb&Z8pdfpR zr>`sf17Md39u$;m(=$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3`sf171q~LT-E2T1$r9Iy66gHf+|;}h2Ir#G#FEq$h4Rdj3Fdh=fSFB@OU66!LV0FMhJw4NZ$Nk>pEyua zsHcl#NW|f{*9`>^81Oh>oF8Yvwq&M+n}CFqQHgd#)la1b<+n_XK3|x@x#4@B=K59Q z3>&UV)lYLj!dQ{f$H2(M!XcpG&;Vx4xWE1y(~4EwSoLJD2;EV6SiKx*0fVQjpUXO@ GgeCxj-at73 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e3b8702bcbda24120765d5ce6ee3aee4a6e6503e GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oVGw3ym^DWND9B#o z>Fdh=fSFB@OaDt_$1b3dWQl7;iF1B#Zfaf$gL6@8Vo7R>LV0FMhJw4NZ$Nk>pEyv_ zHBT4Ekch)qr{Cp0tiaP^Z|qc-AiV4>PtGB}H52ROs&&eK)g_f)DRzU3bFDqyJIRml27 znlWF<|JxY+JlW! zrJ4rDtlA3O{{Ldi6!5wn5Y@3{X~eCbC2u3FCV03Ty$sNjJ-zghi|*M&u^Q{bPH3uT p|6R=ah(RFvj@o(YP6=fOeY@>#!6tEOlYu^D@O1TaS?83{1OUbLe{KK( literal 0 HcmV?d00001 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",