diff --git a/mods/crafting/recipes.lua b/mods/crafting/recipes.lua index 8c3dadb..28ee7a7 100644 --- a/mods/crafting/recipes.lua +++ b/mods/crafting/recipes.lua @@ -84,7 +84,7 @@ crafting.register_craft( { output = "default:ingot_steel 2", items = { - "default:lump_coal", + "default:sheet_graphite", "default:ingot_wrought_iron 4", } }) @@ -93,7 +93,7 @@ crafting.register_craft( { output = "default:ingot_carbon_steel 2", items = { - "default:lump_coal 2", + "default:sheet_graphite 2", "default:ingot_wrought_iron 7", } }) @@ -460,8 +460,17 @@ crafting.register_craft( { output = "default:fertilizer", items = { - "default:fern 3", - "default:fiber", + "default:fern 4", + "default:fiber 3", + } +}) + +crafting.register_craft( + { + output = "default:fertilizer 2", + items = { + "default:lump_sulfur 3", + "default:fiber 3", } }) diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua index b93971d..92c4bed 100644 --- a/mods/default/craftitems.lua +++ b/mods/default/craftitems.lua @@ -34,6 +34,15 @@ minetest.register_craftitem( inventory_image = "default_pearl.png", }) +-- Mineral misc. + +minetest.register_craftitem( + "default:sheet_graphite", + { + description = "Graphite Sheet", + inventory_image = "default_sheet_graphite.png", +}) + -- Mineral lumps minetest.register_craftitem( @@ -57,13 +66,6 @@ minetest.register_craftitem( inventory_image = "default_lump_iron.png", }) -minetest.register_craftitem( - "default:lump_graphite", - { - description = "Graphite Lump", - inventory_image = "default_lump_graphite.png", -}) - minetest.register_craftitem( "default:lump_tin", { diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 510dbf7..a13bfb1 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -632,7 +632,7 @@ minetest.register_decoration( flags = "place_center_x, place_center_z", replacements = {["default:leaves"] = "default:dry_leaves"}, schematic = minetest.get_modpath("default") .. "/schematics/default_bush.mts", - y_min = -32000, + y_min = 0, y_max = 32000, rotation = "0", }) @@ -663,7 +663,7 @@ minetest.register_decoration( flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default") .. "/schematics/default_small_rock.mts", - y_min = -32000, + y_min = 0, y_max = 32000, rotation = "random", }) @@ -678,11 +678,25 @@ minetest.register_decoration( flags = "place_center_x, place_center_z", schematic = minetest.get_modpath("default") .. "/schematics/default_large_rock.mts", - y_min = -32000, + y_min = 0, y_max = 32000, rotation = "random", }) +-- Sulfur decorations + +minetest.register_decoration( + { + deco_type = "simple", + place_on = "default:dry_dirt", + sidelen = 16, + fill_ratio = 0.005, + biomes = {"Wasteland"}, + decoration = {"default:stone_with_sulfur"}, + y_min = 2, + y_max = 14, +}) + -- Clam decorations minetest.register_decoration( @@ -697,6 +711,31 @@ minetest.register_decoration( y_max = 1, }) +-- Graphite ore + +minetest.register_ore( -- Common above sea level mainly + { + ore_type = "scatter", + ore = "default:stone_with_graphite", + wherein = "default:stone", + clust_scarcity = 9*9*9, + clust_num_ores = 8, + clust_size = 8, + y_min = -8, + y_max = 32, +}) + +minetest.register_ore( -- Slight scattering deeper down + { + ore_type = "scatter", + ore = "default:stone_with_graphite", + wherein = "default:stone", + clust_scarcity = 13*13*13, + clust_num_ores = 6, + clust_size = 8, + y_min = -31000, + y_max = -32, +}) -- Coal ore diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 0d41fd6..12b4e0d 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -5,6 +5,26 @@ -- Ores +minetest.register_node( + "default:stone_with_sulfur", + { + description = "Stone with Sulfur", + tiles = {"default_stone.png^default_mineral_sulfur.png"}, + groups = {cracky = 2, stone = 1, not_in_craftingguide = 1}, + drop = "default:lump_sulfur", + sounds = default.node_sound_stone_defaults(), +}) + +minetest.register_node( + "default:stone_with_graphite", + { + description = "Stone with Graphite", + tiles = {"default_stone.png^default_mineral_graphite.png"}, + groups = {cracky = 2, stone = 1, not_in_craftingguide = 1}, + drop = "default:sheet_graphite", + sounds = default.node_sound_stone_defaults(), +}) + minetest.register_node( "default:stone_with_coal", { diff --git a/mods/default/textures/default_lump_graphite.png b/mods/default/textures/default_lump_graphite.png deleted file mode 100644 index 7e92621..0000000 Binary files a/mods/default/textures/default_lump_graphite.png and /dev/null differ diff --git a/mods/default/textures/default_lump_graphite.xcf b/mods/default/textures/default_lump_graphite.xcf deleted file mode 100644 index 056cdb8..0000000 Binary files a/mods/default/textures/default_lump_graphite.xcf and /dev/null differ diff --git a/mods/default/textures/default_mineral_graphite.png b/mods/default/textures/default_mineral_graphite.png new file mode 100644 index 0000000..19e43e5 Binary files /dev/null and b/mods/default/textures/default_mineral_graphite.png differ diff --git a/mods/default/textures/default_mineral_graphite.xcf b/mods/default/textures/default_mineral_graphite.xcf new file mode 100644 index 0000000..02d92bc Binary files /dev/null and b/mods/default/textures/default_mineral_graphite.xcf differ diff --git a/mods/default/textures/default_mineral_sulfur.png b/mods/default/textures/default_mineral_sulfur.png new file mode 100644 index 0000000..1f093ea Binary files /dev/null and b/mods/default/textures/default_mineral_sulfur.png differ diff --git a/mods/default/textures/default_mineral_sulfur.xcf b/mods/default/textures/default_mineral_sulfur.xcf new file mode 100644 index 0000000..027f47c Binary files /dev/null and b/mods/default/textures/default_mineral_sulfur.xcf differ diff --git a/mods/default/textures/default_sheet_graphite.png b/mods/default/textures/default_sheet_graphite.png new file mode 100644 index 0000000..69edc84 Binary files /dev/null and b/mods/default/textures/default_sheet_graphite.png differ diff --git a/mods/default/textures/default_sheet_graphite.xcf b/mods/default/textures/default_sheet_graphite.xcf new file mode 100644 index 0000000..1ca6736 Binary files /dev/null and b/mods/default/textures/default_sheet_graphite.xcf differ