mtcontrib/mobs_redo
1
0
Fork 1
mirror of https://codeberg.org/tenplus1/mobs_redo.git synced 2025-01-10 09:50:19 +01:00
Code Issues Releases Wiki Activity

Fix mob damage and jumping when riding mob.

Browse Source
This commit is contained in:
tenplus1 2023-10-28 15:22:45 +01:00
parent 6049a1c140
commit 712f7f85fd
2 changed files with 14 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api.lua
View File

@ -11,7 +11,7 @@ local use_mc2 = minetest.get_modpath("mcl_core")
-- Global -- Global
mobs = { mobs = {
mod = "redo", mod = "redo",
version = "20231026", version = "20231028",
translate = S, translate = S,
invis = minetest.global_exists("invisibility") and invisibility or {}, invis = minetest.global_exists("invisibility") and invisibility or {},
node_snow = minetest.registered_aliases["mapgen_snow"] node_snow = minetest.registered_aliases["mapgen_snow"]

43
mount.lua
View File

@ -35,23 +35,23 @@ local node_ok = function(pos, fallback)
end end
local function node_is(pos) local function node_is(entity)
local node = node_ok(pos) if not entity.standing_on then return "other" end
if node.name == "air" then if entity.standing_on == "air" then
return "air" return "air"
end end
if minetest.get_item_group(node.name, "lava") ~= 0 then if minetest.get_item_group(entity.standing_on, "lava") ~= 0 then
return "lava" return "lava"
end end
if minetest.get_item_group(node.name, "liquid") ~= 0 then if minetest.get_item_group(entity.standing_on, "liquid") ~= 0 then
return "liquid" return "liquid"
end end
if minetest.registered_nodes[node.name].walkable == true then if minetest.registered_nodes[entity.standing_on].walkable == true then
return "walkable" return "walkable"
end end
@ -330,9 +330,12 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
if velo.y > 0 then velo.y = 0 end if velo.y > 0 then velo.y = 0 end
end end
else else
if ctrl.jump then -- jump if ctrl.jump then -- jump (only when standing on solid surface)
if velo.y == 0 then if velo.y == 0
and entity.standing_on ~= "air"
and entity.standing_on ~= "ignore"
and minetest.get_item_group(entity.standing_on, "liquid") == 0 then
velo.y = velo.y + entity.jump_height velo.y = velo.y + entity.jump_height
acce_y = acce_y + (acce_y * 3) + 1 acce_y = acce_y + (acce_y * 3) + 1
end end
@ -384,7 +387,7 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
p.y = p.y - 0.5 p.y = p.y - 0.5
local ni = node_is(p) local ni = node_is(entity)
local v = entity.v local v = entity.v
if ni == "air" then if ni == "air" then
@ -395,26 +398,6 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
elseif ni == "liquid" or ni == "lava" then elseif ni == "liquid" or ni == "lava" then
if ni == "lava" and entity.lava_damage ~= 0 then
entity.lava_counter = (entity.lava_counter or 0) + dtime
if entity.lava_counter > 1 then
minetest.sound_play("default_punch", {
object = entity.object,
max_hear_distance = 5
}, true)
entity.object:punch(entity.object, 1.0, {
full_punch_interval = 1.0,
damage_groups = {fleshy = entity.lava_damage}
}, nil)
entity.lava_counter = 0
end
end
local terrain_type = entity.terrain_type local terrain_type = entity.terrain_type
if terrain_type == 2 or terrain_type == 3 then if terrain_type == 2 or terrain_type == 3 then
@ -422,7 +405,7 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
new_acce.y = 0 new_acce.y = 0
p.y = p.y + 1 p.y = p.y + 1
if node_is(p) == "liquid" then if minetest.get_item_group(entity.standing_in, "liquid") ~= 0 then
if velo.y >= 5 then if velo.y >= 5 then
velo.y = 5 velo.y = 5