Index: data/metals.lua ================================================================== --- data/metals.lua +++ data/metals.lua @@ -37,10 +37,11 @@ durability = 80; hardness = 2; conduct = 0.3; depth = 64; level = 0; + wire = 'basic_materials:copper_wire'; }; brass = { tone = {255,226,87}; dye = 'bright_orange'; artificial = true; @@ -92,10 +93,11 @@ speed = 1.9; level = 1; slots = { {affinity = {'praxic'}; confluence = 0.5}; }; + wire = 'basic_materials:steel_wire'; }; aluminum = { tone = {196,64,32}, alpha = 128; dye = 'red'; meltpoint = 1; @@ -153,10 +155,11 @@ slots = { {affinity = {'praxic','counterpraxic'}; confluence = 1.4}; {affinity = {'praxic','counterpraxic'}; confluence = 1.2}; }; amulet = {}; + wire = 'basic_materials:gold_wire'; }; silver = { tone = {218,255,246}; dye = 'white'; maxenergy = 2000; @@ -163,10 +166,11 @@ hardness = 1; level = 1; depth = 210; rarity = 13.5; no_armor = true; no_tools = true; power = 1; cooktime = 8; hardness = 1; + wire = 'basic_materials:silver_wire'; }; electrum = { tone = {212, 255, 0}, alpha = 80; artificial = true; hardness = 1; @@ -222,10 +226,11 @@ confluence = 0.65; interference = {speed = 1}; }; }; amulet = { power = 1.5 }; + wire = true; }; lithium = { tone = {255,252,93}, alpha = 80; dye = 'yellow'; rarity = 13; @@ -246,10 +251,11 @@ meltpoint = 2; cooktime = 20; no_tools = true, no_armor = true; conduct = 5; level = 1; + wire = true; image = { block = 'sorcery_metal_vidrium_shiny.png'; }; mix = { metals = { @@ -275,10 +281,11 @@ maxenergy = 1800; depth = 1370; conduct = 10; durability = 1900; speed = 3; + wire = true; image = { block = 'sorcery_metal_iridium_shiny.png'; }; slots = { {affinity={'counterpraxic','syncretic'}, confluence = 1.1}; @@ -374,10 +381,11 @@ durability = 3300; level = 5; sharpness = 3; conduct = 20; speed = 3.4; + wire = true; slots = { {affinity={'praxic'}, confluence = 0.7}; {affinity={'counterpraxic'}, confluence = 1.2}; {affinity={'cognic'}, confluence = 1.1}; }; Index: metal.lua ================================================================== --- metal.lua +++ metal.lua @@ -71,17 +71,48 @@ id = name; data = metal; value = c.cost * fragments_per_ingot; } end end local install = function(part,amt) - sorcery.data.metallookup[part] = { id = name, data = metal, value = amt } + sorcery.data.metallookup[part] = { id = name, data = metal, value = amt } end install(ingot, fragments_per_ingot) install(block, fragments_per_ingot*9) install(fragment, 1) install(powder, 1) install(disc, 8/3) + if metal.wire then + if metal.wire == true then + metal.parts.wire = 'sorcery:wire_' .. name + minetest.register_craftitem(metal.parts.wire, { + inventory_image = string.format('basic_materials_empty_spool.png^sorcery_%s_wire.png', name); + description = string.format('Spool of %s wire',name); + groups = {metal = 1, wire = 1}; + }) + minetest.register_craft { + type = 'shapeless'; + output = metal.parts.wire .. ' 2'; + recipe = { + metal.parts.ingot; + 'basic_materials:empty_spool'; + 'basic_materials:empty_spool'; + } + } + else + metal.parts.wire = metal.wire + end + minetest.register_craft { + type = 'shapeless'; + output = metal.parts.wire; + recipe = { + metal.parts.fragment; + metal.parts.fragment; + 'basic_materials:empty_spool'; + } + } + install(metal.parts.wire, 2) + end if not metal.no_craftables then install(screw, 0.5) minetest.register_craftitem(screw, { description = sorcery.lib.str.capitalize(name) .. ' Screw'; Index: recipes.lua ================================================================== --- recipes.lua +++ recipes.lua @@ -440,10 +440,48 @@ }) regtech('ley_puncture', 'Ley Puncture', {metal = 1}, { {'default:flint',mtlp('tungsten','disc'),'group:sorcery_ley_cable'}; {'','group:sorcery_ley_cable',''}; {'group:sorcery_ley_cable',mtlp('tungsten','disc'),'default:flint'}; +}) +regtech('radiatic_filament', 'Radiatic Filament', {metal=1},{ + {mtlp('gold','wire'),mtlp('steel','wire'),mtlp('gold','wire')}; + {ingot'tungsten',mtlp('steel','wire'),ingot'tungsten'}; + {mtlp('silver','wire'),mtlp('steel','wire'),mtlp('silver','wire')}; +}, 3, { + {mtlp('steel','wire'), 'basic_materials:empty_spool'}; + {mtlp('steel','wire'), 'basic_materials:empty_spool'}; + {mtlp('steel','wire'), 'basic_materials:empty_spool'}; + {mtlp('silver','wire'), 'basic_materials:empty_spool'}; + {mtlp('silver','wire'), 'basic_materials:empty_spool'}; + {mtlp('gold','wire'), 'basic_materials:empty_spool'}; + {mtlp('gold','wire'), 'basic_materials:empty_spool'}; +}) +regtech('tacit_couple', 'Tacit Couple', {metal=1}, { + {mtlp('steel','fragment'),mtlp('copper','wire'),mtlp('steel','fragment')}; + {'sorcery:radiatic_filament', 'basic_materials:steel_bar', 'sorcery:radiatic_filament'}; + {mtlp('steel','fragment'),mtlp('copper','wire'),mtlp('steel','fragment')}; +}) +regtech('tacit_web', 'Tacit Web', {metal=1},{ + {mtlp('gold', 'fragment'),mtlp('vidrium','wire'), mtlp('gold', 'fragment')}; + {mtlp('copper','wire'), mtlp('iridium','fragment'),mtlp('copper','wire')}; + {mtlp('silver','fragment'),mtlp('vidrium','wire'), mtlp('silver','fragment')}; +},1,{ + {mtlp('vidrium','wire'), 'basic_materials:empty_spool'}; + {mtlp('copper','wire'), 'basic_materials:empty_spool'}; + {mtlp('copper','wire'), 'basic_materials:empty_spool'}; + {mtlp('vidrium','wire'), 'basic_materials:empty_spool'}; +}) +regtech('aetherial_harmonizer', 'Aetherial Harmonizer', {metal=1}, { + {ingot'brass'}; + {mtlp('tungsten','disc')}; + {ingot'brass'}; +}) +regtech('aether_coruscator', 'Aether Coruscator', {metal=1}, { + {'sorcery:aetherial_harmonizer','','sorcery:aetherial_harmonizer'}; + {ingot'aluminum','sorcery:radiatic_filament',ingot'aluminum'}; + {ingot'aluminum',ingot'aluminum',ingot'aluminum'}; }) regtech('pulse_rectifier', 'Pulse Rectifier', {metal = 1}) regtech('current_felicitator', 'Current Felicitator', {metal = 1}, { {'basic_materials:silver_wire','basic_materials:silver_wire','basic_materials:silver_wire'}; {'sorcery:cobalt_ingot','sorcery:inversion_matrix','sorcery:cobalt_ingot'}; ADDED textures/sorcery_aether_coruscator.png Index: textures/sorcery_aether_coruscator.png ================================================================== --- textures/sorcery_aether_coruscator.png +++ textures/sorcery_aether_coruscator.png cannot compute difference between binary files ADDED textures/sorcery_aetherial_harmonizer.png Index: textures/sorcery_aetherial_harmonizer.png ================================================================== --- textures/sorcery_aetherial_harmonizer.png +++ textures/sorcery_aetherial_harmonizer.png cannot compute difference between binary files Index: textures/sorcery_amulet_frame_cobalt.png ================================================================== --- textures/sorcery_amulet_frame_cobalt.png +++ textures/sorcery_amulet_frame_cobalt.png cannot compute difference between binary files Index: textures/sorcery_amulet_frame_gold.png ================================================================== --- textures/sorcery_amulet_frame_gold.png +++ textures/sorcery_amulet_frame_gold.png cannot compute difference between binary files Index: textures/sorcery_amulet_frame_iridium.png ================================================================== --- textures/sorcery_amulet_frame_iridium.png +++ textures/sorcery_amulet_frame_iridium.png cannot compute difference between binary files Index: textures/sorcery_amulet_frame_tungsten.png ================================================================== --- textures/sorcery_amulet_frame_tungsten.png +++ textures/sorcery_amulet_frame_tungsten.png cannot compute difference between binary files ADDED textures/sorcery_axial_dispulsor.png Index: textures/sorcery_axial_dispulsor.png ================================================================== --- textures/sorcery_axial_dispulsor.png +++ textures/sorcery_axial_dispulsor.png cannot compute difference between binary files ADDED textures/sorcery_cobalt_wire.png Index: textures/sorcery_cobalt_wire.png ================================================================== --- textures/sorcery_cobalt_wire.png +++ textures/sorcery_cobalt_wire.png cannot compute difference between binary files ADDED textures/sorcery_flux_amplifier.png Index: textures/sorcery_flux_amplifier.png ================================================================== --- textures/sorcery_flux_amplifier.png +++ textures/sorcery_flux_amplifier.png cannot compute difference between binary files ADDED textures/sorcery_iridium_wire.png Index: textures/sorcery_iridium_wire.png ================================================================== --- textures/sorcery_iridium_wire.png +++ textures/sorcery_iridium_wire.png cannot compute difference between binary files ADDED textures/sorcery_radiatic_filament.png Index: textures/sorcery_radiatic_filament.png ================================================================== --- textures/sorcery_radiatic_filament.png +++ textures/sorcery_radiatic_filament.png cannot compute difference between binary files ADDED textures/sorcery_tacit_couple.png Index: textures/sorcery_tacit_couple.png ================================================================== --- textures/sorcery_tacit_couple.png +++ textures/sorcery_tacit_couple.png cannot compute difference between binary files ADDED textures/sorcery_tacit_web.png Index: textures/sorcery_tacit_web.png ================================================================== --- textures/sorcery_tacit_web.png +++ textures/sorcery_tacit_web.png cannot compute difference between binary files ADDED textures/sorcery_unobtanium_wire.png Index: textures/sorcery_unobtanium_wire.png ================================================================== --- textures/sorcery_unobtanium_wire.png +++ textures/sorcery_unobtanium_wire.png cannot compute difference between binary files ADDED textures/sorcery_vidrium_wire.png Index: textures/sorcery_vidrium_wire.png ================================================================== --- textures/sorcery_vidrium_wire.png +++ textures/sorcery_vidrium_wire.png cannot compute difference between binary files