From b53ac766f1e764d6daa3ddadb6d692a8e3feed55 Mon Sep 17 00:00:00 2001 From: IamPyu Date: Sat, 19 Oct 2024 14:57:29 -0600 Subject: [PATCH] Add ferns and enchanted axe --- CHANGELOG.md | 2 ++ mods/CORE/pyutest/models/chair.mtl | 2 -- mods/CORE/pyutest/models/mtable.mtl | 2 -- .../models/{chair.obj => pyutest-chair.obj} | 0 .../models/{mtable.obj => pyutest-mtable.obj} | 0 mods/ITEMS/pyutest_furniture/init.lua | 4 +-- mods/ITEMS/pyutest_grass/init.lua | 4 +++ mods/ITEMS/pyutest_magic/init.lua | 26 ++++++++++++++++++ mods/ITEMS/pyutest_tools/tools.lua | 24 ++++++++-------- textures/pyutest-enchanted-axe.png | Bin 0 -> 273 bytes textures/pyutest-fern.png | Bin 0 -> 171 bytes 11 files changed, 46 insertions(+), 18 deletions(-) delete mode 100644 mods/CORE/pyutest/models/chair.mtl delete mode 100644 mods/CORE/pyutest/models/mtable.mtl rename mods/CORE/pyutest/models/{chair.obj => pyutest-chair.obj} (100%) rename mods/CORE/pyutest/models/{mtable.obj => pyutest-mtable.obj} (100%) create mode 100644 textures/pyutest-enchanted-axe.png create mode 100644 textures/pyutest-fern.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 77993f7..63b1a10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ - Added Concrete which is really just a blank colored block :| - Added Tuff and Diorite both of which can spawn in caves - Added Diorite and Tuff Bricks +- Added Ferns +- Added Enchanted Pickaxe, somehow forgot to add it several updates ago. ## [Oct 6th - Oct 12th 2024] Update: Texture Update diff --git a/mods/CORE/pyutest/models/chair.mtl b/mods/CORE/pyutest/models/chair.mtl deleted file mode 100644 index bbff51c..0000000 --- a/mods/CORE/pyutest/models/chair.mtl +++ /dev/null @@ -1,2 +0,0 @@ -# Made in Blockbench 4.10.3 -newmtl none \ No newline at end of file diff --git a/mods/CORE/pyutest/models/mtable.mtl b/mods/CORE/pyutest/models/mtable.mtl deleted file mode 100644 index bbff51c..0000000 --- a/mods/CORE/pyutest/models/mtable.mtl +++ /dev/null @@ -1,2 +0,0 @@ -# Made in Blockbench 4.10.3 -newmtl none \ No newline at end of file diff --git a/mods/CORE/pyutest/models/chair.obj b/mods/CORE/pyutest/models/pyutest-chair.obj similarity index 100% rename from mods/CORE/pyutest/models/chair.obj rename to mods/CORE/pyutest/models/pyutest-chair.obj diff --git a/mods/CORE/pyutest/models/mtable.obj b/mods/CORE/pyutest/models/pyutest-mtable.obj similarity index 100% rename from mods/CORE/pyutest/models/mtable.obj rename to mods/CORE/pyutest/models/pyutest-mtable.obj diff --git a/mods/ITEMS/pyutest_furniture/init.lua b/mods/ITEMS/pyutest_furniture/init.lua index 6b9f8a4..ca42b82 100644 --- a/mods/ITEMS/pyutest_furniture/init.lua +++ b/mods/ITEMS/pyutest_furniture/init.lua @@ -45,7 +45,7 @@ PyuTest.make_furniture = function(name, desc, craft, tiles, cgroups, extra_conf) paramtype = "light", paramtype2 = "4dir", drawtype = "mesh", - mesh = "chair.obj", + mesh = "pyutest-chair.obj", selection_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 1.1, 0.5 } @@ -69,7 +69,7 @@ PyuTest.make_furniture = function(name, desc, craft, tiles, cgroups, extra_conf) paramtype = "light", paramtype2 = "4dir", drawtype = "mesh", - mesh = "mtable.obj", + mesh = "pyutest-mtable.obj", selection_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 0.25, 0.5 } diff --git a/mods/ITEMS/pyutest_grass/init.lua b/mods/ITEMS/pyutest_grass/init.lua index 3f69232..57ab042 100644 --- a/mods/ITEMS/pyutest_grass/init.lua +++ b/mods/ITEMS/pyutest_grass/init.lua @@ -15,6 +15,10 @@ PyuTest.make_grass = function (name, desc, groups, color, ttex, stex, dtex, econ color = color }) + PyuTest.make_flower(name.."_fern", desc .. " Fern", "pyutest-fern.png", nil, false, nil, { + color = color + }) + minetest.override_item(name.."_block", econf or {}) end diff --git a/mods/ITEMS/pyutest_magic/init.lua b/mods/ITEMS/pyutest_magic/init.lua index c7a44c2..badd72d 100644 --- a/mods/ITEMS/pyutest_magic/init.lua +++ b/mods/ITEMS/pyutest_magic/init.lua @@ -99,6 +99,32 @@ minetest.register_craft({ } }) +PyuTest.make_tool("pyutest_magic:enchanted_axe", "Enchanted Axe", {}, "pyutest-enchanted-axe.png", { + stack_max = 1, + tool_capabilities = PyuTest.tool_caps({ + uses = 2768, + attack_uses = 2768 / 2, + groupcaps = { + choppy = { + times = { + [PyuTest.BLOCK_FAST] = 0.4, + [PyuTest.BLOCK_NORMAL] = 0.6, + [PyuTest.BLOCK_SLOW] = 0.8 + } + } + } + }) +}) + +minetest.register_craft({ + output = "pyutest_magic:enchanted_axe", + recipe = { + {"pyutest_magic:enchanted_shard", "pyutest_magic:enchanted_shard", ""}, + {"pyutest_magic:enchanted_shard", "pyutest_tools:stick", ""}, + {"", "pyutest_tools:stick", ""} + } +}) + PyuTest.make_sword("pyutest_magic:enchanted_sword", "Enchanted Sword", "pyutest-enchanted-sword.png", 9, 3600, 0.7) diff --git a/mods/ITEMS/pyutest_tools/tools.lua b/mods/ITEMS/pyutest_tools/tools.lua index 08b5e61..332f0b8 100644 --- a/mods/ITEMS/pyutest_tools/tools.lua +++ b/mods/ITEMS/pyutest_tools/tools.lua @@ -71,9 +71,9 @@ PyuTest.make_tool("pyutest_tools:wooden_axe", "Wooden Axe", {}, "pyutest-wooden- groupcaps = { choppy = { times = { - [PyuTest.BLOCK_FAST] = 1.1, - [PyuTest.BLOCK_NORMAL] = 1.6, - [PyuTest.BLOCK_SLOW] = 2.2 + [PyuTest.BLOCK_FAST] = 1.2, + [PyuTest.BLOCK_NORMAL] = 1.4, + [PyuTest.BLOCK_SLOW] = 1.6 } } } @@ -88,9 +88,9 @@ PyuTest.make_tool("pyutest_tools:stone_axe", "Stone Axe", {}, "pyutest-stone-axe groupcaps = { choppy = { times = { - [PyuTest.BLOCK_FAST] = 0.98, - [PyuTest.BLOCK_NORMAL] = 1.23, - [PyuTest.BLOCK_SLOW] = 2 + [PyuTest.BLOCK_FAST] = 1, + [PyuTest.BLOCK_NORMAL] = 1.2, + [PyuTest.BLOCK_SLOW] = 1.4 } } } @@ -105,9 +105,9 @@ PyuTest.make_tool("pyutest_tools:iron_axe", "Iron Axe", {}, "pyutest-iron-axe.pn groupcaps = { choppy = { times = { - [PyuTest.BLOCK_FAST] = 0.4, - [PyuTest.BLOCK_NORMAL] = 0.6, - [PyuTest.BLOCK_SLOW] = 1.8 + [PyuTest.BLOCK_FAST] = 0.8, + [PyuTest.BLOCK_NORMAL] = 1, + [PyuTest.BLOCK_SLOW] = 1.2 } } } @@ -122,9 +122,9 @@ PyuTest.make_tool("pyutest_tools:diamond_axe", "Diamond Axe", {}, "pyutest-diamo groupcaps = { choppy = { times = { - [PyuTest.BLOCK_FAST] = 0.3, - [PyuTest.BLOCK_NORMAL] = 0.4, - [PyuTest.BLOCK_SLOW] = 1.4 + [PyuTest.BLOCK_FAST] = 0.6, + [PyuTest.BLOCK_NORMAL] = 0.8, + [PyuTest.BLOCK_SLOW] = 1 } } } diff --git a/textures/pyutest-enchanted-axe.png b/textures/pyutest-enchanted-axe.png new file mode 100644 index 0000000000000000000000000000000000000000..3832f5b5dc5dd4b3abb12fa0806ccd59eac07fc4 GIT binary patch literal 273 zcmV+s0q*{ZP)w?P<&M*e5b1{hgxXSSC^F0PWR$&Y^cw-^W z((wP?dv6)ue*DUC`PEgpi;!c25uaueHg<;nmme`4fAB>Ar`&K2@Fq+SLS71hNR#sNe4iiP@ zHFeFBN@{Ay4jf?MWG`_BD$mijJIlhj&A@@(BKaXu=l{fQlT#TsP5$Vr%y9Frr@zeN S$!CGKGkCiCxvX