Merge branch 'master' into nalc-1.2

cow.lua

@@ -2,7 +2,7 @@
 local S = mobs.intllib
 
 
--- Cow by Krupnovpavel (additional texture by JurajVajda)
+-- Cow by sirrobzeroone
 
 mobs:register_mob("mobs_animal:cow", {
 	type = "animal",
@@ -16,7 +16,7 @@ mobs:register_mob("mobs_animal:cow", {
 	armor = 200,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.2, 0.4},
 	visual = "mesh",
-	mesh = "mobs_cow.x",
+	mesh = "mobs_cow.b3d",
 	textures = {
 		{"mobs_cow.png"},
 		{"mobs_cow2.png"},
@@ -39,16 +39,25 @@ mobs:register_mob("mobs_animal:cow", {
 	lava_damage = 5,
 	light_damage = 0,
 	animation = {
-		speed_normal = 15,
-		speed_run = 15,
 		stand_start = 0,
 		stand_end = 30,
-		walk_start = 35,
-		walk_end = 65,
-		run_start = 105,
-		run_end = 135,
-		punch_start = 70,
-		punch_end = 100,
+		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"},
 	view_range = 8,
@@ -135,7 +144,7 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:cow", S("Cow"), "default_grass.png", 1)
+mobs:register_egg("mobs_animal:cow", S("Cow"), "mobs_cow_inv.png")
 
 
 mobs:alias_mob("mobs:cow", "mobs_animal:cow") -- compatibility

kitten.lua

@@ -13,6 +13,7 @@ attack_type = "dogfight",
 attack_animals = true, -- so it can attack rat
 attack_players = false,
 reach = 1,
+stepheight = 1.1,
 	passive = false,
 	hp_min = 5,
 	hp_max = 10,

license.txt

@@ -23,3 +23,5 @@ THE SOFTWARE.
 Chicken sounds from freesounds.org under CC0
 
 Mutton, Pork and Rabbit meat textures by Piezo_ under CC0
+
+Cow textures by sirrobzeroone under CC0

panda.lua

@@ -83,4 +83,4 @@ if minetest.get_modpath("ethereal") then
 	})
 end
 
-mobs:register_egg("mobs_animal:panda", S("Panda"), "wool_green.png", 1)
+mobs:register_egg("mobs_animal:panda", S("Panda"), "mobs_panda_inv.png")

penguin.lua

@@ -81,4 +81,4 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:penguin", S("Penguin"), "default_snow.png", 1)
+mobs:register_egg("mobs_animal:penguin", S("Penguin"), "mobs_penguin_inv.png")

rat.lua

@@ -79,7 +79,7 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:rat", S("Rat"), "mobs_rat_inventory.png", 0)
+mobs:register_egg("mobs_animal:rat", S("Rat"), "mobs_rat_inv.png")
 
 
 mobs:alias_mob("mobs:rat", "mobs_animal:rat") -- compatibility

sheep.lua

@@ -196,7 +196,7 @@ for _, col in ipairs(all_colours) do
 		end
 	})
 
-	mobs:register_egg("mobs_animal:sheep_"..col[1], S("@1 Sheep", col[2]), "wool_"..col[1]..".png", 1)
+mobs:register_egg("mobs_animal:sheep_"..col[1], S("@1 Sheep", col[2]), "wool_"..col[1]..".png^mobs_sheep_inv.png")
 
 	-- compatibility
 	mobs:alias_mob("mobs:sheep_" .. col[1], "mobs_animal:sheep_" .. col[1])

warthog.lua

@@ -2,7 +2,7 @@
 local S = mobs.intllib
 
 
--- Warthog by KrupnoPavel
+-- Warthog originally by KrupnoPavel, B3D model by sirrobzeroone
 
 mobs:register_mob("mobs_animal:pumba", {
 	stepheight = 0.6,
@@ -19,7 +19,7 @@ mobs:register_mob("mobs_animal:pumba", {
 	armor = 200,
 	collisionbox = {-0.4, -0.01, -0.4, 0.4, 0.95, 0.4},
 	visual = "mesh",
-	mesh = "mobs_pumba.x",
+	mesh = "mobs_pumba.b3d",
 	textures = {
 		{"mobs_pumba.png"},
 	},
@@ -86,7 +86,7 @@ mobs:spawn({
 })
 
 
-mobs:register_egg("mobs_animal:pumba", S("Warthog"), "wool_pink.png", 1)
+mobs:register_egg("mobs_animal:pumba", S("Warthog"), "mobs_pumba_inv.png")
 
 
 mobs:alias_mob("mobs:pumba", "mobs_animal:pumba") -- compatibility