diff --git a/CHANGELOG.md b/CHANGELOG.md index 673fd1c..15ee0b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,11 +39,14 @@ Other Game Changes: - Fireworks now damage entities when they're too close to the explosion - Added new damage types `fireworks` and `projectile` - Add healing information to food descriptions +- Replaced Grassland biome with Plains +- Added FrozenPeaks biome Code Changes: - Reorganize `pyutest_crafts` mod - Addded .editorconfig file and .luarc.json file +- Update unified_inventory and mobs_redo ## [Dec 1st] Unnamed Minor Update diff --git a/mods/PLAYER/pyutest_cmds/init.lua b/mods/PLAYER/pyutest_cmds/init.lua index 73a5a99..c67e498 100644 --- a/mods/PLAYER/pyutest_cmds/init.lua +++ b/mods/PLAYER/pyutest_cmds/init.lua @@ -78,10 +78,11 @@ core.register_chatcommand("teleport", { return end end - + + local caller = core.get_player_by_name(name) for _, v in pairs(targets) do local plr = core.get_player_by_name(v) - local pos = plr:get_pos() + local pos = caller:get_pos() local nx = core.parse_relative_number(x, pos.x) local ny = core.parse_relative_number(y, pos.y) diff --git a/mods/WORLD/pyutest_mapgen/api.lua b/mods/WORLD/pyutest_mapgen/api.lua index 2f09667..bd3d039 100644 --- a/mods/WORLD/pyutest_mapgen/api.lua +++ b/mods/WORLD/pyutest_mapgen/api.lua @@ -66,11 +66,21 @@ PyuTest.MOUNTAIN_STRIP_NOISE_PARAMS = { PyuTest.OVERWORLD_BIOME_TOPS = { lowland = 10, - normal = 200, + normal = 45, + elevated = 200, highlands = 1000, skyland = 31000, } +PyuTest.BIOME_WEIGHTS = { + tiny = 0.4, + small = 0.8, + normal = 1.0, + big = 1.3, + large = 1.8, + vast = 2.2 +} + -- Overworld biome types PyuTest.BIOME_TYPES = { -- Normal biomes (Forests for example) diff --git a/mods/WORLD/pyutest_overworld/biomes.lua b/mods/WORLD/pyutest_overworld/biomes.lua index 5d3b643..e0aa69c 100644 --- a/mods/WORLD/pyutest_overworld/biomes.lua +++ b/mods/WORLD/pyutest_overworld/biomes.lua @@ -14,15 +14,17 @@ if PyuTest.is_flat() then end -- "Just right" -PyuTest.register_overworld_biome("Grassland", PyuTest.BIOME_TYPES.NORMAL, { +PyuTest.register_overworld_biome("Plains", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, - heat_point = 50, - humidity_point = 60, + heat_point = 65, + humidity_point = 40, + + weight = PyuTest.BIOME_WEIGHTS.large, _pyutest_biome_flowering = true }) @@ -35,7 +37,9 @@ PyuTest.register_overworld_biome("Forest", PyuTest.BIOME_TYPES.NORMAL, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 50, - humidity_point = 66, + humidity_point = 80, + + weight = PyuTest.BIOME_WEIGHTS.big, _pyutest_biome_flowering = true }) @@ -48,7 +52,9 @@ PyuTest.register_overworld_biome("BirchForest", PyuTest.BIOME_TYPES.NORMAL, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 50, - humidity_point = 68, + humidity_point = 84, + + weight = PyuTest.BIOME_WEIGHTS.big, _pyutest_biome_flowering = true }) @@ -61,7 +67,9 @@ PyuTest.register_overworld_biome("OldGrowthBirchForest", PyuTest.BIOME_TYPES.NOR y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 50, - humidity_point = 70, + humidity_point = 87, + + weight = PyuTest.BIOME_WEIGHTS.big, _pyutest_biome_flowering = true, _pyutest_biome_flowering_extra = true @@ -72,12 +80,15 @@ PyuTest.register_overworld_biome("Meadow", PyuTest.BIOME_TYPES.NORMAL, { node_filler = "pyutest_blocks:dirt_block", depth_filler = 4, - y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, - y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, + y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, heat_point = 50, - humidity_point = 65, + humidity_point = 83, + weight = PyuTest.BIOME_WEIGHTS.big, + + _enable_beaches = false, _pyutest_biome_flowering = true, _pyutest_biome_flowering_extra = true }) @@ -86,12 +97,15 @@ PyuTest.register_overworld_biome("CherryGrove", PyuTest.BIOME_TYPES.NORMAL, { node_top = "pyutest_grass:grass_block", node_filler = "pyutest_blocks:dirt_block", - y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, - y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, + y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, heat_point = 50, - humidity_point = 60, + humidity_point = 85, + weight = PyuTest.BIOME_WEIGHTS.small, + + _enable_beaches = false, _pyutest_biome_flowering = true, _pyutest_biome_flowering_extra = true }) @@ -100,13 +114,17 @@ PyuTest.register_overworld_biome("CherryGrove", PyuTest.BIOME_TYPES.NORMAL, { PyuTest.register_overworld_biome("Desert", PyuTest.BIOME_TYPES.HOT, { node_top = "pyutest_blocks:sand_block", node_filler = "pyutest_blocks:sandstone_block", + depth_filler = 9, + node_riverbed = "pyutest_blocks:sand_block", - y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 80, - humidity_point = 10, + humidity_point = 0, + + weight = PyuTest.BIOME_WEIGHTS.vast, _enable_beaches = false }) @@ -119,7 +137,9 @@ PyuTest.register_overworld_biome("Savanna", PyuTest.BIOME_TYPES.WARM, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 75, - humidity_point = 10 + humidity_point = 0, + + weight = PyuTest.BIOME_WEIGHTS.large, }) -- Decent @@ -131,7 +151,9 @@ PyuTest.register_overworld_biome("MushroomFields", PyuTest.BIOME_TYPES.NORMAL, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 30, - humidity_point = 96, + humidity_point = 94, + + weight = PyuTest.BIOME_WEIGHTS.tiny, _enable_beaches = false, _pyutest_fog_distance = 60, @@ -145,7 +167,9 @@ PyuTest.register_overworld_biome("LargeMushroomForest", PyuTest.BIOME_TYPES.NORM y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 30, - humidity_point = 96, + humidity_point = 95, + + weight = PyuTest.BIOME_WEIGHTS.tiny, _enable_beaches = false, _pyutest_fog_distance = 60, @@ -159,7 +183,9 @@ PyuTest.register_overworld_biome("Swamp", PyuTest.BIOME_TYPES.WETLAND, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 30, - humidity_point = 88, + humidity_point = 100, + + weight = PyuTest.BIOME_WEIGHTS.tiny, _enable_beaches = false, _pyutest_fog_distance = 60, @@ -174,7 +200,9 @@ PyuTest.register_overworld_biome("Taiga", PyuTest.BIOME_TYPES.CHILLY, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 20, - humidity_point = 42, + humidity_point = 72, + + weight = PyuTest.BIOME_WEIGHTS.small, _pyutest_biome_flowering = true }) @@ -187,7 +215,9 @@ PyuTest.register_overworld_biome("AspenForest", PyuTest.BIOME_TYPES.CHILLY, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 20, - humidity_point = 50, + humidity_point = 74, + + weight = PyuTest.BIOME_WEIGHTS.small, _pyutest_biome_flowering = true, _pyutest_fog_distance = 60, @@ -201,7 +231,9 @@ PyuTest.register_overworld_biome("RedwoodForest", PyuTest.BIOME_TYPES.CHILLY, { y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, heat_point = 20, - humidity_point = 58, + humidity_point = 76, + + weight = PyuTest.BIOME_WEIGHTS.small, _pyutest_biome_flowering = true, _pyutest_fog_distance = 60, @@ -219,9 +251,10 @@ PyuTest.register_overworld_biome("FrozenPlains", PyuTest.BIOME_TYPES.COLD, { node_water_top = "pyutest_blocks:ice_block", depth_water_top = 1, - heat_point = 5, - humidity_point = 69, - _pyutest_fog_distance = 80, + heat_point = 0, + humidity_point = 73, + + weight = PyuTest.BIOME_WEIGHTS.large, }) PyuTest.register_overworld_biome("SnowyForest", PyuTest.BIOME_TYPES.COLD, { @@ -235,9 +268,10 @@ PyuTest.register_overworld_biome("SnowyForest", PyuTest.BIOME_TYPES.COLD, { node_water_top = "pyutest_blocks:ice_block", depth_water_top = 5, - heat_point = 5, - humidity_point = 75, - _pyutest_fog_distance = 80, + heat_point = 0, + humidity_point = 78, + + weight = PyuTest.BIOME_WEIGHTS.large, }) PyuTest.register_overworld_biome("IceSpikes", PyuTest.BIOME_TYPES.COLD, { @@ -250,8 +284,27 @@ PyuTest.register_overworld_biome("IceSpikes", PyuTest.BIOME_TYPES.COLD, { node_water_top = "pyutest_blocks:ice_block", depth_water_top = 5, - heat_point = 5, - humidity_point = 62, - _pyutest_fog_distance = 80, + heat_point = 0, + humidity_point = 75, + + weight = PyuTest.BIOME_WEIGHTS.large, + + _enable_beaches = false +}) + +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", + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.elevated, + y_min = PyuTest.OVERWORLD_BIOME_TOPS.normal, + + heat_point = 0, + humidity_point = 75, + + weight = PyuTest.BIOME_WEIGHTS.large, + _enable_beaches = false }) diff --git a/mods/WORLD/pyutest_overworld/flowers.lua b/mods/WORLD/pyutest_overworld/flowers.lua index 37c923d..12ca7e1 100644 --- a/mods/WORLD/pyutest_overworld/flowers.lua +++ b/mods/WORLD/pyutest_overworld/flowers.lua @@ -21,7 +21,7 @@ core.register_decoration({ place_on = { "group:grass" }, sidelen = 16, fill_ratio = 0.0018, - biomes = { "Grassland" }, + biomes = { "Plains" }, decoration = "pyutest_blocks:haybale_block" }) diff --git a/mods/WORLD/pyutest_overworld/trees.lua b/mods/WORLD/pyutest_overworld/trees.lua index c1eeb77..40d2865 100644 --- a/mods/WORLD/pyutest_overworld/trees.lua +++ b/mods/WORLD/pyutest_overworld/trees.lua @@ -14,7 +14,7 @@ core.register_decoration({ place_on = { "group:grass" }, sidelen = 16, fill_ratio = 0.00045, - biomes = { "Grassland" }, + biomes = { "Plains" }, schematic = PyuTest.get_schematic_path("Tree"), rotation = "random", flags = "place_center_x, place_center_z", diff --git a/mods/mobs_redo b/mods/mobs_redo index 77b53b9..c24874a 160000 --- a/mods/mobs_redo +++ b/mods/mobs_redo @@ -1 +1 @@ -Subproject commit 77b53b905443b894153ff6033c1a1e32261956bd +Subproject commit c24874a3bf094dbef5327c988937ccfe632b2d8e diff --git a/mods/unified_inventory b/mods/unified_inventory index 16265dc..43cf0d8 160000 --- a/mods/unified_inventory +++ b/mods/unified_inventory @@ -1 +1 @@ -Subproject commit 16265dca2dc2133fb9dd8bf31efd78077fa91a3d +Subproject commit 43cf0d8e7e5701d976a5b7b01bdf0194aa783295