From 4140cd385f26bb46cf099e9cbcf6df028b956844 Mon Sep 17 00:00:00 2001 From: IamPyu Date: Wed, 11 Dec 2024 19:44:54 -0600 Subject: [PATCH] At this point just read the CHANGELOG.md diff. --- CHANGELOG.md | 5 +- .../CORE/pyutest/schematics/LargePineTree.mts | Bin 0 -> 215 bytes mods/ITEMS/pyutest_blocks/basic.lua | 11 +++ mods/ITEMS/pyutest_grass/init.lua | 2 +- mods/WORLD/pyutest_overworld/biomes.lua | 82 ++++++++++++++++-- mods/WORLD/pyutest_overworld/features.lua | 44 +++++++--- mods/WORLD/pyutest_overworld/trees.lua | 17 +++- textures/pyutest-mossy-cobblestone.png | Bin 0 -> 447 bytes 8 files changed, 134 insertions(+), 27 deletions(-) create mode 100644 mods/CORE/pyutest/schematics/LargePineTree.mts create mode 100644 textures/pyutest-mossy-cobblestone.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 048c8b4..3c7ab58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,11 +40,14 @@ Other Game Changes: - Added new damage types `fireworks` and `projectile` - Add healing information to food descriptions - Replaced Grassland biome with Plains -- Added FrozenPeaks biome +- Added various new biomes - Added Peach color - Replaced single Haybales blocks spawning in Plains biome with Haybale and Pumpkin pastures - Re-added Barriers - Fixed lava-water collisions +- New Dark Grass color to align with Dark Leaves +- Various biomes now use normal grass +- Added Mossy Cobblestone Code Changes: diff --git a/mods/CORE/pyutest/schematics/LargePineTree.mts b/mods/CORE/pyutest/schematics/LargePineTree.mts new file mode 100644 index 0000000000000000000000000000000000000000..1cc4d0a901e191b2970a371184ad9c18b7073654 GIT binary patch literal 215 zcmeYb3HD`RVc=lkXW*zu1q{p#%!!#r3}5S^sG!*O_AexI`>x%Z{Mcq$15hD+wt0X>Ke~889#HMR@<*Hb-Vw3XN2wj$?s}r rKeo7R^i8r*#G+QyX@&LlbG7$w-M;0oIA8zvbmNk8y9D+S^}7WCDI8v? literal 0 HcmV?d00001 diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua index f13ac6e..108c213 100644 --- a/mods/ITEMS/pyutest_blocks/basic.lua +++ b/mods/ITEMS/pyutest_blocks/basic.lua @@ -16,6 +16,7 @@ PyuTest.make_building_blocks("pyutest_blocks:podzol", "Podzol", { "pyutest-dirt. PyuTest.make_building_blocks("pyutest_blocks:snow", "Snow", { "pyutest-snow.png" }, nil, { ground = 1, + snow = 1, acid_vulnerable = 1, crumbly = PyuTest.BLOCK_FAST, }) @@ -70,6 +71,16 @@ PyuTest.make_building_blocks("pyutest_blocks:cobblestone", "Cobblestone", { "pyu _pyutest_blast_resistance = 3 }) +PyuTest.make_building_blocks("pyutest_blocks:mossy_cobblestone", "Mossy Cobblestone", { "pyutest-mossy-cobblestone.png" }, nil, { + ground = 1, + stone = 1, + cobble = 1, + cracky = PyuTest.BLOCK_NORMAL, +}, { + is_ground_content = true, + _pyutest_blast_resistance = 3 +}) + PyuTest.make_building_blocks("pyutest_blocks:cobbled_darkstone", "Cobbled Darkstone", { "pyutest-cobbled-darkstone.png" }, nil, { ground = 1, stone = 1, diff --git a/mods/ITEMS/pyutest_grass/init.lua b/mods/ITEMS/pyutest_grass/init.lua index 15642ef..abca828 100644 --- a/mods/ITEMS/pyutest_grass/init.lua +++ b/mods/ITEMS/pyutest_grass/init.lua @@ -71,7 +71,7 @@ PyuTest.make_grass("pyutest_grass:grass", "Grass", { PyuTest.make_grass("pyutest_grass:dark_grass", "Dark Grass", { crumbly = PyuTest.BLOCK_FAST, acid_vulnerable = 1 -}, "#388b4a") +}, "#4f613e") PyuTest.make_grass("pyutest_grass:swampy_grass", "Swampy Grass", { crumbly = PyuTest.BLOCK_FAST, diff --git a/mods/WORLD/pyutest_overworld/biomes.lua b/mods/WORLD/pyutest_overworld/biomes.lua index 23b54cc..1b4d9c4 100644 --- a/mods/WORLD/pyutest_overworld/biomes.lua +++ b/mods/WORLD/pyutest_overworld/biomes.lua @@ -1,6 +1,6 @@ if PyuTest.is_flat() then PyuTest.register_overworld_biome("flat", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_grass:dark_grass_block", + node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, @@ -30,7 +30,7 @@ PyuTest.register_overworld_biome("Plains", PyuTest.BIOME_TYPES.NORMAL, { }) PyuTest.register_overworld_biome("Forest", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_grass:dark_grass_block", + node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, @@ -76,7 +76,7 @@ PyuTest.register_overworld_biome("OldGrowthBirchForest", PyuTest.BIOME_TYPES.NOR }) PyuTest.register_overworld_biome("Meadow", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_grass:dark_grass_block", + node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", depth_filler = 4, @@ -202,11 +202,24 @@ PyuTest.register_overworld_biome("Taiga", PyuTest.BIOME_TYPES.CHILLY, { heat_point = 20, humidity_point = 72, - weight = PyuTest.BIOME_WEIGHTS.small, + weight = PyuTest.BIOME_WEIGHTS.normal, _pyutest_biome_flowering = true }) +PyuTest.register_overworld_biome("OldGrowthPineTaiga", PyuTest.BIOME_TYPES.CHILLY, { + node_top = "pyutest_blocks:podzol_block", + node_filler = "pyutest_blocks:dirt_block", + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, + + heat_point = 26, + humidity_point = 73, + + weight = PyuTest.BIOME_WEIGHTS.large, +}) + PyuTest.register_overworld_biome("AspenForest", PyuTest.BIOME_TYPES.CHILLY, { node_top = "pyutest_grass:aspen_grass_block", node_filler = "pyutest_blocks:dirt_block", @@ -214,7 +227,7 @@ PyuTest.register_overworld_biome("AspenForest", PyuTest.BIOME_TYPES.CHILLY, { y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, - heat_point = 20, + heat_point = 19, humidity_point = 74, weight = PyuTest.BIOME_WEIGHTS.small, @@ -230,7 +243,7 @@ PyuTest.register_overworld_biome("RedwoodForest", PyuTest.BIOME_TYPES.CHILLY, { y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, - heat_point = 20, + heat_point = 23, humidity_point = 76, weight = PyuTest.BIOME_WEIGHTS.small, @@ -292,17 +305,17 @@ PyuTest.register_overworld_biome("IceSpikes", PyuTest.BIOME_TYPES.COLD, { _enable_beaches = false }) +-- Peaks and mountains regardless of temperature PyuTest.register_overworld_biome("FrozenPeaks", PyuTest.BIOME_TYPES.COLD, { node_top = "pyutest_blocks:snow_block", node_filler = "pyutest_blocks:ice_block", - depth_filler = 20, - node_stone = "pyutest_blocks:ice_block", + depth_filler = 5, y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, heat_point = 0, - humidity_point = 75, + humidity_point = 76, vertical_blend = 8, @@ -310,3 +323,54 @@ PyuTest.register_overworld_biome("FrozenPeaks", PyuTest.BIOME_TYPES.COLD, { _enable_beaches = false }) + +PyuTest.register_overworld_biome("JaggedPeaks", PyuTest.BIOME_TYPES.COLD, { + node_top = "pyutest_blocks:snow_block", + depth_filler = 0, + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, + y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, + + heat_point = 0, + humidity_point = 79, + + vertical_blend = 8, + + weight = PyuTest.BIOME_WEIGHTS.large, + + _enable_beaches = false +}) + +PyuTest.register_overworld_biome("StonyPeaks", PyuTest.BIOME_TYPES.CHILLY, { + depth_top = 0, + depth_filler = 0, + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, + y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, + + heat_point = 20, + humidity_point = 30, + + vertical_blend = 8, + + weight = PyuTest.BIOME_WEIGHTS.large, + + _enable_beaches = false +}) + +PyuTest.register_overworld_biome("Grove", PyuTest.BIOME_TYPES.COLD, { + node_top = "pyutest_blocks:snow_block", + node_filler = "pyutest_blocks:dirt_block", + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, + y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, + + heat_point = 0, + humidity_point = 73, + + vertical_blend = 8, + + weight = PyuTest.BIOME_WEIGHTS.large, + + _enable_beaches = false, +}) diff --git a/mods/WORLD/pyutest_overworld/features.lua b/mods/WORLD/pyutest_overworld/features.lua index f6500aa..d155094 100644 --- a/mods/WORLD/pyutest_overworld/features.lua +++ b/mods/WORLD/pyutest_overworld/features.lua @@ -10,17 +10,6 @@ core.register_ore({ y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, }) -core.register_ore({ - ore_type = "scatter", - ore = "pyutest_blocks:lava_source", - wherein = PyuTest.ORE_STONES, - clust_scarcity = 16 * 16 * 16, - clust_num_ores = 1, - clust_size = 1, - y_max = PyuTest.OVERWORLD_TOP, - y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, -}) - core.register_ore({ ore_type = "scatter", ore = "pyutest_blocks:lava_source", @@ -70,7 +59,7 @@ core.register_decoration({ biomes = {"Plains"}, schematic = PyuTest.generate_pasture_schematic(4, "pyutest_farming:pumpkin", 0), rotation = "random", - flags = "place_center_x, place_center_y" + flags = "place_center_x, place_center_z" }) core.register_decoration({ @@ -81,5 +70,34 @@ core.register_decoration({ biomes = {"Plains"}, schematic = PyuTest.generate_pasture_schematic(4, "pyutest_blocks:haybale_block", 0), rotation = "random", - flags = "place_center_x, place_center_y" + flags = "place_center_x, place_center_z" +}) + +-- Boulders +PyuTest.generate_boulder_schematic = function (size, node) + local schem = { + size = {x = size, y = size, z = size}, + data = {}, + } + + for _ = 1, size do + for _ = 1, size do + for _ = 1, size do + table.insert(schem.data, {name = node, prob = 256 / 1.2}) + end + end + end + + return schem +end + +core.register_decoration({ + deco_type = "schematic", + place_on = {"group:grass", "group:dirt"}, + sidelen = 16, + fill_ratio = 0.0009, + biomes = {"OldGrowthPineTaiga", "RedwoodForest"}, + schematic = PyuTest.generate_boulder_schematic(3, "pyutest_blocks:mossy_cobblestone_block"), + rotation = "random", + flags = "place_center_x, place_center_z" }) diff --git a/mods/WORLD/pyutest_overworld/trees.lua b/mods/WORLD/pyutest_overworld/trees.lua index 40d2865..fe4df56 100644 --- a/mods/WORLD/pyutest_overworld/trees.lua +++ b/mods/WORLD/pyutest_overworld/trees.lua @@ -46,16 +46,27 @@ core.register_decoration({ core.register_decoration({ deco_type = "schematic", - place_on = { "group:grass" }, + place_on = { "group:grass", "group:snow" }, sidelen = 16, fill_ratio = 0.018, - biomes = { "Taiga" }, + biomes = { "Taiga", "Grove" }, schematic = PyuTest.get_schematic_path("TaigaTree"), rotation = "random", flags = "place_center_x, place_center_z", place_offset_y = 1 }) +core.register_decoration({ + deco_type = "schematic", + place_on = { "group:grass", "group:dirt" }, + sidelen = 16, + fill_ratio = 0.031, + biomes = { "OldGrowthPineTaiga" }, + schematic = PyuTest.get_schematic_path("LargePineTree"), + rotation = "random", + flags = "place_center_x, place_center_z", +}) + core.register_decoration({ deco_type = "schematic", place_on = { "group:grass" }, @@ -161,7 +172,7 @@ core.register_decoration({ deco_type = "schematic", place_on = { "pyutest_blocks:podzol_block" }, sidelen = 16, - fill_ratio = 0.019, + fill_ratio = 0.032, biomes = { "RedwoodForest" }, schematic = PyuTest.get_schematic_path("RedwoodTree"), rotation = "random", diff --git a/textures/pyutest-mossy-cobblestone.png b/textures/pyutest-mossy-cobblestone.png new file mode 100644 index 0000000000000000000000000000000000000000..d47838691cd1d1dbdb620ddbf6bf20f5ba8bc427 GIT binary patch literal 447 zcmV;w0YLtVP)J#XjbSQn5`UE<5vBkv)Xon7hAq1Q*DTu)g z=^*zs(Rilh-t*`CzVqG6>&tV-RcsF{yw>FU7yzwf0F-h7sFo$ANyhfDDlJyZkz#;a zKA~Ydynnwj?#}^;!T^Au^CxL?0Xpu?IUVEM1`XR`y<0GNoJvBw(`CI|6zD`@K)chG zoT`Bqg#n}9OgI9ZjxkJJraN;v{Y z>zJ?K59;U2-7SoIGv2@77(7mIMFeCcq{%*5h7R0+NA|O-X-^SzqT+Z&kg?tzryOvM8 p*A-C>_q(q#zYVW7xv}nb`~l0x!*xUe=-mJS002ovPDHLkV1nTg&9(pl literal 0 HcmV?d00001