diff --git a/README.md b/README.md index 6d91a87d..01d89b8e 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [creatures][mob-engine] ([zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [138f655 Git][ver.mob-engine] *2017-06-04* ([patched][patch.mob-engine]) ***UPDATES*** * [mobs_redo][] ([MIT][lic.mobs_redo] / [CC BY][lic.ccby3.0] / [CC0][lic.cc0]) -- version: [adc4e71 Git][ver.mobs_redo] *2018-07-02* ([patched][patch.mobs_redo]) * general/ - * [mobs_animal][] ([MIT][lic.mobs_animal]) -- version: [cadacac Git][ver.mobs_animal] *2017-08-04* ([patched][patch.mobs_animal]) ***UPDATES*** + * [mobs_animal][] ([MIT][lic.mobs_animal]) -- version: [52889c7 Git][ver.mobs_animal] *2018-06-27* ([patched][patch.mobs_animal]) * [monsters_aggressive][] (see individual mods for licensing) -- version: [89a8187 Git][ver.monsters_aggressive] *2017-08-30* * [monsters_passive][] (see individual mods for licensing) -- version: [b07fe19 Git][ver.monsters_passive] *2017-08-09* * [painting][] (???) -- version [8961849 Git][ver.painting] *2016-05-05* @@ -434,7 +434,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.mesecons]: https://github.com/minetest-mods/mesecons/tree/564bdc2 [ver.minetest_game]: https://github.com/minetest/minetest_game/tree/f855bee [ver.mob-engine]: https://github.com/minetest-mods/mob-engine/tree/138f655 -[ver.mobs_animal]: https://github.com/tenplus1/mobs_animal/tree/cadacac +[ver.mobs_animal]: https://github.com/tenplus1/mobs_animal/tree/52889c7 [ver.mobs_redo]: https://notabug.org/TenPlus1/mobs_redo/src/adc4e71a01728061e47f5af3a9055afb21e53179 [ver.monsters_aggressive]: https://github.com/AntumMT/mp-monsters_aggressive/tree/89a8187 [ver.monsters_passive]: https://github.com/AntumMT/mp-monsters_passive/tree/b07fe19 @@ -508,7 +508,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [patch.mesecons]: https://github.com/AntumMT/mp-mesecons/tree/830823a [patch.minetest_game]: https://github.com/AntumMT/mtgame-minetest/tree/c2f3b95 [patch.mob-engine]: https://github.com/AntumMT/mp-mob-engine/tree/0b3706f -[patch.mobs_animal]: https://github.com/AntumMT/mod-mobs_animal/tree/1d5f1ca +[patch.mobs_animal]: https://github.com/AntumMT/mod-mobs_animal/tree/e275046 [patch.mobs_redo]: https://github.com/AntumMT/mod-mobs_redo/tree/29bf9b6 [patch.moreblocks]: https://github.com/AntumMT/mod-moreblocks/tree/6dda839 [patch.moreores]: https://github.com/AntumMT/mod-moreores/tree/1cd9011 diff --git a/mods/mobiles/general/mobs_animal/bee.lua b/mods/mobiles/general/mobs_animal/bee.lua index 20e36267..7c3de768 100644 --- a/mods/mobiles/general/mobs_animal/bee.lua +++ b/mods/mobiles/general/mobs_animal/bee.lua @@ -39,14 +39,19 @@ mobs:register_mob("mobs_animal:bee", { on_rightclick = function(self, clicker) mobs:capture_mob(self, clicker, 50, 90, 0, true, "mobs_animal:bee") end, +-- after_activate = function(self, staticdata, def, dtime) +-- print ("------", self.name, dtime, self.health) +-- end, }) mobs:spawn({ name = "mobs_animal:bee", nodes = {"group:flower"}, - min_light = 10, - chance = 9000, - min_height = 0, + min_light = 14, + interval = 60, + chance = 7000, + min_height = 3, + max_height = 200, day_toggle = true, }) @@ -59,7 +64,8 @@ mobs:alias_mob("mobs:bee", "mobs_animal:bee") minetest.register_craftitem(":mobs:honey", { description = S("Honey"), inventory_image = "mobs_honey_inv.png", - on_use = minetest.item_eat(6), + on_use = minetest.item_eat(4), + groups = {food_honey = 1, food_sugar = 1, flammable = 1}, }) -- beehive (when placed spawns bee) @@ -90,7 +96,7 @@ minetest.register_node(":mobs:beehive", { after_place_node = function(pos, placer, itemstack) - if placer:is_player() then + if placer and placer:is_player() then minetest.set_node(pos, {name = "mobs:beehive", param2 = 1}) diff --git a/mods/mobiles/general/mobs_animal/bunny.lua b/mods/mobiles/general/mobs_animal/bunny.lua index 58c2a0c3..123dd1dc 100644 --- a/mods/mobiles/general/mobs_animal/bunny.lua +++ b/mods/mobiles/general/mobs_animal/bunny.lua @@ -5,6 +5,7 @@ local S = mobs.intllib -- Bunny by ExeterDad mobs:register_mob("mobs_animal:bunny", { +stepheight = 0.6, type = "animal", passive = true, reach = 1, @@ -25,9 +26,12 @@ mobs:register_mob("mobs_animal:bunny", { walk_velocity = 1, run_velocity = 2, runaway = true, + runaway_from = {"mobs_animal:pumba", "player"}, jump = true, + jump_height = 6, drops = { - {name = "mobs:meat_raw", chance = 1, min = 1, max = 1}, + {name = "mobs:rabbit_raw", chance = 1, min = 1, max = 1}, + {name = "mobs:rabbit_hide", chance = 1, min = 1, max = 1}, }, water_damage = 1, lava_damage = 4, @@ -59,7 +63,7 @@ mobs:register_mob("mobs_animal:bunny", { if item:get_name() == "mobs:lava_orb" then - if not minetest.settings:get_bool("creative_mode") then + if not mobs.is_creative(clicker:get_player_name()) then item:take_item() clicker:set_wielded_item(item) end @@ -74,7 +78,29 @@ mobs:register_mob("mobs_animal:bunny", { return end end, + on_spawn = function(self) + local pos = self.object:get_pos() ; pos.y = pos.y - 1 + + -- white snowy bunny + if minetest.find_node_near(pos, 1, + {"default:snow", "default:snowblock", "default:dirt_with_snow"}) then + self.base_texture = {"mobs_bunny_white.png"} + self.object:set_properties({textures = self.base_texture}) + -- brown desert bunny + elseif minetest.find_node_near(pos, 1, + {"default:desert_sand", "default:desert_stone"}) then + self.base_texture = {"mobs_bunny_brown.png"} + self.object:set_properties({textures = self.base_texture}) + -- grey stone bunny + elseif minetest.find_node_near(pos, 1, + {"default:stone", "default:gravel"}) then + self.base_texture = {"mobs_bunny_grey.png"} + self.object:set_properties({textures = self.base_texture}) + end + + return true -- run only once, false/nil runs every activation + end, attack_type = "dogfight", damage = 5, }) @@ -89,9 +115,12 @@ end mobs:spawn({ name = "mobs_animal:bunny", nodes = {spawn_on}, - min_light = 10, - chance = 15000, - min_height = 0, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, -- 15000 + min_height = 5, + max_height = 200, day_toggle = true, }) @@ -100,3 +129,49 @@ mobs:register_egg("mobs_animal:bunny", S("Bunny"), "mobs_bunny_inv.png", 0) mobs:alias_mob("mobs:bunny", "mobs_animal:bunny") -- compatibility + + +-- raw rabbit +minetest.register_craftitem(":mobs:rabbit_raw", { + description = S("Raw Rabbit"), + inventory_image = "mobs_rabbit_raw.png", + on_use = minetest.item_eat(3), + groups = {food_meat_raw = 1, food_rabbit_raw = 1, flammable = 2}, +}) + +-- cooked rabbit +minetest.register_craftitem(":mobs:rabbit_cooked", { + description = S("Cooked Rabbit"), + inventory_image = "mobs_rabbit_cooked.png", + on_use = minetest.item_eat(5), + groups = {food_meat = 1, food_rabbit = 1, flammable = 2}, +}) + +minetest.register_craft({ + type = "cooking", + output = "mobs:rabbit_cooked", + recipe = "mobs:rabbit_raw", + cooktime = 5, +}) + +-- rabbit hide +minetest.register_craftitem(":mobs:rabbit_hide", { + description = S("Rabbit Hide"), + inventory_image = "mobs_rabbit_hide.png", + groups = {flammable = 2}, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mobs:rabbit_hide", + burntime = 2, +}) + +minetest.register_craft({ + output = "mobs:leather", + type = "shapeless", + recipe = { + "mobs:rabbit_hide", "mobs:rabbit_hide", + "mobs:rabbit_hide", "mobs:rabbit_hide" + } +}) diff --git a/mods/mobiles/general/mobs_animal/chicken.lua b/mods/mobiles/general/mobs_animal/chicken.lua index ea5710ae..1ffa4360 100644 --- a/mods/mobiles/general/mobs_animal/chicken.lua +++ b/mods/mobiles/general/mobs_animal/chicken.lua @@ -5,6 +5,7 @@ local S = mobs.intllib -- Chicken by JK Murray mobs:register_mob("mobs_animal:chicken", { +stepheight = 0.6, type = "animal", passive = true, hp_min = 5, @@ -31,6 +32,7 @@ mobs:register_mob("mobs_animal:chicken", { walk_velocity = 1, run_velocity = 3, runaway = true, + runaway_from = {"player", "mobs_animal:pumba"}, drops = { {name = "mobs:chicken_raw", chance = 1, min = 2, max = 2}, {name = "mobs:chicken_feather", chance = 3, min = 1, max = 2}, @@ -71,7 +73,7 @@ mobs:register_mob("mobs_animal:chicken", { return end - local pos = self.object:getpos() + local pos = self.object:get_pos() minetest.add_item(pos, "mobs:egg") @@ -93,10 +95,12 @@ end mobs:spawn({ name = "mobs_animal:chicken", nodes = {spawn_on}, - min_light = 10, - chance = 15000, - active_object_count = 2, - min_height = 0, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, -- 15000 + min_height = 5, + max_height = 200, day_toggle = true, }) @@ -179,7 +183,7 @@ local egg_VELOCITY = 19 -- shoot egg local mobs_shoot_egg = function (item, player, pointed_thing) - local playerpos = player:getpos() + local playerpos = player:get_pos() minetest.sound_play("default_place_node_hard", { pos = playerpos, @@ -237,7 +241,7 @@ minetest.register_node(":mobs:egg", { type = "fixed", fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2} }, - groups = {snappy = 2, dig_immediate = 3}, + groups = {food_egg = 1, snappy = 2, dig_immediate = 3}, after_place_node = function(pos, placer, itemstack) if placer:is_player() then minetest.set_node(pos, {name = "mobs:egg", param2 = 1}) @@ -252,6 +256,7 @@ minetest.register_craftitem(":mobs:chicken_egg_fried", { description = S("Fried Egg"), inventory_image = "mobs_chicken_egg_fried.png", on_use = minetest.item_eat(2), + groups = {food_egg_fried = 1, flammable = 2}, }) minetest.register_craft({ @@ -265,6 +270,7 @@ minetest.register_craftitem(":mobs:chicken_raw", { description = S("Raw Chicken"), inventory_image = "mobs_chicken_raw.png", on_use = minetest.item_eat(2), + groups = {food_meat_raw = 1, food_chicken_raw = 1, flammable = 2}, }) -- cooked chicken @@ -272,6 +278,7 @@ minetest.register_craftitem(":mobs:chicken_cooked", { description = S("Cooked Chicken"), inventory_image = "mobs_chicken_cooked.png", on_use = minetest.item_eat(6), + groups = {food_meat = 1, food_chicken = 1, flammable = 2}, }) minetest.register_craft({ @@ -284,4 +291,11 @@ minetest.register_craft({ minetest.register_craftitem(":mobs:chicken_feather", { description = S("Feather"), inventory_image = "mobs_chicken_feather.png", + groups = {flammable = 2}, +}) + +minetest.register_craft({ + type = "fuel", + recipe = "mobs:chicken_feather", + burntime = 1, }) diff --git a/mods/mobiles/general/mobs_animal/cow.lua b/mods/mobiles/general/mobs_animal/cow.lua index c9b9e1ec..76f3c0b3 100644 --- a/mods/mobiles/general/mobs_animal/cow.lua +++ b/mods/mobiles/general/mobs_animal/cow.lua @@ -8,12 +8,13 @@ mobs:register_mob("mobs_animal:cow", { type = "animal", passive = false, attack_type = "dogfight", + attack_npcs = false, reach = 2, damage = 4, hp_min = 5, hp_max = 20, armor = 200, - collisionbox = {-0.4, -0.01, -0.4, 0.4, 1, 0.4}, + collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.2, 0.4}, visual = "mesh", mesh = "mobs_cow.x", textures = { @@ -27,6 +28,7 @@ mobs:register_mob("mobs_animal:cow", { walk_velocity = 1, run_velocity = 2, jump = true, + jump_height = 6, drops = { {name = "mobs:meat_raw", chance = 1, min = 1, max = 3}, {name = "mobs:leather", chance = 1, min = 1, max = 2}, @@ -87,7 +89,7 @@ mobs:register_mob("mobs_animal:cow", { if inv:room_for_item("main", {name = "mobs:bucket_milk"}) then clicker:get_inventory():add_item("main", "mobs:bucket_milk") else - local pos = self.object:getpos() + local pos = self.object:get_pos() pos.y = pos.y + 0.5 minetest.add_item(pos, {name = "mobs:bucket_milk"}) end @@ -100,19 +102,15 @@ mobs:register_mob("mobs_animal:cow", { }) -local spawn_on = "default:dirt_with_grass" - -if minetest.get_modpath("ethereal") then - spawn_on = "ethereal:green_dirt" -end - mobs:spawn({ name = "mobs_animal:cow", - nodes = {spawn_on}, - min_light = 10, - chance = 15000, - min_height = 0, - max_height = 31000, + nodes = {"default:dirt_with_grass", "ethereal:green_dirt"}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 8000, -- 15000 + min_height = 5, + max_height = 200, day_toggle = true, }) @@ -129,13 +127,39 @@ minetest.register_craftitem(":mobs:bucket_milk", { inventory_image = "mobs_bucket_milk.png", stack_max = 1, on_use = minetest.item_eat(8, 'bucket:bucket_empty'), + groups = {food_milk = 1, flammable = 3}, }) +-- butter +minetest.register_craftitem(":mobs:butter", { + description = S("Butter"), + inventory_image = "mobs_butter.png", + on_use = minetest.item_eat(1), + groups = {food_butter = 1, flammable = 2}, +}) + +if minetest.get_modpath("farming") and farming and farming.mod then +minetest.register_craft({ + type = "shapeless", + output = "mobs:butter", + recipe = {"mobs:bucket_milk", "farming:salt"}, + replacements = {{ "mobs:bucket_milk", "bucket:bucket_empty"}} +}) +else -- some saplings are high in sodium so makes a good replacement item +minetest.register_craft({ + type = "shapeless", + output = "mobs:butter", + recipe = {"mobs:bucket_milk", "default:sapling"}, + replacements = {{ "mobs:bucket_milk", "bucket:bucket_empty"}} +}) +end + -- cheese wedge minetest.register_craftitem(":mobs:cheese", { description = S("Cheese"), inventory_image = "mobs_cheese.png", on_use = minetest.item_eat(4), + groups = {food_cheese = 1, flammable = 2}, }) minetest.register_craft({ diff --git a/mods/mobiles/general/mobs_animal/kitten.lua b/mods/mobiles/general/mobs_animal/kitten.lua index adea21b1..bcae7c4d 100644 --- a/mods/mobiles/general/mobs_animal/kitten.lua +++ b/mods/mobiles/general/mobs_animal/kitten.lua @@ -5,8 +5,15 @@ local S = mobs.intllib -- Kitten by Jordach / BFD mobs:register_mob("mobs_animal:kitten", { +stepheight = 0.6, type = "animal", - passive = true, + specific_attack = {"mobs_animal:rat"}, + damage = 1, + attack_type = "dogfight", + attack_animals = true, -- so it can attack rat + attack_players = false, + reach = 1, + passive = false, hp_min = 5, hp_max = 10, armor = 200, @@ -52,13 +59,21 @@ mobs:register_mob("mobs_animal:kitten", { }) +local spawn_on = "default:dirt_with_grass" + +if minetest.get_modpath("ethereal") then + spawn_on = "ethereal:grove_dirt" +end + mobs:spawn({ name = "mobs_animal:kitten", - nodes = {"default:dirt_with_grass", "ethereal:grove_dirt"}, - min_light = 12, - chance = 22000, - min_height = 0, - max_height = 31000, + nodes = {spawn_on}, + neighbors = {"group:grass"}, + min_light = 14, + interval = 60, + chance = 10000, -- 22000 + min_height = 5, + max_height = 200, day_toggle = true, }) diff --git a/mods/mobiles/general/mobs_animal/locale/de.po b/mods/mobiles/general/mobs_animal/locale/de.po index cd89f741..cd6d85e2 100644 --- a/mods/mobiles/general/mobs_animal/locale/de.po +++ b/mods/mobiles/general/mobs_animal/locale/de.po @@ -38,6 +38,18 @@ msgstr "Honigblock" msgid "Bunny" msgstr "Häschen" +#: bunny.lua +msgid "Raw Rabbit" +msgstr "Rohes Kaninchen" + +#: bunny.lua +msgid "Cooked Rabbit" +msgstr "Gekochtes Kaninchen" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "Kaninchenfell" + #: chicken.lua msgid "Chicken" msgstr "Huhn" @@ -169,6 +181,15 @@ msgstr "Gelbes" msgid "@1 Sheep" msgstr "@1 Schaf" +#: sheep.lua +msgid "Raw Mutton" +msgstr "Rohes Hammelfleisch" + +#: sheep.lua +#, fuzzy +msgid "Cooked Mutton" +msgstr "Gekochtes Hammelfleisch" + #: warthog.lua msgid "Warthog" msgstr "Warzenschwein" diff --git a/mods/mobiles/general/mobs_animal/locale/fr.po b/mods/mobiles/general/mobs_animal/locale/fr.po index e309a2c5..5c0d2f6f 100644 --- a/mods/mobiles/general/mobs_animal/locale/fr.po +++ b/mods/mobiles/general/mobs_animal/locale/fr.po @@ -38,6 +38,19 @@ msgstr "Bloc de miel" msgid "Bunny" msgstr "Lapin" +#: bunny.lua +msgid "Raw Rabbit" +msgstr "Lapin Cru" + +#: bunny.lua +#, fuzzy +msgid "Cooked Rabbit" +msgstr "Lapin Cuit" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "Fourrure de Lapin" + #: chicken.lua msgid "Chicken" msgstr "Poule" @@ -167,6 +180,15 @@ msgstr "jaune" msgid "@1 Sheep" msgstr "Mouton @1" +#: sheep.lua +msgid "Raw Mutton" +msgstr "Mouton Cru" + +#: sheep.lua +#, fuzzy +msgid "Cooked Mutton" +msgstr "Mouton Cuit" + #: warthog.lua msgid "Warthog" msgstr "Sanglier" diff --git a/mods/mobiles/general/mobs_animal/locale/it.po b/mods/mobiles/general/mobs_animal/locale/it.po new file mode 100644 index 00000000..8982f935 --- /dev/null +++ b/mods/mobiles/general/mobs_animal/locale/it.po @@ -0,0 +1,201 @@ +# ITALIAN LOCALE FILE FOR THE MOBS ANMAL MODULE +# Copyright (c) 2014 Krupnov Pavel and 2016 TenPlus1 +# This file is distributed under the same license as the MOBS ANIMAL package. +# Hamlet , 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: Italian localization file for the Mobs Animal mod\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-07-31 11:28+0200\n" +"PO-Revision-Date: 2017-08-18 00:56+0100\n" +"Last-Translator: H4mlet \n" +"Language-Team: \n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.6.10\n" + +#: bee.lua +msgid "Bee" +msgstr "Ape" + +#: bee.lua +msgid "Honey" +msgstr "Miele" + +#: bee.lua +msgid "Beehive" +msgstr "Favo" + +#: bee.lua +msgid "Honey Block" +msgstr "Blocco di miele" + +#: bunny.lua +msgid "Bunny" +msgstr "Coniglietto" + +#: bunny.lua +msgid "Raw Rabbit" +msgstr "Coniglio Crudo" + +#: bunny.lua +#, fuzzy +msgid "Cooked Rabbit" +msgstr "Coniglio Cotto" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "Pelle di Coniglio" + +#: chicken.lua +msgid "Chicken" +msgstr "Gallina" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Uovo di gallina" + +#: chicken.lua +msgid "Fried Egg" +msgstr "Uovo fritto" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Pollo crudo" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Pollo cotto" + +#: chicken.lua +msgid "Feather" +msgstr "Piuma" + +#: cow.lua +msgid "Cow already milked!" +msgstr "Mucca già munta!" + +#: cow.lua +msgid "Cow" +msgstr "Mucca" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Secchio di latte" + +#: cow.lua +msgid "Cheese" +msgstr "Formaggio" + +#: cow.lua +msgid "Cheese Block" +msgstr "Blocco di formaggio" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[MOD] Mobs Redo 'Animals' caricato" + +#: kitten.lua +msgid "Kitten" +msgstr "Gattino" + +#: penguin.lua +msgid "Penguin" +msgstr "Pinguino" + +#: rat.lua +msgid "Rat" +msgstr "Ratto" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Ratto cotto" + +#: sheep.lua +msgid "Black" +msgstr "Nera" + +#: sheep.lua +msgid "Blue" +msgstr "Blu" + +#: sheep.lua +msgid "Brown" +msgstr "Marrone" + +#: sheep.lua +msgid "Cyan" +msgstr "Ciano" + +#: sheep.lua +msgid "Dark Green" +msgstr "Verde scuro" + +#: sheep.lua +msgid "Dark Grey" +msgstr "Grigio scuro" + +#: sheep.lua +msgid "Green" +msgstr "Verde" + +#: sheep.lua +msgid "Grey" +msgstr "Grigia" + +#: sheep.lua +msgid "Magenta" +msgstr "Magenta" + +#: sheep.lua +msgid "Orange" +msgstr "Arancione" + +#: sheep.lua +msgid "Pink" +msgstr "Rosa" + +#: sheep.lua +msgid "Red" +msgstr "Rossa" + +#: sheep.lua +msgid "Violet" +msgstr "Viola" + +#: sheep.lua +msgid "White" +msgstr "Bianca" + +#: sheep.lua +msgid "Yellow" +msgstr "Gialla" + +#: sheep.lua +msgid "@1 Sheep" +msgstr "Pecora @1" + +#: sheep.lua +msgid "Raw Mutton" +msgstr "Montone Crudo" + +#: sheep.lua +#, fuzzy +msgid "Cooked Mutton" +msgstr "Montone Cotto" + +#: warthog.lua +msgid "Warthog" +msgstr "Facocero" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Bistecca di maiale cruda" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Bistecca di maiale cotta" diff --git a/mods/mobiles/general/mobs_animal/locale/ms.po b/mods/mobiles/general/mobs_animal/locale/ms.po new file mode 100644 index 00000000..38e896da --- /dev/null +++ b/mods/mobiles/general/mobs_animal/locale/ms.po @@ -0,0 +1,199 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-02-06 00:17+0800\n" +"PO-Revision-Date: 2018-02-06 00:25+0800\n" +"Last-Translator: MuhdNurHidayat (MNH48) \n" +"Language-Team: \n" +"Language: ms\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: bee.lua +msgid "Bee" +msgstr "Lebah" + +#: bee.lua +msgid "Honey" +msgstr "Madu" + +#: bee.lua +msgid "Beehive" +msgstr "Sarang Lebah" + +#: bee.lua +msgid "Honey Block" +msgstr "Blok Madu" + +#: bunny.lua +msgid "Bunny" +msgstr "Arnab" + +#: bunny.lua +msgid "Raw Rabbit" +msgstr "Daging Arnab Mentah" + +#: bunny.lua +msgid "Cooked Rabbit" +msgstr "Daging Arnab Bakar" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "Belulang Arnab" + +#: chicken.lua +msgid "Chicken" +msgstr "Ayam" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Telur Ayam" + +#: chicken.lua +msgid "Fried Egg" +msgstr "Telur Goreng" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Ayam Mentah" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Ayam Bakar" + +#: chicken.lua +msgid "Feather" +msgstr "Bulu" + +#: cow.lua +msgid "Cow already milked!" +msgstr "Lembu telah diperah susunya!" + +#: cow.lua +msgid "Cow" +msgstr "Lembu" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Baldi Susu" + +#: cow.lua +msgid "Cheese" +msgstr "Keju" + +#: cow.lua +msgid "Cheese Block" +msgstr "Blok Keju" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[MODS] Mobs Redo 'Animals' telah dimuatkan" + +#: kitten.lua +msgid "Kitten" +msgstr "Anak Kucing" + +#: penguin.lua +msgid "Penguin" +msgstr "Penguin" + +#: rat.lua +msgid "Rat" +msgstr "Tikus" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Tikus Bakar" + +#: sheep.lua +msgid "Black" +msgstr "Hitam" + +#: sheep.lua +msgid "Blue" +msgstr "Biru" + +#: sheep.lua +msgid "Brown" +msgstr "Perang" + +#: sheep.lua +msgid "Cyan" +msgstr "Sian" + +#: sheep.lua +msgid "Dark Green" +msgstr "Hijau Gelap" + +#: sheep.lua +msgid "Dark Grey" +msgstr "Kelabu Gelap" + +#: sheep.lua +msgid "Green" +msgstr "Hijau" + +#: sheep.lua +msgid "Grey" +msgstr "Kelabu" + +#: sheep.lua +msgid "Magenta" +msgstr "Merah Lembayung" + +#: sheep.lua +msgid "Orange" +msgstr "Jingga" + +#: sheep.lua +msgid "Pink" +msgstr "Merah Jambu" + +#: sheep.lua +msgid "Red" +msgstr "Merah" + +#: sheep.lua +msgid "Violet" +msgstr "Ungu" + +#: sheep.lua +msgid "White" +msgstr "Putih" + +#: sheep.lua +msgid "Yellow" +msgstr "Kuning" + +#: sheep.lua +msgid "@1 Sheep" +msgstr "Biri-biri @1" + +#: sheep.lua +msgid "Raw Mutton" +msgstr "Daging Biri-biri Mentah" + +#: sheep.lua +msgid "Cooked Mutton" +msgstr "Daging Biri-biri Bakar" + +#: warthog.lua +msgid "Warthog" +msgstr "Babi Hutan" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Daging Babi Mentah" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Daging Babi Bakar" diff --git a/mods/mobiles/general/mobs_animal/locale/ru.po b/mods/mobiles/general/mobs_animal/locale/ru.po new file mode 100644 index 00000000..3aff7152 --- /dev/null +++ b/mods/mobiles/general/mobs_animal/locale/ru.po @@ -0,0 +1,200 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-08-13 16:00 (UTC+5)\n" +"PO-Revision-Date: 2018-03-29 18:00 (UTC+5)\n" +"Last-Translator: Oleg720 \n" +"Language-Team: 720 Locales <>\n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#: bee.lua +msgid "Bee" +msgstr "Пчела" + +#: bee.lua +msgid "Honey" +msgstr "Мёд" + +#: bee.lua +msgid "Beehive" +msgstr "Улей" + +#: bee.lua +msgid "Honey Block" +msgstr "Блок мёда" + +#: bunny.lua +msgid "Bunny" +msgstr "Кролик" + +#: bunny.lua +msgid "Raw Rabbit" +msgstr "Сырой кролик" + +#: bunny.lua +#, fuzzy +msgid "Cooked Rabbit" +msgstr "Приготовленный кролик" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "Кролик скрыть" + +#: chicken.lua +msgid "Chicken" +msgstr "Курица" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Курино яйцо" + +#: chicken.lua +msgid "Fried Egg" +msgstr "Жареное яйцо" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Сырая курятина" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Вареная курятина" + +#: chicken.lua +msgid "Feather" +msgstr "Перо" + +#: cow.lua +msgid "Cow already milked!" +msgstr "Корову уже подоили!" + +#: cow.lua +msgid "Cow" +msgstr "Корова" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Ведро молока" + +#: cow.lua +msgid "Cheese" +msgstr "Сыр" + +#: cow.lua +msgid "Cheese Block" +msgstr "Блок сыра" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[МОД] Mobs Redo 'Animals' загружен" + +#: kitten.lua +msgid "Kitten" +msgstr "Котенок" + +#: penguin.lua +msgid "Penguin" +msgstr "Пингвин" + +#: rat.lua +msgid "Rat" +msgstr "Крыса" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Приготовленная крыса" + +#: sheep.lua +msgid "Black" +msgstr "Черный" + +#: sheep.lua +msgid "Blue" +msgstr "Синий" + +#: sheep.lua +msgid "Brown" +msgstr "Коричневый" + +#: sheep.lua +msgid "Cyan" +msgstr "Голубой" + +#: sheep.lua +msgid "Dark Green" +msgstr "Темно-зеленый" + +#: sheep.lua +msgid "Dark Grey" +msgstr "Темно-серый" + +#: sheep.lua +msgid "Green" +msgstr "Зеленый" + +#: sheep.lua +msgid "Grey" +msgstr "Серый" + +#: sheep.lua +msgid "Magenta" +msgstr "Пурпурный" + +#: sheep.lua +msgid "Orange" +msgstr "Оранжевый" + +#: sheep.lua +msgid "Pink" +msgstr "Розовый" + +#: sheep.lua +msgid "Red" +msgstr "Красный" + +#: sheep.lua +msgid "Violet" +msgstr "Фиолетовый" + +#: sheep.lua +msgid "White" +msgstr "Белый" + +#: sheep.lua +msgid "Yellow" +msgstr "Желтый" + +#: sheep.lua +msgid "@1 Sheep" +msgstr "@1 Овец" + +#: sheep.lua +msgid "Raw Mutton" +msgstr "сырой ягненок" + +#: sheep.lua +#, fuzzy +msgid "Cooked Mutton" +msgstr "приготовленный ягненок" + +#: warthog.lua +msgid "Warthog" +msgstr "Бородавочник" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Отбивные из свинины" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Приготовленные отбивные" diff --git a/mods/mobiles/general/mobs_animal/locale/template.pot b/mods/mobiles/general/mobs_animal/locale/template.pot index 94b00c21..79f58ff7 100644 --- a/mods/mobiles/general/mobs_animal/locale/template.pot +++ b/mods/mobiles/general/mobs_animal/locale/template.pot @@ -37,6 +37,18 @@ msgstr "" msgid "Bunny" msgstr "" +#: bunny.lua +msgid "Raw Rabbit" +msgstr "" + +#: bunny.lua +msgid "Cooked Rabbit" +msgstr "" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "" + #: chicken.lua msgid "Chicken" msgstr "" @@ -165,6 +177,14 @@ msgstr "" msgid "@1 Sheep" msgstr "" +#: sheep.lua +msgid "Raw Mutton" +msgstr "" + +#: sheep.lua +msgid "Cooked Mutton" +msgstr "" + #: warthog.lua msgid "Warthog" msgstr "" diff --git a/mods/mobiles/general/mobs_animal/locale/tr.po b/mods/mobiles/general/mobs_animal/locale/tr.po index ef9acfe5..f3c0b86c 100644 --- a/mods/mobiles/general/mobs_animal/locale/tr.po +++ b/mods/mobiles/general/mobs_animal/locale/tr.po @@ -38,6 +38,19 @@ msgstr "Bal bloğu" msgid "Bunny" msgstr "Tavşan" +#: bunny.lua +msgid "Raw Rabbit" +msgstr "çiğ tavşan" + +#: bunny.lua +#, fuzzy +msgid "Cooked Rabbit" +msgstr "pişmiş tavşan" + +#: bunny.lua +msgid "Rabbit Hide" +msgstr "tavşan kürkü" + #: chicken.lua msgid "Chicken" msgstr "Tavuk" @@ -167,6 +180,15 @@ msgstr "Sarı" msgid "@1 Sheep" msgstr "@1 Koyun" +#: sheep.lua +msgid "Raw Mutton" +msgstr "çiğ kuzu" + +#: sheep.lua +#, fuzzy +msgid "Cooked Mutton" +msgstr "pişmiş kuzu" + #: warthog.lua msgid "Warthog" msgstr "Domuz" diff --git a/mods/mobiles/general/mobs_animal/lucky_block.lua b/mods/mobiles/general/mobs_animal/lucky_block.lua index 247aa32e..94befc30 100644 --- a/mods/mobiles/general/mobs_animal/lucky_block.lua +++ b/mods/mobiles/general/mobs_animal/lucky_block.lua @@ -14,8 +14,12 @@ if minetest.get_modpath("lucky_block") then {"spw", "mobs:cow", 5}, {"dro", {"mobs:bucket_milk"}, 8}, {"spw", "mobs:kitten", 2}, - {"tro", "default:nyancat", "mobs_kitten", true}, {"exp"}, }) - + + if minetest.registered_nodes["default:nyancat"] then + lucky_block:add_blocks({ + {"tro", "default:nyancat", "mobs_kitten", true}, + }) + end end diff --git a/mods/mobiles/general/mobs_animal/penguin.lua b/mods/mobiles/general/mobs_animal/penguin.lua index d5e9a5bf..2ee14b9e 100644 --- a/mods/mobiles/general/mobs_animal/penguin.lua +++ b/mods/mobiles/general/mobs_animal/penguin.lua @@ -5,6 +5,7 @@ local S = mobs.intllib -- Penguin by D00Med mobs:register_mob("mobs_animal:penguin", { +stepheight = 0.6, type = "animal", passive = true, reach = 1, @@ -42,7 +43,7 @@ mobs:register_mob("mobs_animal:penguin", { fly_end = 95, -- 50-70 is slide/water idle }, - fly_in = "default:water_source", + fly_in = {"default:water_source", "default:water_flowing"}, floats = 0, follow = {"ethereal:fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical"}, view_range = 5, @@ -60,9 +61,11 @@ mobs:register_mob("mobs_animal:penguin", { mobs:spawn({ name = "mobs_animal:penguin", nodes = {"default:snowblock"}, - min_light = 10, + min_light = 14, + interval = 60, chance = 20000, min_height = 0, + max_height = 200, day_toggle = true, }) diff --git a/mods/mobiles/general/mobs_animal/rat.lua b/mods/mobiles/general/mobs_animal/rat.lua index 31304eb7..27017fe4 100644 --- a/mods/mobiles/general/mobs_animal/rat.lua +++ b/mods/mobiles/general/mobs_animal/rat.lua @@ -5,6 +5,7 @@ local S = mobs.intllib -- Rat by PilzAdam mobs:register_mob("mobs_animal:rat", { +stepheight = 0.6, type = "animal", passive = true, hp_min = 1, @@ -41,7 +42,7 @@ mobs:register_mob("mobs_animal:rat", { self.rat_timer = 0 - local pos = self.object:getpos() + local pos = self.object:get_pos() print("rat pos", pos.x, pos.y, pos.z, dtime) @@ -70,7 +71,9 @@ mobs:spawn({ name = "mobs_animal:rat", nodes = {"default:stone"}, min_light = 3, - active_object_count = 2, + max_light = 9, + interval = 60, + chance = 8000, max_height = 0, -- on_spawn = rat_spawn, }) @@ -87,11 +90,12 @@ minetest.register_craftitem(":mobs:rat_cooked", { description = S("Cooked Rat"), inventory_image = "mobs_cooked_rat.png", on_use = minetest.item_eat(3), + groups = {food_rat = 1, flammable = 2}, }) minetest.register_craft({ type = "cooking", output = "mobs:rat_cooked", - recipe = "mobs:rat", + recipe = "mobs_animal:rat", cooktime = 5, }) diff --git a/mods/mobiles/general/mobs_animal/readme.md b/mods/mobiles/general/mobs_animal/readme.md index c93bf989..e8f434e4 100644 --- a/mods/mobiles/general/mobs_animal/readme.md +++ b/mods/mobiles/general/mobs_animal/readme.md @@ -1,42 +1,41 @@ +# ANIMAL MOBS -ANIMAL MOBS +### Bee +Tends to buzz around flowers and gives honey when killed, you can also right-click a bee to pick it up and place in inventory. 3x bee's in a row can craft a beehive. -Bee +--- +### Bunny +Bunnies appear in green grass areas (prairie biome in ethereal) and can be tamed with 4 carrots or grass. Can also be picked up and placed in inventory and gives 1 raw rabbit and 1 rabbit hide when killed. -- Tends to buzz around flowers and gives honey when killed, you can also right-click a bee to pick it up and place in inventory. 3x bee's in a row can craft a beehive. +--- +### Chicken +Found in green areas (bamboo biome in ethereal) and lays eggs on flat ground, Can be picked up and placed in inventory and gives 1-2 raw chicken when killed. Feed 8x wheat seed to breed. -Bunny +--- +### Cow +Wanders around eating grass/wheat and can be right-clicked with empty bucket to get milk. Cows will defend themselves when hit and can be right-clicked with 8x wheat to tame and breed. -- Bunnies appear in green grass areas (prairie biome in ethereal) and can be tamed with 4 carrots or grass. Can also be picked up and placed in inventory and gives 1-2 meat when killed. +--- +### Kitten +Found on green grass these cute cats walk around and can be picked up and placed in inventory as pets or right-clicked with 4x live rats or raw fish (found in ethereal) and tamed. -Chicken +--- +### Rat +Typically found around stone they can be picked up and cooked for eating. -- Found in green areas (bamboo biome in ethereal) and lays eggs on flat ground, Can be picked up and placed in inventory and gives 1-2 raw chicken when killed. Feed 8x wheat seed to breed. +--- +### Sheep +Green grass and wheat munchers that can be clipped using shears to give 1-3 wool. Feed sheep 8x wheat to regrow wool, tame and breed. Right-click a tamed sheep with dye to change it's colour. Will drop 1-3 raw mutton when killed. -Cow +--- +### Warthog +Warthogs unlike pigs defend themselves when hit and give 1-3 raw pork when killed, they can also be right-clicked with 8x apples to tame or breed. -- Wanders around eating grass/wheat and can be right-clicked with empty bucket to get milk. Cows will defend themselves when hit and can be right-clicked with 8x wheat to tame and breed. +--- +### Penguin +These little guys can be found in glacier biomes on top of snow and have the ability to swim if they fall into water. -Kitten +--- +*Note: After breeding animals need to rest for 4 minutes, baby animals take 4 minutes to grow up and feeding them helps them grow quicker...* -- Found on green grass these cute cats walk around and can be picked up and placed in inventory as pets or right-clicked with 4x live rats or raw fish (found in ethereal) and tamed. - -Rat - -- Typically found around stone they can be picked up and cooked for eating. - -Sheep - -- Green grass and wheat munchers that can be clipped using shears to give 1-3 wool. Feed sheep 8x wheat to regrow wool, tame and breed. Right-click a tamed sheep with dye to change it's colour. Will drop 1-3 meat when killed. - -Warthog - -- Warthogs unlike pigs defend themselves when hit and give 1-3 raw pork when killed, they can also be right-clicked with 8x apples to tame or breed. - -Penguin - -- These little guys can be found in glacier biomes on top of snow and have the ability to swim if they fall into water. - -Note: After breeding animals need to rest for 4 minutes, baby animals take 4 minutes to grow up and feeding them helps them grow quicker... - -Lucky Blocks: 14 +#### Lucky Blocks: 14 diff --git a/mods/mobiles/general/mobs_animal/textures/mobs_butter.png b/mods/mobiles/general/mobs_animal/textures/mobs_butter.png new file mode 100644 index 00000000..2e843497 Binary files /dev/null and b/mods/mobiles/general/mobs_animal/textures/mobs_butter.png differ diff --git a/mods/mobiles/general/mobs_animal/textures/mobs_mutton_cooked.png b/mods/mobiles/general/mobs_animal/textures/mobs_mutton_cooked.png new file mode 100644 index 00000000..3189f67f Binary files /dev/null and b/mods/mobiles/general/mobs_animal/textures/mobs_mutton_cooked.png differ diff --git a/mods/mobiles/general/mobs_animal/textures/mobs_mutton_raw.png b/mods/mobiles/general/mobs_animal/textures/mobs_mutton_raw.png new file mode 100644 index 00000000..622d84cb Binary files /dev/null and b/mods/mobiles/general/mobs_animal/textures/mobs_mutton_raw.png differ diff --git a/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_cooked.png b/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_cooked.png new file mode 100644 index 00000000..310c9049 Binary files /dev/null and b/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_cooked.png differ diff --git a/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_hide.png b/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_hide.png new file mode 100644 index 00000000..b45ad836 Binary files /dev/null and b/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_hide.png differ diff --git a/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_raw.png b/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_raw.png new file mode 100644 index 00000000..b5c3b7dc Binary files /dev/null and b/mods/mobiles/general/mobs_animal/textures/mobs_rabbit_raw.png differ diff --git a/mods/mobiles/general/mobs_animal/warthog.lua b/mods/mobiles/general/mobs_animal/warthog.lua index 0afcc52c..92418e2e 100644 --- a/mods/mobiles/general/mobs_animal/warthog.lua +++ b/mods/mobiles/general/mobs_animal/warthog.lua @@ -5,17 +5,19 @@ local S = mobs.intllib -- Warthog by KrupnoPavel mobs:register_mob("mobs_animal:pumba", { +stepheight = 0.6, type = "animal", passive = false, attack_type = "dogfight", group_attack = true, owner_loyal = true, + attack_npcs = false, reach = 2, damage = 2, hp_min = 5, hp_max = 15, armor = 200, - collisionbox = {-0.4, -0.01, -0.4, 0.4, 1, 0.4}, + collisionbox = {-0.4, -0.01, -0.4, 0.4, 0.95, 0.4}, visual = "mesh", mesh = "mobs_pumba.x", textures = { @@ -29,6 +31,7 @@ mobs:register_mob("mobs_animal:pumba", { walk_velocity = 2, run_velocity = 3, jump = true, + jump_height = 6, follow = {"default:apple", "farming:potato"}, view_range = 10, drops = { @@ -55,20 +58,28 @@ mobs:register_mob("mobs_animal:pumba", { end, }) +local spawn_on = {"default:dirt_with_grass"} +local spawn_by = {"group:grass"} -local spawn_on = "default:dirt_with_grass" +if minetest.get_mapgen_setting("mg_name") ~= "v6" then + spawn_on = {"default:dirt_with_dry_grass"} + spawn_by = {"group:dry_grass"} +end if minetest.get_modpath("ethereal") then - spawn_on = "ethereal:mushroom_dirt" + spawn_on = {"ethereal:mushroom_dirt"} + spawn_by = {"flowers:mushroom_brown", "flowers:mushroom_brown"} end mobs:spawn({ name = "mobs_animal:pumba", - nodes = {spawn_on}, - min_light = 10, - chance = 15000, + nodes = spawn_on, + neighbors = spawn_by, + min_light = 14, + interval = 60, + chance = 8000, -- 15000 min_height = 0, - max_height = 31000, + max_height = 200, day_toggle = true, }) @@ -84,6 +95,7 @@ minetest.register_craftitem(":mobs:pork_raw", { description = S("Raw Porkchop"), inventory_image = "mobs_pork_raw.png", on_use = minetest.item_eat(4), + groups = {food_meat_raw = 1, food_pork_raw = 1, flammable = 2}, }) -- cooked porkchop @@ -91,6 +103,7 @@ minetest.register_craftitem(":mobs:pork_cooked", { description = S("Cooked Porkchop"), inventory_image = "mobs_pork_cooked.png", on_use = minetest.item_eat(8), + groups = {food_meat = 1, food_pork = 1, flammable = 2}, }) minetest.register_craft({