TanyaEleventhGoddess
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into mineclone5

This commit is contained in:
Lizzy Fleckenstein 2021-04-28 11:40:21 +02:00
parent 6eadeb21c0 528f5e6b86
commit cca03bcbd2
3 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mods/ENTITIES/mobs_mc/slime+magma_cube.lua
View File

@ -59,7 +59,6 @@ local slime_big = {
description = S("Slime"),
type = "monster",
spawn_class = "hostile",
pathfinding = 1,
group_attack = { "mobs_mc:slime_big", "mobs_mc:slime_small", "mobs_mc:slime_tiny" },
hp_min = 16,
hp_max = 16,
@ -68,7 +67,7 @@ local slime_big = {
rotate = 270,
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
visual_size = {x=12.5, y=12.5},
textures = {{"mobs_mc_slime.png"}},
textures = {{"mobs_mc_slime.png", "mobs_mc_slime.png"}},
visual = "mesh",
mesh = "mobs_mc_slime.b3d",
makes_footstep_sound = true,
@ -85,18 +84,15 @@ local slime_big = {
drops = {},
-- TODO: Fix animations
animation = {
speed_normal = 24,
speed_run = 48,
stand_start = 0,
stand_end = 23,
walk_start = 24,
walk_end = 47,
run_start = 48,
run_end = 62,
hurt_start = 64,
hurt_end = 86,
death_start = 88,
death_end = 118,
jump_speed = 17,
stand_speed = 17,
walk_speed = 17,
jump_start = 1,
jump_end = 20,
stand_start = 1,
stand_end = 20,
walk_start = 1,
walk_end = 20,
},
fall_damage = 0,
view_range = 16,
@ -303,7 +299,7 @@ local magma_cube_big = {
xp_max = 4,
collisionbox = {-1.02, -0.01, -1.02, 1.02, 2.03, 1.02},
visual_size = {x=12.5, y=12.5},
textures = {{ "mobs_mc_magmacube.png" }},
textures = {{ "mobs_mc_magmacube.png", "mobs_mc_magmacube.png" }},
visual = "mesh",
mesh = "mobs_mc_magmacube.b3d",
makes_footstep_sound = true,
@ -327,18 +323,15 @@ local magma_cube_big = {
},
-- TODO: Fix animations
animation = {
speed_normal = 24,
speed_run = 48,
stand_start = 0,
stand_end = 23,
walk_start = 24,
walk_end = 47,
run_start = 48,
run_end = 62,
hurt_start = 64,
hurt_end = 86,
death_start = 88,
death_end = 118,
jump_speed = 20,
stand_speed = 20,
walk_speed = 20,
jump_start = 1,
jump_end = 40,
stand_start = 1,
stand_end = 1,
walk_start = 1,
walk_end = 40,
},
water_damage = 0,
lava_damage = 0,

1
mods/ITEMS/REDSTONE/mesecons_walllever/init.lua
View File

@ -37,7 +37,6 @@ minetest.register_node("mesecons_walllever:wall_lever_off", {
wield_image = "jeija_wall_lever.png",
paramtype = "light",
paramtype2 = "facedir",
drawtype = "mesh",
mesh = "jeija_wall_lever_off.obj",
sunlight_propagates = true,
walkable = false,

8
mods/PLAYER/mcl_playerplus/init.lua
View File

@ -168,11 +168,11 @@ minetest.register_globalstep(function(dtime)
and (fly_node == "air" or fly_node == "ignore")
if elytra.active then
if player_velocity.x < (player_velocity_old.x - 10) or player_velocity.x > (player_velocity_old.x + 10) then
player:set_hp(player:get_hp() - (math.abs(player_velocity_old.x) * 0.2))
if player_velocity.x < (player_velocity_old.x - 10) or player_velocity.x > (player_velocity_old.x + 10) and fly_node ~= "ignore" then
mcl_util.deal_damage(player, math.abs(player_velocity_old.x) * 0.2, {type = "fly_into_wall"})
end
if player_velocity.z < (player_velocity_old.z - 10) or player_velocity.z > (player_velocity_old.z + 10) then
player:set_hp(player:get_hp() - (math.abs(player_velocity_old.z) * 0.2))
if player_velocity.z < (player_velocity_old.z - 10) or player_velocity.z > (player_velocity_old.z + 10) and fly_node ~= "ignore" then
mcl_util.deal_damage(player, math.abs(player_velocity_old.z) * 0.2, {type = "fly_into_wall"})
end
mcl_player.player_set_animation(player, "fly")
if player_velocity.y < -1.5 then