diff --git a/mods/mobs/kitten.lua b/mods/mobs/kitten.lua index a5bab2c3..748cde41 100644 --- a/mods/mobs/kitten.lua +++ b/mods/mobs/kitten.lua @@ -56,7 +56,7 @@ local kitten_nodes = { local function register_kitten(image, name) - mobs:register_spawn("mobs:kitten_"..name, {"default:dirt_with_grass"}, 15, 0, 10000, 10, 31000) + mobs:register_spawn("mobs:kitten_"..name, {"default:dirt_with_grass"}, 15, 0, 9000, 10, 31000) mobs:register_mob("mobs:kitten_"..name, { type = "animal", @@ -77,9 +77,9 @@ local function register_kitten(image, name) max = 1,}, }, water_damage = 1, - lava_damage = 10, + lava_damage = 5, on_rightclick = nil, - armor = 100, + armor = 200, sounds = { random = "mobs_kitten", }, @@ -89,13 +89,37 @@ local function register_kitten(image, name) walk_start = 0, walk_end = 96, speed_normal = 42, - } - }) + }, + + follow = "fishing:fish_raw", + view_range = 8, +-- jump = true, +-- step = 0.5, + passive = true, + blood_texture = "mobs_blood.png", + + 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 -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 diff --git a/mods/mobs/warthog.lua b/mods/mobs/warthog.lua index c19b464a..ab9f9385 100644 --- a/mods/mobs/warthog.lua +++ b/mods/mobs/warthog.lua @@ -37,10 +37,10 @@ mobs:register_mob("mobs:pumba", { }, follow = "farming:wheat", view_range = 8, -jump = true, -step = 1, -passive = true, -blood_texture = "mobs_blood.png", + jump = true, + step = 1, + passive = true, + blood_texture = "mobs_blood.png", on_rightclick = function(self, clicker) local item = clicker:get_wielded_item() diff --git a/mods/random_messages/init.lua b/mods/random_messages/init.lua index c8124982..f6165861 100644 --- a/mods/random_messages/init.lua +++ b/mods/random_messages/init.lua @@ -12,9 +12,9 @@ random_messages = {} random_messages.messages = {} --This table contains all messages. function random_messages.initialize() --Set the interval in minetest.conf. - minetest.setting_set("random_messages_interval",120) + minetest.setting_set("random_messages_interval",1800) minetest.setting_save(); - return 120 + return 1800 end function random_messages.set_interval() --Read the interval from minetest.conf(set it if it doesn'st exist)