Merge branch 'master' of yunohost.local:mtcontrib/mobs_animal into nalc-1.2-dev

bee.lua

@@ -1,7 +1,7 @@
 
 local S = mobs.intllib
 
--- Bee by KrupnoPavel
+-- Bee by KrupnoPavel (.b3d model by sirrobzeroone)
 
 mobs:register_mob("mobs_animal:bee", {
 	type = "animal",
@@ -11,7 +11,7 @@ mobs:register_mob("mobs_animal:bee", {
 	armor = 200,
 	collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.5, 0.2},
 	visual = "mesh",
-	mesh = "mobs_bee.x",
+	mesh = "mobs_bee.b3d",
 	textures = {
 		{"mobs_bee.png"},
 	},
@@ -20,7 +20,7 @@ mobs:register_mob("mobs_animal:bee", {
 	makes_footstep_sound = false,
 	sounds = {
 		random = "mobs_bee",
-	},	
+	},
 	walk_velocity = 1,
 	jump = true,
 	drops = {
@@ -57,7 +57,7 @@ mobs:spawn({
 	day_toggle = true,
 })
 
-mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png", 0)
+mobs:register_egg("mobs_animal:bee", S("Bee"), "mobs_bee_inv.png")
 
 -- compatibility
 mobs:alias_mob("mobs:bee", "mobs_animal:bee")

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
@@ -146,7 +155,7 @@ 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'),
+	on_use = minetest.item_eat(8, "bucket:bucket_empty"),
 	groups = {food_milk = 1, flammable = 3},
 })
 
@@ -154,7 +163,7 @@ minetest.register_craftitem(":mobs:bucket_milk", {
 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'),
+	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
 	groups = {food_milk_glass = 1, flammable = 3, vessel = 1},
 })
 
@@ -162,9 +171,9 @@ minetest.register_craft({
 	type = "shapeless",
 	output = "mobs:glass_milk 4",
 	recipe = {
-		'vessels:drinking_glass', 'vessels:drinking_glass',
-		'vessels:drinking_glass', 'vessels:drinking_glass',
-		'mobs:bucket_milk'
+		"vessels:drinking_glass", "vessels:drinking_glass",
+		"vessels:drinking_glass", "vessels:drinking_glass",
+		"mobs:bucket_milk"
 	},
 	replacements = { {"mobs:bucket_milk", "bucket:bucket_empty"} }
 })
@@ -173,9 +182,9 @@ minetest.register_craft({
 	type = "shapeless",
 	output = "mobs:bucket_milk",
 	recipe = {
-		'mobs:glass_milk', 'mobs:glass_milk',
-		'mobs:glass_milk', 'mobs:glass_milk',
-		'bucket:bucket_empty'
+		"mobs:glass_milk", "mobs:glass_milk",
+		"mobs:glass_milk", "mobs:glass_milk",
+		"bucket:bucket_empty"
 	},
 	replacements = { {"mobs:glass_milk", "vessels:drinking_glass 4"} }
 })
@@ -233,16 +242,16 @@ minetest.register_node(":mobs:cheeseblock", {
 minetest.register_craft({
 	output = "mobs:cheeseblock",
 	recipe = {
-		{'mobs:cheese', 'mobs:cheese', 'mobs:cheese'},
-		{'mobs:cheese', 'mobs:cheese', 'mobs:cheese'},
-		{'mobs:cheese', 'mobs:cheese', 'mobs:cheese'},
+		{"mobs:cheese", "mobs:cheese", "mobs:cheese"},
+		{"mobs:cheese", "mobs:cheese", "mobs:cheese"},
+		{"mobs:cheese", "mobs:cheese", "mobs:cheese"},
 	}
 })
 
 minetest.register_craft({
 	output = "mobs:cheese 9",
 	recipe = {
-		{'mobs:cheeseblock'},
+		{"mobs:cheeseblock"},
 	}
 })
 

init.lua

@@ -22,4 +22,4 @@ dofile(path .. "/panda.lua") -- AspireMint
 
 dofile(path .. "/lucky_block.lua")
 
-print (S("[MOD] Mobs Redo 'Animals' loaded"))
+print (S("[MOD] Mobs Redo Animals loaded"))

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

@@ -33,7 +33,7 @@ stepheight = 0.6,
 	run_velocity = 1.5,
 	jump = false,
 	jump_height = 6,
-	follow = {"ethereal:bamboo"},
+	follow = {"ethereal:bamboo", "bamboo:trunk"},
 	view_range = 8,
 	drops = {
 		{name = "mobs:meat_raw", chance = 1, min = 1, max = 2},
@@ -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

@@ -47,8 +47,8 @@ stepheight = 0.6,
 	floats = 0,
 	follow = {
 		"ethereal:fish_raw",
-		"mobs_fish:clownfish",
-		"mobs_fish:tropical",
+		"mobs_fish:clownfish_set", "mobs_fish:clownfish",
+		"mobs_fish:tropical_set", "mobs_fish:tropical",
 		"fishing:fish_raw",
 		"fishing:clownfish_raw",
 		"fishing:bluewhite_raw",
@@ -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

@@ -2,7 +2,7 @@
 local S = mobs.intllib
 
 
--- Rat by PilzAdam
+-- Rat by PilzAdam (B3D model by sirrobzeroone)
 
 mobs:register_mob("mobs_animal:rat", {
 stepheight = 0.6,
@@ -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