1
0
Fork 0

Merge pull request 'Add basic sculk' (#2668) from sculk into master

Reviewed-on: MineClone2/MineClone2#2668
Reviewed-by: Johannes Fritz <mrrar@noreply.git.minetest.land>
This commit is contained in:
cora 2022-10-05 22:32:34 +00:00
commit 8f5bca7506
17 changed files with 273 additions and 1 deletions

View File

@ -136,7 +136,7 @@ end
function mcl_experience.throw_xp(pos, total_xp) function mcl_experience.throw_xp(pos, total_xp)
local i, j = 0, 0 local i, j = 0, 0
local obs = {}
while i < total_xp and j < 100 do while i < total_xp and j < 100 do
local xp = math.min(math.random(1, math.min(32767, total_xp - math.floor(i / 2))), total_xp - i) local xp = math.min(math.random(1, math.min(32767, total_xp - math.floor(i / 2))), total_xp - i)
local obj = minetest.add_entity(pos, "mcl_experience:orb", tostring(xp)) local obj = minetest.add_entity(pos, "mcl_experience:orb", tostring(xp))
@ -153,7 +153,9 @@ function mcl_experience.throw_xp(pos, total_xp)
i = i + xp i = i + xp
j = j + 1 j = j + 1
table.insert(obs,obj)
end end
return obs
end end
function mcl_experience.remove_hud(player) function mcl_experience.remove_hud(player)

View File

@ -0,0 +1,267 @@
local S = minetest.get_translator(minetest.get_current_modname())
local mt_sound_play = minetest.sound_play
local spread_to = {"mcl_core:stone","mcl_core:dirt","mcl_core:sand","mcl_core:dirt_with_grass","group:grass_block","mcl_core:andesite","mcl_core:diorite","mcl_core:granite","mcl_core:mycelium","group:dirt","mcl_end:end_stone","mcl_nether:netherrack","mcl_blackstone:basalt","mcl_nether:soul_sand","mcl_blackstone:soul_soil","mcl_crimson:warped_nylium","mcl_crimson:crimson_nylium","mcl_core:gravel"}
local sounds = {
footstep = {name = "mcl_sculk_block", },
dug = {name = "mcl_sculk_block", },
}
local SPREAD_RANGE = 8
local SENSOR_RANGE = 8
local SENSOR_DELAY = 0.5
local SHRIEKER_COOLDOWN = 10
local adjacents = {
vector.new(1,0,0),
vector.new(-1,0,0),
vector.new(0,1,0),
vector.new(0,-1,0),
vector.new(0,0,1),
vector.new(0,0,-1),
}
--[[
local function sensor_action(p,tp)
local s = minetest.find_node_near(p,SPREAD_RANGE,{"mcl_sculk:shrieker"})
local n = minetest.get_node(s)
if s and n.param2 ~= 1 then
minetest.sound_play("mcl_sculk_shrieker", {pos=s, gain=1.5, max_hear_distance = 16}, true)
n.param2 = 1
minetest.set_node(s,n)
minetest.after(SHRIEKER_COOLDOWN,function(s)
minetest.set_node(s,{name = "mcl_sculk:shrieker",param2=0})
end,s)
end
--local p1 = vector.offset(p,-SENSOR_RANGE,-SENSOR_RANGE,-SENSOR_RANGE)
--local p2 = vector.offset(p,SENSOR_RANGE,SENSOR_RANGE,SENSOR_RANGE)
--darken_area(p1,p2)
end
function minetest.sound_play(spec, parameters, ephemeral)
local rt = mt_sound_play(spec, parameters, ephemeral)
if parameters.pos then
pos = parameters.pos
elseif parameters.to_player then
pos = minetest.get_player_by_name(parameters.to_player):get_pos()
end
if not pos then return rt end
local s = minetest.find_node_near(pos,SPREAD_RANGE,{"mcl_sculk:sensor"})
if s then
--minetest.after(SENSOR_DELAY,sensor_action,s,pos)
end
return rt
end
walkover.register_global(function(pos, node, player)
local s = minetest.find_node_near(pos,SPREAD_RANGE,{"mcl_sculk:sensor"})
if not s then return end
local v = player:get_velocity()
if v.x == 0 and v.y == 0 and v.z == 0 then return end
if player:get_player_control().sneak then return end
local def = minetest.registered_nodes[node.name]
if def and def.sounds then
minetest.log("walkover "..node.name)
minetest.after(SENSOR_DELAY,sensor_action,s,pos)
end
end)
--]]
local function get_node_xp(pos)
local meta = minetest.get_meta(pos)
return meta:get_int("xp")
end
local function set_node_xp(pos,xp)
local meta = minetest.get_meta(pos)
return meta:set_int("xp",xp)
end
local function sculk_on_destruct(pos)
local xp = get_node_xp(pos)
local n = minetest.get_node(pos)
if n.param2 == 1 then
xp = 1
end
local obs = mcl_experience.throw_xp(pos,xp)
for _,v in pairs(obs) do
local l = v:get_luaentity()
l._sculkdrop = true
end
end
local function has_air(pos)
for _,v in pairs(adjacents) do
if minetest.get_item_group(minetest.get_node(vector.add(pos,v)).name,"solid") <= 0 then return true end
end
end
local function has_nonsculk(pos)
for _,v in pairs(adjacents) do
local p = vector.add(pos,v)
if minetest.get_item_group(minetest.get_node(p).name,"sculk") <= 0 and minetest.get_item_group(minetest.get_node(p).name,"solid") > 0 then return p end
end
end
local old_on_step = minetest.registered_entities["mcl_experience:orb"].on_step
minetest.registered_entities["mcl_experience:orb"].on_step = function(self,dtime)
local p = self.object:get_pos()
local nu = minetest.get_node(vector.offset(p,0,-1,0))
local ret = old_on_step(self,dtime)
if not self._sculkdrop then
local c = minetest.find_node_near(p,SPREAD_RANGE,{"mcl_sculk:catalyst"})
if c then
local nnn = minetest.find_nodes_in_area(vector.offset(p,-SPREAD_RANGE,-SPREAD_RANGE,-SPREAD_RANGE),vector.offset(p,SPREAD_RANGE,SPREAD_RANGE,SPREAD_RANGE),spread_to)
local nn={}
for _,v in pairs(nnn) do
if has_air(v) then
table.insert(nn,v)
end
end
table.sort(nn,function(a, b)
return vector.distance(p, a) < vector.distance(p, b)
end)
if nn and #nn > 0 and self._xp > 0 then
local d = math.random(100)
--[[ --enable to generate shriekers and sensors
if d <= 1 then
minetest.set_node(nn[1],{name = "mcl_sculk:shrieker"})
set_node_xp(nn[1],math.min(1,self._xp - 10))
self.object:remove()
return ret
elseif d <= 9 then
minetest.set_node(nn[1],{name = "mcl_sculk:sensor"})
set_node_xp(nn[1],math.min(1,self._xp - 5))
self.object:remove()
return ret
else --]]
local r = math.min(math.random(#nn),self._xp)
for i=1,r do
minetest.set_node(nn[i],{name = "mcl_sculk:sculk" })
set_node_xp(nn[i],math.floor(self._xp / r))
end
for i=1,r do
local p = has_nonsculk(nn[i])
if p and has_air(p) then
minetest.set_node(vector.offset(p,0,1,0),{name = "mcl_sculk:vein", param2 = 1})
end
end
set_node_xp(nn[1],get_node_xp(nn[1]) + self._xp % r)
self.object:remove()
return ret
--end
end
end
end
return ret
end
minetest.register_node("mcl_sculk:sculk", {
description = S("Sculk"),
tiles = {
{ name = "mcl_sculk_sculk.png",
animation = {
type = "vertical_frames",
aspect_w = 16,
aspect_h = 16,
length = 3.0,
}, },
},
drop = "",
groups = {handy = 1, hoey = 1, building_block=1, sculk = 1,},
place_param2 = 1,
sounds = sounds,
is_ground_content = false,
on_destruct = sculk_on_destruct,
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.6,
_mcl_silk_touch_drop = true,
})
minetest.register_node("mcl_sculk:vein", {
description = S("Sculk Vein"),
_doc_items_longdesc = S("Sculk vein."),
drawtype = "signlike",
tiles = {"mcl_sculk_vein.png"},
inventory_image = "mcl_sculk_vein.png",
wield_image = "mcl_sculk_vein.png",
paramtype = "light",
sunlight_propagates = true,
paramtype2 = "wallmounted",
walkable = false,
climbable = true,
buildable_to = true,
selection_box = {
type = "wallmounted",
},
groups = {
handy = 1, axey = 1, shearsy = 1, swordy = 1, deco_block = 1,
dig_by_piston = 1, destroy_by_lava_flow = 1, sculk = 1, dig_by_water = 1,
},
sounds = sounds,
drop = "",
_mcl_shears_drop = true,
node_placement_prediction = "",
_mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
on_rotate = false,
})
minetest.register_node("mcl_sculk:catalyst", {
description = S("Sculk Catalyst"),
tiles = {
"mcl_sculk_catalyst_top.png",
"mcl_sculk_catalyst_bottom.png",
"mcl_sculk_catalyst_side.png"
},
drop = "",
sounds = sounds,
groups = {handy = 1, hoey = 1, building_block=1, sculk = 1,},
place_param2 = 1,
is_ground_content = false,
on_destruct = sculk_on_destruct,
_mcl_blast_resistance = 3,
light_source = 6,
_mcl_hardness = 3,
_mcl_silk_touch_drop = true,
})
--[[
minetest.register_node("mcl_sculk:sensor", {
description = S("Sculk Sensor"),
tiles = {
"mcl_sculk_sensor_top.png",
"mcl_sculk_sensor_bottom.png",
"mcl_sculk_sensor_side.png"
},
drop = "",
sounds = sounds,
groups = {handy = 1, hoey = 1, building_block=1, sculk = 1,},
place_param2 = 1,
is_ground_content = false,
on_destruct = sculk_on_destruct,
_mcl_blast_resistance = 3,
light_source = 6,
_mcl_hardness = 3,
_mcl_silk_touch_drop = true,
})
minetest.register_node("mcl_sculk:shrieker", {
description = S("Sculk Shrieker"),
tiles = {
"mcl_sculk_shrieker_top.png",
"mcl_sculk_shrieker_bottom.png",
"mcl_sculk_shrieker_side.png"
},
drop = "",
sounds = sounds,
groups = {handy = 1, hoey = 1, building_block=1, sculk = 1,},
place_param2 = 0,
is_ground_content = false,
on_destruct = sculk_on_destruct,
_mcl_blast_resistance = 3,
light_source = 6,
_mcl_hardness = 3,
_mcl_silk_touch_drop = true,
})
--]]

View File

@ -0,0 +1,3 @@
name = mcl_sculk
author = cora
depends = mcl_core, mcl_sounds, mcl_experience, walkover

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB