diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c01bba..c834721 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,11 @@ ## [Oct 6th - **STILL UNDER DEVELOPMENT** 2024] Update: Texture Update +This update contains breaking changes due to the grass revamp + - Change the games style in terms of textures +- Creative block breaking speed increased +- "Revamped" grass ## [Oct 6th 2024] Unnamed Minor Update diff --git a/CREDITS.md b/CREDITS.md index 284c1f5..9a6454d 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -10,7 +10,7 @@ Sounds generated with [JFXR](https://jfxr.frozenfractal.com) ## Textures -Some textures made and edited [Estrella](https://www.youtube.com/@xoxoEstrella/featured) +Some (pre-Texture Update) textures made and edited [Estrella](https://www.youtube.com/@xoxoEstrella/featured) (Ex. Old Pickaxe Texture, Dirt, Grass, Apple, Brick) Thanks to Estrella for teaching me how I can make better pixel art! (Taught me color theory) diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua index 7684da6..cef0ce5 100644 --- a/mods/ITEMS/pyutest_blocks/basic.lua +++ b/mods/ITEMS/pyutest_blocks/basic.lua @@ -1,59 +1,3 @@ -PyuTest.make_building_blocks("pyutest_blocks:grass", "Grass", { - "pyutest-grass.png" -}, nil, { - ground = 1, - acid_vulnerable = 1, - grass = 1, - crumbly = PyuTest.BLOCK_FAST -}) - -PyuTest.make_building_blocks("pyutest_blocks:dark_grass", "Dark Grass", { - "pyutest-dark-grass.png" -}, nil, { - ground = 1, - acid_vulnerable = 1, - grass = 1, - crumbly = PyuTest.BLOCK_FAST -}) - -PyuTest.make_building_blocks("pyutest_blocks:swampy_grass", "Swampy Grass", { - "pyutest-swampy-grass.png" -}, nil, { - ground = 1, - acid_vulnerable = 1, - sugarcane_spawn_on = 1, - grass = 1, - crumbly = PyuTest.BLOCK_FAST -}) - -PyuTest.make_building_blocks("pyutest_blocks:savanna_grass", "Savanna Grass", { - "pyutest-savanna-grass.png" -}, nil, { - ground = 1, - acid_vulnerable = 1, - sugarcane_spawn_on = 1, - grass = 1, - crumbly = PyuTest.BLOCK_FAST -}) - -PyuTest.make_building_blocks("pyutest_blocks:aspen_grass", "Aspen Grass", { - "pyutest-aspen-grass.png" -}, nil, { - ground = 1, - acid_vulnerable = 1, - grass = 1, - crumbly = PyuTest.BLOCK_FAST -}) - -PyuTest.make_building_blocks("pyutest_blocks:jungle_grass", "Jungle Grass", { - "pyutest-jungle-grass.png" -}, nil, { - ground = 1, - acid_vulnerable = 1, - grass = 1, - crumbly = PyuTest.BLOCK_FAST -}) - PyuTest.make_building_blocks("pyutest_blocks:dirt", "Dirt", { "pyutest-dirt.png" }, nil, { ground = 1, acid_vulnerable = 1, diff --git a/mods/ITEMS/pyutest_grass/init.lua b/mods/ITEMS/pyutest_grass/init.lua new file mode 100644 index 0000000..b39a166 --- /dev/null +++ b/mods/ITEMS/pyutest_grass/init.lua @@ -0,0 +1,44 @@ +PyuTest.make_grass = function (name, desc, groups, color, ttex, stex, dtex) + local _ttex = {name = ttex or "pyutest-grass-top.png", color = color} + local _stex = {name = stex or "pyutest-grass-side.png", color = color} + local _dtex = {_ttex, dtex or "pyutest-dirt.png"} + + PyuTest.make_building_blocks(name, desc, _dtex, nil, PyuTest.util.tableconcat(groups or {}, { + ground = 1, + grass = 1, + }), { + overlay_tiles = {"", "", _stex} + }) +end + +PyuTest.make_grass("pyutest_grass:grass", "Grass", { + crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1 +}, "#6baf4a") + +PyuTest.make_grass("pyutest_grass:dark_grass", "Dark Grass", { + crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1 +}, "#388b4a") + +PyuTest.make_grass("pyutest_grass:swampy_grass", "Swampy Grass", { + crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1, + sugarcane_spawn_on = 1 +}, "#48592a") + +PyuTest.make_grass("pyutest_grass:savanna_grass", "Savanna Grass", { + crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1, + sugarcane_spawn_on = 1, +}, "#9faf4a") + +PyuTest.make_grass("pyutest_grass:aspen_grass", "Aspen Grass", { + crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1, +}, "#ad9d4b") + +PyuTest.make_grass("pyutest_grass:jungle_grass", "Jungle Grass", { + crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1, +}, "#3b562d") diff --git a/mods/ITEMS/pyutest_grass/mod.conf b/mods/ITEMS/pyutest_grass/mod.conf new file mode 100644 index 0000000..d3c5936 --- /dev/null +++ b/mods/ITEMS/pyutest_grass/mod.conf @@ -0,0 +1 @@ +depends = pyutest_blocks diff --git a/mods/ITEMS/pyutest_overrides/init.lua b/mods/ITEMS/pyutest_overrides/init.lua index 9e29219..2694421 100644 --- a/mods/ITEMS/pyutest_overrides/init.lua +++ b/mods/ITEMS/pyutest_overrides/init.lua @@ -1,5 +1,5 @@ minetest.override_item("pyutest_blocks:clay_block", { - drop = "pyutest_core:clay 3" + drop = "pyutest_tools:clay 3" }) minetest.override_item("pyutest_blocks:bone_block", { diff --git a/mods/MAPGEN/pyutest_mapgen/mapgen.lua b/mods/MAPGEN/pyutest_mapgen/mapgen.lua index d6b08d8..9c75ece 100644 --- a/mods/MAPGEN/pyutest_mapgen/mapgen.lua +++ b/mods/MAPGEN/pyutest_mapgen/mapgen.lua @@ -178,7 +178,7 @@ end if PyuTest.is_flat() then PyuTest.register_overworld_biome("flat", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_blocks:dark_grass_block", + node_top = "pyutest_grass:dark_grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.grassland, @@ -192,7 +192,7 @@ if PyuTest.is_flat() then end PyuTest.register_overworld_biome("grassland", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_blocks:grass_block", + node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.grassland, @@ -205,7 +205,7 @@ PyuTest.register_overworld_biome("grassland", PyuTest.BIOME_TYPES.NORMAL, { }) PyuTest.register_overworld_biome("forest", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_blocks:dark_grass_block", + node_top = "pyutest_grass:dark_grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, @@ -303,7 +303,7 @@ PyuTest.register_overworld_biome("ice_spikes", PyuTest.BIOME_TYPES.COLD, { }) PyuTest.register_overworld_biome("meadow", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_blocks:dark_grass_block", + node_top = "pyutest_grass:dark_grass_block", node_filler = "pyutest_blocks:dirt_block", depth_filler = 4, @@ -333,7 +333,7 @@ PyuTest.register_overworld_biome("snowy_forest", PyuTest.BIOME_TYPES.COLD, { }) PyuTest.register_overworld_biome("savanna", PyuTest.BIOME_TYPES.WARM, { - node_top = "pyutest_blocks:savanna_grass_block", + node_top = "pyutest_grass:savanna_grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.grassland, @@ -344,7 +344,7 @@ PyuTest.register_overworld_biome("savanna", PyuTest.BIOME_TYPES.WARM, { }) PyuTest.register_overworld_biome("taiga", PyuTest.BIOME_TYPES.CHILLY, { - node_top = "pyutest_blocks:dark_grass_block", + node_top = "pyutest_grass:dark_grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, @@ -357,7 +357,7 @@ PyuTest.register_overworld_biome("taiga", PyuTest.BIOME_TYPES.CHILLY, { }) PyuTest.register_overworld_biome("birch_forest", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_blocks:grass_block", + node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, @@ -370,7 +370,7 @@ PyuTest.register_overworld_biome("birch_forest", PyuTest.BIOME_TYPES.NORMAL, { }) PyuTest.register_overworld_biome("cherry_grove", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_blocks:grass_block", + node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, @@ -384,7 +384,7 @@ PyuTest.register_overworld_biome("cherry_grove", PyuTest.BIOME_TYPES.NORMAL, { }) PyuTest.register_overworld_biome("swamp", PyuTest.BIOME_TYPES.WETLAND, { - node_top = "pyutest_blocks:swampy_grass_block", + node_top = "pyutest_grass:swampy_grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.swamp, @@ -395,7 +395,7 @@ PyuTest.register_overworld_biome("swamp", PyuTest.BIOME_TYPES.WETLAND, { }) PyuTest.register_overworld_biome("old_growth_birch_forest", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_blocks:grass_block", + node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, @@ -409,7 +409,7 @@ PyuTest.register_overworld_biome("old_growth_birch_forest", PyuTest.BIOME_TYPES. }) PyuTest.register_overworld_biome("aspen_forest", PyuTest.BIOME_TYPES.CHILLY, { - node_top = "pyutest_blocks:aspen_grass_block", + node_top = "pyutest_grass:aspen_grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.BIOME_TOPS.forest, diff --git a/mods/MAPGEN/pyutest_mapgen/trees.lua b/mods/MAPGEN/pyutest_mapgen/trees.lua index ca6c1e6..d4508f4 100644 --- a/mods/MAPGEN/pyutest_mapgen/trees.lua +++ b/mods/MAPGEN/pyutest_mapgen/trees.lua @@ -136,7 +136,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "schematic", - place_on = {"pyutest_blocks:grass_block"}, + place_on = {"group:grass"}, sidelen = 16, fill_ratio = 0.005, biomes = {"birch_forest"}, @@ -148,7 +148,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "schematic", - place_on = {"pyutest_blocks:grass_block"}, + place_on = {"group:grass"}, sidelen = 16, fill_ratio = 0.005, biomes = {"birch_forest", "old_growth_birch_forest"}, @@ -160,7 +160,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "schematic", - place_on = {"pyutest_blocks:grass_block"}, + place_on = {"group:grass"}, sidelen = 16, fill_ratio = 0.005, biomes = {"cherry_grove"}, @@ -210,7 +210,7 @@ minetest.register_decoration({ minetest.register_decoration({ deco_type = "schematic", - place_on = {"pyutest_blocks:grass_block"}, + place_on = {"group:grass"}, sidelen = 16, fill_ratio = 0.004, biomes = {"old_growth_birch_forest"}, diff --git a/mods/MAPGEN/pyutest_ores/init.lua b/mods/MAPGEN/pyutest_ores/init.lua index 0d093e6..57909e6 100644 --- a/mods/MAPGEN/pyutest_ores/init.lua +++ b/mods/MAPGEN/pyutest_ores/init.lua @@ -64,7 +64,8 @@ PyuTest.make_ore = function(id, desc, item_id_suffix, item_description_suffix, o ore_drop = nil, ore_drop_count = 1, ore_sounds = nil, - ore_tiles = {}, + ore_stone = {"pyutest-stone.png"}, + ore_color = nil, item_conf = {}, item_groups = {}, @@ -103,10 +104,11 @@ PyuTest.make_ore = function(id, desc, item_id_suffix, item_description_suffix, o cracky = conf.ore_strength, mineral = 1, }, conf.ore_groups), - light_source = 2.2, + -- light_source = 2.2, drop = conf.ore_drop or (conf.make_raw and rid or iid) .. " " .. tostring(conf.ore_drop_count or 1), sounds = PyuTest.make_node_sounds(conf.ore_sounds), - tiles = conf.ore_tiles + tiles = conf.ore_stone, + overlay_tiles = {{name = "pyutest-ore-overlay.png", color = conf.ore_color}} }, conf.ore_conf)) minetest.register_craftitem(iid, PyuTest.util.tableconcat({ @@ -198,7 +200,7 @@ PyuTest.make_ore("pyutest_ores:coal", "Coal", "lump", "Lump", { ore_strength = PyuTest.BLOCK_NORMAL, ore_drop_count = 2, - ore_tiles = {"pyutest-ore-coal.png"}, + ore_color = {r = 32, g = 32, b = 32}, item_texture = "pyutest-lump.png", item_conf = { @@ -217,7 +219,6 @@ PyuTest.make_ore("pyutest_ores:iron", "Iron", "ingot", "Ingot", { y_max = 18, ore_strength = PyuTest.BLOCK_NORMAL, - ore_tiles = {"pyutest-ore-iron.png"}, item_texture = "pyutest-ingot.png", @@ -232,7 +233,7 @@ PyuTest.make_ore("pyutest_ores:copper", "Copper", "ingot", "Ingot", { y_max = 18, ore_strength = PyuTest.BLOCK_NORMAL, - ore_tiles = {"pyutest-ore-copper.png"}, + ore_color = "darkgoldenrod", item_texture = "pyutest-ingot.png", item_conf = { @@ -254,7 +255,7 @@ PyuTest.make_ore("pyutest_ores:gold", "Gold", "ingot", "Ingot", { y_max = -35, ore_strength = PyuTest.BLOCK_NORMAL, - ore_tiles = {"pyutest-ore-gold.png"}, + ore_color = "gold", item_texture = "pyutest-ingot.png", item_conf = { @@ -276,7 +277,7 @@ PyuTest.make_ore("pyutest_ores:diamond", "Diamond", "shard", "Shard", { y_max = -50, ore_strength = PyuTest.BLOCK_NORMAL, - ore_tiles = {"pyutest-ore-diamond.png"}, + ore_color = "cyan", item_texture = "pyutest-shard.png", item_conf = { @@ -292,7 +293,7 @@ PyuTest.make_ore("pyutest_ores:emerald", "Emerald", "shard", "Shard", { y_max = -50, ore_strength = PyuTest.BLOCK_NORMAL, - ore_tiles = {"pyutest-ore-emerald.png"}, + ore_color = "seagreen", item_texture = "pyutest-shard.png", item_conf = { @@ -308,7 +309,7 @@ PyuTest.make_ore("pyutest_ores:zinc", "Zinc", "ingot", "Ingot", { y_max = 18, ore_strength = PyuTest.BLOCK_NORMAL, - ore_tiles = {"pyutest-ore-zinc.png"}, + ore_color = "#bed3d4", item_texture = "pyutest-ingot.png", item_conf = { @@ -332,8 +333,7 @@ PyuTest.make_ore("pyutest_ores:tin", "Tin", "ingot", "Ingot", { y_max = 18, ore_strength = PyuTest.BLOCK_NORMAL, - ore_tiles = {"pyutest-ore-tin.png"}, - ore_levle = 2, + ore_color = "#8e8591", item_texture = "pyutest-ingot.png", item_conf = { diff --git a/mods/PLAYER/pyutest_player/init.lua b/mods/PLAYER/pyutest_player/init.lua index 85dca8f..c71c7fd 100644 --- a/mods/PLAYER/pyutest_player/init.lua +++ b/mods/PLAYER/pyutest_player/init.lua @@ -9,6 +9,10 @@ minetest.register_on_joinplayer(function (player) player:get_inventory():set_width("main", 8) player:get_inventory():set_size("main", 8 * 4) player:hud_set_hotbar_itemcount(8) + player:set_lighting({ + volumetric_light = { strength = 0.1 }, + saturation = 1.1, + }) -- creative mode privs if minetest.is_creative_enabled(name) then @@ -53,7 +57,7 @@ if minetest.is_creative_enabled("") then range = 9, tool_capabilities = PyuTest.tool_caps({ uses = 0, - time = 0.35, + time = 0.20, groupcaps = { crumbly = {}, diff --git a/textures/pyutest-cherry-wood.png b/textures/pyutest-cherry-wood.png index fb0ead3..d03a7f6 100644 Binary files a/textures/pyutest-cherry-wood.png and b/textures/pyutest-cherry-wood.png differ diff --git a/textures/pyutest-grass-side.png b/textures/pyutest-grass-side.png new file mode 100644 index 0000000..b47b6a8 Binary files /dev/null and b/textures/pyutest-grass-side.png differ diff --git a/textures/pyutest-grass-top.png b/textures/pyutest-grass-top.png new file mode 100644 index 0000000..1ccb1c9 Binary files /dev/null and b/textures/pyutest-grass-top.png differ diff --git a/textures/pyutest-ice.png b/textures/pyutest-ice.png index 2a4cdb0..5feebd0 100644 Binary files a/textures/pyutest-ice.png and b/textures/pyutest-ice.png differ diff --git a/textures/pyutest-jungle-wood.png b/textures/pyutest-jungle-wood.png index ac697be..27afad6 100644 Binary files a/textures/pyutest-jungle-wood.png and b/textures/pyutest-jungle-wood.png differ diff --git a/textures/pyutest-molten-rock.png b/textures/pyutest-molten-rock.png index 5c3ad99..31820a7 100644 Binary files a/textures/pyutest-molten-rock.png and b/textures/pyutest-molten-rock.png differ diff --git a/textures/pyutest-ore-overlay.png b/textures/pyutest-ore-overlay.png new file mode 100644 index 0000000..da3c11c Binary files /dev/null and b/textures/pyutest-ore-overlay.png differ diff --git a/textures/pyutest-redwood.png b/textures/pyutest-redwood.png index fb6684a..b114aa4 100644 Binary files a/textures/pyutest-redwood.png and b/textures/pyutest-redwood.png differ diff --git a/textures/pyutest-savanna-wood.png b/textures/pyutest-savanna-wood.png index 890438a..918d87e 100644 Binary files a/textures/pyutest-savanna-wood.png and b/textures/pyutest-savanna-wood.png differ diff --git a/textures/pyutest-snow.png b/textures/pyutest-snow.png index 0b7cbc7..26f5a2b 100644 Binary files a/textures/pyutest-snow.png and b/textures/pyutest-snow.png differ diff --git a/textures/pyutest-stone.png b/textures/pyutest-stone.png index a91d780..90c67e6 100644 Binary files a/textures/pyutest-stone.png and b/textures/pyutest-stone.png differ diff --git a/textures/pyutest-vyn-wood.png b/textures/pyutest-vyn-wood.png index 8a08c33..5f4c39f 100644 Binary files a/textures/pyutest-vyn-wood.png and b/textures/pyutest-vyn-wood.png differ