diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dd30ac..6efcf13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ I should just start giving updates a version number to avoid naming updates. - Give Fire an animated texture - Added a Sky Dimension for people using `floatlands` mapgen setting in v7 - Added Fireworks! +- Grass Plants and Ferns now require Shears to be obtained ## [Oct 20th - Nov 2nd] Update: The Something Update diff --git a/mods/ENTITIES/pyutest_fireworks/init.lua b/mods/ENTITIES/pyutest_fireworks/init.lua index c9d7307..ce7bf7e 100644 --- a/mods/ENTITIES/pyutest_fireworks/init.lua +++ b/mods/ENTITIES/pyutest_fireworks/init.lua @@ -2,7 +2,8 @@ minetest.register_entity("pyutest_fireworks:firework", { initial_properties = { visual = "upright_sprite", textures = {"pyutest-firework.png", "pyutest-firework.png"}, - physical = true + physical = true, + glow = minetest.LIGHT_MAX }, on_activate = function (self) @@ -14,6 +15,7 @@ minetest.register_entity("pyutest_fireworks:firework", { if vel.y < 0 then self:explode() self.object:remove() + return end vel.y = vel.y - (2 * dtime) @@ -22,7 +24,7 @@ minetest.register_entity("pyutest_fireworks:firework", { end, trail = function (self) - local pos = self.object:get_pos() + local pos = self.object:get_pos() - vector.new(0, .5, 0) minetest.add_particle({ pos = pos, @@ -46,7 +48,7 @@ minetest.register_entity("pyutest_fireworks:firework", { minetest.add_particlespawner({ amount = math.random(20, 40), - time = 1.8, + time = 0.8, minexptime = 0.4, maxexptime = 1.4, minsize = 2, diff --git a/mods/ITEMS/pyutest_flowers/init.lua b/mods/ITEMS/pyutest_flowers/init.lua index feca4f8..d85ead6 100644 --- a/mods/ITEMS/pyutest_flowers/init.lua +++ b/mods/ITEMS/pyutest_flowers/init.lua @@ -78,6 +78,7 @@ PyuTest.make_node("pyutest_flowers:lilypad", "Lily Pad", { type = "fixed", fixed = {-0.5, -31/64, -0.5, 0.5, -15/32, 0.5} }, + floodable = true, }) PyuTest.make_flower("pyutest_flowers:sugarcane", "Sugarcane", "pyutest-sugarcane.png", "pyutest_flowers:green_dye", false, nil) @@ -89,6 +90,7 @@ PyuTest.make_node("pyutest_flowers:sugarcane", "Sugarcane", { paramtype = "light", sunlight_propagates = true, walkable = false, + floodable = true, }) PyuTest.make_flower("pyutest_flowers:kelp", "Kelp", "pyutest-kelp.png", "pyutest_flowers:green_dye", false, "plantlike_rooted", { diff --git a/mods/ITEMS/pyutest_grass/init.lua b/mods/ITEMS/pyutest_grass/init.lua index bb583f5..dca41a4 100644 --- a/mods/ITEMS/pyutest_grass/init.lua +++ b/mods/ITEMS/pyutest_grass/init.lua @@ -11,12 +11,28 @@ PyuTest.make_grass = function (name, desc, groups, color, ttex, stex, dtex, econ overlay_tiles = {"", "", _stex} }) + local function make_drops(name) + return { + max_items = 1, + items = { + { + tool_groups = { + "shears" + }, + items = {name} + } + } + } + end + PyuTest.make_flower(name.."_plant", desc .. " Plant", "pyutest-grass-plant.png", nil, false, nil, { - color = color + color = color, + drop = make_drops(name.."_plant") }) PyuTest.make_flower(name.."_fern", desc .. " Fern", "pyutest-fern.png", nil, false, nil, { - color = color + color = color, + drop = make_drops(name.."_fern") }) minetest.override_item(name.."_block", econf or {}) diff --git a/mods/ITEMS/pyutest_tools/items.lua b/mods/ITEMS/pyutest_tools/items.lua index 33966ff..b9443e7 100644 --- a/mods/ITEMS/pyutest_tools/items.lua +++ b/mods/ITEMS/pyutest_tools/items.lua @@ -33,3 +33,4 @@ 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/textures/pyutest-firework.png b/textures/pyutest-firework.png index 20d967a..ef9d389 100644 Binary files a/textures/pyutest-firework.png and b/textures/pyutest-firework.png differ diff --git a/textures/pyutest-paper.png b/textures/pyutest-paper.png new file mode 100644 index 0000000..a5cc09c Binary files /dev/null and b/textures/pyutest-paper.png differ