diff --git a/CHANGELOG.md b/CHANGELOG.md index c889633..c0a17a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,11 +14,14 @@ Game Changes: - Added Reinforced Glass - Make Fireworks faster - Revamp Fences +- Added `stick` group for sticks +- Added Bones to the `stick` group, why not? +- Removed Beaches from IceSpikes biome +- Added `pickaxe` and `axe` groups Code Changes: - Reorganize `pyutest_crafts` mod -- Added `stick` group for sticks ## [Dec 1st] Unnamed Minor Update diff --git a/mods/ITEMS/pyutest_magic/init.lua b/mods/ITEMS/pyutest_magic/init.lua index 04d0364..fbab82a 100644 --- a/mods/ITEMS/pyutest_magic/init.lua +++ b/mods/ITEMS/pyutest_magic/init.lua @@ -75,7 +75,9 @@ core.register_craft({ } }) -PyuTest.make_tool("pyutest_magic:enchanted_pickaxe", "Enchanted Pickaxe", {}, "pyutest-enchanted-pickaxe.png", { +PyuTest.make_tool("pyutest_magic:enchanted_pickaxe", "Enchanted Pickaxe", { + pickaxe = 1 +}, "pyutest-enchanted-pickaxe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 2768, @@ -109,7 +111,9 @@ core.register_craft({ } }) -PyuTest.make_tool("pyutest_magic:enchanted_axe", "Enchanted Axe", {}, "pyutest-enchanted-axe.png", { +PyuTest.make_tool("pyutest_magic:enchanted_axe", "Enchanted Axe", { + axe = 1 +}, "pyutest-enchanted-axe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 2768, @@ -138,7 +142,6 @@ core.register_craft({ PyuTest.make_sword("pyutest_magic:enchanted_sword", "Enchanted Sword", "pyutest-enchanted-sword.png", 9, 3600, 0.7) - core.register_craft({ output = "pyutest_magic:enchanted_sword", recipe = { diff --git a/mods/ITEMS/pyutest_tools/items.lua b/mods/ITEMS/pyutest_tools/items.lua index e2a0d85..e8fc800 100644 --- a/mods/ITEMS/pyutest_tools/items.lua +++ b/mods/ITEMS/pyutest_tools/items.lua @@ -1,7 +1,11 @@ PyuTest.make_item("pyutest_tools:stick", "Stick", { stick = 1 }, "pyutest-stick.png") -PyuTest.make_item("pyutest_tools:bone", "Bone", {}, "pyutest-bone.png", {}) + +PyuTest.make_item("pyutest_tools:bone", "Bone", { + stick = 1 +}, "pyutest-bone.png", {}) + PyuTest.make_item("pyutest_tools:gunpowder", "Gunpowder", {}, "pyutest-powder.png", { color = "dimgray", }) @@ -33,6 +37,5 @@ PyuTest.make_item("pyutest_tools:glass_bottle", "Glass Bottle", {}, "pyutest-gla }) PyuTest.make_item("pyutest_tools:brick", "Brick", {}, "pyutest-brick.png") PyuTest.make_item("pyutest_tools:snowball", "Snowball", {}, "pyutest-snowball.png") -PyuTest.make_item("pyutest_tools:bone", "Bone", {}, "pyutest-bone.png") PyuTest.make_item("pyutest_tools:flint", "Flint", {}, "pyutest-flint.png") PyuTest.make_item("pyutest_tools:paper", "Paper", {}, "pyutest-paper.png") diff --git a/mods/ITEMS/pyutest_tools/tools/axes.lua b/mods/ITEMS/pyutest_tools/tools/axes.lua index ac450b4..d7a0f82 100644 --- a/mods/ITEMS/pyutest_tools/tools/axes.lua +++ b/mods/ITEMS/pyutest_tools/tools/axes.lua @@ -1,4 +1,6 @@ -PyuTest.make_tool("pyutest_tools:wooden_axe", "Wooden Axe", {}, "pyutest-wooden-axe.png", { +PyuTest.make_tool("pyutest_tools:wooden_axe", "Wooden Axe", { + axe = 1 +}, "pyutest-wooden-axe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 69, @@ -16,7 +18,9 @@ PyuTest.make_tool("pyutest_tools:wooden_axe", "Wooden Axe", {}, "pyutest-wooden- }) }) -PyuTest.make_tool("pyutest_tools:stone_axe", "Stone Axe", {}, "pyutest-stone-axe.png", { +PyuTest.make_tool("pyutest_tools:stone_axe", "Stone Axe", { + axe = 1 +}, "pyutest-stone-axe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 274, @@ -34,7 +38,9 @@ PyuTest.make_tool("pyutest_tools:stone_axe", "Stone Axe", {}, "pyutest-stone-axe }) }) -PyuTest.make_tool("pyutest_tools:iron_axe", "Iron Axe", {}, "pyutest-iron-axe.png", { +PyuTest.make_tool("pyutest_tools:iron_axe", "Iron Axe", { + axe = 1 +}, "pyutest-iron-axe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 689, @@ -52,7 +58,9 @@ PyuTest.make_tool("pyutest_tools:iron_axe", "Iron Axe", {}, "pyutest-iron-axe.pn }) }) -PyuTest.make_tool("pyutest_tools:diamond_axe", "Diamond Axe", {}, "pyutest-diamond-axe.png", { +PyuTest.make_tool("pyutest_tools:diamond_axe", "Diamond Axe", { + axe = 1 +}, "pyutest-diamond-axe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 1345, diff --git a/mods/ITEMS/pyutest_tools/tools/pickaxes.lua b/mods/ITEMS/pyutest_tools/tools/pickaxes.lua index 91e7b40..8983583 100644 --- a/mods/ITEMS/pyutest_tools/tools/pickaxes.lua +++ b/mods/ITEMS/pyutest_tools/tools/pickaxes.lua @@ -1,4 +1,6 @@ -PyuTest.make_tool("pyutest_tools:wooden_pickaxe", "Wooden Pickaxe", {}, "pyutest-wooden-pickaxe.png", { +PyuTest.make_tool("pyutest_tools:wooden_pickaxe", "Wooden Pickaxe", { + pickaxe = 1 +}, "pyutest-wooden-pickaxe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 69, @@ -23,7 +25,9 @@ PyuTest.make_tool("pyutest_tools:wooden_pickaxe", "Wooden Pickaxe", {}, "pyutest }) }) -PyuTest.make_tool("pyutest_tools:stone_pickaxe", "Stone Pickaxe", {}, "pyutest-stone-pickaxe.png", { +PyuTest.make_tool("pyutest_tools:stone_pickaxe", "Stone Pickaxe", { + pickaxe = 1 +}, "pyutest-stone-pickaxe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 274, @@ -48,7 +52,9 @@ PyuTest.make_tool("pyutest_tools:stone_pickaxe", "Stone Pickaxe", {}, "pyutest-s }) }) -PyuTest.make_tool("pyutest_tools:iron_pickaxe", "Iron Pickaxe", {}, "pyutest-iron-pickaxe.png", { +PyuTest.make_tool("pyutest_tools:iron_pickaxe", "Iron Pickaxe", { + pickaxe = 1 +}, "pyutest-iron-pickaxe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 689, @@ -73,7 +79,9 @@ PyuTest.make_tool("pyutest_tools:iron_pickaxe", "Iron Pickaxe", {}, "pyutest-iro }) }) -PyuTest.make_tool("pyutest_tools:diamond_pickaxe", "Diamond Pickaxe", {}, "pyutest-diamond-pickaxe.png", { +PyuTest.make_tool("pyutest_tools:diamond_pickaxe", "Diamond Pickaxe", { + pickaxe = 1 +}, "pyutest-diamond-pickaxe.png", { stack_max = 1, tool_capabilities = PyuTest.tool_caps({ uses = 1345, diff --git a/mods/WORLD/pyutest_overworld/biomes.lua b/mods/WORLD/pyutest_overworld/biomes.lua index 9c9cf87..b114946 100644 --- a/mods/WORLD/pyutest_overworld/biomes.lua +++ b/mods/WORLD/pyutest_overworld/biomes.lua @@ -253,4 +253,5 @@ PyuTest.register_overworld_biome("IceSpikes", PyuTest.BIOME_TYPES.COLD, { heat_point = 5, humidity_point = 62, _pyutest_fog_distance = 80, + _enable_beaches = false })