6 Commits

15 changed files with 42 additions and 17 deletions

View File

@@ -689,13 +689,16 @@ end
-- \param displayName Display name of cell -- \param displayName Display name of cell
-- \param node Node which can be picked up with this cell -- \param node Node which can be picked up with this cell
-- \returns nil -- \returns nil
industrialtest.api.registerStorageCell=function(name,displayName,node,modname) industrialtest.api.registerStorageCell=function(name,displayName,node,modname,color)
color = color or "#ffffffff"
if not modname then if not modname then
modname="industrialtest" modname="industrialtest"
end end
minetest.register_craftitem("industrialtest:"..name.."_cell",{ minetest.register_craftitem("industrialtest:"..name.."_cell",{
description=S(displayName.." Cell"), description=S(displayName.." Cell"),
inventory_image=modname.."_"..name.."_cell.png", inventory_image="industrialtest_cell_fluid.png",
inventory_overlay="industrialtest_cell_casing.png",
color=color,
on_place=function(itemstack,user,pointed) on_place=function(itemstack,user,pointed)
if pointed.type~="node" or not user or not user:is_player() then if pointed.type~="node" or not user or not user:is_player() then
return nil return nil

View File

@@ -202,7 +202,7 @@ if industrialtest.mclAvailable then
minetest.register_tool("industrialtest:"..material.."_pickaxe",{ minetest.register_tool("industrialtest:"..material.."_pickaxe",{
description=S(materialDisplayName.." Pickaxe"), description=S(materialDisplayName.." Pickaxe"),
inventory_image="industrialtest_mcl_"..material.."_pickaxe.png", inventory_image="industrialtest_mcl_"..material.."_pickaxe.png",
groups={tool=1,pickaxe=1,dig_speed_class=config.digSpeedClass}, groups={tool=1,pickaxe=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
tool_capabilities={ tool_capabilities={
full_punch_interval=1, full_punch_interval=1,
max_drop_level=config.dropLevel, max_drop_level=config.dropLevel,
@@ -218,7 +218,7 @@ if industrialtest.mclAvailable then
minetest.register_tool("industrialtest:"..material.."_shovel",{ minetest.register_tool("industrialtest:"..material.."_shovel",{
description=S(materialDisplayName.." Shovel"), description=S(materialDisplayName.." Shovel"),
inventory_image="industrialtest_mcl_"..material.."_shovel.png", inventory_image="industrialtest_mcl_"..material.."_shovel.png",
groups={tool=1,shovel=1,dig_speed_class=config.digSpeedClass}, groups={tool=1,shovel=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
tool_capabilities={ tool_capabilities={
full_punch_interval=1, full_punch_interval=1,
max_drop_level=config.dropLevel, max_drop_level=config.dropLevel,
@@ -270,7 +270,7 @@ if industrialtest.mclAvailable then
minetest.register_tool("industrialtest:"..material.."_axe",{ minetest.register_tool("industrialtest:"..material.."_axe",{
description=S(materialDisplayName.." Axe"), description=S(materialDisplayName.." Axe"),
inventory_image="industrialtest_mcl_"..material.."_axe.png", inventory_image="industrialtest_mcl_"..material.."_axe.png",
groups={tool=1,axe=1,dig_speed_class=config.digSpeedClass}, groups={tool=1,axe=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
tool_capabilities={ tool_capabilities={
full_punch_interval=1, full_punch_interval=1,
max_level_drop=config.levelDrop, max_level_drop=config.levelDrop,
@@ -287,7 +287,7 @@ if industrialtest.mclAvailable then
minetest.register_tool("industrialtest:"..material.."_sword",{ minetest.register_tool("industrialtest:"..material.."_sword",{
description=S(materialDisplayName.." Sword"), description=S(materialDisplayName.." Sword"),
inventory_image="industrialtest_mcl_"..material.."_sword.png", inventory_image="industrialtest_mcl_"..material.."_sword.png",
groups={weapon=1,sword=1,dig_speed_class=config.digSpeedClass}, groups={weapon=1,sword=1,dig_speed_class=config.digSpeedClass,enchantability=config.enchantability},
tool_capabilities={ tool_capabilities={
full_punch_interval=0.625, full_punch_interval=0.625,
max_drop_level=config.maxDropLevel, max_drop_level=config.maxDropLevel,
@@ -304,7 +304,7 @@ if industrialtest.mclAvailable then
minetest.register_tool("industrialtest:"..material.."_hoe",{ minetest.register_tool("industrialtest:"..material.."_hoe",{
description=S(materialDisplayName.." Hoe"), description=S(materialDisplayName.." Hoe"),
inventory_image="industrialtest_mcl_"..material.."_hoe.png", inventory_image="industrialtest_mcl_"..material.."_hoe.png",
groups={tool=1,hoe=1}, groups={tool=1,hoe=1,enchantability=config.enchantability},
tool_capabilities={ tool_capabilities={
full_punch_interval=1, full_punch_interval=1,
damage_groups={fleshy=1} damage_groups={fleshy=1}
@@ -372,6 +372,7 @@ if industrialtest.mclAvailable then
cook_material=config.armorCookMaterial, cook_material=config.armorCookMaterial,
sound_equip=config.armorEquipSound, sound_equip=config.armorEquipSound,
sound_unequip=config.armorUnequipSound, sound_unequip=config.armorUnequipSound,
enchantability=config.enchantability,
textures={ textures={
head="industrialtest_mcl_"..material.."_helmet.png", head="industrialtest_mcl_"..material.."_helmet.png",
torso="industrialtest_mcl_"..material.."_chestplate.png", torso="industrialtest_mcl_"..material.."_chestplate.png",
@@ -575,7 +576,8 @@ if industrialtest.mclAvailable then
}, },
armorCookMaterial="industrialtest:bronze_nugget", armorCookMaterial="industrialtest:bronze_nugget",
armorEquipSound="mcl_armor_equip_iron", armorEquipSound="mcl_armor_equip_iron",
armorUnequipSound="mcl_armor_unequip_iron" armorUnequipSound="mcl_armor_unequip_iron",
enchantability=15,
}) })
--register other blocks that are not availabe in MCL --register other blocks that are not availabe in MCL

View File

@@ -31,6 +31,14 @@ local colors={
sulfur="#b88805ff", sulfur="#b88805ff",
tin="#ebd182ff", tin="#ebd182ff",
uranium="#3b8c09ff", uranium="#3b8c09ff",
-- fluid colors
lava="#ff5712ff",
water="#277bbcff",
river_water="#0ebfc2ff",
biomass="#2a8626ff",
biofuel="#4eba49ff",
coalfuel="#462228ff",
coolant="#188676ff"
} }
-- Power storage items -- Power storage items
@@ -626,12 +634,12 @@ minetest.register_craft({
{"",industrialtest.elementKeys.tinIngot,""} {"",industrialtest.elementKeys.tinIngot,""}
} }
}) })
industrialtest.api.registerStorageCell("water","Water",industrialtest.elementKeys.waterSource) industrialtest.api.registerStorageCell("water","Water",industrialtest.elementKeys.waterSource,nil,colors.water)
if industrialtest.mtgAvailable then if industrialtest.mtgAvailable then
industrialtest.api.registerStorageCell("river_water","River Water","default:river_water_source") industrialtest.api.registerStorageCell("river_water","River Water","default:river_water_source",nil,colors.river_water)
end end
industrialtest.api.registerStorageCell("lava","Lava",industrialtest.elementKeys.lavaSource) industrialtest.api.registerStorageCell("lava","Lava",industrialtest.elementKeys.lavaSource,nil,colors.lava)
minetest.register_tool("industrialtest:uranium_cell",{ minetest.register_tool("industrialtest:uranium_cell",{
description=S("Uranium Cell"), description=S("Uranium Cell"),
@@ -639,7 +647,9 @@ minetest.register_tool("industrialtest:uranium_cell",{
_industrialtest_placedInNuclearReactor=1, _industrialtest_placedInNuclearReactor=1,
_industrialtest_nuclearReactorFuel=1 _industrialtest_nuclearReactorFuel=1
}, },
inventory_image="industrialtest_uranium_cell.png", inventory_image="industrialtest_cell_fluid.png",
inventory_overlay="industrialtest_cell_casing.png",
color=colors.uranium,
}) })
minetest.register_craft({ minetest.register_craft({
type="shapeless", type="shapeless",
@@ -656,7 +666,9 @@ minetest.register_tool("industrialtest:coolant_cell",{
_industrialtest_placedInNuclearReactor=1, _industrialtest_placedInNuclearReactor=1,
_industrialtest_nuclearReactorCoolant=1 _industrialtest_nuclearReactorCoolant=1
}, },
inventory_image="industrialtest_coolant_cell.png", inventory_image="industrialtest_cell_fluid.png",
inventory_overlay="industrialtest_cell_casing.png",
color=colors.coolant,
}) })
minetest.register_craft({ minetest.register_craft({
type="shaped", type="shaped",
@@ -681,7 +693,9 @@ end
minetest.register_craftitem("industrialtest:bio_cell",{ minetest.register_craftitem("industrialtest:bio_cell",{
description=S("Bio Cell"), description=S("Bio Cell"),
inventory_image="industrialtest_bio_cell.png" inventory_image="industrialtest_cell_fluid.png",
inventory_overlay="industrialtest_cell_casing.png",
color=colors.biomass,
}) })
minetest.register_craft({ minetest.register_craft({
type="shapeless", type="shapeless",
@@ -694,7 +708,9 @@ minetest.register_craft({
minetest.register_craftitem("industrialtest:biofuel_cell",{ minetest.register_craftitem("industrialtest:biofuel_cell",{
description=S("Biofuel Cell"), description=S("Biofuel Cell"),
inventory_image="industrialtest_bio_cell.png", inventory_image="industrialtest_cell_fluid.png",
inventory_overlay="industrialtest_cell_casing.png",
color=colors.biofuel,
groups={ groups={
_industrialtest_fuel=1 _industrialtest_fuel=1
}, },
@@ -709,7 +725,9 @@ industrialtest.api.registerExtractorRecipe({
minetest.register_craftitem("industrialtest:hydrated_coal_cell",{ minetest.register_craftitem("industrialtest:hydrated_coal_cell",{
description=S("Hydrated Coal Cell"), description=S("Hydrated Coal Cell"),
inventory_image="industrialtest_hydrated_coal_cell.png" inventory_image="industrialtest_cell_fluid.png",
inventory_overlay="industrialtest_cell_casing.png",
color=colors.coal,
}) })
minetest.register_craft({ minetest.register_craft({
type="shapeless", type="shapeless",
@@ -722,7 +740,9 @@ minetest.register_craft({
minetest.register_craftitem("industrialtest:coalfuel_cell",{ minetest.register_craftitem("industrialtest:coalfuel_cell",{
description=S("Coalfuel Cell"), description=S("Coalfuel Cell"),
inventory_image="industrialtest_coalfuel_cell.png", inventory_image="industrialtest_cell_fluid.png",
inventory_overlay="industrialtest_cell_casing.png",
color=colors.coalfuel,
groups={ groups={
_industrialtest_fuel=1 _industrialtest_fuel=1
}, },

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 863 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 815 B

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 867 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 878 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 859 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 862 B