Merge branch 'master' of http://github.com/Ombridride/minetest-minetestforfun-server

mods/mobs/bee.lua

@@ -35,7 +35,7 @@ mobs:register_mob("mobs:bee", {
 		walk_end = 65,
 	},
 	sounds = {
-		random = "mobs_bee_random01",
+		random = "mobs_bee",
 	},
 	on_rightclick = function(self, clicker)
 		if clicker:is_player() and clicker:get_inventory() then

mods/mobs/dirtmonster.lua

@@ -48,7 +48,7 @@ mobs:register_mob("mobs:dirt_monster", {
 		punch_end = 63,
 	},
 	sounds = {
-		random = {"mobs_dirtmonster_random01", "mobs_dirtmonster_random02"},
+		random = "mobs_dirtmonster",
 	},
 	jump = true,
 	step = 1,

mods/mobs/dungeonmaster.lua

@@ -75,7 +75,7 @@ mobs:register_mob("mobs:dungeon_master", {
 		speed_run = 15,
 	},
 	sounds = {
-		random = {"mobs_dungeonmaster_random01", "mobs_dungeonmaster_random02.ogg", "mobs_dungeonmaster_random03.ogg"},
+		random = "mobs_dungeonmaster",
 	},
 	jump = true,
 	step = 0.5,

mods/mobs/init.lua

@@ -11,6 +11,9 @@ dofile(minetest.get_modpath("mobs").."/sheep.lua")
 dofile(minetest.get_modpath("mobs").."/warthog.lua")
 dofile(minetest.get_modpath("mobs").."/bee.lua")
 
+-- Animals/Kittens from Jordach BFD subgame
+dofile(minetest.get_modpath("mobs").."/kitten.lua")
+
 -- Monsters
 
 dofile(minetest.get_modpath("mobs").."/dirtmonster.lua")

mods/mobs/kitten.lua

@@ -0,0 +1,101 @@
+local kitten_nodes = {
+"wool:black",
+"wool:blue",
+"wool:brown",
+"wool:cyan",
+"wool:dark_green",
+"wool:dark_grey",
+"wool:green",
+"wool:grey",
+"wool:magenta",
+"wool:orange",
+"wool:pink",
+"wool:red",
+"wool:violet",
+"wool:white",
+"wool:yellow",
+"carpet:black",
+"carpet:blue",
+"carpet:brown",
+"carpet:cyan",
+"carpet:dark_green",
+"carpet:dark_grey",
+"carpet:green",
+"carpet:grey",
+"carpet:magenta",
+"carpet:orange",
+"carpet:pink",
+"carpet:red",
+"carpet:violet",
+"carpet:white",
+"carpet:yellow",
+"deco:furnace_active",
+"beds:bed_bottom",
+"beds:bed_top",
+"beds:bed_top_red",
+"beds:bed_top_orange",
+"beds:bed_top_yellow",
+"beds:bed_top_green",
+"beds:bed_top_blue",
+"beds:bed_top_violet",
+"beds:bed_top_black",
+"beds:bed_top_grey",
+"beds:bed_top_white",
+"beds:bed_bottom_red",
+"beds:bed_bottom_orange",
+"beds:bed_bottom_yellow",
+"beds:bed_bottom_green",
+"beds:bed_bottom_blue",
+"beds:bed_bottom_violet",
+"beds:bed_bottom_black",
+"beds:bed_bottom_grey",
+"beds:bed_bottom_white",
+}
+
+
+
+local function register_kitten(image, name)
+
+	mobs:register_spawn("mobs:kitten_"..name, {"default:dirt_with_grass"}, 15, 0, 10000, 10, 31000)
+
+	mobs:register_mob("mobs:kitten_"..name, {
+		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",
+		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 = 10,
+		on_rightclick = nil,
+		armor = 100,
+		sounds = {
+			random = "mobs_kitten",
+		},
+		animation = {
+			stand_start = 97,
+			stand_end = 192,
+			walk_start = 0,
+			walk_end = 96,
+			speed_normal = 42,
+		}
+	})
+	
+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")
+

mods/mobs/lava_flan.lua

@@ -54,7 +54,7 @@ mobs:register_mob("mobs:lava_flan", {
 		punch_end = 28,
 	},
 	sounds = {
-		random = {"mobs_lavaflan_random01", "mobs_lavaflan_random02"},
+		random = "mobs_lavaflan",
 	},
 	jump = true,
 	step = 2,

mods/mobs/mese_monster.lua

@@ -66,7 +66,7 @@ mobs:register_mob("mobs:mese_monster", {
 		punch_end = 38, -- 63
 	},
 	sounds = {
-		random = {"mobs_mesemonster_random01", "mobs_mesemonster_random02"},
+		random = "mobs_mesemonster",
 	},
 	jump = true,
 	step = 1,

mods/mobs/oerkki.lua

@@ -50,7 +50,7 @@ mobs:register_mob("mobs:oerkki", {
 		speed_run = 15,
 	},
 	sounds = {
-		random = {"mobs_oerkki_random01", "mobs_oerkki_random02"},
+		random = "mobs_oerkki",
 		attack = "mobs_oerkki_attack",
 	},
 	jump = true,

mods/mobs/rat.lua

@@ -26,7 +26,7 @@ jump = true,
 step = 1,
 passive = true,
 	sounds = {
-		random = {"mobs_rat_random01", "mobs_rat_random02"},
+		random = "mobs_rat",
 	},
 	
 	on_rightclick = function(self, clicker)

mods/mobs/sandmonster.lua

@@ -49,7 +49,7 @@ mobs:register_mob("mobs:sand_monster", {
 		punch_end = 105,
 	},
 	sounds = {
-		random = {"mobs_sandmonster_random01", "mobs_sandmonster_random02"},
+		random = "mobs_sandmonster",
 	},
 	jump = true,
 	step = 1,

mods/mobs/spider.lua

@@ -58,7 +58,7 @@ mobs:register_mob("mobs:spider", {
 		punch_end = 90,
 	},
 	sounds = {
-		random = {"mobs_spider_random01", "mobs_spider_random02"},
+		random = "mobs_spider",
 		war_cry = "mobs_eerie",
 		death = "mobs_howl",
 		attack = "mobs_oerkki_attack",

mods/mobs/stonemonster.lua

@@ -57,7 +57,7 @@ mobs:register_mob("mobs:stone_monster", {
 		punch_end = 63,
 	},
 	sounds = {
-		random = "mobs_stonemonster_random01", "mobs_stonemonster_random02",
+		random = "mobs_stonemonster",
 	},
 	jump = true,
 	step = 1,

mods/mobs/treemonster.lua

@@ -58,7 +58,7 @@ mobs:register_mob("mobs:tree_monster", {
 		punch_end = 62,
 	},
 	sounds = {
-		random = {"mobs_treemonster_random01", "mobs_treemonster_random01"},
+		random = "mobs_treemonster",
 	},
 	step = 0.5,
 	jump = true,