diff --git a/bee.lua b/bee.lua index c41ee66..a85f945 100644 --- a/bee.lua +++ b/bee.lua @@ -9,7 +9,7 @@ mobs:register_mob("mobs_animal:bee", { hp_min = 1, hp_max = 2, armor = 200, - collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.2, 0.2}, + collisionbox = {-0.2, -0.01, -0.2, 0.2, 0.5, 0.2}, visual = "mesh", mesh = "mobs_bee.x", textures = { diff --git a/bunny.lua b/bunny.lua index 1c882cd..32b31f3 100644 --- a/bunny.lua +++ b/bunny.lua @@ -42,7 +42,7 @@ mobs:register_mob("mobs_animal:bunny", { punch_start = 16, punch_end = 24, }, - follow = {"farming:carrot", "farming_plus:carrot_item"}, + follow = {"farming:carrot", "farming_plus:carrot_item", "default:grass_1"}, view_range = 8, replace_rate = 10, replace_what = {"farming:carrot_7", "farming:carrot_8", "farming_plus:carrot"}, @@ -50,9 +50,9 @@ mobs:register_mob("mobs_animal:bunny", { on_rightclick = function(self, clicker) -- feed or tame - if mobs:feed_tame(self, clicker, 4, true, true) then - return - end + if mobs:feed_tame(self, clicker, 4, true, true) then return end + if mobs:protect(self, clicker) then return end + if mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) then return end -- Monty Python tribute local item = clicker:get_wielded_item() @@ -73,9 +73,6 @@ mobs:register_mob("mobs_animal:bunny", { return end - - mobs:protect(self, clicker) - mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) end, attack_type = "dogfight", diff --git a/chicken.lua b/chicken.lua index 11cc4b7..ea5710a 100644 --- a/chicken.lua +++ b/chicken.lua @@ -31,9 +31,9 @@ mobs:register_mob("mobs_animal:chicken", { walk_velocity = 1, run_velocity = 3, runaway = true, - jump = true, drops = { {name = "mobs:chicken_raw", chance = 1, min = 2, max = 2}, + {name = "mobs:chicken_feather", chance = 3, min = 1, max = 2}, }, water_damage = 1, lava_damage = 5, @@ -53,18 +53,21 @@ mobs:register_mob("mobs_animal:chicken", { on_rightclick = function(self, clicker) - if mobs:feed_tame(self, clicker, 8, true, true) then - return - end - - mobs:protect(self, clicker) - mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) + if mobs:feed_tame(self, clicker, 8, true, true) then return end + if mobs:protect(self, clicker) then return end + if mobs:capture_mob(self, clicker, 30, 50, 80, false, nil) then return end end, - do_custom = function(self) + do_custom = function(self, dtime) + + self.egg_timer = (self.egg_timer or 0) + dtime + if self.egg_timer < 10 then + return + end + self.egg_timer = 0 if self.child - or math.random(1, 5000) > 1 then + or math.random(1, 100) > 1 then return end @@ -113,14 +116,14 @@ mobs:register_arrow("mobs_animal:egg_entity", { velocity = 6, hit_player = function(self, player) - player:punch(self.object, 1.0, { + player:punch(minetest.get_player_by_name(self.playername) or self.object, 1.0, { full_punch_interval = 1.0, damage_groups = {fleshy = 1}, }, nil) end, hit_mob = function(self, player) - player:punch(self.object, 1.0, { + player:punch(minetest.get_player_by_name(self.playername) or self.object, 1.0, { full_punch_interval = 1.0, damage_groups = {fleshy = 1}, }, nil) @@ -128,43 +131,42 @@ mobs:register_arrow("mobs_animal:egg_entity", { hit_node = function(self, pos, node) - local num = math.random(1, 10) - - if num == 1 then - - pos.y = pos.y + 1 - - local nod = minetest.get_node_or_nil(pos) - - if not nod - or not minetest.registered_nodes[nod.name] - or minetest.registered_nodes[nod.name].walkable == true then - return - end - - local mob = minetest.add_entity(pos, "mobs_animal:chicken") - local ent2 = mob:get_luaentity() - - mob:set_properties({ - textures = ent2.child_texture[1], - visual_size = { - x = ent2.base_size.x / 2, - y = ent2.base_size.y / 2 - }, - collisionbox = { - ent2.base_colbox[1] / 2, - ent2.base_colbox[2] / 2, - ent2.base_colbox[3] / 2, - ent2.base_colbox[4] / 2, - ent2.base_colbox[5] / 2, - ent2.base_colbox[6] / 2 - }, - }) - - ent2.child = true - ent2.tamed = true - ent2.owner = self.playername + if math.random(1, 10) > 1 then + return end + + pos.y = pos.y + 1 + + local nod = minetest.get_node_or_nil(pos) + + if not nod + or not minetest.registered_nodes[nod.name] + or minetest.registered_nodes[nod.name].walkable == true then + return + end + + local mob = minetest.add_entity(pos, "mobs_animal:chicken") + local ent2 = mob:get_luaentity() + + mob:set_properties({ + textures = ent2.child_texture[1], + visual_size = { + x = ent2.base_size.x / 2, + y = ent2.base_size.y / 2 + }, + collisionbox = { + ent2.base_colbox[1] / 2, + ent2.base_colbox[2] / 2, + ent2.base_colbox[3] / 2, + ent2.base_colbox[4] / 2, + ent2.base_colbox[5] / 2, + ent2.base_colbox[6] / 2 + }, + }) + + ent2.child = true + ent2.tamed = true + ent2.owner = self.playername end }) @@ -247,7 +249,7 @@ minetest.register_node(":mobs:egg", { -- fried egg minetest.register_craftitem(":mobs:chicken_egg_fried", { -description = S("Fried Egg"), + description = S("Fried Egg"), inventory_image = "mobs_chicken_egg_fried.png", on_use = minetest.item_eat(2), }) @@ -277,3 +279,9 @@ minetest.register_craft({ recipe = "mobs:chicken_raw", output = "mobs:chicken_cooked", }) + +-- feather +minetest.register_craftitem(":mobs:chicken_feather", { + description = S("Feather"), + inventory_image = "mobs_chicken_feather.png", +}) diff --git a/cow.lua b/cow.lua index 44ef581..c9b9e1e 100644 --- a/cow.lua +++ b/cow.lua @@ -47,7 +47,7 @@ mobs:register_mob("mobs_animal:cow", { punch_end = 100, }, follow = "farming:wheat", - view_range = 7, + view_range = 8, replace_rate = 10, -- replace_what = {"default:grass_3", "default:grass_4", "default:grass_5", "farming:wheat_8"}, replace_what = { @@ -59,9 +59,9 @@ mobs:register_mob("mobs_animal:cow", { on_rightclick = function(self, clicker) -- feed or tame - if mobs:feed_tame(self, clicker, 8, true, true) then - return - end + if mobs:feed_tame(self, clicker, 8, true, true) then return end + if mobs:protect(self, clicker) then return end + if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end local tool = clicker:get_wielded_item() local name = clicker:get_player_name() @@ -96,9 +96,6 @@ mobs:register_mob("mobs_animal:cow", { return end - - mobs:protect(self, clicker) - mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) end, }) diff --git a/init.lua b/init.lua index 1618780..69e6c73 100644 --- a/init.lua +++ b/init.lua @@ -1,13 +1,9 @@ local path = minetest.get_modpath("mobs_animal") --- Intllib -local S -if minetest.get_modpath("intllib") then - S = intllib.Getter() -else - S = function(s) return s end -end +-- Load support for intllib. +local MP = minetest.get_modpath(minetest.get_current_modname()) +local S, NS = dofile(MP.."/intllib.lua") mobs.intllib = S -- Animals diff --git a/intllib.lua b/intllib.lua new file mode 100644 index 0000000..6669d72 --- /dev/null +++ b/intllib.lua @@ -0,0 +1,45 @@ + +-- Fallback functions for when `intllib` is not installed. +-- Code released under Unlicense . + +-- Get the latest version of this file at: +-- https://raw.githubusercontent.com/minetest-mods/intllib/master/lib/intllib.lua + +local function format(str, ...) + local args = { ... } + local function repl(escape, open, num, close) + if escape == "" then + local replacement = tostring(args[tonumber(num)]) + if open == "" then + replacement = replacement..close + end + return replacement + else + return "@"..open..num..close + end + end + return (str:gsub("(@?)@(%(?)(%d+)(%)?)", repl)) +end + +local gettext, ngettext +if minetest.get_modpath("intllib") then + if intllib.make_gettext_pair then + -- New method using gettext. + gettext, ngettext = intllib.make_gettext_pair() + else + -- Old method using text files. + gettext = intllib.Getter() + end +end + +-- Fill in missing functions. + +gettext = gettext or function(msgid, ...) + return format(msgid, ...) +end + +ngettext = ngettext or function(msgid, msgid_plural, n, ...) + return format(n==1 and msgid or msgid_plural, ...) +end + +return gettext, ngettext diff --git a/kitten.lua b/kitten.lua index e2fb922..adea21b 100644 --- a/kitten.lua +++ b/kitten.lua @@ -45,12 +45,9 @@ mobs:register_mob("mobs_animal:kitten", { view_range = 8, on_rightclick = function(self, clicker) - if mobs:feed_tame(self, clicker, 4, true, true) then - return - end - - mobs:protect(self, clicker) - mobs:capture_mob(self, clicker, 50, 50, 90, false, nil) + if mobs:feed_tame(self, clicker, 4, true, true) then return end + if mobs:protect(self, clicker) then return end + if mobs:capture_mob(self, clicker, 50, 50, 90, false, nil) then return end end }) diff --git a/locale/de.po b/locale/de.po new file mode 100644 index 0000000..6545371 --- /dev/null +++ b/locale/de.po @@ -0,0 +1,185 @@ +# 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: 2017-07-31 11:28+0200\n" +"PO-Revision-Date: 2016-06-10 08:58+0200\n" +"Last-Translator: Xanthin\n" +"Language-Team: \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.12\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bee.lua +msgid "Bee" +msgstr "Biene" + +msgid "Angry Bee" +msgstr "Verärgerte Biene" + +#: bee.lua +msgid "Honey" +msgstr "Honig" + +#: bee.lua +msgid "Beehive" +msgstr "Bienenstock" + +#: bee.lua +msgid "Honey Block" +msgstr "Honigblock" + +#: bunny.lua +msgid "Bunny" +msgstr "Häschen" + +#: chicken.lua +msgid "Chicken" +msgstr "Huhn" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Hühnerei" + +#: chicken.lua +msgid "Fried Egg" +msgstr "Spiegelei" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Rohes Hühnchen" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Gekochtes Hühnchen" + +#: chicken.lua +#, fuzzy +msgid "Feather" +msgstr "Feder" + +#: cow.lua +msgid "Cow already milked!" +msgstr "Kuh ist bereits gemolken!" + +#: cow.lua +msgid "Cow" +msgstr "Kuh" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Eimer Milch" + +#: cow.lua +msgid "Cheese" +msgstr "Käse" + +#: cow.lua +msgid "Cheese Block" +msgstr "Käseblock" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[MOD] Mobs Redo 'Animals' geladen" + +#: kitten.lua +msgid "Kitten" +msgstr "Kätzchen" + +#: penguin.lua +#, fuzzy +msgid "Penguin" +msgstr "Pinguin" + +#: rat.lua +msgid "Rat" +msgstr "Ratte" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Gekochte Ratte" + +#: sheep.lua +msgid "Black" +msgstr "Schwarzes" + +#: sheep.lua +msgid "Blue" +msgstr "Blaues" + +#: sheep.lua +msgid "Brown" +msgstr "Braunes" + +#: sheep.lua +msgid "Cyan" +msgstr "Cyan" + +#: sheep.lua +msgid "Dark Green" +msgstr "Dunkelgrünes" + +#: sheep.lua +msgid "Dark Grey" +msgstr "Dunkelgraues" + +#: sheep.lua +msgid "Green" +msgstr "Grünes" + +#: sheep.lua +msgid "Grey" +msgstr "Graues" + +#: sheep.lua +msgid "Magenta" +msgstr "Magenta" + +#: sheep.lua +msgid "Orange" +msgstr "Oranges" + +#: sheep.lua +msgid "Pink" +msgstr "Pinkes" + +#: sheep.lua +msgid "Red" +msgstr "Rotes" + +#: sheep.lua +msgid "Violet" +msgstr "Violettes" + +#: sheep.lua +msgid "White" +msgstr "Weißes" + +#: sheep.lua +msgid "Yellow" +msgstr "Gelbes" + +#: sheep.lua +#, fuzzy +msgid "@1 Sheep" +msgstr "@1 Schaf" + +#: warthog.lua +msgid "Warthog" +msgstr "Warzenschwein" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Rohes Schweinekotelett" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Gekochtes Schweinekotelett" diff --git a/locale/de.txt b/locale/de.txt deleted file mode 100644 index 95a8167..0000000 --- a/locale/de.txt +++ /dev/null @@ -1,61 +0,0 @@ -# German Translation for mobs_animal mod -# Deutsche Übersetzung der mobs_animal Mod -# last update: 2016/June/10 -# Author: Xanthin - -#bee.lua -Bee = Biene -Angry Bee = verärgerte Biene -Honey = Honig -Beehive = Bienenstock -Honey Block = Honigblock - -#bunny.lua -Bunny = Häschen - -#chicken.lua -Chicken = Huhn -Chicken Egg = Hühnerei -Fried Egg = Spiegelei -Raw Chicken = Rohes Hühnchen -Cooked Chicken = Gekochtes Hühnchen - -#cow.lua -Cow already milked! = Kuh ist bereits gemolken! -Cow = Kuh -Bucket of Milk = Eimer Milch -Cheese = Käse -Cheese Block = Käseblock - -#init.lua -[MOD] Mobs Redo 'Animals' loaded = [MOD] Mobs Redo 'Animals' geladen - -#kitten.lua -Kitten = Kätzchen - -#rat.lua -Rat = Ratte -Cooked Rat = Gekochte Ratte - -#sheep.lua -Black = Schwarzes -Blue = Blaues -Brown = Braunes -Cyan = Cyan -Dark Green = Dunkelgrünes -Dark Grey = Dunkelgraues -Green = Grünes -Grey = Graues -Magenta = Magenta -Orange = Oranges -Pink = Pinkes -Red = Rotes -Violet = Violettes -White = Weißes -Yellow = Gelbes -Sheep = Schaf - -#warthog.lua -Warthog = Warzenschwein -Raw Porkchop = Rohes Schweinekotelett -Cooked Porkchop = Gekochtes Schweinekotelett diff --git a/locale/fr.po b/locale/fr.po new file mode 100644 index 0000000..e309a2c --- /dev/null +++ b/locale/fr.po @@ -0,0 +1,180 @@ +# 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: 2017-07-31 11:28+0200\n" +"PO-Revision-Date: 2017-07-31 09:18+0200\n" +"Last-Translator: fat115 \n" +"Language-Team: \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.12\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: bee.lua +msgid "Bee" +msgstr "Abeille" + +#: bee.lua +msgid "Honey" +msgstr "Miel" + +#: bee.lua +msgid "Beehive" +msgstr "Ruche" + +#: bee.lua +msgid "Honey Block" +msgstr "Bloc de miel" + +#: bunny.lua +msgid "Bunny" +msgstr "Lapin" + +#: chicken.lua +msgid "Chicken" +msgstr "Poule" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Œuf" + +#: chicken.lua +msgid "Fried Egg" +msgstr "Œuf au plat" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Poulet cru" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Poulet cuit" + +#: chicken.lua +msgid "Feather" +msgstr "Plume" + +#: cow.lua +msgid "Cow already milked!" +msgstr "Vache déjà traite !" + +#: cow.lua +msgid "Cow" +msgstr "Vache" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Seau de lait" + +#: cow.lua +msgid "Cheese" +msgstr "Fromage" + +#: cow.lua +msgid "Cheese Block" +msgstr "Bloc de fromage" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[MOD] Mobs Redo 'Animals' chargé" + +#: kitten.lua +msgid "Kitten" +msgstr "Chaton" + +#: penguin.lua +msgid "Penguin" +msgstr "Manchot" + +#: rat.lua +msgid "Rat" +msgstr "Rat" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Rat cuit" + +#: sheep.lua +msgid "Black" +msgstr "noir" + +#: sheep.lua +msgid "Blue" +msgstr "bleu" + +#: sheep.lua +msgid "Brown" +msgstr "marron" + +#: sheep.lua +msgid "Cyan" +msgstr "cyan" + +#: sheep.lua +msgid "Dark Green" +msgstr "vert foncé" + +#: sheep.lua +msgid "Dark Grey" +msgstr "gris foncé" + +#: sheep.lua +msgid "Green" +msgstr "vert" + +#: sheep.lua +msgid "Grey" +msgstr "gris" + +#: sheep.lua +msgid "Magenta" +msgstr "magenta" + +#: sheep.lua +msgid "Orange" +msgstr "orange" + +#: sheep.lua +msgid "Pink" +msgstr "rose" + +#: sheep.lua +msgid "Red" +msgstr "rouge" + +#: sheep.lua +msgid "Violet" +msgstr "violet" + +#: sheep.lua +msgid "White" +msgstr "blanc" + +#: sheep.lua +msgid "Yellow" +msgstr "jaune" + +#: sheep.lua +#, fuzzy +msgid "@1 Sheep" +msgstr "Mouton @1" + +#: warthog.lua +msgid "Warthog" +msgstr "Sanglier" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Côte de sanglier crue" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Côte de sanglier cuite" diff --git a/locale/template.pot b/locale/template.pot new file mode 100644 index 0000000..94b00c2 --- /dev/null +++ b/locale/template.pot @@ -0,0 +1,178 @@ +# 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-07-31 11:28+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \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 "" + +#: 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 "" + +#: 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 "" + +#: warthog.lua +msgid "Warthog" +msgstr "" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "" diff --git a/locale/template.txt b/locale/template.txt deleted file mode 100644 index cfe6238..0000000 --- a/locale/template.txt +++ /dev/null @@ -1,58 +0,0 @@ -# Template for translations of mobs_animal mod -# last update: 2016/June/10 - -#bee.lua -Bee = -Honey = -Beehive = -Honey Block = - -#bunny.lua -Bunny = - -#chicken.lua -Chicken = -Chicken Egg = -Fried Egg = -Raw Chicken = -Cooked Chicken = - -#cow.lua -Cow already milked! = -Cow = -Bucket of Milk = -Cheese = -Cheese Block = - -#init.lua -[MOD] Mobs Redo 'Animals' loaded = - -#kitten.lua -Kitten = - -#rat.lua -Rat = -Cooked Rat = - -#sheep.lua -Black = -Blue = -Brown = -Cyan = -Dark Green = -Dark Grey = -Green = -Grey = -Magenta = -Orange = -Pink = -Red = -Violet = -White = -Yellow = -Sheep = - -#warthog.lua -Warthog = -Raw Porkchop = -Cooked Porkchop = \ No newline at end of file diff --git a/locale/tr.po b/locale/tr.po new file mode 100644 index 0000000..ef9acfe --- /dev/null +++ b/locale/tr.po @@ -0,0 +1,180 @@ +# 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: 2017-07-31 11:28+0200\n" +"PO-Revision-Date: 2017-04-26 09:02+0200\n" +"Last-Translator: Admicos\n" +"Language-Team: \n" +"Language: tr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.12\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: bee.lua +msgid "Bee" +msgstr "Arı" + +#: bee.lua +msgid "Honey" +msgstr "Bal" + +#: bee.lua +msgid "Beehive" +msgstr "Arı kovanı" + +#: bee.lua +msgid "Honey Block" +msgstr "Bal bloğu" + +#: bunny.lua +msgid "Bunny" +msgstr "Tavşan" + +#: chicken.lua +msgid "Chicken" +msgstr "Tavuk" + +#: chicken.lua +msgid "Chicken Egg" +msgstr "Tavuk yumurtası " + +#: chicken.lua +msgid "Fried Egg" +msgstr "Kızarmış yumurta" + +#: chicken.lua +msgid "Raw Chicken" +msgstr "Çiğ tavuk" + +#: chicken.lua +msgid "Cooked Chicken" +msgstr "Pişmiş tavuk" + +#: chicken.lua +msgid "Feather" +msgstr "" + +#: cow.lua +msgid "Cow already milked!" +msgstr "İnekte süt yok!" + +#: cow.lua +msgid "Cow" +msgstr "İnek" + +#: cow.lua +msgid "Bucket of Milk" +msgstr "Süt kovası" + +#: cow.lua +msgid "Cheese" +msgstr "Peynir" + +#: cow.lua +msgid "Cheese Block" +msgstr "Peynir bloğu" + +#: init.lua +msgid "[MOD] Mobs Redo 'Animals' loaded" +msgstr "[MOD] Mobs Redo 'Hayvanlar' yüklendi" + +#: kitten.lua +msgid "Kitten" +msgstr "Yavru kedi" + +#: penguin.lua +msgid "Penguin" +msgstr "" + +#: rat.lua +msgid "Rat" +msgstr "Sıçan" + +#: rat.lua +msgid "Cooked Rat" +msgstr "Pişmiş sıçan" + +#: sheep.lua +msgid "Black" +msgstr "Siyah" + +#: sheep.lua +msgid "Blue" +msgstr "Mavi" + +#: sheep.lua +msgid "Brown" +msgstr "Kahverengi" + +#: sheep.lua +msgid "Cyan" +msgstr "Camgöbeği" + +#: sheep.lua +msgid "Dark Green" +msgstr "Koyu yeşil" + +#: sheep.lua +msgid "Dark Grey" +msgstr "Koyu gri" + +#: sheep.lua +msgid "Green" +msgstr "Yeşil" + +#: sheep.lua +msgid "Grey" +msgstr "Gri" + +#: sheep.lua +msgid "Magenta" +msgstr "Macenta" + +#: sheep.lua +msgid "Orange" +msgstr "Turuncu" + +#: sheep.lua +msgid "Pink" +msgstr "Pembe" + +#: sheep.lua +msgid "Red" +msgstr "Kırmızı" + +#: sheep.lua +msgid "Violet" +msgstr "Mor" + +#: sheep.lua +msgid "White" +msgstr "Beyaz" + +#: sheep.lua +msgid "Yellow" +msgstr "Sarı" + +#: sheep.lua +#, fuzzy +msgid "@1 Sheep" +msgstr "@1 Koyun" + +#: warthog.lua +msgid "Warthog" +msgstr "Domuz" + +#: warthog.lua +msgid "Raw Porkchop" +msgstr "Çiğ pirzola" + +#: warthog.lua +msgid "Cooked Porkchop" +msgstr "Pişmiş pirzola" diff --git a/penguin.lua b/penguin.lua index b7748ed..d5e9a5b 100644 --- a/penguin.lua +++ b/penguin.lua @@ -44,18 +44,15 @@ mobs:register_mob("mobs_animal:penguin", { }, fly_in = "default:water_source", floats = 0, - follow = {"ethereal:fish_raw"}, + follow = {"ethereal:fish_raw", "mobs_fish:clownfish", "mobs_fish:tropical"}, view_range = 5, on_rightclick = function(self, clicker) -- feed or tame - if mobs:feed_tame(self, clicker, 4, false, true) then - return - end - - mobs:protect(self, clicker) - mobs:capture_mob(self, clicker, 5, 50, 80, false, nil) + if mobs:feed_tame(self, clicker, 4, false, true) then return end + if mobs:protect(self, clicker) then return end + if mobs:capture_mob(self, clicker, 5, 50, 80, false, nil) then return end end, }) diff --git a/readme.md b/readme.md index c5cb278..c93bf98 100644 --- a/readme.md +++ b/readme.md @@ -7,7 +7,7 @@ Bee Bunny -- Bunnies appear in green grass areas (prairie biome in ethereal) and can be tamed with 4 carrots. Can also be picked up and placed in inventory and gives 1-2 meat when killed. +- 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. Chicken @@ -19,7 +19,7 @@ Cow 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 raw fish (found in ethereal) and tamed. +- 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 diff --git a/sheep.lua b/sheep.lua index 8637ef7..1dde501 100644 --- a/sheep.lua +++ b/sheep.lua @@ -69,7 +69,11 @@ for _, col in ipairs(all_colours) do replace_with = "air", replace_offset = -1, fear_height = 3, - +--[[ + on_replace = function(self, pos, oldnode, newnode) + print ("---- replaced") ; return false -- false to keep node, true to replace + end, +]] on_rightclick = function(self, clicker) --are we feeding? @@ -168,14 +172,14 @@ for _, col in ipairs(all_colours) do end -- protect mod with mobs:protector item - mobs:protect(self, clicker) + if mobs:protect(self, clicker) then return end --are we capturing? - mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) + if mobs:capture_mob(self, clicker, 0, 5, 60, false, nil) then return end end }) - mobs:register_egg("mobs_animal:sheep_"..col[1], col[2] .. " " .. S("Sheep"), "wool_"..col[1]..".png", 1) + mobs:register_egg("mobs_animal:sheep_"..col[1], S("@1 Sheep", col[2]), "wool_"..col[1]..".png", 1) -- compatibility mobs:alias_mob("mobs:sheep_" .. col[1], "mobs_animal:sheep_" .. col[1]) diff --git a/textures/mobs_chicken_feather.png b/textures/mobs_chicken_feather.png new file mode 100644 index 0000000..b6ae211 Binary files /dev/null and b/textures/mobs_chicken_feather.png differ diff --git a/warthog.lua b/warthog.lua index 436e468..0afcc52 100644 --- a/warthog.lua +++ b/warthog.lua @@ -9,6 +9,7 @@ mobs:register_mob("mobs_animal:pumba", { passive = false, attack_type = "dogfight", group_attack = true, + owner_loyal = true, reach = 2, damage = 2, hp_min = 5, @@ -48,12 +49,9 @@ mobs:register_mob("mobs_animal:pumba", { }, on_rightclick = function(self, clicker) - if mobs:feed_tame(self, clicker, 8, true, true) then - return - end - - mobs:protect(self, clicker) - mobs:capture_mob(self, clicker, 0, 5, 50, false, nil) + if mobs:feed_tame(self, clicker, 8, true, true) then return end + if mobs:protect(self, clicker) then return end + if mobs:capture_mob(self, clicker, 0, 5, 50, false, nil) then return end end, })