From 4e77e56aede7f8d58e59af93f8d7caac0e20e2f6 Mon Sep 17 00:00:00 2001 From: IamPyu Date: Sun, 29 Sep 2024 11:33:49 -0600 Subject: [PATCH] Unnamed Minor Update --- CHANGELOG.md | 10 +++++ minetest.conf | 2 +- mods/pyutest/pyutest_core/blocks.lua | 12 ++++-- mods/pyutest/pyutest_core/electricity.lua | 18 ++++---- mods/pyutest/pyutest_core/flowers.lua | 4 +- mods/pyutest/pyutest_core/magic.lua | 4 +- mods/pyutest/pyutest_core/ores.lua | 4 +- mods/pyutest/pyutest_core/utils.lua | 50 ++++++++++++++++++++-- mods/pyutest/pyutest_inventory/init.lua | 2 +- textures/pyutest-blast.png | Bin 193 -> 187 bytes textures/pyutest-blast2.png | Bin 0 -> 84 bytes textures/pyutest-blast3.png | Bin 0 -> 84 bytes 12 files changed, 81 insertions(+), 25 deletions(-) create mode 100644 textures/pyutest-blast2.png create mode 100644 textures/pyutest-blast3.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 961f6e0..9e7ae16 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +# [Sep 29th 2024] Unnamed Minor Update + +- Replace Delayer Wire with Zinc Wire, giving Zinc a purpose +- Give explosions more particles, including sparks +- Change `default_stack_max` to 999 +- TNT will no longer explode if the TNT block has been removed +- Fixed lily pads appearance +- Windballs launch you forward a bit less now +- Replace `electricity` group with `electric` + # [Sep 27th - Sep 28th 2024] Update: The Electricity Update - Add a new electricity system to replace the old discontinued one diff --git a/minetest.conf b/minetest.conf index cab7bfb..7386ff7 100644 --- a/minetest.conf +++ b/minetest.conf @@ -1,4 +1,4 @@ unified_inventory_lite = false unified_inventory_bags = false unified_inventory_waypoints = false - +default_stack_max = 999 diff --git a/mods/pyutest/pyutest_core/blocks.lua b/mods/pyutest/pyutest_core/blocks.lua index 122ff54..82d2df0 100644 --- a/mods/pyutest/pyutest_core/blocks.lua +++ b/mods/pyutest/pyutest_core/blocks.lua @@ -469,16 +469,20 @@ PyuTestCore.make_node("pyutest_core:tnt", "TNT", { "pyutest-tnt-top-bottom.png", "pyutest-tnt-side.png" -- Affects all other sides }, { - on_rightclick = function (pos, _, clicker) + on_rightclick = function (pos, node, clicker) minetest.after(3, function() - -- minetest.remove_node(pos) + if minetest.get_node(pos).name ~= "pyutest_core:tnt" then + return + end PyuTestCore.create_explosion(pos, 3, true, 7, clicker, true) end) end, - __on_electricity_activated = function (pos, _, clicker) + __on_electricity_activated = function (pos, node, clicker, sender_pos) minetest.after(3, function() - -- minetest.remove_node(pos) + if minetest.get_node(pos).name ~= "pyutest_core:tnt" then + return + end PyuTestCore.create_explosion(pos, 3, true, 7, clicker, true) end) end, diff --git a/mods/pyutest/pyutest_core/electricity.lua b/mods/pyutest/pyutest_core/electricity.lua index f916cba..3bd81a3 100644 --- a/mods/pyutest/pyutest_core/electricity.lua +++ b/mods/pyutest/pyutest_core/electricity.lua @@ -21,7 +21,7 @@ end PyuTestCore.make_button = function (id, desc, groups, tiles) PyuTestCore.make_node(id, desc, PyuTestCore.util.tableconcat(groups, { - electricity = 1 + electric = 1 }), tiles, { is_ground_content = false, on_rightclick = function (pos, node, clicker) @@ -48,7 +48,7 @@ PyuTestCore.make_wire = function (id, desc, groups, color, efn) end PyuTestCore.make_node(id, desc, PyuTestCore.util.tableconcat(groups, { - electricity = 1 + electric = 1 }), {"pyutest-wire.png"}, { drawtype = "signlike", color = color, @@ -88,9 +88,9 @@ PyuTestCore.make_wire("pyutest_core:copper_wire", "Copper Wire", { snappy = PyuTestCore.BLOCK_NORMAL }, "darkgoldenrod") -PyuTestCore.make_wire("pyutest_core:delayer_wire", "Delayer Wire", { +PyuTestCore.make_wire("pyutest_core:zinc_wire", "Zinc Wire", { snappy = PyuTestCore.BLOCK_NORMAL -}, PyuTestCore.COLORS["blue"][2], function (def, pos, node, clicker, sender_pos) +}, "#bed3d4", function (def, pos, node, clicker, sender_pos) minetest.after(0.2, function () def.__on_electricity_activated(pos, node, clicker, sender_pos) end) @@ -98,7 +98,7 @@ end) PyuTestCore.make_node("pyutest_core:test_device", "Test Device", { choppy = PyuTestCore.BLOCK_FAST, - electricity = 1 + electric = 1 }, {"pyutest-wood.png"}, { __on_electricity_activated = function(pos, node, clicker) minetest.add_item(pos + vector.new(0, 1, 0), ItemStack("pyutest_core:apple 1")) @@ -107,7 +107,7 @@ PyuTestCore.make_node("pyutest_core:test_device", "Test Device", { PyuTestCore.make_node("pyutest_core:freezer_device", "Freezer Device", { cracky = PyuTestCore.BLOCK_FAST, - electricity = 1 + electric = 1 }, {"pyutest-freezer.png"}, { __on_electricity_activated = function(pos, node, clicker) PyuTestCore.dorange(pos, 2, function (p) @@ -122,7 +122,7 @@ PyuTestCore.make_node("pyutest_core:freezer_device", "Freezer Device", { PyuTestCore.make_node("pyutest_core:heater_device", "Heater Device", { cracky = PyuTestCore.BLOCK_FAST, - electricity = 1 + electric = 1 }, {"pyutest-heater.png"}, { __on_electricity_activated = function(pos, node, clicker) PyuTestCore.dorange(pos, 2, function (p) @@ -146,9 +146,9 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "pyutest_core:delayer_wire", + output = "pyutest_core:zinc_wire 4", recipe = { - "pyutest_core:copper_wire", "pyutest_core:blue_dye" + "pyutest_core:zinc_ingot" }, type = "shapeless" }) diff --git a/mods/pyutest/pyutest_core/flowers.lua b/mods/pyutest/pyutest_core/flowers.lua index da589da..f3df3ef 100644 --- a/mods/pyutest/pyutest_core/flowers.lua +++ b/mods/pyutest/pyutest_core/flowers.lua @@ -49,12 +49,12 @@ PyuTestCore.make_flower("pyutest_core:sugarcane", "Sugarcane", "pyutest-sugarcan PyuTestCore.make_node("pyutest_core:lilypad", "Lily Pad", { block = PyuTestCore.BLOCK_BREAKABLE_INSTANT }, {"pyutest-lilypad.png"}, { - drawtype = "nodebox", + drawtype = "signlike", paramtype = "light", paramtype2 = "facedir", buildable_to = true, sunlight_propagates = true, - node_box = { + selection_box = { type = "fixed", fixed = {-0.5, -31/64, -0.5, 0.5, -15/32, 0.5} }, diff --git a/mods/pyutest/pyutest_core/magic.lua b/mods/pyutest/pyutest_core/magic.lua index a20b8ab..e741ba1 100644 --- a/mods/pyutest/pyutest_core/magic.lua +++ b/mods/pyutest/pyutest_core/magic.lua @@ -142,8 +142,8 @@ PyuTestCore.make_item("pyutest_core:windball", "Windball", {}, "pyutest-windball local vel = user:get_velocity() user:add_velocity({ - x = vel.x * 3.5, - z = vel.z * 3.5, + x = vel.x * 2.5, + z = vel.z * 2.5, y = math.random(11, 14) }) diff --git a/mods/pyutest/pyutest_core/ores.lua b/mods/pyutest/pyutest_core/ores.lua index 66b2d24..be19317 100644 --- a/mods/pyutest/pyutest_core/ores.lua +++ b/mods/pyutest/pyutest_core/ores.lua @@ -322,8 +322,6 @@ PyuTestCore.make_ore("pyutest_core:emerald", "Emerald", "shard", "Shard", { block_color = "seagreen" }) --- "Secondary" Ores - PyuTestCore.make_ore("pyutest_core:zinc", "Zinc", "ingot", "Ingot", { scarcity = 11 * 11 * 11, y_max = 18, @@ -347,6 +345,8 @@ PyuTestCore.make_ore("pyutest_core:zinc", "Zinc", "ingot", "Ingot", { block_color = "#bed3d4" }) +-- "Secondary" Ores + PyuTestCore.make_ore("pyutest_core:tin", "Tin", "ingot", "Ingot", { scarcity = 11 * 11 * 11, y_max = 18, diff --git a/mods/pyutest/pyutest_core/utils.lua b/mods/pyutest/pyutest_core/utils.lua index ba63346..8e03e5c 100644 --- a/mods/pyutest/pyutest_core/utils.lua +++ b/mods/pyutest/pyutest_core/utils.lua @@ -72,18 +72,60 @@ PyuTestCore.create_explosion = function (pos, range, rm_pos, dmg, creator, dmg_c local maxpos = {x = pos.x + r, y = pos.y + r, z = pos.z + r} minetest.add_particlespawner({ - amount = range * 3, - time = 0.1, + amount = range * 8, + time = 0.4, minexptime = 0.4, maxexptime = 1.4, - minsize = 32, - maxsize = 64, + minsize = 16, + maxsize = 32, + vertical = false, + glow = 8, collisiondetection = false, texture = "pyutest-blast.png", minpos = minpos, maxpos = maxpos, + minvel = vector.new(-1, -1, 1), + maxvel = vector.new(1, 1, 1), + }) + + minetest.add_particlespawner({ + amount = range * 18, + time = 0.4, + minexptime = 0.4, + maxexptime = 1.4, + minsize = 1, + maxsize = 2, + vertical = false, + glow = 4, + + collisiondetection = false, + texture = "pyutest-blast2.png", + + minpos = minpos, + maxpos = maxpos, + minvel = vector.new(-6, -6, -6), + maxvel = vector.new( 6, 6, 6), + }) + + minetest.add_particlespawner({ + amount = range * 18, + time = 0.4, + minexptime = 0.4, + maxexptime = 1.4, + minsize = 1, + maxsize = 2, + vertical = false, + glow = 4, + + collisiondetection = false, + texture = "pyutest-blast3.png", + + minpos = minpos, + maxpos = maxpos, + minvel = vector.new(-6, -6, -6), + maxvel = vector.new( 6, 6, 6), }) minetest.sound_play("block_break", { diff --git a/mods/pyutest/pyutest_inventory/init.lua b/mods/pyutest/pyutest_inventory/init.lua index ff7916c..5dba37d 100644 --- a/mods/pyutest/pyutest_inventory/init.lua +++ b/mods/pyutest/pyutest_inventory/init.lua @@ -74,5 +74,5 @@ unified_inventory.register_category("pyutest_inventory:electricity", { symbol = "pyutest_core:button", label = "Electricity", index = 11, - items = get_items_from_group("electricity") + items = get_items_from_group("electric") }) diff --git a/textures/pyutest-blast.png b/textures/pyutest-blast.png index fdd8e7bdd3faf91d1cb2228645b5a22efb8db7e4..68b42723d5e943d07cb9df92b4c0feb66fa1b874 100644 GIT binary patch delta 159 zcmV;Q0AT;Y0lNW^B!7ZQL_t(Ijjd8a3cw%?i?WmKk+O$LA1S?Vr%5aY=QOv5CJk+Y zMFdM+Ip16tk-%IL=`_I;R#gDNnG!sXO(MHh)z-+h<#<^1V$Yx@;3*?;ia2Wil%R+N zUf8t3mL1H1Px)(!O9|{Fb)Ps&VZ{J&*amCD*RkR*!JERH>=+5R;Q==VN_+Th5#Rs- N002ovPDHLkV1k7^MZy38 delta 165 zcmV;W09yaM0l@)~B!7rWL_t(Ijm46&4#Y4BL)}vc{~lk;?|JJ@uDF!8$#kAjgv}EK z__wy%#>_liN5tv-tW1*xNk3uJ1g4M#03eBo*p>)7E$_etrdZy=sHuRuwA+BpJi5jX z{gI%CJehrky*|3JhTKiI_U`e``F Tkb>%r00000NkvXXu0mjf7fe)! diff --git a/textures/pyutest-blast2.png b/textures/pyutest-blast2.png new file mode 100644 index 0000000000000000000000000000000000000000..7e08c12e2d761c654abbfd2fb6765f4b982abb47 GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^Od!m`1|*BN@u~nRX-^l&5RRG27U3y>{y$y3gTe~DWM4f*%%cH literal 0 HcmV?d00001 diff --git a/textures/pyutest-blast3.png b/textures/pyutest-blast3.png new file mode 100644 index 0000000000000000000000000000000000000000..949f095e9e8cb59e776e0512161022a108444be7 GIT binary patch literal 84 zcmeAS@N?(olHy`uVBq!ia0vp^Od!m`1|*BN@u~nRX-^l&5RRG27U3y>{y$y3