Merge remote-tracking branch 'upstream/master'

depends.txt

@@ -1,3 +0,0 @@
-mobs
-lucky_block?
-intllib?

init.lua

@@ -2,31 +2,8 @@
 -- Load support for intllib.
 local MP = minetest.get_modpath(minetest.get_current_modname()) .. "/"
 
--- Check for translation method
+-- Translation support
-local S
+local S = minetest.get_translator("mob_horse")
-if minetest.get_translator ~= nil then
-	S = minetest.get_translator("mob_horse") -- 5.x translation function
-else
-	if minetest.get_modpath("intllib") then
-		dofile(minetest.get_modpath("intllib") .. "/init.lua")
-		if intllib.make_gettext_pair then
-			S = intllib.make_gettext_pair() -- new gettext method
-		else
-			S = intllib.Getter() -- old text file method
-		end
-	else -- boilerplate function
-		S = function(str, ...)
-			local args = {...}
-			return str:gsub("@%d+", function(match)
-				return args[tonumber(match:sub(2))]
-			end)
-		end
-	end
-end
-
-
--- 0.4.17 or 5.0 check
-local y_off = minetest.features.object_independent_selectionbox and 10 or 20
 
 -- horse shoes (speed, jump, brake/reverse speed, overlay texture)
 local shoes = {
@@ -72,7 +49,8 @@ mobs:register_mob("mob_horse:horse", {
 	view_range = 5,
 	follow = {
 		"farming:wheat", "default:apple", "farming:oat",
-		"farming:barley", "farming:corn"},
+		"farming:barley", "farming:corn"
+	},
 	passive = true,
 	hp_min = 12,
 	hp_max = 16,
@@ -94,8 +72,8 @@ mobs:register_mob("mob_horse:horse", {
 			self.max_speed_reverse = 2
 			self.accel = 6
 			self.terrain_type = 3
-			self.driver_attach_at = {x = 0, y = y_off, z = -2}
+			self.driver_attach_at = {x = 0, y = 10, z = -2}
-			self.driver_eye_offset = {x = 0, y = y_off + 3, z = 0}
+			self.driver_eye_offset = {x = 0, y = 10 + 3, z = 0}
 			self.driver_scale = {x = 0.8, y = 0.8} -- shrink driver to fit model
 		end
 
@@ -178,7 +156,7 @@ mobs:register_mob("mob_horse:horse", {
 
 				self.saddle = true
 				self.order = "stand"
-				self.object:set_properties({stepheight = 1.1})
+				self.object:set_properties({stepheight = 1.2})
 
 				-- take saddle from inventory
 				inv:remove_item("main", "mobs:saddle")
@@ -211,6 +189,7 @@ mobs:register_mob("mob_horse:horse", {
 
 				-- apply horseshoe overlay to current horse texture
 				if overlay then
+
 					self.texture_mods = "^" .. overlay
 
 					if self.saddle then
@@ -363,4 +342,4 @@ if minetest.get_modpath("lucky_block") then
 	})
 end
 
-print("[MOD] Mobs Redo Horse loaded")
+print("[MOD] Mob Horse loaded")

locale/it_IT.po

@@ -1,59 +0,0 @@
-# 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 <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-06 00:07+0800\n"
-"PO-Revision-Date: 2020-05-11 13:43+0200\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2.1\n"
-"Last-Translator: Hamlet <hamlatgitlab@riseup.net>\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: it_IT\n"
-
-#: init.lua
-msgid "Horse"
-msgstr "Cavallo"
-
-#: init.lua
-msgid "Horse shoes fitted -"
-msgstr "Ferri di cavallo indossati -"
-
-#: init.lua
-msgid " speed: "
-msgstr " velocità: "
-
-#: init.lua
-msgid " , jump height: "
-msgstr " , altezza di salto: "
-
-#: init.lua
-msgid " , stop speed: "
-msgstr " , velocità di arresto: "
-
-#: init.lua
-msgid "Horse shoes only work on horses!"
-msgstr "I ferri di cavallo funzionano solo sui cavalli!"
-
-#: init.lua
-msgid "Steel HorseShoes (use on horse to apply)"
-msgstr "Ferri di cavallo d'acciaio (usarli su un cavallo per applicarli)"
-
-#: init.lua
-msgid "Bronze HorseShoes (use on horse to apply)"
-msgstr "Ferri di cavallo di bronzo (usarli su un cavallo per applicarli)"
-
-#: init.lua
-msgid "Mese HorseShoes (use on horse to apply)"
-msgstr "Ferri di cavallo di mese (usarli su un cavallo per applicarli)"
-
-#: init.lua
-msgid "Diamond HorseShoes (use on horse to apply)"
-msgstr "Ferri di cavallo di diamante (usarli su un cavallo per applicarli)"

locale/ms.po

@@ -1,59 +0,0 @@
-# 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 <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-06 00:07+0800\n"
-"PO-Revision-Date: 2018-02-06 00:14+0800\n"
-"Language-Team: \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"
-"Last-Translator: MuhdNurHidayat (MNH48) <mnh48mail@gmail.com>\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"Language: ms\n"
-
-#: init.lua
-msgid "Horse"
-msgstr "Kuda"
-
-#: init.lua
-msgid "Horse shoes fitted -"
-msgstr "Ladam telah dipasang pada kuda -"
-
-#: init.lua
-msgid " speed: "
-msgstr " kelajuan: "
-
-#: init.lua
-msgid " , jump height: "
-msgstr " , ketinggian lompat: "
-
-#: init.lua
-msgid " , stop speed: "
-msgstr " , kelajuan berhenti: "
-
-#: init.lua
-msgid "Horse shoes only work on horses!"
-msgstr "Ladam hanya boleh dipakaikan pada kuda!"
-
-#: init.lua
-msgid "Steel HorseShoes (use on horse to apply)"
-msgstr "Ladam Kuda Keluli (guna pada kuda untuk pakaikan ia)"
-
-#: init.lua
-msgid "Bronze HorseShoes (use on horse to apply)"
-msgstr "Ladam Kuda Gangsa (guna pada kuda untuk pakaikan ia)"
-
-#: init.lua
-msgid "Mese HorseShoes (use on horse to apply)"
-msgstr "Ladam Kuda Mese (guna pada kuda untuk pakaikan ia)"
-
-#: init.lua
-msgid "Diamond HorseShoes (use on horse to apply)"
-msgstr "Ladam Kuda Intan (guna pada kuda untuk pakaikan ia)"

locale/template.pot

@@ -1,58 +0,0 @@
-# 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 <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-06 00:07+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: init.lua
-msgid "Horse"
-msgstr ""
-
-#: init.lua
-msgid "Horse shoes fitted -"
-msgstr ""
-
-#: init.lua
-msgid " speed: "
-msgstr ""
-
-#: init.lua
-msgid " , jump height: "
-msgstr ""
-
-#: init.lua
-msgid " , stop speed: "
-msgstr ""
-
-#: init.lua
-msgid "Horse shoes only work on horses!"
-msgstr ""
-
-#: init.lua
-msgid "Steel HorseShoes (use on horse to apply)"
-msgstr ""
-
-#: init.lua
-msgid "Bronze HorseShoes (use on horse to apply)"
-msgstr ""
-
-#: init.lua
-msgid "Mese HorseShoes (use on horse to apply)"
-msgstr ""
-
-#: init.lua
-msgid "Diamond HorseShoes (use on horse to apply)"
-msgstr ""

locale/zh_CN.pot

@@ -1,58 +0,0 @@
-# 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 <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-06 00:07+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: init.lua
-msgid "Horse"
-msgstr "马"
-
-#: init.lua
-msgid "Horse shoes fitted -"
-msgstr "马蹄铁 -"
-
-#: init.lua
-msgid " speed: "
-msgstr "速度："
-
-#: init.lua
-msgid " , jump height: "
-msgstr "，跳跃高度"
-
-#: init.lua
-msgid " , stop speed: "
-msgstr "，停止速度："
-
-#: init.lua
-msgid "Horse shoes only work on horses!"
-msgstr "马蹄铁只对马有效！"
-
-#: init.lua
-msgid "Steel HorseShoes (use on horse to apply)"
-msgstr "钢马蹄铁（用在马匹上）"
-
-#: init.lua
-msgid "Bronze HorseShoes (use on horse to apply)"
-msgstr "青铜马蹄铁（用在马匹上）"
-
-#: init.lua
-msgid "Mese HorseShoes (use on horse to apply)"
-msgstr "黄石马蹄铁（用在马匹上）"
-
-#: init.lua
-msgid "Diamond HorseShoes (use on horse to apply)"
-msgstr "钻石马蹄铁（用在马匹上）"

locale/zh_CN.txt

@@ -1,12 +0,0 @@
-#Mod: mob_horse
-
-Horse = 马
-Horse shoes fitted - = 马蹄铁 -
- speed:  = 速度：
- , jump height:  = ，跳跃高度：
- , stop speed:  = ，停止速度：
-Horse shoes only work on horses! = 马蹄铁只对马有效！
-Steel HorseShoes (use on horse to apply) = 钢马蹄铁（用在马匹上）
-Bronze HorseShoes (use on horse to apply) = 青铜马蹄铁（用在马匹上）
-Mese HorseShoes (use on horse to apply) = 黄石马蹄铁（用在马匹上）
-Diamond HorseShoes (use on horse to apply) = 钻石马蹄铁（用在马匹上）

locale/zh_TW.txt

@@ -1,12 +0,0 @@
-#Mod: mob_horse
-
-Horse = 馬
-Horse shoes fitted - = 馬蹄鐵 -
- speed:  = 速度：
- , jump height:  = ，跳躍高度：
- , stop speed:  = ，停止速度：
-Horse shoes only work on horses! = 馬蹄鐵只對馬有效！
-Steel HorseShoes (use on horse to apply) = 鋼馬蹄鐵（用在馬匹上）
-Bronze HorseShoes (use on horse to apply) = 青銅馬蹄鐵（用在馬匹上）
-Mese HorseShoes (use on horse to apply) = 黃石馬蹄鐵（用在馬匹上）
-Diamond HorseShoes (use on horse to apply) = 鑽石馬蹄鐵（用在馬匹上）

mod.conf

@@ -1,4 +1,5 @@
 name = mob_horse
-depends = mobs
-optional_depends = lucky_block, intllib
 description = Adds a rideable horse into game with horse shoe upgrades.
+depends = mobs
+optional_depends = lucky_block
+min_minetest_version = 5.0