From 88c0475d310011a7e0db05ca7da3ba6cdc92e1ad Mon Sep 17 00:00:00 2001 From: IamPyu Date: Thu, 12 Dec 2024 19:11:01 -0600 Subject: [PATCH] Add Pork, and Ominous Forests --- CHANGELOG.md | 9 +++++--- mods/CORE/pyutest/schematics/OminousTree.mts | Bin 0 -> 251 bytes mods/ENTITIES/pyutest_mobs/basic.lua | 11 ++++++++- mods/ITEMS/pyutest_blocks/basic.lua | 2 +- mods/ITEMS/pyutest_grass/init.lua | 5 +++++ mods/ITEMS/pyutest_leaves/init.lua | 1 + mods/ITEMS/pyutest_tools/food.lua | 8 +++++-- mods/WORLD/pyutest_mapgen/api.lua | 1 + mods/WORLD/pyutest_overworld/biomes.lua | 21 +++++++++++++++--- mods/WORLD/pyutest_overworld/biomes_extra.lua | 13 +++++++++++ mods/WORLD/pyutest_overworld/init.lua | 3 ++- mods/WORLD/pyutest_overworld/trees.lua | 11 +++++++++ textures/pyutest-cooked-pork.png | Bin 0 -> 233 bytes textures/pyutest-golden-apple.png | Bin 0 -> 194 bytes textures/pyutest-raw-pork.png | Bin 0 -> 173 bytes 15 files changed, 74 insertions(+), 11 deletions(-) create mode 100644 mods/CORE/pyutest/schematics/OminousTree.mts create mode 100644 mods/WORLD/pyutest_overworld/biomes_extra.lua create mode 100644 textures/pyutest-cooked-pork.png create mode 100644 textures/pyutest-golden-apple.png create mode 100644 textures/pyutest-raw-pork.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 960869b..d3685cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## [Dec 2nd - STILL UNDER DEVELOPMENT] So far unnamed update +## [Dec 2nd - STILL UNDER DEVELOPMENT] Major Update: The Greatest Update + +I am running out of names for updates extremely fast. Notable Game Changes: @@ -10,9 +12,8 @@ Notable Game Changes: - Improved Slabs - Improved Stairs - Added Reinforced Glass -- Add back the Rubies that were removed a while ago! - Replaced Spawnpoints with a item -- Added Pigs +- Added Pigs along with Raw and Cooked Pork - Improved hudbars - Improved command system and added Command Blocks - Added many new commands, while also improving some builtin Luanti ones. @@ -51,6 +52,8 @@ Other Game Changes: - Added Mossy Cobblestone - Added Boulders - Mushroom biomes are now marked as lowlands, only going up to Y 10 +- Superslime now bounces the player slightly higher +- Add back the Rubies that were removed a while ago! Code Changes: diff --git a/mods/CORE/pyutest/schematics/OminousTree.mts b/mods/CORE/pyutest/schematics/OminousTree.mts new file mode 100644 index 0000000000000000000000000000000000000000..2cc0af42ac8110d12267598c7657288fb703f103 GIT binary patch literal 251 zcmeYb3HD`RVc=kpW8kRA3mBLgm=iOL7?cYtOG{FVOX71<6U$PIt@3j-^YTlJq1^bS zoc!c$1`(K|^8EZ1tNg_5_?-OoiaBqmKICgq;Aq(@{{HIfnbHs0cA1Lo>5q4RckWQ6 zm+*=Fw~w}q&lGv<`t|kMDO==?v~T@h_vy{@v#U!VFZVnrJ@$5d8l6Te)_0l! literal 0 HcmV?d00001 diff --git a/mods/ENTITIES/pyutest_mobs/basic.lua b/mods/ENTITIES/pyutest_mobs/basic.lua index 6f4d95b..bd8dcee 100644 --- a/mods/ENTITIES/pyutest_mobs/basic.lua +++ b/mods/ENTITIES/pyutest_mobs/basic.lua @@ -156,6 +156,15 @@ mobs:register_mob("pyutest_mobs:pig", { collisionbox = PyuTest.SMALL_ANIMAL_CBOX, can_leap = false, jump = false, - pushable = false + pushable = false, + + drops = { + { + name = "pyutest_tools:raw_pork", + min = 2, + max = 4, + chance = 1 + } + } }) mobs:register_egg("pyutest_mobs:pig", "Pig Spawn Egg", "pyutest-egg.png^[multiply:pink", 0) diff --git a/mods/ITEMS/pyutest_blocks/basic.lua b/mods/ITEMS/pyutest_blocks/basic.lua index 108c213..5283b45 100644 --- a/mods/ITEMS/pyutest_blocks/basic.lua +++ b/mods/ITEMS/pyutest_blocks/basic.lua @@ -290,6 +290,6 @@ PyuTest.make_building_blocks("pyutest_blocks:slime", "Slime", { "pyutest-slime.p }) PyuTest.make_building_blocks("pyutest_blocks:superslime", "Superslime", { "pyutest-slime.png" }, "cyan", { - bouncy = 110, + bouncy = 115, oddly_breakable_by_hand = PyuTest.BLOCK_FAST }) diff --git a/mods/ITEMS/pyutest_grass/init.lua b/mods/ITEMS/pyutest_grass/init.lua index abca828..32d9058 100644 --- a/mods/ITEMS/pyutest_grass/init.lua +++ b/mods/ITEMS/pyutest_grass/init.lua @@ -100,6 +100,11 @@ PyuTest.make_grass("pyutest_grass:snowy_grass", "Snowy Grass", { acid_vulnerable = 1, }, "#f2f6fb") +PyuTest.make_grass("pyutest_grass:ominous_grass", "Ominous Grass", { + crumbly = PyuTest.BLOCK_FAST, + acid_vulnerable = 1, +}, "#433548") + PyuTest.make_grass("pyutest_grass:dirt_path", "Dirt Path", { crumbly = PyuTest.BLOCK_FAST, acid_vulnerable = 1, diff --git a/mods/ITEMS/pyutest_leaves/init.lua b/mods/ITEMS/pyutest_leaves/init.lua index 741b9fa..8960c6f 100644 --- a/mods/ITEMS/pyutest_leaves/init.lua +++ b/mods/ITEMS/pyutest_leaves/init.lua @@ -58,3 +58,4 @@ PyuTest.make_leaves("pyutest_leaves:cherry", "Cherry", "#f3c2db") PyuTest.make_leaves("pyutest_leaves:dark", "Dark", "#395124") PyuTest.make_leaves("pyutest_leaves:aspen", "Aspen", "#978c52") PyuTest.make_leaves("pyutest_leaves:red_aspen", "Red Aspen", "#945c53") +PyuTest.make_leaves("pyutest_leaves:ominous", "Ominous", "#3e3245") diff --git a/mods/ITEMS/pyutest_tools/food.lua b/mods/ITEMS/pyutest_tools/food.lua index 16bb81c..0747bed 100644 --- a/mods/ITEMS/pyutest_tools/food.lua +++ b/mods/ITEMS/pyutest_tools/food.lua @@ -1,4 +1,5 @@ PyuTest.make_food("pyutest_tools:apple", "Apple", "pyutest-apple.png", 6) +PyuTest.make_food("pyutest_tools:golden_apple", "Golden Apple", "pyutest-golden-apple.png", 9) PyuTest.make_food("pyutest_tools:bread", "Bread", "pyutest-bread.png", 4) PyuTest.make_food("pyutest_tools:carrot", "Carrot", "pyutest-carrot.png", 7) PyuTest.make_food("pyutest_tools:banana", "Banana", "pyutest-banana.png", 6) @@ -6,6 +7,9 @@ PyuTest.make_food("pyutest_tools:water_bottle", "Water Bottle", "pyutest-water-b PyuTest.make_food("pyutest_tools:potato", "Potato", "pyutest-potato.png", 3, "pyutest_tools:cooked_potato") PyuTest.make_food("pyutest_tools:cooked_potato", "Cooked Potato", "pyutest-cooked-potato.png", 7) -PyuTest.make_food("pyutest_tools:sliced_potato", "Sliced Potato", "pyutest-sliced-potato.png", 0.5, "pyutest_tools:french_fries") +PyuTest.make_food("pyutest_tools:sliced_potato", "Sliced Potato", "pyutest-sliced-potato.png", 1, "pyutest_tools:french_fries") -PyuTest.make_food("pyutest_tools:french_fries", "French Fries", "pyutest-french-fries.png", 6.5) +PyuTest.make_food("pyutest_tools:french_fries", "French Fries", "pyutest-french-fries.png", 6) + +PyuTest.make_food("pyutest_tools:raw_pork", "Raw Pork", "pyutest-raw-pork.png", 3, "pyutest_tools:cooked_pork") +PyuTest.make_food("pyutest_tools:cooked_pork", "Cooked Pork", "pyutest-cooked-pork.png", 9) diff --git a/mods/WORLD/pyutest_mapgen/api.lua b/mods/WORLD/pyutest_mapgen/api.lua index 7179030..9c4e5cd 100644 --- a/mods/WORLD/pyutest_mapgen/api.lua +++ b/mods/WORLD/pyutest_mapgen/api.lua @@ -65,6 +65,7 @@ PyuTest.MOUNTAIN_STRIP_NOISE_PARAMS = { } PyuTest.OVERWORLD_BIOME_TOPS = { + extreme_lowland = 3, lowland = 10, normal = 45, elevated = 200, diff --git a/mods/WORLD/pyutest_overworld/biomes.lua b/mods/WORLD/pyutest_overworld/biomes.lua index 45e0c78..dbfcab2 100644 --- a/mods/WORLD/pyutest_overworld/biomes.lua +++ b/mods/WORLD/pyutest_overworld/biomes.lua @@ -135,7 +135,7 @@ PyuTest.register_overworld_biome("MushroomFields", PyuTest.BIOME_TYPES.NORMAL, { y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, - heat_point = 30, + heat_point = 50, humidity_point = 94, weight = PyuTest.BIOME_WEIGHTS.tiny, @@ -151,7 +151,7 @@ PyuTest.register_overworld_biome("LargeMushroomForest", PyuTest.BIOME_TYPES.NORM y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, - heat_point = 30, + heat_point = 50, humidity_point = 95, weight = PyuTest.BIOME_WEIGHTS.tiny, @@ -167,7 +167,7 @@ PyuTest.register_overworld_biome("Swamp", PyuTest.BIOME_TYPES.WETLAND, { y_max = PyuTest.OVERWORLD_BIOME_TOPS.lowland, y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, - heat_point = 30, + heat_point = 50, humidity_point = 100, weight = PyuTest.BIOME_WEIGHTS.tiny, @@ -237,6 +237,21 @@ PyuTest.register_overworld_biome("RedwoodForest", PyuTest.BIOME_TYPES.CHILLY, { _pyutest_fog_distance = 60, }) +PyuTest.register_overworld_biome("OminousForest", PyuTest.BIOME_TYPES.CHILLY, { + node_top = "pyutest_grass:ominous_grass", + node_filler = "pyutest_blocks:dirt_block", + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, + + heat_point = 19, + humidity_point = 81, + + weight = PyuTest.BIOME_WEIGHTS.tiny, + + _pyutest_fog_distance = 45, +}) + -- Winter PyuTest.register_overworld_biome("FrozenPlains", PyuTest.BIOME_TYPES.COLD, { node_dust = "pyutest_blocks:snow_carpet", diff --git a/mods/WORLD/pyutest_overworld/biomes_extra.lua b/mods/WORLD/pyutest_overworld/biomes_extra.lua new file mode 100644 index 0000000..f78727c --- /dev/null +++ b/mods/WORLD/pyutest_overworld/biomes_extra.lua @@ -0,0 +1,13 @@ +PyuTest.register_overworld_biome("GravelBeach", PyuTest.BIOME_TYPES.CHILLY, { + depth_top = 0, + node_filler = "pyutest_blocks:gravel_block", + depth_filler = 7, + + y_max = PyuTest.OVERWORLD_BIOME_TOPS.extreme_lowland, + y_min = PyuTest.OVERWORLD_SURFACE_BOTTOM, + + heat_point = 20, + humidity_point = 50, + + weight = PyuTest.BIOME_WEIGHTS.tiny +}, true) diff --git a/mods/WORLD/pyutest_overworld/init.lua b/mods/WORLD/pyutest_overworld/init.lua index 80a153f..2805540 100644 --- a/mods/WORLD/pyutest_overworld/init.lua +++ b/mods/WORLD/pyutest_overworld/init.lua @@ -2,7 +2,7 @@ local modpath = core.get_modpath("pyutest_overworld") if PyuTest.is_flat() then PyuTest.register_overworld_biome("flat", PyuTest.BIOME_TYPES.NORMAL, { - node_top = "pyutest_grass:grass_block", + node_top = "pyutest_blocks:sand_block", node_filler = "pyutest_blocks:dirt_block", y_max = PyuTest.OVERWORLD_BIOME_TOPS.normal, @@ -16,6 +16,7 @@ if PyuTest.is_flat() then end dofile(modpath .. "/biomes.lua") +dofile(modpath .. "/biomes_extra.lua") dofile(modpath .. "/caves.lua") dofile(modpath .. "/features.lua") dofile(modpath .. "/structures.lua") diff --git a/mods/WORLD/pyutest_overworld/trees.lua b/mods/WORLD/pyutest_overworld/trees.lua index fe4df56..83ab8f0 100644 --- a/mods/WORLD/pyutest_overworld/trees.lua +++ b/mods/WORLD/pyutest_overworld/trees.lua @@ -168,6 +168,17 @@ core.register_decoration({ flags = "place_center_x, place_center_z", }) +core.register_decoration({ + deco_type = "schematic", + place_on = { "pyutest_grass:ominous_grass" }, + sidelen = 16, + fill_ratio = 0.043, + biomes = { "OminousForest" }, + schematic = PyuTest.get_schematic_path("OminousTree"), + rotation = "random", + flags = "place_center_x, place_center_z", +}) + core.register_decoration({ deco_type = "schematic", place_on = { "pyutest_blocks:podzol_block" }, diff --git a/textures/pyutest-cooked-pork.png b/textures/pyutest-cooked-pork.png new file mode 100644 index 0000000000000000000000000000000000000000..fbd5d36b85dfa53cc328c9fd3248fa64ffc01a24 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`8$4YcLo9mNPTnZmY{27UUzr(F zsQ}c&mcaZhshP*Yak3I~;LZ}Q-zS|EKM0j>dhb{M$@oviS=O9SJJMM%nS8l=aL*cs zvu~T2x1Zx!lKJ9hQi=Zi`zMmGGYPoFOk6BG)!Emii zK$CAxN8f~F>((|*Tax@F{S4F5O>C962Oj^_I=ou;hHv#=wQB1XMbU!Z_bfLkS?zY; h#{O-yOyd9W{O-O;ZU3rlC7|0GJYD@<);T3K0RXoKUEBZw literal 0 HcmV?d00001 diff --git a/textures/pyutest-golden-apple.png b/textures/pyutest-golden-apple.png new file mode 100644 index 0000000000000000000000000000000000000000..1494917f1a1934abdf4d79d952fe61f373a3554b GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`ot`d^Ar`$`CmrN!P!MoY-};RLhsA$37Tn(K^skYd(eKk`W`2g(cQ%zo zerH^sv|(M2KmqqYDXnu0w7YX(-Voa|cM%)svn4MZS**?XvM*^`-W0x|d`Ura8@qU} tg6~u*h6Z`|!?Rv~iD3BfP(3Z1y`G literal 0 HcmV?d00001