diff --git a/elepower_dynamics/compat/basic_materials.lua b/elepower_dynamics/compat/basic_materials.lua index fba8a69..907c71a 100644 --- a/elepower_dynamics/compat/basic_materials.lua +++ b/elepower_dynamics/compat/basic_materials.lua @@ -111,4 +111,16 @@ if minetest.get_modpath("basic_materials") == nil then inventory_image = "elepower_silicon.png", groups = {silicon = 1, lump = 1} }) + + ----------- + -- BRASS -- + ----------- + + minetest.register_craftitem(":basic_materials:brass_ingot", { + description = "Brass Ingot", + inventory_image = "elepower_brass_ingot.png", + groups = {brass = 1, ingot = 1} + }) +else + minetest.clear_craft({output = "basic_materials:brass_ingot"}) end diff --git a/elepower_dynamics/components.lua b/elepower_dynamics/components.lua index d6c0279..fff0f63 100644 --- a/elepower_dynamics/components.lua +++ b/elepower_dynamics/components.lua @@ -2,16 +2,17 @@ local list_def = { {material = "bronze", description = "Bronze", color = "#fa7b26", dust = true, plate = true, gear = true}, {material = "copper", description = "Copper", color = "#fcb15f", dust = true, plate = true, gear = true}, + {material = "brass", description = "Brass", color = "#cdaf2c", dust = true, plate = true, gear = true}, {material = "gold", description = "Gold", color = "#ffff47", dust = true, plate = true, gear = true}, {material = "steel", description = "Steel", color = "#ffffff", dust = true, plate = true, gear = true}, {material = "tin", description = "Tin", color = "#c1c1c1", dust = true, plate = true, gear = true}, {material = "mithril", description = "Mithril", color = "#8686df", dust = true, plate = true, gear = true}, {material = "silver", description = "Silver", color = "#d7e2e8", dust = true, plate = true, gear = true}, - {material = "lead", description = "Lead", color = "#aeaedc", dust = true, plate = true, gear = true}, + {material = "lead", description = "Lead", color = "#374559", dust = true, plate = true, gear = true}, {material = "iron", description = "Iron", color = "#dddddd", dust = true, plate = true, gear = true}, {material = "diamond", description = "Diamond", color = "#02c1e8", dust = true, plate = true, gear = true}, {material = "nickel", description = "Nickel", color = "#d6d5ab", dust = true, plate = true, gear = true}, - {material = "invar", description = "Invar", color = "#9fa5b2", dust = true, plate = true, gear = true}, + {material = "invar", description = "Invar", color = "#71848c", dust = true, plate = true, gear = true}, {material = "electrum", description = "Electrum", color = "#ebeb90", dust = true, plate = true, gear = true}, {material = "viridisium", description = "Viridisium", color = "#5b9751", dust = true, plate = true, gear = true}, {material = "zinc", description = "Zinc", color = "#598a9e", dust = true, plate = true}, diff --git a/elepower_dynamics/textures/elepower_brass_ingot.png b/elepower_dynamics/textures/elepower_brass_ingot.png new file mode 100644 index 0000000..f9f42b6 Binary files /dev/null and b/elepower_dynamics/textures/elepower_brass_ingot.png differ diff --git a/elepower_dynamics/textures/elepower_invar_block.png b/elepower_dynamics/textures/elepower_invar_block.png index aeab678..cb7467a 100644 Binary files a/elepower_dynamics/textures/elepower_invar_block.png and b/elepower_dynamics/textures/elepower_invar_block.png differ diff --git a/elepower_dynamics/textures/elepower_invar_ingot.png b/elepower_dynamics/textures/elepower_invar_ingot.png index 0e1e0fb..4ee1b86 100644 Binary files a/elepower_dynamics/textures/elepower_invar_ingot.png and b/elepower_dynamics/textures/elepower_invar_ingot.png differ diff --git a/elepower_dynamics/textures/elepower_lead_ingot.png b/elepower_dynamics/textures/elepower_lead_ingot.png index 743b33f..9b74f5d 100644 Binary files a/elepower_dynamics/textures/elepower_lead_ingot.png and b/elepower_dynamics/textures/elepower_lead_ingot.png differ diff --git a/elepower_dynamics/textures/elepower_lead_lump.png b/elepower_dynamics/textures/elepower_lead_lump.png index 4a78563..d6d934d 100644 Binary files a/elepower_dynamics/textures/elepower_lead_lump.png and b/elepower_dynamics/textures/elepower_lead_lump.png differ diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index 1df3479..36bbba5 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -42,6 +42,11 @@ local alloy_recipes = { output = "elepower_dynamics:hardened_glass 4", time = 8, }, + { + recipe = { "default:copper_ingot 2", "moreores:silver_ingot" }, + output = "basic_materials:brass_ingot", + time = 8, + }, } -- Register alloy furnace recipes @@ -427,9 +432,9 @@ minetest.register_craft({ minetest.register_craft({ output = "elepower_machines:machine_block", recipe = { - {"elepower_dynamics:electrum_ingot", "default:steel_ingot", "elepower_dynamics:electrum_ingot"}, - {"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"}, - {"elepower_dynamics:electrum_ingot", "basic_materials:motor", "elepower_dynamics:electrum_ingot"}, + {"default:steel_ingot", "default:glass", "default:steel_ingot"}, + {"default:glass", "elepower_dynamics:brass_gear", "default:glass"}, + {"default:steel_ingot", "basic_materials:motor", "default:steel_ingot"}, } }) @@ -638,8 +643,8 @@ minetest.register_craft({ minetest.register_craft({ output = "elepower_machines:advanced_machine_block 8", recipe = { - {"elepower_dynamics:electrum_plate", "elepower_dynamics:lead_ingot", "elepower_dynamics:electrum_plate"}, - {"elepower_dynamics:lead_ingot", "elepower_machines:machine_block", "elepower_dynamics:lead_ingot"}, - {"elepower_dynamics:electrum_plate", "elepower_dynamics:lead_ingot", "elepower_dynamics:electrum_plate"}, + {"elepower_dynamics:electrum_plate", "elepower_dynamics:brass_plate", "elepower_dynamics:electrum_plate"}, + {"elepower_dynamics:brass_plate", "elepower_machines:machine_block", "elepower_dynamics:brass_plate"}, + {"elepower_dynamics:electrum_plate", "elepower_dynamics:brass_plate", "elepower_dynamics:electrum_plate"}, } })