From 55f921d7c985deb441d5f908dda437156100e104 Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Tue, 27 Sep 2022 11:34:33 +0100 Subject: [PATCH 1/3] code tidy --- init.lua | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/init.lua b/init.lua index 75f4d0a..c627a73 100644 --- a/init.lua +++ b/init.lua @@ -10,11 +10,10 @@ else if minetest.get_modpath("intllib") then dofile(minetest.get_modpath("intllib") .. "/init.lua") if intllib.make_gettext_pair then - gettext, ngettext = intllib.make_gettext_pair() -- new gettext method + S = intllib.make_gettext_pair() -- new gettext method else - gettext = intllib.Getter() -- old text file method + S = intllib.Getter() -- old text file method end - S = gettext else -- boilerplate function S = function(str, ...) local args = {...} @@ -27,11 +26,7 @@ end -- 0.4.17 or 5.0 check -local y_off = 20 -if minetest.features.object_independent_selectionbox then - y_off = 10 -end - +local y_off = minetest.features.object_independent_selectionbox and 10 or 20 -- horse shoes (speed, jump, brake/reverse speed, overlay texture) local shoes = { @@ -340,34 +335,32 @@ minetest.register_craft({ -- crystal horseshoes if minetest.get_modpath("ethereal") then -minetest.register_craftitem(":mobs:horseshoe_crystal", { - description = S("Crystal HorseShoes (use on horse to apply)"), - inventory_image = "mobs_horseshoe_crystal.png" -}) - -minetest.register_craft({ - output = "mobs:horseshoe_crystal", - recipe = { - {"", "ethereal:crystal_block", ""}, - {"ethereal:crystal_ingot", "", "ethereal:crystal_ingot"}, - {"ethereal:crystal_ingot", "", "ethereal:crystal_ingot"} - } -}) + minetest.register_craftitem(":mobs:horseshoe_crystal", { + description = S("Crystal HorseShoes (use on horse to apply)"), + inventory_image = "mobs_horseshoe_crystal.png" + }) + minetest.register_craft({ + output = "mobs:horseshoe_crystal", + recipe = { + {"", "ethereal:crystal_block", ""}, + {"ethereal:crystal_ingot", "", "ethereal:crystal_ingot"}, + {"ethereal:crystal_ingot", "", "ethereal:crystal_ingot"} + } + }) end -- lucky blocks if minetest.get_modpath("lucky_block") then -lucky_block:add_blocks({ - {"dro", {"mobs:horseshoe_steel"}}, - {"dro", {"mobs:horseshoe_bronze"}}, - {"dro", {"mobs:horseshoe_mese"}}, - {"dro", {"mobs:horseshoe_diamond"}}, - {"dro", {"mobs:horseshoe_crystal"}} -}) - + lucky_block:add_blocks({ + {"dro", {"mobs:horseshoe_steel"}}, + {"dro", {"mobs:horseshoe_bronze"}}, + {"dro", {"mobs:horseshoe_mese"}}, + {"dro", {"mobs:horseshoe_diamond"}}, + {"dro", {"mobs:horseshoe_crystal"}} + }) end From 2e4cc8a90b7774a8ebf9bd347a397828374619ff Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Thu, 29 Sep 2022 14:47:53 +0100 Subject: [PATCH 2/3] fix driver eye level --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index c627a73..a791088 100644 --- a/init.lua +++ b/init.lua @@ -95,7 +95,7 @@ mobs:register_mob("mob_horse:horse", { self.accel = 6 self.terrain_type = 3 self.driver_attach_at = {x = 0, y = y_off, z = -2} - self.driver_eye_offset = {x = 0, y = 3, z = 0} + self.driver_eye_offset = {x = 0, y = y_off + 3, z = 0} self.driver_scale = {x = 0.8, y = 0.8} -- shrink driver to fit model end From 2d2211c51da154fa2e4c4906b8d1ae193df3650f Mon Sep 17 00:00:00 2001 From: tenplus1 Date: Mon, 19 Dec 2022 17:08:55 +0000 Subject: [PATCH 3/3] amend loaded msg --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index a791088..b61bb38 100644 --- a/init.lua +++ b/init.lua @@ -364,4 +364,4 @@ if minetest.get_modpath("lucky_block") then end -print("[MOD] Mob Horse loaded") +print("[MOD] Mobs Redo Horse loaded")