From 1722878030fba68259ebd94d1e8a60314cb80247 Mon Sep 17 00:00:00 2001 From: TheOnlyJoeEnderman Date: Thu, 23 Mar 2023 20:27:56 +0000 Subject: [PATCH] 0.3.4 alpha --- changelog.txt | 12 ++ crafting.lua | 531 ++++++++++++++++++++++++++++++++++++++++++++++++- geodes.lua | 6 +- geodes_lib.lua | 39 ++-- init.lua | 2 +- 5 files changed, 568 insertions(+), 22 deletions(-) diff --git a/changelog.txt b/changelog.txt index 08d17b9..47af006 100644 --- a/changelog.txt +++ b/changelog.txt @@ -91,3 +91,15 @@ V0.3.3 Fixed a bug where several stones still required default for no reason All games that use mapgen_stone are now supported: i.e. Anything that actually has mapgen and not a premade map or otherwise has no terrain Removed several uneeded files + +V0.3.4 +Added Fire Opal +Redo Black Opal, remove its transparency as it was ugly +Crystals now pop off of broken blocks +Add Covellite Cobblestone +Add Andesite +Add Beige tuff +Add Grey Tuff +Add Red Tuff +Add Howlite Cobble +Add Glass Batch diff --git a/crafting.lua b/crafting.lua index e17ccc7..b67f97e 100644 --- a/crafting.lua +++ b/crafting.lua @@ -80,6 +80,23 @@ minetest.register_craft({ {"too_many_stones:amethyst", "too_many_stones:amethyst", "too_many_stones:amethyst"}, } }) +-- Andesite +minetest.register_craft({ + output = "too_many_stones:andesite_brick 4", + recipe = { + {"too_many_stones:andesite", "too_many_stones:andesite"}, + {"too_many_stones:andesite", "too_many_stones:andesite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:andesite_block 9", + recipe = { + {"too_many_stones:andesite", "too_many_stones:andesite", "too_many_stones:andesite"}, + {"too_many_stones:andesite", "too_many_stones:andesite", "too_many_stones:andesite"}, + {"too_many_stones:andesite", "too_many_stones:andesite", "too_many_stones:andesite"}, + } +}) -- Basalt minetest.register_craft({ output = "too_many_stones:basalt_brick 4", @@ -984,6 +1001,18 @@ minetest.register_craft({ recipe = "too_many_stones:amethyst", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:andesite", + recipe = "too_many_stones:andesite_cobble", +}) + +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:andesite_cracked_brick", + recipe = "too_many_stones:andesite_brick", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:basalt", @@ -1050,6 +1079,12 @@ minetest.register_craft({ recipe = "too_many_stones:citrine", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:covellite", + recipe = "too_many_stones:covellite_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:covellite_cracked_brick", @@ -1105,42 +1140,84 @@ minetest.register_craft({ recipe = "too_many_stones:galena_brick", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:granite_black", + recipe = "too_many_stones:granite_black_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:granite_black_cracked_brick", recipe = "too_many_stones:granite_black_brick", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:granite_blue", + recipe = "too_many_stones:granite_blue_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:granite_blue_cracked_brick", recipe = "too_many_stones:granite_blue_brick", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:granite_gray", + recipe = "too_many_stones:granite_gray_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:granite_gray_cracked_brick", recipe = "too_many_stones:granite_gray_brick", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:granite_green", + recipe = "too_many_stones:granite_green_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:granite_green_cracked_brick", recipe = "too_many_stones:granite_green_brick", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:granite_pink", + recipe = "too_many_stones:granite_pink_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:granite_pink_cracked_brick", recipe = "too_many_stones:granite_pink_brick", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:granite_red", + recipe = "too_many_stones:granite_red_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:granite_red_cracked_brick", recipe = "too_many_stones:granite_red_brick", }) +minetest.register_craft({ + type = "cooking", + output = "too_many_stones:granite_white", + recipe = "too_many_stones:granite_white_cobble", +}) + minetest.register_craft({ type = "cooking", output = "too_many_stones:granite_white_cracked_brick", @@ -1423,17 +1500,459 @@ minetest.register_craft({ recipe = "too_many_stones:vivianite", }) ---[[ +-- Various Stone Group Recipes + +minetest.register_craft({ + output = "too_many_stones:batch", + recipe = { + {"group:quartz", "group:quartz", "group:quartz"}, + {"group:quartz", "group:limestone", "group:quartz"}, + {"group:quartz", "group:quartz", "group:quartz"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:lapis_lazuli", + recipe = { + {"too_many_stones:sodalite", "too_many_stones:sodalite", "too_many_stones:sodalite"}, + {"too_many_stones:sodalite", "too_many_stones:pyrite", "too_many_stones:sodalite"}, + {"too_many_stones:sodalite", "too_many_stones:sodalite", "too_many_stones:sodalite"}, + } +}) + if minetest.get_modpath("dye") ~= nil then minetest.register_craft({ - output = "too_many_stones:amethyst 9", + output = "dye:black 9", recipe = { - {"too_many_stones:quartz", "too_many_stones:quartz", "too_many_stones:quartz"}, - {"too_many_stones:quartz", "dye:violet", "too_many_stones:quartz"}, - {"too_many_stones:quartz", "too_many_stones:quartz", "too_many_stones:quartz"}, + {"group:black_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:blue 9", + recipe = { + {"group:blue_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:brown 9", + recipe = { + {"group:brown_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:cyan 9", + recipe = { + {"group:cyan_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:dark_green 9", + recipe = { + {"group:dark_green_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:dark_grey 9", + recipe = { + {"group:dark_grey_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:green 9", + recipe = { + {"group:green_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:grey 9", + recipe = { + {"group:grey_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:magenta 9", + recipe = { + {"group:magenta_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:orange 9", + recipe = { + {"group:orange_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:pink 9", + recipe = { + {"group:pink_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:red 9", + recipe = { + {"group:red_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:violet 9", + recipe = { + {"group:violet_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:white 9", + recipe = { + {"group:white_stone"}, + } +}) + +minetest.register_craft({ + output = "dye:yellow 9", + recipe = { + {"group:yellow_stone"}, + } +}) + +-- Agate + +minetest.register_craft({ + output = "too_many_stones:agate_blue 8", + recipe = { + {"group:agate", "group:agate", "group:agate"}, + {"group:agate", "dye:blue", "group:agate"}, + {"group:agate", "group:agate", "group:agate"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:agate_gray 8", + recipe = { + {"group:agate", "group:agate", "group:agate"}, + {"group:agate", "dye:grey", "group:agate"}, + {"group:agate", "group:agate", "group:agate"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:agate_green 8", + recipe = { + {"group:agate", "group:agate", "group:agate"}, + {"group:agate", "dye:green", "group:agate"}, + {"group:agate", "group:agate", "group:agate"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:agate_moss 8", + recipe = { + {"group:agate", "group:agate", "group:agate"}, + {"group:agate", "dye:dark_green", "group:agate"}, + {"group:agate", "group:agate", "group:agate"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:agate_orange 8", + recipe = { + {"group:agate", "group:agate", "group:agate"}, + {"group:agate", "dye:orange", "group:agate"}, + {"group:agate", "group:agate", "group:agate"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:agate_purple 8", + recipe = { + {"group:agate", "group:agate", "group:agate"}, + {"group:agate", "dye:violet", "group:agate"}, + {"group:agate", "group:agate", "group:agate"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:agate_red 8", + recipe = { + {"group:agate", "group:agate", "group:agate"}, + {"group:agate", "dye:red", "group:agate"}, + {"group:agate", "group:agate", "group:agate"}, + } +}) + +-- Quartz + +minetest.register_craft({ + output = "too_many_stones:amethyst 8", + recipe = { + {"group:quartz", "group:quartz", "group:quartz"}, + {"group:quartz", "dye:violet", "group:quartz"}, + {"group:quartz", "group:quartz", "group:quartz"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:citrine 8", + recipe = { + {"group:quartz", "group:quartz", "group:quartz"}, + {"group:quartz", "dye:yellow", "group:quartz"}, + {"group:quartz", "group:quartz", "group:quartz"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:prasiolite 8", + recipe = { + {"group:quartz", "group:quartz", "group:quartz"}, + {"group:quartz", "dye:dark_green", "group:quartz"}, + {"group:quartz", "group:quartz", "group:quartz"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:quartz 8", + recipe = { + {"group:quartz", "group:quartz", "group:quartz"}, + {"group:quartz", "dye:white", "group:quartz"}, + {"group:quartz", "group:quartz", "group:quartz"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:rose_quartz 8", + recipe = { + {"group:quartz", "group:quartz", "group:quartz"}, + {"group:quartz", "dye:pink", "group:quartz"}, + {"group:quartz", "group:quartz", "group:quartz"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:smokey_quartz 8", + recipe = { + {"group:quartz", "group:quartz", "group:quartz"}, + {"group:quartz", "dye:brown", "group:quartz"}, + {"group:quartz", "group:quartz", "group:quartz"}, + } +}) + +-- Opal + +minetest.register_craft({ + output = "too_many_stones:black_opal 8", + recipe = { + {"group:opal", "group:opal", "group:opal"}, + {"group:opal", "dye:green", "group:opal"}, + {"group:opal", "group:opal", "group:opal"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:fire_opal 8", + recipe = { + {"group:opal", "group:opal", "group:opal"}, + {"group:opal", "dye:orange", "group:opal"}, + {"group:opal", "group:opal", "group:opal"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:opal 8", + recipe = { + {"group:opal", "group:opal", "group:opal"}, + {"group:opal", "dye:cyan", "group:opal"}, + {"group:opal", "group:opal", "group:opal"}, + } +}) + +-- Granite + +minetest.register_craft({ + output = "too_many_stones:granite_black 8", + recipe = { + {"group:granite", "group:granite", "group:granite"}, + {"group:granite", "dye:black", "group:granite"}, + {"group:granite", "group:granite", "group:granite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:granite_blue 8", + recipe = { + {"group:granite", "group:granite", "group:granite"}, + {"group:granite", "dye:blue", "group:granite"}, + {"group:granite", "group:granite", "group:granite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:granite_gray 8", + recipe = { + {"group:granite", "group:granite", "group:granite"}, + {"group:granite", "dye:grey", "group:granite"}, + {"group:granite", "group:granite", "group:granite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:granite_green 8", + recipe = { + {"group:granite", "group:granite", "group:granite"}, + {"group:granite", "dye:dark_green", "group:granite"}, + {"group:granite", "group:granite", "group:granite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:granite_pink 8", + recipe = { + {"group:granite", "group:granite", "group:granite"}, + {"group:granite", "dye:pink", "group:granite"}, + {"group:granite", "group:granite", "group:granite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:granite_red 8", + recipe = { + {"group:granite", "group:granite", "group:granite"}, + {"group:granite", "dye:red", "group:granite"}, + {"group:granite", "group:granite", "group:granite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:granite_white 8", + recipe = { + {"group:granite", "group:granite", "group:granite"}, + {"group:granite", "dye:white", "group:granite"}, + {"group:granite", "group:granite", "group:granite"}, + } +}) + +-- Glow Stones + +minetest.register_craft({ + output = "too_many_stones:glow_apatite 8", + recipe = { + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + {"group:glow_stone", "dye:violet", "group:glow_stone"}, + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:glow_calcite 8", + recipe = { + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + {"group:glow_stone", "dye:red", "group:glow_stone"}, + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:glow_esperite 8", + recipe = { + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + {"group:glow_stone", "dye:yellow", "group:glow_stone"}, + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:glow_fluorite 8", + recipe = { + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + {"group:glow_stone", "dye:blue", "group:glow_stone"}, + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:glow_selenite 8", + recipe = { + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + {"group:glow_stone", "dye:cyan", "group:glow_stone"}, + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:glow_sodalite 8", + recipe = { + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + {"group:glow_stone", "dye:orange", "group:glow_stone"}, + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:glow_willemite 8", + recipe = { + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + {"group:glow_stone", "dye:green", "group:glow_stone"}, + {"group:glow_stone", "group:glow_stone", "group:glow_stone"}, + } +}) + +-- Dyed stones to represent how many fakes are made + +minetest.register_craft({ + output = "too_many_stones:turquoise 8", + recipe = { + {"too_many_stones:howlite", "too_many_stones:howlite", "too_many_stones:howlite"}, + {"too_many_stones:howlite", "dye:cyan", "too_many_stones:howlite"}, + {"too_many_stones:howlite", "too_many_stones:howlite", "too_many_stones:howlite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:sugilite 8", + recipe = { + {"too_many_stones:serpentine", "too_many_stones:serpentine", "too_many_stones:serpentine"}, + {"too_many_stones:serpentine", "dye:violet", "too_many_stones:serpentine"}, + {"too_many_stones:serpentine", "too_many_stones:serpentine", "too_many_stones:serpentine"}, + } +}) + +end + +if minetest.get_modpath("default") ~= nil then + +minetest.register_craft({ + type = "cooking", + output = "default:glass", + recipe = "too_many_stones:batch", +}) + +minetest.register_craft({ + output = "too_many_stones:glow_calcite 8", + recipe = { + {"too_many_stones:calcite", "too_many_stones:calcite", "too_many_stones:calcite"}, + {"too_many_stones:calcite", "default:mese_shard", "too_many_stones:calcite"}, + {"too_many_stones:calcite", "too_many_stones:calcite", "too_many_stones:calcite"}, + } +}) + +minetest.register_craft({ + output = "too_many_stones:glow_sodalite 8", + recipe = { + {"too_many_stones:sodalite", "too_many_stones:sodalite", "too_many_stones:sodalite"}, + {"too_many_stones:sodalite", "default:mese_shard", "too_many_stones:sodalite"}, + {"too_many_stones:sodalite", "too_many_stones:sodalite", "too_many_stones:sodalite"}, } }) end ---]] diff --git a/geodes.lua b/geodes.lua index fdae1df..50ab08b 100644 --- a/geodes.lua +++ b/geodes.lua @@ -14,6 +14,10 @@ geodes.register_geode("too_many_stones:gabbro", "too_many_stones:calcite", "too_ geodes.register_geode("too_many_stones:limestone_white", "too_many_stones:calcite", "too_many_stones:agate_red", "too_many_stones:agate_red", "too_many_stones:agate_red") +geodes.register_geode("too_many_stones:travertine", "too_many_stones:calcite", "too_many_stones:black_opal", "too_many_stones:black_opal") + +geodes.register_geode("too_many_stones:basalt", "too_many_stones:calcite", "too_many_stones:fire_opal", "too_many_stones:fire_opal") + geodes.register_geode("too_many_stones:mudstone", "too_many_stones:calcite", "too_many_stones:amazonite", "too_many_stones:amazonite_crystal") geodes.register_geode("too_many_stones:gabbro", "too_many_stones:calcite", "too_many_stones:amethyst", "too_many_stones:amethyst_crystal") @@ -36,8 +40,6 @@ geodes.register_geode("too_many_stones:travertine", "too_many_stones:calcite", " geodes.register_geode("too_many_stones:serpentine", "too_many_stones:calcite", "too_many_stones:heliodor", "too_many_stones:heliodor_crystal") -geodes.register_geode("too_many_stones:travertine", "too_many_stones:calcite", "too_many_stones:black_opal", "too_many_stones:black_opal") - geodes.register_geode("too_many_stones:pumice", "too_many_stones:calcite", "too_many_stones:celestine", "too_many_stones:celestine_crystal") geodes.register_geode("too_many_stones:pumice", "too_many_stones:calcite", "too_many_stones:quartz", "too_many_stones:quartz_crystal") diff --git a/geodes_lib.lua b/geodes_lib.lua index 1369682..36dfd44 100644 --- a/geodes_lib.lua +++ b/geodes_lib.lua @@ -94,6 +94,32 @@ geodes_lib:register_geode({ radius_max = 10, }) +geodes_lib:register_geode({ + wherein = "mapgen_stone", + y_min = -31000, + y_max = -10, + scarcity = 80, + core = "too_many_stones:black_opal", + core_alt = "too_many_stones:black_opal", + core_alt_chance = 100, + shell = {"too_many_stones:travertine", "too_many_stones:calcite"}, + radius_min = 2, + radius_max = 10, +}) + +geodes_lib:register_geode({ + wherein = "mapgen_stone", + y_min = -31000, + y_max = -10, + scarcity = 80, + core = "too_many_stones:fire_opal", + core_alt = "too_many_stones:fire_opal", + core_alt_chance = 100, + shell = {"too_many_stones:basalt", "too_many_stones:calcite"}, + radius_min = 2, + radius_max = 10, +}) + geodes_lib:register_geode({ wherein = "mapgen_stone", y_min = -31000, @@ -237,19 +263,6 @@ geodes_lib:register_geode({ radius_max = 10, }) -geodes_lib:register_geode({ - wherein = "mapgen_stone", - y_min = -31000, - y_max = -10, - scarcity = 80, - core = "too_many_stones:black_opal", - core_alt = "too_many_stones:black_opal", - core_alt_chance = 100, - shell = {"too_many_stones:travertine", "too_many_stones:calcite"}, - radius_min = 2, - radius_max = 10, -}) - geodes_lib:register_geode({ wherein = "mapgen_stone", y_min = -31000, diff --git a/init.lua b/init.lua index 4dbfdf5..f046635 100644 --- a/init.lua +++ b/init.lua @@ -14,7 +14,7 @@ dofile(minetest.get_modpath("too_many_stones") .. "/sounds.lua") dofile(minetest.get_modpath("too_many_stones") .. "/nodes.lua") dofile(minetest.get_modpath("too_many_stones") .. "/crafting.lua") dofile(minetest.get_modpath("too_many_stones") .. "/mapgen.lua") -dofile(minetest.get_modpath("too_many_stones") .. "/mapgen_universal.lua") +-- dofile(minetest.get_modpath("too_many_stones") .. "/mapgen_universal.lua") dofile(minetest.get_modpath("too_many_stones") .. "/mapgen_secondary.lua") dofile(minetest.get_modpath("too_many_stones") .. "/wall.lua") dofile(minetest.get_modpath("too_many_stones") .. "/stairs.lua")