Merge remote-tracking branch 'upstream/master'

cow.lua

@@ -1,4 +1,4 @@
--- Translation support
+
 local S = minetest.get_translator("mobs_animal")
 
 -- Cow by sirrobzeroone
@@ -21,9 +21,7 @@ mobs:register_mob("mobs_animal:cow", {
 		{"mobs_cow2.png"}
 	},
 	makes_footstep_sound = true,
-	sounds = {
-		random = "mobs_cow",
-	},
+	sounds = {random = "mobs_cow"},
 	walk_velocity = 1,
 	run_velocity = 2,
 	jump = true,
@@ -38,25 +36,12 @@ mobs:register_mob("mobs_animal:cow", {
 	lava_damage = 5,
 	light_damage = 0,
 	animation = {
-		stand_start = 0,
-		stand_end = 30,
-		stand_speed = 20,
-		stand1_start = 35,
-		stand1_end = 75,
-		stand1_speed = 20,
-		walk_start = 85,
-		walk_end = 114,
-		walk_speed = 20,
-		run_start = 120,
-		run_end = 140,
-		run_speed = 30,
-		punch_start = 145,
-		punch_end = 160,
-		punch_speed = 20,
-		die_start = 165,
-		die_end = 185,
-		die_speed = 10,
-		die_loop = false
+		stand_start = 0, stand_end = 30, stand_speed = 20,
+		stand1_start = 35, stand1_end = 75, stand1_speed = 20,
+		walk_start = 85, walk_end = 114, walk_speed = 20,
+		run_start = 120, run_end = 140, run_speed = 30,
+		punch_start = 145, punch_end = 160, punch_speed = 20,
+		die_start = 165, die_end = 185, die_speed = 10, die_loop = false
 	},
 	follow = {
 		"farming:wheat", "default:grass_1", "farming:barley",
@@ -77,9 +62,7 @@ mobs:register_mob("mobs_animal:cow", {
 		if mobs:feed_tame(self, clicker, 8, true, true) then
 
 			-- if fed 7x wheat or grass then cow can be milked again
-			if self.food and self.food > 6 then
-				self.gotten = false
-			end
+			if self.food and self.food > 6 then self.gotten = false end
 
 			return
 		end
@@ -96,10 +79,7 @@ mobs:register_mob("mobs_animal:cow", {
 		or item == "wooden_bucket:bucket_wood_empty"
 		or item == "bucket_wooden:bucket_empty" then
 
-			--if self.gotten == true
-			if self.child == true then
-				return
-			end
+			if self.child == true then return end
 
 			if self.gotten == true then
 
@@ -141,14 +121,14 @@ mobs:register_mob("mobs_animal:cow", {
 
 		self.food = (self.food or 0) + 1
 
-		-- if cow replaces 8x grass then it can be milked again
-		if self.food >= 8 then
+		if self.food >= 8 then -- replace 8x grass and can be milked again
 			self.food = 0
 			self.gotten = false
 		end
 	end
 })
 
+-- where to spawn
 
 if not mobs.custom_spawn_animal then
 
@@ -165,30 +145,36 @@ if not mobs.custom_spawn_animal then
 	})
 end
 
+-- spawn egg
 
 mobs:register_egg("mobs_animal:cow", S("Cow"), "mobs_cow_inv.png")
 
+-- old mobs mod compatibility
 
-mobs:alias_mob("mobs:cow", "mobs_animal:cow") -- compatibility
-
+mobs:alias_mob("mobs:cow", "mobs_animal:cow")
 
 -- bucket of milk
+
 minetest.register_craftitem(":mobs:bucket_milk", {
 	description = S("Bucket of Milk"),
 	inventory_image = "mobs_bucket_milk.png",
 	stack_max = 1,
 	on_use = minetest.item_eat(8, "bucket:bucket_empty"),
-	groups = {food_milk = 1, flammable = 3, drink = 1}
+	groups = {food_milk = 1, drink = 1}
 })
 
--- glass of milk
+mobs.add_eatable("mobs:bucket_milk", 8)
+
+-- glass of milk and recipes
 minetest.register_craftitem(":mobs:glass_milk", {
 	description = S("Glass of Milk"),
 	inventory_image = "mobs_glass_milk.png",
 	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
-	groups = {food_milk_glass = 1, flammable = 3, vessel = 1, drink = 1}
+	groups = {food_milk_glass = 1, vessel = 1, drink = 1}
 })
 
+mobs.add_eatable("mobs:glass_milk", 2)
+
 minetest.register_craft({
 	output = "mobs:glass_milk 4",
 	recipe = {
@@ -211,15 +197,17 @@ minetest.register_craft({
 	}
 })
 
+-- butter and recipe
 
--- butter
 minetest.register_craftitem(":mobs:butter", {
 	description = S("Butter"),
 	inventory_image = "mobs_butter.png",
 	on_use = minetest.item_eat(1),
-	groups = {food_butter = 1, flammable = 2}
+	groups = {food_butter = 1}
 })
 
+mobs.add_eatable("mobs:butter", 1)
+
 local salt_item = "default:sapling" -- some saplings are high in sodium
 
 if minetest.get_modpath("farming") and farming and farming.mod then
@@ -232,14 +220,17 @@ minetest.register_craft({
 	replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}}
 })
 
--- cheese wedge
+-- cheese wedge and recipe
+
 minetest.register_craftitem(":mobs:cheese", {
 	description = S("Cheese"),
 	inventory_image = "mobs_cheese.png",
 	on_use = minetest.item_eat(4),
-	groups = {food_cheese = 1, flammable = 2}
+	groups = {food_cheese = 1}
 })
 
+mobs.add_eatable("mobs:cheese", 4)
+
 minetest.register_craft({
 	type = "cooking",
 	output = "mobs:cheese",
@@ -248,13 +239,14 @@ minetest.register_craft({
 	replacements = {{"mobs:bucket_milk", "bucket:bucket_empty"}}
 })
 
--- cheese block
+-- cheese block and recipe
+
 minetest.register_node(":mobs:cheeseblock", {
 	description = S("Cheese Block"),
 	tiles = {"mobs_cheeseblock.png"},
 	is_ground_content = false,
 	groups = {oddly_breakable_by_hand = 3},
-	sounds = default and default.node_sound_dirt_defaults()
+	sounds = mobs.node_sound_dirt_defaults()
 })
 
 minetest.register_craft({
@@ -271,7 +263,7 @@ minetest.register_craft({
 	recipe = {{"mobs:cheeseblock"}}
 })
 
--- Dung (from factory's fertilizer)
+-- NALC: Dung (from factory's fertilizer)
 minetest.register_node(
 	":mobs:dung",
 	{
@@ -301,6 +293,7 @@ minetest.register_craft({
 })
 
 -- check for either of the wood bucket mods and add compatibility
+
 local wb = minetest.get_modpath("wooden_bucket")
 local bw = minetest.get_modpath("bucket_wooden")