From 27a945b8f31cb22d160ec3185dc9114827785fe7 Mon Sep 17 00:00:00 2001 From: cora Date: Mon, 4 Jul 2022 12:04:45 +0200 Subject: [PATCH 1/2] Tweak crying obsidian particles --- mods/ITEMS/mcl_core/functions.lua | 62 ++++++++++++------ .../mcl_core_crying_obsidian_tear.png | Bin 91 -> 378 bytes 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index 48719d96e0..a3b693316c 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -1702,40 +1702,64 @@ end -- Obsidian crying -local crying_obsidian_tears = { - "mcl_core_crying_obsidian_tear.png", - "mcl_core_crying_obsidian_tear2.png", - "mcl_core_crying_obsidian_tear3.png" -} - local psdef = { - amount = 10, + amount = 1, time = 0.9, --everything longer than 1 is a coord exploit - minvel = vector.new(0,-0.15,0), - maxvel = vector.new(0,-0.001,0), - minacc = vector.new(0,-0.1,0), - maxacc = vector.new(0,-0.001,0), + minvel = vector.new(0,-2,0), + maxvel = vector.new(0,-0.5,0), + minacc = vector.new(0,-10,0), + maxacc = vector.new(0,-8,0), minexptime = 1, maxexptime = 6, - minsize = 0.1, - maxsize = 0.25, + minsize = 1.5, + maxsize = 2, collisiondetection = true, collision_removal = true, object_collision = true, vertical = true, + texture = "mcl_core_crying_obsidian_tear.png", +} +local psdef2 = { + amount = 1, + time = 0.9, --everything longer than 1 is a coord exploit + minvel = vector.new(0,-0.01,0), + maxvel = vector.new(0,-0.005,0), + minacc = vector.new(0,-0.1,0), + maxacc = vector.new(0,-0.01,0), + minexptime = 2, + maxexptime = 3, + minsize = 0.3, + maxsize = 0.6, + collisiondetection = true, + collision_removal = true, + object_collision = true, + vertical = true, + texture = "mcl_core_crying_obsidian_tear.png", } minetest.register_abm({ label = "Obsidian cries", nodenames = {"mcl_core:crying_obsidian"}, - interval = 60, + interval = 5, chance = 10, action = function(pos, node) - psdef.minpos = vector.offset(pos,-0.6,-0.51,-0.6) - psdef.maxpos = vector.offset(pos,0.6,-0.51,0.6) - for _,t in pairs(crying_obsidian_tears) do - psdef.texture = t + minetest.after(math.random(0.1,1.5),function() + psdef.minpos = vector.offset(pos,-0.6,-0.51,-0.6) + psdef.maxpos = vector.offset(pos,0.6,0.51,0.6) minetest.add_particlespawner(psdef) - end + psdef2.minpos = vector.offset(pos,-0.55,-0.51,-0.55) + psdef2.maxpos = vector.offset(pos,-0.5,0.51,-0.5) + minetest.add_particlespawner(psdef2) + psdef2.minpos = vector.offset(pos,0.55,-0.51,-0.55) + psdef2.maxpos = vector.offset(pos,0.5,0.51,-0.5) + minetest.add_particlespawner(psdef2) + psdef2.minpos = vector.offset(pos,0.55,-0.51,0.55) + psdef2.maxpos = vector.offset(pos,0.5,0.51,0.5) + minetest.add_particlespawner(psdef2) + psdef2.minpos = vector.offset(pos,-0.55,-0.51,0.55) + psdef2.maxpos = vector.offset(pos,-0.5,0.51,0.5) + minetest.add_particlespawner(psdef2) + + end) end }) diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_crying_obsidian_tear.png b/mods/ITEMS/mcl_core/textures/mcl_core_crying_obsidian_tear.png index 94d9bd21a144595e901bb17602460e27daee5a3d..e37f9cd68ac922dab5e03d0d2cf16b7067e5a57c 100644 GIT binary patch literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2?0JKu0T4MA-9O3sD`1Yg`uT~ zp=T1qq`3@p7ceZ?#;^@2OCcycAN&t!#8poh#}JFtOD}KaY<3W7co=_~b&{73%f=!` zRqm9AGY^>hCcP4y&@(~tjZRRucwvL`67K28gr^GceNy_~_TKU4YWDiJWGyj~Rg0v4 zF>U17@mNJYoVAt7!;|sKEjD2VH8&;36)Q|O$x5`#`FV!=<*{$sV!rpN)TS*5nH7|z z1R4*tNHn%Q;d<~;P>{D&IElsU)bjrQFZt9QeE%|i_;|SO*}Cl#$N#9^iToT8TwYr> z@x*ui^EVh}EScV{Wo)$gdRS_s{gR$DH-F76^X{GSL0Di;uH)+;OetSYcOTfkRSXnH Mp00i_>zopr034NhkN^Mx literal 91 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y-!3HF~bz9kil#-{5V+hCfWRHaC+8K;oGp5Yc mNz7q8me!|UAZY;-lwg>r&Stai=HZ7x)eN4lelF{r5}E))v=+($ From efad7dad243f6c21b6d3a1ba7bf0a0ee604b5a05 Mon Sep 17 00:00:00 2001 From: cora Date: Tue, 5 Jul 2022 11:18:09 +0200 Subject: [PATCH 2/2] clean up --- mods/ITEMS/mcl_core/functions.lua | 34 +++++++++--------- .../mcl_core_crying_obsidian_tear.png | Bin 378 -> 308 bytes 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index a3b693316c..c56ae51c35 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -1702,7 +1702,7 @@ end -- Obsidian crying -local psdef = { +local crobby_psdef = { amount = 1, time = 0.9, --everything longer than 1 is a coord exploit minvel = vector.new(0,-2,0), @@ -1719,7 +1719,7 @@ local psdef = { vertical = true, texture = "mcl_core_crying_obsidian_tear.png", } -local psdef2 = { +local crobby_psdef2 = { amount = 1, time = 0.9, --everything longer than 1 is a coord exploit minvel = vector.new(0,-0.01,0), @@ -1744,21 +1744,21 @@ minetest.register_abm({ chance = 10, action = function(pos, node) minetest.after(math.random(0.1,1.5),function() - psdef.minpos = vector.offset(pos,-0.6,-0.51,-0.6) - psdef.maxpos = vector.offset(pos,0.6,0.51,0.6) - minetest.add_particlespawner(psdef) - psdef2.minpos = vector.offset(pos,-0.55,-0.51,-0.55) - psdef2.maxpos = vector.offset(pos,-0.5,0.51,-0.5) - minetest.add_particlespawner(psdef2) - psdef2.minpos = vector.offset(pos,0.55,-0.51,-0.55) - psdef2.maxpos = vector.offset(pos,0.5,0.51,-0.5) - minetest.add_particlespawner(psdef2) - psdef2.minpos = vector.offset(pos,0.55,-0.51,0.55) - psdef2.maxpos = vector.offset(pos,0.5,0.51,0.5) - minetest.add_particlespawner(psdef2) - psdef2.minpos = vector.offset(pos,-0.55,-0.51,0.55) - psdef2.maxpos = vector.offset(pos,-0.5,0.51,0.5) - minetest.add_particlespawner(psdef2) + crobby_psdef.minpos = vector.offset(pos,-0.6,-0.51,-0.6) + crobby_psdef.maxpos = vector.offset(pos,0.6,0.51,0.6) + minetest.add_particlespawner(crobby_psdef) + crobby_psdef2.minpos = vector.offset(pos,-0.51,-0.51,-0.51) + crobby_psdef2.maxpos = vector.offset(pos,-0.5,0.51,-0.5) + minetest.add_particlespawner(crobby_psdef2) + crobby_psdef2.minpos = vector.offset(pos,0.51,-0.51,-0.51) + crobby_psdef2.maxpos = vector.offset(pos,0.5,0.51,-0.5) + minetest.add_particlespawner(crobby_psdef2) + crobby_psdef2.minpos = vector.offset(pos,0.51,-0.51,0.51) + crobby_psdef2.maxpos = vector.offset(pos,0.5,0.51,0.5) + minetest.add_particlespawner(crobby_psdef2) + crobby_psdef2.minpos = vector.offset(pos,-0.51,-0.51,0.51) + crobby_psdef2.maxpos = vector.offset(pos,-0.5,0.51,0.5) + minetest.add_particlespawner(crobby_psdef2) end) end diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_crying_obsidian_tear.png b/mods/ITEMS/mcl_core/textures/mcl_core_crying_obsidian_tear.png index e37f9cd68ac922dab5e03d0d2cf16b7067e5a57c..eb3fc2cb5cd6aba9671168b8b1ff3c8f2fd421b2 100644 GIT binary patch delta 172 zcmeyxw1sKHg!+C@7sn8b)5!@7Oi!eqII4aAh=ImIrZ(39;s!cD{ClE!^nH?Me38GY z;FQ>C$}`WvM$^qa#prO#nl^*P&38Kvt`JxI*7lG$MsBuZL~KFN!yCzlY=(;tbqo4S zbP0l+XkKD#A%V delta 242 zcmVb?-gi$AfzZe}-c!78I(Y8u|jU2)N@UCszf90!T># z)Y=9UASOm40jQ`nvK<(Q9!^PBPHqRZv^TxQ8nU#(10W(A5Nm