Add lead ore (finally!)

This commit is contained in:
mrkubax10 2024-03-10 13:49:03 +01:00
parent e60e43a702
commit 514e8cf5f1
3 changed files with 56 additions and 8 deletions

View File

@ -91,7 +91,7 @@ end
-- compatibilty that adds not existing elements -- compatibilty that adds not existing elements
if industrialtest.mclAvailable then if industrialtest.mclAvailable then
industrialtest.registerMetal=function(name,displayName,oreBlastResistance,oreHardness,rawBlockBlastResistance,rawBlockHardness,blockBlastResistance,blockHardness) industrialtest.internal.registerMetal=function(name,displayName,oreBlastResistance,oreHardness,rawBlockBlastResistance,rawBlockHardness,blockBlastResistance,blockHardness)
minetest.register_craftitem("industrialtest:raw_"..name,{ minetest.register_craftitem("industrialtest:raw_"..name,{
description=S("Raw "..displayName), description=S("Raw "..displayName),
inventory_image="industrialtest_mcl_raw_"..name..".png" inventory_image="industrialtest_mcl_raw_"..name..".png"
@ -555,6 +555,7 @@ if industrialtest.mclAvailable then
industrialtest.elementKeys.stoneWithGold="mcl_core:stone_with_gold" industrialtest.elementKeys.stoneWithGold="mcl_core:stone_with_gold"
industrialtest.elementKeys.copperBlock="mcl_copper:block" industrialtest.elementKeys.copperBlock="mcl_copper:block"
industrialtest.elementKeys.stoneWithCopper="mcl_copper:stone_with_copper" industrialtest.elementKeys.stoneWithCopper="mcl_copper:stone_with_copper"
industrialtest.elementKeys.leadLump="industrialtest:raw_lead"
industrialtest.elementKeys.ironPickaxe="mcl_tools:pick_iron" industrialtest.elementKeys.ironPickaxe="mcl_tools:pick_iron"
industrialtest.elementKeys.ironHelmet="mcl_tools:helmet_iron" industrialtest.elementKeys.ironHelmet="mcl_tools:helmet_iron"
industrialtest.elementKeys.ironBoots="mcl_armor:boots_iron" industrialtest.elementKeys.ironBoots="mcl_armor:boots_iron"
@ -573,7 +574,7 @@ if industrialtest.mclAvailable then
industrialtest.elementKeys.treetap=(industrialtest.mods.mclRubber and "mcl_rubber:treetap" or "industrialtest:treetap") industrialtest.elementKeys.treetap=(industrialtest.mods.mclRubber and "mcl_rubber:treetap" or "industrialtest:treetap")
-- register required minerals that are not available in MCL -- register required minerals that are not available in MCL
industrialtest.registerMetal("tin","Tin",3,3) industrialtest.internal.registerMetal("tin","Tin",3,3)
industrialtest.elementKeys.tinIngot="industrialtest:tin_ingot" industrialtest.elementKeys.tinIngot="industrialtest:tin_ingot"
industrialtest.elementKeys.tinBlock="industrialtest:tin_block" industrialtest.elementKeys.tinBlock="industrialtest:tin_block"
industrialtest.elementKeys.stoneWithTin="industrialtest:stone_with_tin" industrialtest.elementKeys.stoneWithTin="industrialtest:stone_with_tin"
@ -684,7 +685,7 @@ elseif industrialtest.mtgAvailable then
tnt.boom(pos,{radius=radius}) tnt.boom(pos,{radius=radius})
end end
industrialtest.registerMetal=function(name,displayName,hardness) industrialtest.internal.registerMetal=function(name,displayName,hardness)
minetest.register_craftitem("industrialtest:"..name.."_lump",{ minetest.register_craftitem("industrialtest:"..name.."_lump",{
description=S(displayName.." Lump"), description=S(displayName.." Lump"),
inventory_image="industrialtest_mtg_"..name.."_lump.png" inventory_image="industrialtest_mtg_"..name.."_lump.png"
@ -789,6 +790,7 @@ elseif industrialtest.mtgAvailable then
industrialtest.elementKeys.tinBlock="default:tinblock" industrialtest.elementKeys.tinBlock="default:tinblock"
industrialtest.elementKeys.stoneWithTin="default:stone_with_tin" industrialtest.elementKeys.stoneWithTin="default:stone_with_tin"
industrialtest.elementKeys.bronzeBlock="default:bronzeblock" industrialtest.elementKeys.bronzeBlock="default:bronzeblock"
industrialtest.elementKeys.leadLump="industrialtest:lead_lump"
industrialtest.elementKeys.ironPickaxe="default:pick_steel" industrialtest.elementKeys.ironPickaxe="default:pick_steel"
industrialtest.elementKeys.ironHelmet="3d_armor:helmet_steel" industrialtest.elementKeys.ironHelmet="3d_armor:helmet_steel"
industrialtest.elementKeys.ironBoots="3d_armor:boots_steel" industrialtest.elementKeys.ironBoots="3d_armor:boots_steel"

View File

@ -432,8 +432,21 @@ industrialtest.api.registerRotaryMaceratorModifier({
uses=4 uses=4
}) })
industrialtest.api.registerResourceDust("sulfur","Sulfur",{},"#e3ff33ff",false) industrialtest.api.registerResourceDust("sulfur","Sulfur",{},"#e3ff33ff",false)
-- TODO: Add lead ore industrialtest.api.registerResourceDust("lead","Lead",{
industrialtest.api.registerResourceDust("lead","Lead",{},"#eafef8ff",false) {
resource="industrialtest:lead_block",
count=9
},
{
resource="industrialtest:lead_ore",
count=2
},
{
resource=industrialtest.elementKeys.leadLump,
count=2
},
{resource="industrialtest:lead_ingot"}
},"#eafef8ff",true)
industrialtest.api.registerResourceDust("refined_iron","Refined Iron",{ industrialtest.api.registerResourceDust("refined_iron","Refined Iron",{
{ {
resource="industrialtest:refined_iron_ingot", resource="industrialtest:refined_iron_ingot",

View File

@ -15,7 +15,7 @@
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program. If not, see <http://www.gnu.org/licenses/>.
if industrialtest.mtgAvailable then if industrialtest.mtgAvailable then
industrialtest.registerMetal("uranium","Uranium",3) industrialtest.internal.registerMetal("uranium","Uranium",3)
minetest.register_ore({ minetest.register_ore({
ore_type="scatter", ore_type="scatter",
ore="industrialtest:stone_with_uranium", ore="industrialtest:stone_with_uranium",
@ -26,9 +26,21 @@ if industrialtest.mtgAvailable then
y_max=-128, y_max=-128,
y_min=-31000 y_min=-31000
}) })
industrialtest.internal.registerMetal("lead","Lead",2)
minetest.register_ore({
ore_type="scatter",
ore="industrialtest:stone_with_lead",
wherein="default:stone",
clust_scarcity=7*7*7,
clust_num_ores=3,
clust_size=3,
y_max=-48,
y_min=-31000
})
elseif industrialtest.mclAvailable then elseif industrialtest.mclAvailable then
industrialtest.registerMetal("uranium","Uranium",4,4,4,4,5,5) industrialtest.internal.registerMetal("uranium","Uranium",4,4,4,4,5,5)
local stonelike={"mcl_core:stone","mcl_core:diorite","mcl_core:andesite","mcl_core:granite"} local stonelike={"mcl_core:stone","mcl_core:diorite","mcl_core:andesite","mcl_core:granite"}
local deepslatelike={"mcl_deepslate:deepslate","mcl_deepslate:tuff"}
minetest.register_ore({ minetest.register_ore({
ore_type="scatter", ore_type="scatter",
ore="industrialtest:stone_with_uranium", ore="industrialtest:stone_with_uranium",
@ -42,7 +54,28 @@ elseif industrialtest.mclAvailable then
minetest.register_ore({ minetest.register_ore({
ore_type="scatter", ore_type="scatter",
ore="industrialtest:deepslate_with_uranium", ore="industrialtest:deepslate_with_uranium",
wherein={"mcl_deepslate:deepslate","mcl_deepslate:tuff"}, wherein=deepslatelike,
clust_scarcity=7*7*7,
clust_num_ores=3,
clust_size=3,
y_max=mcl_worlds.layer_to_y(15),
y_min=mcl_vars.mg_overworld_min
})
industrialtest.internal.registerMetal("lead","Lead",4,4,4,4,6,5)
minetest.register_ore({
ore_type="scatter",
ore="industrialtest:stone_with_lead",
wherein=stonelike,
clust_scarcity=7*7*7,
clust_num_ores=3,
clust_size=3,
y_max=mcl_worlds.layer_to_y(30),
y_min=mcl_vars.mg_overworld_min
})
minetest.register_ore({
ore_type="scatter",
ore="industrialtest:deepslate_with_lead",
wherein=deepslatelike,
clust_scarcity=7*7*7, clust_scarcity=7*7*7,
clust_num_ores=3, clust_num_ores=3,
clust_size=3, clust_size=3,