Update: Cave Update

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [Jun 10th 2024] Update: Cave Update
+
+- Added andesite and granite
+- Added various gemstones and metals
+    - Added Tin
+    - Added Zinc
+    - Added Amethyst Quartz
+    - Added Pink Quartz
+    - Added Rubies
+- Granite and andesite will spawn underground as large blobs
+- Added different types of ore clusters
+- Change classification of a "major" update 
+
 ## [Jul 10th 2024] Unnamed Minor Update
 
 - Add Unified Inventory categories
@@ -128,7 +141,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 - Bring back Unified Inventory
 - Adjusted Biome Tempatures
 
-## [Jun 17th - 18th 2024] Major Update: Electricity Update Pt.1
+## [Jun 17th - 18th 2024] Update: Electricity Update Pt.1 (Discontinued)
 
 - Added Copper
 - Added Copper Wires
@@ -180,7 +193,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 
 - Added Aliases in the Format BLOCK_TYPE ex. dirt_slab
 
-## [Jun 15th 2024] Major Update: Survival Update Pt. 2
+## [Jun 15th 2024] Update: Survival Update Pt. 2
 
 - Added Mining Mechanics
     - Added Coal Lump and Ore
@@ -198,7 +211,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 - Replaced unified_inventory with sfinv
 - Added cg_plus (Crafting Guide Plus)
 
-## [Jun 14th 2024] Major Update: Luck and Boxes
+## [Jun 14th 2024] Update: Luck and Boxes
 
 - Added Lootboxes
     - Added Trash Lootbox
@@ -209,7 +222,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 - Lootboxes spawn across various biomes 
 - Revamped Bomb
 
-## [Jun 14th 2024] Major Update: Items and Utilites Update
+## [Jun 14th 2024] Update: Items and Utilites Update
 
 - Added Gunpowder, Coins, Sugar, and Ash
 - Added `replacenear` command for editing your worlds
@@ -220,7 +233,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 - Added New Colored Blocks
 - Revamp Light Texture
 
-## [Jun 12th 2024] Major Update: Survival Update Pt. 1
+## [Jun 12th 2024] Update: Survival Update Pt. 1
 
 - Added Survival Mechanics
 - Added Crafting Recipes
@@ -228,7 +241,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 - Tweaks to the Pickaxe and Contagious Acid
 - New Pickaxe Texture
 
-## [Jun 11th 2024] Unnamed Major Update
+## [Jun 11th 2024] Unnamed Update
 
 - Update Contagious Acid
 - Added Haybale Placeholder
@@ -237,7 +250,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 - Added Oil, and Liquid Acid
 - Added New Biomes: Oillands
 
-## [Jun 10 2024] Unnamed Major Update
+## [Jun 10 2024] Unnamed Update
 
 - Added New Biomes
 - Added Contagious Acid
@@ -250,7 +263,7 @@ Now that I think of it, this wasn't much of an "adventure" update..
 
 - Added Dandelions
 
-## [Jun 8 2024] Unnamed Major Update
+## [Jun 8 2024] Unnamed Update
 
 - Added Biomes and Structures.
 - Added Snow, Sand, Sandstone and Ice.

mods/pyutest_core/blocks.lua

@@ -181,7 +181,7 @@ PyuTestCore.make_building_blocks("pyutest_core:dirt", "Dirt", {"dirt.png"}, nil,
 })
 
 PyuTestCore.make_building_blocks("pyutest_core:stone", "Stone", {"stone.png"}, nil, {
-  ground = 1, 
+  ground = 1,
   block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE,
 }, {is_ground_content = false})
 

mods/pyutest_core/mapgen.lua

