Merge branch 'Gael-kitten'

mods/mobs/kitten.lua

@@ -54,72 +54,68 @@ local kitten_nodes = {
 
 
 
-local function register_kitten(image, name)
+mobs:register_spawn("mobs:kitten", {"default:dirt_with_grass"}, 15, 0, 2750, 10, 31000)
 
-	mobs:register_spawn("mobs:kitten_"..name, {"default:dirt_with_grass"}, 15, 0, 9000, 10, 31000)
+mobs:register_mob("mobs:kitten", {
+	type = "animal",
+	hp_min = 5,
+	hp_max = 10,
+	collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.1, 0.3},
+	visual = "mesh",
+	visual_size = {x=0.5, y=0.5},
+	mesh = "mobs_kitten.b3d",
+	available_textures = {
+		total = 4,
+		texture_1 = {"mobs_kitten_striped.png"},
+		texture_2 = {"mobs_kitten_splotchy.png"},
+		texture_3 = {"mobs_kitten_ginger.png"},
+		texture_4 = {"mobs_kitten_sandy.png"},
+	},
+	makes_footstep_sound = false,
+	view_range = 16,
+	walk_velocity = 0.6,
+	drops = {
+		{name = "maptools:copper_coin",
+		chance = 10,
+		min = 1,
+		max = 1,},
+	},
+	water_damage = 1,
+	lava_damage = 5,
+	on_rightclick = nil,
+	armor = 200,
+	sounds = {
+		random = "mobs_kitten",
+	},
+	animation = {
+		stand_start = 97,
+		stand_end = 192,
+		walk_start = 0,
+		walk_end = 96,
+		speed_normal = 42,
+	},
 
-	mobs:register_mob("mobs:kitten_"..name, {
+	follow = "fishing:fish_raw",
-		type = "animal",
+	view_range = 8,
-		hp_min = 5,
+--	jump = true,
-		hp_max = 10,
+--	step = 0.5,
-		collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.1, 0.3},
+	passive = true,
-		visual = "mesh",
+	blood_texture = "mobs_blood.png",
-		visual_size = {x=0.5, y=0.5},
-		mesh = "mobs_kitten.b3d",
-		textures = {image},
-		makes_footstep_sound = false,
-		view_range = 16,
-		walk_velocity = 0.6,
-		drops = {
-			{name = "maptools:copper_coin",
-			chance = 10,
-			min = 1,
-			max = 1,},
-		},
-		water_damage = 1,
-		lava_damage = 5,
-		on_rightclick = nil,
-		armor = 200,
-		sounds = {
-			random = "mobs_kitten",
-		},
-		animation = {
-			stand_start = 97,
-			stand_end = 192,
-			walk_start = 0,
-			walk_end = 96,
-			speed_normal = 42,
-		},
 
-		follow = "fishing:fish_raw",
+	on_rightclick = function(self, clicker)
-		view_range = 8,
+		local item = clicker:get_wielded_item()
---		jump = true,
+		if item:get_name() == "fishing:fish_raw" then
---		step = 0.5,
+			if not minetest.setting_getbool("creative_mode") then
-		passive = true,
+				item:take_item()
-		blood_texture = "mobs_blood.png",
+				clicker:set_wielded_item(item)
-
-		on_rightclick = function(self, clicker)
-			local item = clicker:get_wielded_item()
-			if item:get_name() == "fishing:fish_raw" then
-				if not minetest.setting_getbool("creative_mode") then
-					item:take_item()
-					clicker:set_wielded_item(item)
-				end
-				self.food = (self.food or 0) + 1
-				if self.food >= 4 then
-					self.food = 0
-					self.tamed = true
-					minetest.sound_play("mobs_kitten", {object = self.object,gain = 1.0,max_hear_distance = 32,loop = false,})
-				end
-				return
 			end
-	
+			self.food = (self.food or 0) + 1
+			if self.food >= 4 then
+				self.food = 0
+				self.tamed = true
+				minetest.sound_play("mobs_kitten", {object = self.object,gain = 1.0,max_hear_distance = 32,loop = false,})
+			end
+			return
+		end
 	end
-	})
+})
-
-register_kitten("mobs_kitten_striped.png", "striped")
-register_kitten("mobs_kitten_splotchy.png", "splotchy")
-register_kitten("mobs_kitten_ginger.png", "ginger")
-register_kitten("mobs_kitten_sandy.png", "sandy")
-
-end