tweak and tidy code

This commit is contained in:
tenplus1
2024-08-10 14:10:22 +01:00
parent 10865e9ab4
commit 53f72b8a9e
14 changed files with 243 additions and 345 deletions

View File

@ -1,4 +1,4 @@
-- Translation support
local S = minetest.get_translator("mobs_animal")
-- Chicken by JK Murray and Sirrobzeroone
@ -18,13 +18,9 @@ mobs:register_mob("mobs_animal:chicken", {
{"mobs_chicken_brown.png"},
{"mobs_chicken_black.png"}
},
child_texture = {
{"mobs_chick.png"}
},
child_texture = {{"mobs_chick.png"}},
makes_footstep_sound = true,
sounds = {
random = "mobs_chicken"
},
sounds = {random = "mobs_chicken"},
walk_velocity = 1,
run_velocity = 3,
runaway = true,
@ -41,18 +37,10 @@ mobs:register_mob("mobs_animal:chicken", {
fear_height = 5,
animation = {
speed_normal = 15,
stand_start = 1,
stand_end = 30,
stand_speed = 28,
stand1_start = 31,
stand1_end = 70,
stand1_speed = 32,
walk_start = 71,
walk_end = 90,
walk_speed = 24,
run_start = 91,
run_end = 110,
run_speed = 24
stand_start = 1, stand_end = 30, stand_speed = 28,
stand1_start = 31, stand1_end = 70, stand1_speed = 32,
walk_start = 71, walk_end = 90, walk_speed = 24,
run_start = 91, run_end = 110, run_speed = 24
},
follow = {
"farming:seed_wheat", "farming:seed_cotton", "farming:seed_barley",
@ -84,14 +72,10 @@ mobs:register_mob("mobs_animal:chicken", {
do_custom = function(self, dtime)
self.egg_timer = (self.egg_timer or 0) + dtime
if self.egg_timer < 10 then
return
end
if self.egg_timer < 10 then return end
self.egg_timer = 0
if self.child then
return
end
if self.child then return end
local pos = self.object:get_pos() ; if not pos then return end
@ -99,11 +83,8 @@ mobs:register_mob("mobs_animal:chicken", {
minetest.add_item(pos, "mobs:egg")
minetest.sound_play("default_place_node_hard", {
pos = pos,
gain = 1.0,
max_hear_distance = 5
}, true)
minetest.sound_play("default_place_node_hard",
{pos = pos, gain = 1.0, max_hear_distance = 5}, true)
elseif math.random(100) < 3 then
minetest.add_item(pos, "mobs:chicken_feather")
@ -111,16 +92,16 @@ mobs:register_mob("mobs_animal:chicken", {
end
})
local spawn_on = {"default:dirt_with_grass"}
if minetest.get_modpath("ethereal") then
spawn_on = {"ethereal:bamboo_dirt", "ethereal:prairie_dirt"}
end
-- where to spawn
if not mobs.custom_spawn_animal then
local spawn_on = {"default:dirt_with_grass"}
if minetest.get_modpath("ethereal") then
spawn_on = {"ethereal:bamboo_dirt", "ethereal:prairie_dirt"}
end
mobs:spawn({
name = "mobs_animal:chicken",
nodes = spawn_on,
@ -134,22 +115,24 @@ if not mobs.custom_spawn_animal then
})
end
-- spawn egg
mobs:register_egg("mobs_animal:chicken", S("Chicken"), "mobs_chicken_inv.png", 0)
-- compatibility with older mobs mod
mobs:alias_mob("mobs:chicken", "mobs_animal:chicken") -- compatibility
mobs:alias_mob("mobs:chicken", "mobs_animal:chicken")
-- egg entity
mobs:register_arrow("mobs_animal:egg_entity", {
visual = "sprite",
visual_size = {x=.5, y=.5},
visual_size = {x = .5, y = .5},
textures = {"mobs_chicken_egg.png"},
velocity = 6,
hit_player = function(self, player)
player:punch(minetest.get_player_by_name(self.playername) or self.object, 1.0, {
full_punch_interval = 1.0,
damage_groups = {fleshy = 1}
@ -157,6 +140,7 @@ mobs:register_arrow("mobs_animal:egg_entity", {
end,
hit_mob = function(self, player)
player:punch(self.object, 1.0, {
full_punch_interval = 1.0,
damage_groups = {fleshy = 1}
@ -165,16 +149,13 @@ mobs:register_arrow("mobs_animal:egg_entity", {
hit_node = function(self, pos, node)
if math.random(10) > 1 then
return
end
if math.random(10) > 1 then return end
pos.y = pos.y + 1
local nod = minetest.get_node_or_nil(pos)
if not nod
or not minetest.registered_nodes[nod.name]
if not nod or not minetest.registered_nodes[nod.name]
or minetest.registered_nodes[nod.name].walkable == true then
return
end
@ -189,22 +170,17 @@ mobs:register_arrow("mobs_animal:egg_entity", {
end
})
-- egg throwing item
-- egg throwing function
local egg_GRAVITY = 9
local egg_VELOCITY = 19
-- shoot egg
local mobs_shoot_egg = function (item, player, pointed_thing)
local playerpos = player:get_pos()
minetest.sound_play("default_place_node_hard", {
pos = playerpos,
gain = 1.0,
max_hear_distance = 5
})
minetest.sound_play("default_place_node_hard",
{pos = playerpos, gain = 1.0, max_hear_distance = 5}, true)
local obj = minetest.add_entity({
x = playerpos.x,
@ -220,16 +196,10 @@ local mobs_shoot_egg = function (item, player, pointed_thing)
ent._is_arrow = true -- tell advanced mob protection this is an arrow
obj:set_velocity({
x = dir.x * egg_VELOCITY,
y = dir.y * egg_VELOCITY,
z = dir.z * egg_VELOCITY
})
x = dir.x * egg_VELOCITY, y = dir.y * egg_VELOCITY, z = dir.z * egg_VELOCITY})
obj:set_acceleration({
x = dir.x * -3,
y = -egg_GRAVITY,
z = dir.z * -3
})
x = dir.x * -3, y = -egg_GRAVITY, z = dir.z * -3})
-- pass player name to egg for chick ownership
local ent2 = obj:get_luaentity()
@ -241,8 +211,8 @@ local mobs_shoot_egg = function (item, player, pointed_thing)
return item
end
-- egg
minetest.register_node(":mobs:egg", {
description = S("Chicken Egg"),
tiles = {"mobs_chicken_egg.png"},
@ -259,16 +229,17 @@ minetest.register_node(":mobs:egg", {
fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
},
groups = {food_egg = 1, snappy = 2, dig_immediate = 3},
sounds = mobs.node_sound_defaults(),
after_place_node = function(pos, placer, itemstack)
if placer:is_player() then
minetest.set_node(pos, {name = "mobs:egg", param2 = 1})
end
minetest.set_node(pos, {name = "mobs:egg", param2 = 1})
end,
on_use = mobs_shoot_egg
})
-- fried egg and recipe
-- fried egg
minetest.register_craftitem(":mobs:chicken_egg_fried", {
description = S("Fried Egg"),
inventory_image = "mobs_chicken_egg_fried.png",
@ -285,6 +256,7 @@ minetest.register_craft({
})
-- raw chicken
minetest.register_craftitem(":mobs:chicken_raw", {
description = S("Raw Chicken"),
inventory_image = "mobs_chicken_raw.png",
@ -294,7 +266,8 @@ minetest.register_craftitem(":mobs:chicken_raw", {
mobs.add_eatable("mobs:chicken_raw", 2)
-- cooked chicken
-- cooked chicken and recipe
minetest.register_craftitem(":mobs:chicken_cooked", {
description = S("Cooked Chicken"),
inventory_image = "mobs_chicken_cooked.png",
@ -310,15 +283,12 @@ minetest.register_craft({
output = "mobs:chicken_cooked"
})
-- feather
-- feather and fuel
minetest.register_craftitem(":mobs:chicken_feather", {
description = S("Feather"),
inventory_image = "mobs_chicken_feather.png",
groups = {flammable = 2, feather = 1}
})
minetest.register_craft({
type = "fuel",
recipe = "mobs:chicken_feather",
burntime = 1
})
minetest.register_craft({type = "fuel", recipe = "mobs:chicken_feather", burntime = 1})