@@ -161,6 +161,7 @@ PyuTestCore.register_biome("stony_mountains", {
 PyuTestCore.register_biome("desert", {
   node_top = "pyutest_core:sand_block",
   node_filler = "pyutest_core:sandstone_block",
+  node_riverbed = "pyutest_core:sand_block",
 
   y_max = PyuTestCore_BiomeTops.desert,
   y_min = PyuTestCore_SurfaceBottom,

mods/pyutest_core/ores.lua

@@ -1,3 +1,54 @@
+PyuTestCore.make_building_blocks("pyutest_core:granite", "Granite", {"granite.png"}, nil, {
+  ground = 1,
+  block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
+})
+
+PyuTestCore.make_building_blocks("pyutest_core:andesite", "Andesite", {"andesite.png"}, nil, {
+  ground = 1,
+  block = PyuTestCore.BLOCK_BREAKABLE_MIDDLE
+})
+
+PyuTestCore.SPECIALSTONE_NOISE_PARAMS = {
+  offset = 0,
+  scale = 1,
+  spread = {x = 250, y = 250, z = 250},
+  seed = 1536,
+  octaves = 3,
+  persist = 0.4,
+  lacunarity = 2,
+  flags = "defaults"
+}
+
+minetest.register_ore({
+  ore_type = "blob",
+  ore = "pyutest_core:granite_block",
+  wherein = "pyutest_core:stone_block",
+  clust_scarcity = 9 * 9 * 9,
+  clust_num_ores = 35,
+  clust_size = 5,
+  y_max = PyuTestCore_SurfaceBottom - 1,
+  y_min = PyuTestCore_WorldBottom,
+  noise_params = PyuTestCore.SPECIALSTONE_NOISE_PARAMS
+})
+
+minetest.register_ore({
+  ore_type = "blob",
+  ore = "pyutest_core:andesite_block",
+  wherein = "pyutest_core:stone_block",
+  clust_scarcity = 9 * 9 * 9,
+  clust_num_ores = 35,
+  clust_size = 5,
+  y_max = PyuTestCore_SurfaceBottom - 1,
+  y_min = PyuTestCore_WorldBottom,
+  noise_params = PyuTestCore.SPECIALSTONE_NOISE_PARAMS
+})
+
+PyuTestCore.ORE_STONES = {
+  "pyutest_core:stone_block",
+  "pyutest_core:granite_block",
+  "pyutest_core:andesite_block",
+}
+
 PyuTestCore.make_ore = function (id, desc, ifix, idfix, btxt, itxt, color, y_max, scarcity, count, btype, oconf, bconf)
   local oid = id.."_ore"
   local iid = id.."_"..ifix
@@ -5,7 +56,10 @@ PyuTestCore.make_ore = function (id, desc, ifix, idfix, btxt, itxt, color, y_max
 
   minetest.register_node(oid, PyuTestCore.util.tableconcat({
     description = Translate(desc .. " Ore"),
-    groups = {block = block_type},
+    groups = {
+      block = block_type,
+      mineral = 1
+    },
     tiles = {btxt},
     drop = iid .. " " .. tostring(count or 1),
     sounds = PyuTestCore.make_node_sounds(),
@@ -16,19 +70,43 @@ PyuTestCore.make_ore = function (id, desc, ifix, idfix, btxt, itxt, color, y_max
     description = Translate(desc .. " " .. idfix),
     inventory_image = itxt,
     wield_image = itxt,
-    color = color
+    color = color,
+    groups = {
+      mineral = 1
+    }
   })
 
   minetest.register_ore({
     ore_type = "scatter",
     ore = oid,
-    wherein = "pyutest_core:stone_block",
+    wherein = PyuTestCore.ORE_STONES,
     clust_scarcity = scarcity * scarcity * scarcity,
-    clust_num_ores = 5,
+    clust_num_ores = 4,
     clust_size = 3,
     y_max = y_max,
     y_min = PyuTestCore_WorldBottom,
-    biomes = PyuTestCore.BIOMES,
+  })
+
+  minetest.register_ore({
+    ore_type = "scatter",
+    ore = oid,
+    wherein = PyuTestCore.ORE_STONES,
+    clust_scarcity = scarcity * scarcity * scarcity * 2.2,
+    clust_num_ores = 6,
+    clust_size = 3,
+    y_max = y_max,
+    y_min = PyuTestCore_WorldBottom,
+  })
+
+  minetest.register_ore({
+    ore_type = "scatter",
+    ore = oid,
+    wherein = PyuTestCore.ORE_STONES,
+    clust_scarcity = (scarcity * scarcity * scarcity) * 3,
+    clust_num_ores = 16,
+    clust_size = 5,
+    y_max = y_max,
+    y_min = PyuTestCore_WorldBottom,
   })
 
   PyuTestCore.make_building_blocks(id, desc, {"metal.png"}, color, {block = block_type}, bconf or {})
@@ -51,9 +129,17 @@ PyuTestCore.make_ore = function (id, desc, ifix, idfix, btxt, itxt, color, y_max
   })
 end
 
+-- Useful Ores
 PyuTestCore.make_ore("pyutest_core:coal", "Coal", "lump", "Lump", "ore-coal.png", "lump.png", {r = 32, g = 32, b = 32}, 48, 8, 2, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
-PyuTestCore.make_ore("pyutest_core:iron", "Iron", "ingot", "Ingot", "ore-iron.png", "ingot.png", nil, 21, 13, 1)
-PyuTestCore.make_ore("pyutest_core:copper", "Copper", "ingot", "Ingot", "ore-copper.png", "ingot.png", "darkgoldenrod", 21, 9, 2)
+PyuTestCore.make_ore("pyutest_core:copper", "Copper", "ingot", "Ingot", "ore-copper.png", "ingot.png", "darkgoldenrod", 18, 11, 2, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
+PyuTestCore.make_ore("pyutest_core:tin", "Tin", "ingot", "Ingot", "ore-tin.png", "ingot.png", "#8e8591", 18, 11, 1, PyuTestCore.BLOCK_BREAKABLE_MIDDLE)
+PyuTestCore.make_ore("pyutest_core:iron", "Iron", "ingot", "Ingot", "ore-iron.png", "ingot.png", nil, 18, 11, 1)
 PyuTestCore.make_ore("pyutest_core:gold", "Gold", "ingot", "Ingot", "ore-gold.png", "ingot.png", "gold", -75, 15.5, 1)
 PyuTestCore.make_ore("pyutest_core:diamond", "Diamond", "shard", "Shard", "ore-diamond.png", "shard.png", "cyan", -90, 16.7, 1)
 PyuTestCore.make_ore("pyutest_core:emerald", "Emerald", "shard", "Shard", "ore-emerald.png", "shard.png", "seagreen", -120, 18.3, 1)
+
+-- Ores without any special uses
+PyuTestCore.make_ore("pyutest_core:zinc", "Zinc", "ingot", "Ingot", "ore-zinc.png", "ingot.png", "#bed3d4", 18, 13, 1)
+PyuTestCore.make_ore("pyutest_core:amethyst_quartz", "Amethyst Quartz", "shard", "Shard", "ore-amethyst.png", "shard.png", "#9f7ba9", -50, 14.1, 1)
+PyuTestCore.make_ore("pyutest_core:pink_quartz", "Pink Quartz", "shard", "Shard", "ore-pink-quartz.png", "shard.png", "#dbafdc", -50, 14.1, 1)
+PyuTestCore.make_ore("pyutest_core:ruby", "Ruby", "shard", "Shard", "ore-ruby.png", "shard.png", "#992727", -75, 15.5, 1)

mods/pyutest_inventory/init.lua

@@ -26,3 +26,17 @@ unified_inventory.register_category("pyutest_inventory:tools", {
   index = 4,
   items = get_items_from_group("tool") 
 })
+
+unified_inventory.register_category("pyutest_inventory:furniture", {
+  symbol = "pyutest_core:wooden_chair",
+  label = "Furniture",
+  index = 5,
+  items = get_items_from_group("furniture") 
+})
+
+unified_inventory.register_category("pyutest_inventory:minerals", {
+  symbol = "pyutest_core:diamond_ore",
+  label = "Minerals",
+  index = 6,
+  items = get_items_from_group("mineral") 
+})