diff --git a/README.md b/README.md index 07942a1..aecc4a3 100644 --- a/README.md +++ b/README.md @@ -102,6 +102,8 @@ who helped make this mod bigger and better throughout it's release :) - Use underground decoration placement for illumishrooms to improve performance - Use worldalign textures for stairs - Tidy and tweak code to run on Minetest 5.1 and above + - Replace 32px textures with 16px variants so items do not look mismatched + - Add new biome layout so that specific biomes aren't too large or small ### 1.31 - Fix fishing biome checks diff --git a/biome_info.json b/biome_info.json index e9f7930..4740cb6 100644 --- a/biome_info.json +++ b/biome_info.json @@ -6,9 +6,8 @@ {"name": "desert", "heat_point": 92, "humidity_point": 16, "y_min": 3, "y_max": 23}, {"name": "desert_ocean", "heat_point": 92, "humidity_point": 16, "y_min": -192, "y_max": 3}, {"name": "desert_under", "heat_point": 92, "humidity_point": 16, "y_min": -31000, "y_max": -256}, -{"name": "bamboo", "heat_point": 45, "humidity_point": 45, "y_min": 25, "y_max": 70}, -{"name": "sakura", "heat_point": 45, "humidity_point": 45, "y_min": 3, "y_max": 25}, -{"name": "sakura_ocean", "heat_point": 45, "humidity_point": 45, "y_min": -192, "y_max": 2}, +{"name": "bamboo", "heat_point": 45, "humidity_point": 45, "y_min": 3, "y_max": 70}, +{"name": "bamboo_ocean", "heat_point": 45, "humidity_point": 45, "y_min": -192, "y_max": 2}, {"name": "mesa", "heat_point": 25, "humidity_point": 10, "y_min": 1, "y_max": 71}, {"name": "mesa_ocean", "heat_point": 25, "humidity_point": 10, "y_min": -192, "y_max": 2}, {"name": "coniferous_forest", "heat_point": 45, "humidity_point": 70, "y_min": 6, "y_max": 140}, @@ -43,8 +42,8 @@ {"name": "grove", "heat_point": 40, "humidity_point": 25, "y_min": 3, "y_max": 23}, {"name": "grove_ocean", "heat_point": 40, "humidity_point": 25, "y_min": -192, "y_max": 2}, {"name": "mediterranean", "heat_point": 30, "humidity_point": 45, "y_min": 3, "y_max": 50}, -{"name": "mushroom", "heat_point": 45, "humidity_point": 85, "y_min": 3, "y_max": 50}, -{"name": "mushroom_ocean", "heat_point": 45, "humidity_point": 85, "y_min": -192, "y_max": 2}, +{"name": "mushroom", "heat_point": 45, "humidity_point": 90, "y_min": 3, "y_max": 50}, +{"name": "mushroom_ocean", "heat_point": 45, "humidity_point": 90, "y_min": -192, "y_max": 2}, {"name": "sandstone_desert", "heat_point": 60, "humidity_point": 0, "y_min": 3, "y_max": 23}, {"name": "sandstone_desert_ocean", "heat_point": 60, "humidity_point": 0, "y_min": -192, "y_max": 2}, {"name": "sandstone_desert_under", "heat_point": 60, "humidity_point": 0, "y_min": -31000, "y_max": -256}, diff --git a/biomes.lua b/biomes.lua index 0341942..6fec184 100644 --- a/biomes.lua +++ b/biomes.lua @@ -78,18 +78,12 @@ register_biome(ethereal.desert, { register_biome(ethereal.bamboo, { name = "bamboo", - heat_point = 45, humidity_point = 45, y_min = 25, y_max = 70, + heat_point = 45, humidity_point = 45, y_min = 3, y_max = 70, node_top = "ethereal:bamboo_dirt", depth_top = 1, node_filler = "default:dirt", depth_filler = 3}) -register_biome(ethereal.sakura, { - name = "sakura", - heat_point = 45, humidity_point = 45, y_min = 3, y_max = 25, - node_top = "ethereal:bamboo_dirt", depth_top = 1, - node_filler = "default:dirt", depth_filler = 3}) - -register_biome(ethereal.sakura, { - name = "sakura_ocean", +register_biome(ethereal.bamboo, { + name = "bamboo_ocean", heat_point = 45, humidity_point = 45, y_min = -192, y_max = 2, node_top = "default:sand", depth_top = 1, node_filler = "default:sand", depth_filler = 2}) @@ -334,13 +328,13 @@ register_biome(ethereal.mediterranean, { register_biome(ethereal.mushroom, { name = "mushroom", - heat_point = 45, humidity_point = 85, y_min = 3, y_max = 50, + heat_point = 45, humidity_point = 90, y_min = 3, y_max = 50, node_top = "ethereal:mushroom_dirt", depth_top = 1, node_filler = "default:dirt", depth_filler = 3}) register_biome(ethereal.mushroom, { name = "mushroom_ocean", - heat_point = 45, humidity_point = 85, y_min = -192, y_max = 2, + heat_point = 45, humidity_point = 90, y_min = -192, y_max = 2, node_top = "default:sand", depth_top = 1, node_filler = "default:sand", depth_filler = 2}) diff --git a/decor.lua b/decor.lua index ed054e1..f0346b0 100644 --- a/decor.lua +++ b/decor.lua @@ -243,7 +243,7 @@ register_decoration(1, { "ethereal:prairie_dirt", "ethereal:grove_dirt", "ethereal:bamboo_dirt"}, fill_ratio = 0.35, biomes = {"deciduous_forest", "grassytwo", "jumble", "junglee", "grove", "prairie", - "mediterranean", "bamboo", "sakura"}, + "mediterranean", "bamboo"}, decoration = {"default:grass_2", "default:grass_3", "default:grass_4", "default:grass_5"}}) @@ -255,10 +255,11 @@ register_decoration(1, { -- lilac -register_decoration(ethereal.sakura, { +register_decoration(ethereal.bamboo, { place_on = {"ethereal:bamboo_dirt"}, fill_ratio = 0.025, - biomes = {"sakura"}, + y_min = 3, y_max = 35, + biomes = {"bamboo"}, decoration = "ethereal:lilac"}) -- marram grass diff --git a/fishing.lua b/fishing.lua index 2a4adfd..dbe48b3 100644 --- a/fishing.lua +++ b/fishing.lua @@ -17,9 +17,9 @@ local fish_items = { {"ethereal:fish_flathead", "jungle"}, {"ethereal:fish_pufferfish", "desert_ocean"}, {"ethereal:fish_cichlid", "junglee_ocean"}, - {"ethereal:fish_coy", "sakura"}, - {"ethereal:fish_tilapia", "sakura"}, - {"ethereal:fish_trevally", "sakura"}, + {"ethereal:fish_coy", "bamboo"}, + {"ethereal:fish_tilapia", "bamboo"}, + {"ethereal:fish_trevally", "bamboo"}, {"ethereal:fish_angler", "ocean"}, {"ethereal:fish_jellyfish", "ocean"}, {"ethereal:fish_seahorse", "ocean"}, @@ -40,7 +40,7 @@ local fish_items = { {"ethereal:fish_tetra", "grayness_ocean"}, {"ethereal:fish_mackerel", "glacier"} } --- grassland_ocean, desert_ocean, sakura_ocean, mesa_ocean, coniferous_forest_ocean, +-- grassland_ocean, desert_ocean, bamboo_ocean, mesa_ocean, coniferous_forest_ocean, -- taiga_ocean, frost_ocean, deciduous_forest_ocean, grayness_ocean, grassytwo_ocean, -- prairie_ocean, jumble_ocean, junglee_ocean, grove_ocean, mushroom_ocean, -- sandstone_desert_ocean, plains_ocean, savanna_ocean, fiery_ocean, swamp_ocean, diff --git a/init.lua b/init.lua index 0e651fc..c1206a4 100644 --- a/init.lua +++ b/init.lua @@ -8,7 +8,7 @@ -- global -ethereal = {version = "20240820"} +ethereal = {version = "20240829"} -- setting helper @@ -64,7 +64,6 @@ setting("number", "fiery", 1) setting("number", "swamp", 1) setting("number", "sealife", 1) setting("number", "reefs", 1) -setting("number", "sakura", 1) setting("number", "tundra", 1) setting("number", "mediterranean", 1) setting("number", "logs", 1) diff --git a/schems.lua b/schems.lua index 80e283e..f8c579f 100644 --- a/schems.lua +++ b/schems.lua @@ -59,11 +59,11 @@ register_decoration(ethereal.glacier, { -- sakura tree -register_decoration(ethereal.sakura, { +register_decoration(ethereal.bamboo, { place_on = "ethereal:bamboo_dirt", - fill_ratio = 0.001, - biomes = {"sakura"}, - y_min = 7, y_max = 100, + fill_ratio = 0.002, + biomes = {"bamboo"}, + y_min = 7, y_max = 35, schematic = ethereal.sakura_tree, spawn_by = "ethereal:bamboo_dirt", num_spawn_by = 6}) @@ -253,6 +253,7 @@ register_decoration(1, { register_decoration(ethereal.bamboo, { place_on = "ethereal:bamboo_dirt", fill_ratio = 0.025, + y_min = 36, y_max = 70, biomes = {"bamboo"}, schematic = ethereal.bambootree}) @@ -261,6 +262,7 @@ register_decoration(ethereal.bamboo, { register_decoration(ethereal.bamboo, { place_on = "ethereal:bamboo_dirt", fill_ratio = 0.08, + y_min = 35, y_max = 70, biomes = {"bamboo"}, schematic = ethereal.bush, spawn_by = "ethereal:bamboo_dirt", num_spawn_by = 6}) diff --git a/settingtypes.txt b/settingtypes.txt index 2c9fddb..d1b3fb0 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -33,7 +33,6 @@ ethereal.fiery (Feiry Lava biome, 1 = Enable / 0 = Disable) int 1 ethereal.swamp (Swamp biome, 1 = Enable / 0 = Disable) int 1 ethereal.sealife (Coral and Seaweed biome, 1 = Enable / 0 = Disable) int 1 ethereal.reefs (MT5 Coral biome, 1 = Enable / 0 = Disable) int 1 -ethereal.sakura (Sakura biome, 1 = Enable / 0 = Disable) int 1 ethereal.tundra (Tundra biome, 1 = Enable / 0 = Disable) int 1 ethereal.mediterranean (Mediterranean biome, 1 = Enable / 0 = Disable) int 1 ethereal.logs (Tree log decor, 1 = Enable / 0 = Disable) int 1