diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index 4baf403e..ba5fcd46 100755 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -1,4 +1,4 @@ --- Mobs Api (18th December 2015) +-- Mobs Api (21st December 2015) mobs = {} mobs.mod = "redo" @@ -1037,7 +1037,7 @@ minetest.register_entity(name, { } if vec.x ~= 0 - and vec.z ~= 0 then + or vec.z ~= 0 then yaw = (math.atan(vec.z / vec.x) + pi / 2) - self.rotate @@ -1112,7 +1112,7 @@ minetest.register_entity(name, { } if vec.x ~= 0 - and vec.z ~= 0 then + or vec.z ~= 0 then yaw = (math.atan(vec.z / vec.x) + pi / 2) - self.rotate @@ -1175,7 +1175,7 @@ minetest.register_entity(name, { } if vec.x ~= 0 - and vec.z ~= 0 then + or vec.z ~= 0 then yaw = math.atan(vec.z / vec.x) + 3 * pi / 2 - self.rotate @@ -1258,7 +1258,7 @@ minetest.register_entity(name, { } if vec.x ~= 0 - and vec.z ~= 0 then + or vec.z ~= 0 then yaw = math.atan(vec.z / vec.x) + pi / 2 - self.rotate @@ -1408,7 +1408,7 @@ minetest.register_entity(name, { } if vec.x ~= 0 - and vec.z ~= 0 then + or vec.z ~= 0 then yaw = (math.atan(vec.z / vec.x) + pi / 2) - self.rotate @@ -1496,7 +1496,7 @@ minetest.register_entity(name, { } if vec.x ~= 0 - and vec.z ~= 0 then + or vec.z ~= 0 then yaw = (math.atan(vec.z / vec.x) + pi / 2) - self.rotate diff --git a/mods/mobs/chicken.lua b/mods/mobs/chicken.lua index b502f882..4009fd22 100755 --- a/mods/mobs/chicken.lua +++ b/mods/mobs/chicken.lua @@ -45,6 +45,7 @@ mobs:register_mob("mobs:chicken", { light_damage = 0, fall_damage = 0, fall_speed = -8, + fear_height = 5, -- model animation animation = { speed_normal = 15, diff --git a/mods/mobs/ent.lua b/mods/mobs/ent.lua index 3350473b..9672dd78 100755 --- a/mods/mobs/ent.lua +++ b/mods/mobs/ent.lua @@ -102,7 +102,9 @@ minetest.register_node("mobs:tree_monster_spawner", { -- Boss -- spawn on mobs:ent_spawner between 1 and 20 light, 4 interval, 1 chance, 1 ent in area up to 31000 in height mobs:spawn_specific("mobs:ent", {"mobs:ent_spawner"}, {"air"}, 1, 20, 300, 1, 100, -31000, 31000, true) +mobs:register_egg("mobs:ent", "Ent", "mobs_ent_inv.png", 1) -- Minions -- spawn on mobs:pumpboom_spawner between 1 and 20 light, 4 interval, 1 chance, 1 pumpboom in area up to 31000 in height mobs:spawn_specific("mobs:tree_monster", {"mobs:tree_monster_spawner"}, {"air"}, 1, 20, 10, 4, 100, -31000, 31000, true) + diff --git a/mods/mobs/pumpkins.lua b/mods/mobs/pumpkins.lua index 6579b8c0..7daad577 100755 --- a/mods/mobs/pumpkins.lua +++ b/mods/mobs/pumpkins.lua @@ -130,8 +130,9 @@ minetest.register_node("mobs:pumpboom_spawner", { --(name, nodes, neighbors, min_light, max_light, interval, chance, active_object_count, min_height, max_height, spawn_in_area) -- spawn on mobs:pumpking_spawner between 1 and 20 light, interval 300, 1 chance, 1 pumpking_spawner in area up to 31000 in height mobs:spawn_specific("mobs:pumpking", {"mobs:pumpking_spawner"}, {"air"}, 1, 20, 300, 1, 100, -31000, 31000, true) +mobs:register_egg("mobs:pumpking", "Pumpking", "mobs_pumpking_inv.png", 1) -- spawn on mobs:pumpboom_spawner between 1 and 20 light, 4 interval, 1 chance, 100 pumpboom in area up to 31000 in height mobs:spawn_specific("mobs:pumpboom", {"mobs:pumpboom_spawner"}, {"air"}, 1, 20, 10, 4, 100, -31000, 31000, true) - +mobs:register_egg("mobs:pumpboom", "Pumpboom", "mobs_pumpboom_inv.png", 1) diff --git a/mods/mobs/shark.lua b/mods/mobs/shark.lua index 823839df..2161b214 100755 --- a/mods/mobs/shark.lua +++ b/mods/mobs/shark.lua @@ -19,7 +19,7 @@ local l_anims = { run_start = 80, run_end = 160 } local l_model = "mobs_shark.b3d" -local l_egg_texture = "mobs_shark_shark_item.png" +local l_egg_texture = "mobs_shark_shark_inv.png" local l_spawn_in = {"default:water_source"} local l_spawn_near = {"default:water_flowing","default:water_source","seawrecks:woodship","seawrecks:uboot"} local l_spawn_chance = 500000 @@ -66,7 +66,7 @@ mobs:register_mob("mobs:shark_lg", { }) --name, nodes, neighbours, minlight, maxlight, interval, chance, active_object_count, min_height, max_height mobs:spawn_specific("mobs:shark_lg", l_spawn_in, l_spawn_near, -1, 20, 30, l_spawn_chance, 1, -50, -1) -mobs:register_egg("mobs:shark_lg", "Shark (large)", l_egg_texture, 0) +mobs:register_egg("mobs:shark_lg", "Shark (large)", l_egg_texture, 1) -- medium mobs:register_mob("mobs:shark_md", { @@ -97,4 +97,4 @@ mobs:register_mob("mobs:shark_md", { }) --name, nodes, neighbours, minlight, maxlight, interval, chance, active_object_count, min_height, max_height mobs:spawn_specific("mobs:shark_md", l_spawn_in, l_spawn_near, -1, 20, 30, l_spawn_chance, 1, -50, -1) -mobs:register_egg("mobs:shark_md", "Shark (medium)", l_egg_texture, 0) +mobs:register_egg("mobs:shark_md", "Shark (medium)", l_egg_texture, 1) diff --git a/mods/mobs/textures/mobs_ent_inv.png b/mods/mobs/textures/mobs_ent_inv.png new file mode 100755 index 00000000..eb0766b3 Binary files /dev/null and b/mods/mobs/textures/mobs_ent_inv.png differ diff --git a/mods/mobs/textures/mobs_pumpboom_inv.png b/mods/mobs/textures/mobs_pumpboom_inv.png new file mode 100755 index 00000000..92bf92d6 Binary files /dev/null and b/mods/mobs/textures/mobs_pumpboom_inv.png differ diff --git a/mods/mobs/textures/mobs_shark_shark_inv.png b/mods/mobs/textures/mobs_shark_shark_inv.png new file mode 100755 index 00000000..e59af637 Binary files /dev/null and b/mods/mobs/textures/mobs_shark_shark_inv.png differ diff --git a/mods/mobs/textures/mobs_shark_shark_item.png b/mods/mobs/textures/mobs_shark_shark_item.png deleted file mode 100755 index 375890bf..00000000 Binary files a/mods/mobs/textures/mobs_shark_shark_item.png and /dev/null differ