forked from VoxeLibre/VoxeLibre
Compare commits
4 Commits
environmen
...
master
Author | SHA1 | Date |
---|---|---|
kno10 | 253a06fa08 | |
kno10 | dcfd31d17a | |
teknomunk | c34aecfcab | |
Mikita Wiśniewski | 9cb4f51468 |
|
@ -89,6 +89,7 @@ local function enable_physics(object, luaentity, ignore_check)
|
|||
object:set_properties({
|
||||
physical = true
|
||||
})
|
||||
object:set_acceleration(vector.new(0, -get_gravity(), 0))
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -656,6 +657,62 @@ local function push_out_item_stuck_in_solid(self, dtime, p, def, is_in_water)
|
|||
end
|
||||
end
|
||||
|
||||
local function move_items_in_water (self, p, def, node, is_floating, is_in_water)
|
||||
-- Move item around on flowing liquids; add 'source' check to allow items to continue flowing a bit in the source block of flowing water.
|
||||
if def and not is_floating and (def.liquidtype == "flowing" or def.liquidtype == "source") then
|
||||
self._flowing = true
|
||||
|
||||
--[[ Get flowing direction (function call from flowlib), if there's a liquid.
|
||||
NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
|
||||
Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
|
||||
local vec = flowlib.quick_flow(p, node)
|
||||
-- Just to make sure we don't manipulate the speed for no reason
|
||||
if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
|
||||
-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
|
||||
local f = 1.2
|
||||
-- Set new item moving speed into the direciton of the liquid
|
||||
local newv = vector.multiply(vec, f)
|
||||
-- Swap to acceleration instead of a static speed to better mimic MC mechanics.
|
||||
self.object:set_acceleration(vector.new(newv.x, -0.22, newv.z))
|
||||
|
||||
self.physical_state = true
|
||||
self._flowing = true
|
||||
self.object:set_properties({
|
||||
physical = true
|
||||
})
|
||||
return true
|
||||
end
|
||||
if is_in_water and def.liquidtype == "source" then
|
||||
local cur_vec = self.object:get_velocity()
|
||||
-- apply some acceleration in the opposite direction so it doesn't slide forever
|
||||
local vec = {
|
||||
x = 0 - cur_vec.x * 0.9,
|
||||
y = 3 - cur_vec.y * 0.9,
|
||||
z = 0 - cur_vec.z * 0.9
|
||||
}
|
||||
self.object:set_acceleration(vec)
|
||||
-- slow down the item in water
|
||||
local vel = self.object:get_velocity()
|
||||
if vel.y < 0 then
|
||||
vel.y = vel.y * 0.9
|
||||
end
|
||||
self.object:set_velocity(vel)
|
||||
if self.physical_state ~= false or self._flowing ~= true then
|
||||
self.physical_state = true
|
||||
self._flowing = true
|
||||
self.object:set_properties({
|
||||
physical = true
|
||||
})
|
||||
end
|
||||
end
|
||||
elseif self._flowing == true and not is_in_water and not is_floating then
|
||||
-- Disable flowing physics if not on/in flowing liquid
|
||||
self._flowing = false
|
||||
enable_physics(self.object, self, true)
|
||||
return true
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_entity(":__builtin:item", {
|
||||
initial_properties = {
|
||||
hp_max = 1,
|
||||
|
@ -862,6 +919,7 @@ minetest.register_entity(":__builtin:item", {
|
|||
|
||||
self.object:set_armor_groups({ immortal = 1 })
|
||||
-- self.object:set_velocity(vector.new(0, 2, 0))
|
||||
self.object:set_acceleration(vector.new(0, -get_gravity(), 0))
|
||||
self:set_item(self.itemstring)
|
||||
end,
|
||||
|
||||
|
@ -995,7 +1053,7 @@ minetest.register_entity(":__builtin:item", {
|
|||
|
||||
if push_out_item_stuck_in_solid(self, dtime, p, def, is_in_water) then return end
|
||||
|
||||
vl_physics.apply_entity_environmental_physics(self)
|
||||
if move_items_in_water (self, p, def, node, is_floating, is_in_water) then return end
|
||||
|
||||
-- If node is not registered or node is walkably solid and resting on nodebox
|
||||
local nn = minetest.get_node(vector.offset(p, 0, -0.5, 0)).name
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
name = mcl_item_entity
|
||||
author = PilzAdam
|
||||
description = Dropped items will be attracted to the player like a magnet.
|
||||
depends = vl_physics, mcl_enchanting
|
||||
depends = flowlib, mcl_enchanting
|
||||
|
|
|
@ -388,7 +388,7 @@ end
|
|||
|
||||
|
||||
|
||||
local function on_step_work (self, dtime)
|
||||
local function on_step_work(self, dtime, moveresult)
|
||||
local pos = self.object:get_pos()
|
||||
if not pos then return end
|
||||
|
||||
|
@ -402,7 +402,7 @@ local function on_step_work (self, dtime)
|
|||
-- Do we abandon out of here now?
|
||||
end
|
||||
|
||||
if self:falling(pos) then return end
|
||||
if self:falling(pos, moveresult) then return end
|
||||
if self:step_damage (dtime, pos) then return end
|
||||
|
||||
if self.state == "die" then return end
|
||||
|
@ -411,8 +411,7 @@ local function on_step_work (self, dtime)
|
|||
local player_in_active_range = self:player_in_active_range()
|
||||
self:check_suspend(player_in_active_range)
|
||||
|
||||
-- Handle environmental physics
|
||||
vl_physics.apply_entity_environmental_physics(self)
|
||||
self:check_water_flow()
|
||||
|
||||
if not self._jumping_cliff then
|
||||
self._can_jump_cliff = self:can_jump_cliff()
|
||||
|
@ -503,11 +502,11 @@ end
|
|||
|
||||
|
||||
-- main mob function
|
||||
function mob_class:on_step(dtime)
|
||||
function mob_class:on_step(dtime, moveresult)
|
||||
if not DEVELOPMENT then
|
||||
-- Removed as bundled Lua (5.1 doesn't support xpcall)
|
||||
--local status, retVal = xpcall(on_step_work, on_step_error_handler, self, dtime)
|
||||
local status, retVal = pcall(on_step_work, self, dtime)
|
||||
local status, retVal = pcall(on_step_work, self, dtime, moveresult)
|
||||
if status then
|
||||
return retVal
|
||||
else
|
||||
|
@ -522,7 +521,7 @@ function mob_class:on_step(dtime)
|
|||
log_error (dump(retVal), dump(pos), dump(self))
|
||||
end
|
||||
else
|
||||
return on_step_work (self, dtime)
|
||||
return on_step_work (self, dtime, moveresult)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -615,7 +615,7 @@ function mcl_mobs.register_egg(mob_id, desc, background_color, overlay_color, ad
|
|||
|
||||
pos.y = pos.y - 1
|
||||
local mob = mcl_mobs.spawn(pos, mob_name)
|
||||
if not object then
|
||||
if not mob then
|
||||
pos.y = pos.y + 1
|
||||
mob = mcl_mobs.spawn(pos, mob_name)
|
||||
if not mob then return end
|
||||
|
|
|
@ -2,4 +2,4 @@ name = mcl_mobs
|
|||
author = PilzAdam
|
||||
description = Adds a mob API for mods to add animals or monsters, etc.
|
||||
depends = mcl_particles, mcl_luck
|
||||
optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience, mcl_sculk, vl_physics
|
||||
optional_depends = mcl_weather, mcl_explosions, mcl_hunger, mcl_worlds, invisibility, lucky_block, cmi, doc_identifier, mcl_armor, mcl_portals, mcl_experience, mcl_sculk
|
||||
|
|
|
@ -927,7 +927,8 @@ end
|
|||
|
||||
-- falling and fall damage
|
||||
-- returns true if mob died
|
||||
function mob_class:falling(pos)
|
||||
function mob_class:falling(pos, moveresult)
|
||||
if moveresult and moveresult.touching_ground then return false end
|
||||
|
||||
if self.fly and self.state ~= "die" then
|
||||
return
|
||||
|
@ -996,7 +997,43 @@ function mob_class:falling(pos)
|
|||
end
|
||||
|
||||
function mob_class:check_water_flow()
|
||||
-- Deprecated. Do nothing
|
||||
-- Add water flowing for mobs from mcl_item_entity
|
||||
local p, node, nn, def
|
||||
p = self.object:get_pos()
|
||||
node = minetest.get_node_or_nil(p)
|
||||
if node then
|
||||
nn = node.name
|
||||
def = minetest.registered_nodes[nn]
|
||||
end
|
||||
|
||||
-- Move item around on flowing liquids
|
||||
if def and def.liquidtype == "flowing" then
|
||||
|
||||
--[[ Get flowing direction (function call from flowlib), if there's a liquid.
|
||||
NOTE: According to Qwertymine, flowlib.quickflow is only reliable for liquids with a flowing distance of 7.
|
||||
Luckily, this is exactly what we need if we only care about water, which has this flowing distance. ]]
|
||||
local vec = flowlib.quick_flow(p, node)
|
||||
-- Just to make sure we don't manipulate the speed for no reason
|
||||
if vec.x ~= 0 or vec.y ~= 0 or vec.z ~= 0 then
|
||||
-- Minecraft Wiki: Flowing speed is "about 1.39 meters per second"
|
||||
local f = 1.39
|
||||
-- Set new item moving speed into the direciton of the liquid
|
||||
local newv = vector.multiply(vec, f)
|
||||
self.object:set_acceleration({x = 0, y = 0, z = 0})
|
||||
self.object:set_velocity({x = newv.x, y = -0.22, z = newv.z})
|
||||
|
||||
self.physical_state = true
|
||||
self._flowing = true
|
||||
self.object:set_properties({
|
||||
physical = true
|
||||
})
|
||||
return
|
||||
end
|
||||
elseif self._flowing == true then
|
||||
-- Disable flowing physics if not on/in flowing liquid
|
||||
self._flowing = false
|
||||
return
|
||||
end
|
||||
end
|
||||
|
||||
function mob_class:check_dying()
|
||||
|
|
|
@ -1,62 +0,0 @@
|
|||
local mod = vl_physics
|
||||
|
||||
local registered_environment_effects = {}
|
||||
|
||||
function mod.register_environment_effect(effect)
|
||||
local list = registered_environment_effects
|
||||
list[#list + 1] = effect
|
||||
end
|
||||
|
||||
function mod.get_environment_effect(pos, vel, staticdata, mass, entity)
|
||||
local v = vector.zero()
|
||||
local a = vector.zero()
|
||||
|
||||
-- Accumulate all enviornmental effects
|
||||
for _,effect in ipairs(registered_environment_effects) do
|
||||
local dv,da = effect(pos, vel, staticdata, entity)
|
||||
if dv then
|
||||
v = v + dv
|
||||
end
|
||||
if da then
|
||||
a = a + da
|
||||
end
|
||||
end
|
||||
|
||||
-- Disable small effects
|
||||
if vector.length(v) < 0.01 then v = nil end
|
||||
if vector.length(a) < 0.01 then a = nil end
|
||||
|
||||
return v,a
|
||||
end
|
||||
|
||||
local DEFAULT_ENTITY_PHYSICS = {
|
||||
mass = 1,
|
||||
}
|
||||
function mod.apply_entity_environmental_physics(self, data)
|
||||
data = data or {}
|
||||
|
||||
local physics = self._vl_physics or DEFAULT_ENTITY_PHYSICS
|
||||
local mass = physics.mass or DEFAULT_ENTITY_PHYSICS.mass
|
||||
|
||||
local pos = self.object:get_pos()
|
||||
local vel = self.object:get_velocity()
|
||||
local new_velocity,new_acceleration = vl_physics.get_environment_effect(pos, vel, data, mass, self)
|
||||
|
||||
--if new_velocity then print("new_velocity="..tostring(new_velocity)) end
|
||||
--if new_acceleration then print("new_acceleration="..tostring(new_acceleration)) end
|
||||
|
||||
-- Update entity states
|
||||
self._flowing = data.flowing
|
||||
|
||||
-- Apply environmental effects if there are any
|
||||
if new_velocity or new_acceleration then
|
||||
if new_acceleration then self.object:set_acceleration(new_acceleration) end
|
||||
if new_velocity then self.object:set_velocity(new_velocity) end
|
||||
|
||||
self.physical_state = true
|
||||
self._flowing = true
|
||||
self.object:set_properties({
|
||||
physical = true
|
||||
})
|
||||
end
|
||||
end
|
|
@ -1,100 +0,0 @@
|
|||
local modname = minetest.get_current_modname()
|
||||
local modpath = minetest.get_modpath(modname)
|
||||
local mod = {}
|
||||
vl_physics = mod
|
||||
|
||||
dofile(modpath.."/api.lua")
|
||||
|
||||
-- Flowing water
|
||||
-- TODO: move to Flowlib
|
||||
local FLOW_SPEED = 1.39
|
||||
local BOUANCY = 3
|
||||
mod.register_environment_effect(function(pos, vel, staticdata, entity)
|
||||
-- Get the node and node definition
|
||||
local node = minetest.get_node_or_nil(pos); if not node then return end
|
||||
local nodedef = minetest.registered_nodes[node.name]; if not nodedef then return end
|
||||
|
||||
-- Make sure we are in a liquid before continuing
|
||||
local is_flowing = (nodedef.liquidtype == "flowing")
|
||||
staticdata.flowing = is_flowing
|
||||
if not is_flowing then return end
|
||||
|
||||
-- Get liquid flow direction
|
||||
local vec = vector.multiply(flowlib.quick_flow(pos, node), FLOW_SPEED)
|
||||
return vector.new(vec.x, -0.22, vec.z),nil -- TODO: move bouancy velocity out of here
|
||||
end)
|
||||
|
||||
-- Simple gravity and bouancy
|
||||
mod.register_environment_effect(function(pos, vel, staticdata, entity)
|
||||
-- Get the node and node definition
|
||||
local node = minetest.get_node_or_nil(pos);
|
||||
local nodedef = nil
|
||||
if node then nodedef = minetest.registered_nodes[node.name] end
|
||||
|
||||
if nodedef and nodedef.liquidtype == "source" then -- TODO: make this apply to flowing liquids as well
|
||||
-- TODO: make this not apply to fish
|
||||
--print("entity="..dump(entity))
|
||||
|
||||
-- Apply decceleration and bouancy if the entity moved from flowing water to
|
||||
-- stationary water
|
||||
return nil,vector.new(
|
||||
0 - vel.x * 0.9,
|
||||
BOUANCY - vel.y * 0.9,
|
||||
0 - vel.z * 0.9
|
||||
)
|
||||
else
|
||||
local gravity = tonumber(minetest.settings:get("movement_gravity")) or 9.81
|
||||
return nil,vector.new(0,-gravity,0)
|
||||
end
|
||||
end)
|
||||
|
||||
-- Node effects
|
||||
local DEFAULT_NODE_PHYSICS = {
|
||||
friction = 0.9
|
||||
}
|
||||
local function apply_node_physics(node, vel, staticdata, entity)
|
||||
local node_def = minetest.registered_nodes[node.name] or {}
|
||||
local node_physics = node_def._vl_physics or DEFAULT_NODE_PHYSICS
|
||||
|
||||
local node_physics_effect = node_physics.effect
|
||||
if node_physics_effect then
|
||||
return node_physics_effect(pos, vel, staticdata)
|
||||
end
|
||||
|
||||
-- Default behavior
|
||||
local accel = vector.zero()
|
||||
|
||||
-- Friction
|
||||
if node.name ~= "air" then
|
||||
local friction_scale = node_physics.friction
|
||||
accel = accel + vel * -friction_scale
|
||||
end
|
||||
|
||||
return vector.zero(), accel
|
||||
end
|
||||
mod.register_environment_effect(function(pos, vel, staticdata, entity)
|
||||
local a = vector.zero()
|
||||
local v = vector.zero()
|
||||
|
||||
-- Apply node physics for the node we are inside of
|
||||
local pos1_r = vector.round(pos)
|
||||
local node1 = minetest.get_node(pos1_r)
|
||||
local v1,a1 = apply_node_physics(node1, vel, staticdata, entity)
|
||||
v = v + v1
|
||||
a = a + a1
|
||||
|
||||
-- TODO: only apply when touching under_node
|
||||
local pos2_r = vector.offset(pos1_r,0,-1,0)
|
||||
local node2 = minetest.get_node(pos2_r)
|
||||
local v2,a2 = apply_node_physics(node2, vel, staticdata, entity)
|
||||
v = v + v2
|
||||
a = a + a2
|
||||
|
||||
-- Male speeds of less than 1/100 block/second count as zero
|
||||
if vector.length(v) < 0.01 then
|
||||
v = nil
|
||||
end
|
||||
|
||||
return v,a
|
||||
end)
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
name = vl_physics
|
||||
author = teknomunk
|
||||
description = Environmental physics
|
||||
depends = flowlib
|
|
@ -107,7 +107,42 @@ local function xp_step(self, dtime)
|
|||
end
|
||||
|
||||
-- Slide on slippery nodes
|
||||
vl_physics.apply_entity_environmental_physics(self)
|
||||
local vel = self.object:get_velocity()
|
||||
local def = node and minetest.registered_nodes[node.name]
|
||||
local is_moving = (def and not def.walkable) or
|
||||
vel.x ~= 0 or vel.y ~= 0 or vel.z ~= 0
|
||||
local is_slippery = false
|
||||
|
||||
if def and def.walkable then
|
||||
local slippery = minetest.get_item_group(node.name, "slippery")
|
||||
is_slippery = slippery ~= 0
|
||||
if is_slippery and (math.abs(vel.x) > 0.2 or math.abs(vel.z) > 0.2) then
|
||||
-- Horizontal deceleration
|
||||
local slip_factor = 4.0 / (slippery + 4)
|
||||
self.object:set_acceleration({
|
||||
x = -vel.x * slip_factor,
|
||||
y = 0,
|
||||
z = -vel.z * slip_factor
|
||||
})
|
||||
elseif vel.y == 0 then
|
||||
is_moving = false
|
||||
end
|
||||
end
|
||||
|
||||
if self.moving_state == is_moving and self.slippery_state == is_slippery then
|
||||
-- Do not update anything until the moving state changes
|
||||
return
|
||||
end
|
||||
|
||||
self.moving_state = is_moving
|
||||
self.slippery_state = is_slippery
|
||||
|
||||
if is_moving then
|
||||
self.object:set_acceleration(gravity)
|
||||
else
|
||||
self.object:set_acceleration({x = 0, y = 0, z = 0})
|
||||
self.object:set_velocity({x = 0, y = 0, z = 0})
|
||||
end
|
||||
end
|
||||
|
||||
minetest.register_entity("mcl_experience:orb", {
|
||||
|
|
|
@ -74,7 +74,7 @@ function mcl_bamboo.break_orphaned(pos)
|
|||
local node_name = node_below.name
|
||||
|
||||
-- short circuit checks.
|
||||
if mcl_bamboo.is_dirt(node_name) or mcl_bamboo.is_bamboo(node_name) or mcl_bamboo.is_bamboo(minetest.get_node(pos).name) == false then
|
||||
if node_name == "ignore" or mcl_bamboo.is_dirt(node_name) or mcl_bamboo.is_bamboo(node_name) or mcl_bamboo.is_bamboo(minetest.get_node(pos).name) == false then
|
||||
return
|
||||
end
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ minetest.register_lbm({
|
|||
local node_name = node.name
|
||||
node.name = node_name .. "_small"
|
||||
minetest.swap_node(pos, node)
|
||||
select_and_spawn_entity(pos, node)
|
||||
mcl_chests.select_and_spawn_entity(pos, node)
|
||||
if node_name == "mcl_chests:trapped_chest_on" then
|
||||
minetest.log("action", "[mcl_chests] Disabled active trapped chest on load: " .. minetest.pos_to_string(pos))
|
||||
mcl_chests.chest_update_after_close(pos)
|
||||
|
|
|
@ -919,9 +919,6 @@ minetest.register_node("mcl_core:ice", {
|
|||
_mcl_blast_resistance = 0.5,
|
||||
_mcl_hardness = 0.5,
|
||||
_mcl_silk_touch_drop = true,
|
||||
_vl_physics = {
|
||||
friction = 0.4,
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_node("mcl_core:packed_ice", {
|
||||
|
@ -936,9 +933,6 @@ minetest.register_node("mcl_core:packed_ice", {
|
|||
_mcl_blast_resistance = 0.5,
|
||||
_mcl_hardness = 0.5,
|
||||
_mcl_silk_touch_drop = true,
|
||||
_vl_physics = {
|
||||
friction = 0.15,
|
||||
},
|
||||
})
|
||||
|
||||
-- Frosted Ice (4 nodes)
|
||||
|
|
|
@ -196,7 +196,7 @@ function kelp.find_unsubmerged(pos, node, height)
|
|||
for i=1,height do
|
||||
walk_pos.y = y + i
|
||||
local walk_node = mt_get_node(walk_pos)
|
||||
if not kelp.is_submerged(walk_node) then
|
||||
if walk_node.name ~= "ignore" and not kelp.is_submerged(walk_node) then
|
||||
return walk_pos, walk_node, height, i
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,95 +0,0 @@
|
|||
local S = minetest.get_translator(minetest.get_current_modname())
|
||||
|
||||
local WATER_VISC = 1
|
||||
local USE_TEXTURE_ALPHA = true
|
||||
if minetest.features.use_texture_alpha_string_modes then
|
||||
USE_TEXTURE_ALPHA = "blend"
|
||||
end
|
||||
|
||||
local positions = {}
|
||||
local function check_bubble_column(pos, node)
|
||||
local below_pos = vector.offset(pos,0,-1,0)
|
||||
local below = minetest.get_node(below_pos)
|
||||
if below.name == "mcl_nether:soul_sand" or below.name == "mcl_nether:magma" then
|
||||
return true
|
||||
end
|
||||
|
||||
if below.name == "mcl_core:water_source" and positions[minetest.hash_node_position(below_pos)] then
|
||||
return true
|
||||
end
|
||||
|
||||
print("Tearing down bubble column at "..vector.to_string(pos))
|
||||
|
||||
local pos_hash = minetest.hash_node_position(pos)
|
||||
|
||||
-- Don't continue upwards if this already wasn't a bubble column
|
||||
if not positions[pos_hash] then return end
|
||||
|
||||
-- Remove this node from the columnpositions
|
||||
positions[pos_hash] = nil
|
||||
|
||||
pos = vector.offset(pos,0,1,0)
|
||||
|
||||
node = minetest.get_node(pos)
|
||||
return check_bubble_column(pos,node)
|
||||
end
|
||||
|
||||
minetest.register_abm({
|
||||
label = "Create Bubble Column",
|
||||
interval = 1,
|
||||
chance = 1,
|
||||
nodenames = { "mcl_nether:soul_sand", "mcl_nether:magma" },
|
||||
neighbors = { "mcl_core:water_source" },
|
||||
action = function(pos, node)
|
||||
local above_pos = vector.offset(pos,0,1,0)
|
||||
local above = minetest.get_node(above_pos)
|
||||
if above.name ~= "mcl_core:water_source" then return end
|
||||
|
||||
local direction = 1
|
||||
if node.name == "mcl_nether:magma" then
|
||||
direction = -1
|
||||
end
|
||||
|
||||
-- Create the bubble column
|
||||
while above.name == "mcl_core:water_source" do
|
||||
local above_pos_hash = minetest.hash_node_position(above_pos)
|
||||
if positions[above_pos_hash] == direction then return end
|
||||
positions[above_pos_hash] = direction
|
||||
|
||||
above_pos = vector.offset(above_pos,0,1,0)
|
||||
above = minetest.get_node(above_pos)
|
||||
end
|
||||
end
|
||||
})
|
||||
local BUBBLE_TIME = 0.5
|
||||
local BUBBLE_PARTICLE = {
|
||||
texture = "mcl_particles_bubble.png",
|
||||
collision_removal = false,
|
||||
expirationtime = BUBBLE_TIME,
|
||||
collisiondetection = false,
|
||||
size = 2.5,
|
||||
}
|
||||
minetest.register_globalstep(function(dtime)
|
||||
for hash,dir in pairs(positions) do
|
||||
if math.random(1,17) == 1 then
|
||||
local pos = minetest.get_position_from_hash(hash)
|
||||
local node = minetest.get_node(pos)
|
||||
if check_bubble_column(pos, node) then
|
||||
local particle = table.copy(BUBBLE_PARTICLE)
|
||||
particle.pos = vector.offset(pos, math.random(-28,28)/64, -0.51 * dir, math.random(-28,28)/64)
|
||||
particle.velocity = (vector.offset(pos, math.random(-28,28)/64, 0.51 * dir, math.random(-28,28)/64) - particle.pos) / BUBBLE_TIME
|
||||
particle.acceleration = vector.zero()
|
||||
minetest.add_particle(particle)
|
||||
end
|
||||
end
|
||||
end
|
||||
end)
|
||||
vl_physics.register_environment_effect(function(pos, vel, staticdata, entity)
|
||||
local pos_r = vector.round(pos)
|
||||
local pos_r_hash = minetest.hash_node_position(pos_r)
|
||||
local dir = positions[pos_r_hash]
|
||||
if not dir then return nil,nil end
|
||||
|
||||
return vector.new(0,4*dir,0),vector.new(0,9*dir,0)
|
||||
end)
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
name = vl_bubble_column
|
||||
author = teknomunk
|
||||
description = Bubble Column
|
||||
depends = mcl_sounds, vl_physics
|
|
@ -204,10 +204,6 @@ minetest.register_globalstep(function(dtime)
|
|||
|
||||
local c_x, c_y = unpack(player_collision(player))
|
||||
|
||||
-- Apply enviornmental physics effects
|
||||
local v,a = vl_physics.get_environment_effect(player:get_pos(), player_velocity, {}, 1, player)
|
||||
if v then player:add_velocity(v) end
|
||||
|
||||
if player_velocity.x + player_velocity.y < .5 and c_x + c_y > 0 then
|
||||
player:add_velocity({x = c_x, y = 0, z = c_y})
|
||||
player_velocity = player:get_velocity() or player:get_player_velocity()
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
name = mcl_playerplus
|
||||
author = TenPlus1
|
||||
description = Adds some simple player-related gameplay effects: Hurt by touching a cactus, suffocation and more.
|
||||
depends = mcl_init, mcl_core, mcl_particles, mcl_hunger, playerphysics, mcl_playerinfo, mcl_weather, mcl_spawn, mcl_enchanting, mcl_damage, mcl_sprint, mcl_util, mcl_shields, vl_physics
|
||||
depends = mcl_init, mcl_core, mcl_particles, mcl_hunger, playerphysics, mcl_playerinfo, mcl_weather, mcl_spawn, mcl_enchanting, mcl_damage, mcl_sprint, mcl_util, mcl_shields
|
||||
|
||||
|
|
Loading…
Reference in New Issue