Merge remote-tracking branch 'upstream/master'

depends.txt

@@ -1,5 +1,5 @@
-default
 mobs
+default?
 lucky_block?
 toolranks?
 intllib?

dirt_monster.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local dirt_types = {
 

dungeon_master.lua

@@ -1,5 +1,15 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
+
+local master_types = {
+
+	{	nodes = {"nether:rack"},
+		skins = {"mobs_dungeon_master_nether.png"},
+	},
+	{	nodes = {"nether:rack_deep"},
+		skins = {"mobs_dungeon_master_netherdeep.png"},
+	}
+}
 
 
 -- Dungeon Master by PilzAdam
@@ -62,13 +72,39 @@ mobs:register_mob("mobs_monster:dungeon_master", {
 		speed_normal = 15,
 		speed_run = 15,
 	},
+
+	-- check surrounding nodes and spawn a specific monster
+	on_spawn = function(self)
+
+		local pos = self.object:get_pos() ; pos.y = pos.y - 1
+		local tmp
+
+		for n = 1, #master_types do
+
+			tmp = master_types[n]
+
+			if minetest.find_node_near(pos, 1, tmp.nodes) then
+
+				self.base_texture = tmp.skins
+				self.object:set_properties({textures = tmp.skins})
+
+				if tmp.drops then
+					self.drops = tmp.drops
+				end
+
+				return true
+			end
+		end
+
+		return true -- run only once, false/nil runs every activation
+	end
 })
 
 
 if not mobs.custom_spawn_monster then
 mobs:spawn({
 	name = "mobs_monster:dungeon_master",
-	nodes = {"default:stone", "default:sandstone", "nether:netherrack"},
+	nodes = {"default:stone", "nether:rack", "nether:rack_deep", "hell:hellrack"},
 	max_light = 5,
 	chance = 9000,
 	active_object_count = 1,

fire_spirit.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local mob_drops = {
 	{name = "fireflies:firefly", chance = 1, min = 1, max = 1}

init.lua

@@ -2,10 +2,32 @@
 -- Load support for intllib.
 local path = minetest.get_modpath(minetest.get_current_modname()) .. "/"
 
-local S = minetest.get_translator and minetest.get_translator("mobs_monster") or
+local S
-		dofile(path .. "intllib.lua")
 
-mobs.intllib = S
+-- Check for translation method
+local S
+if minetest.get_translator ~= nil then
+	S = minetest.get_translator("mobs_monster") -- 5.x translation function
+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
+		else
+			gettext = intllib.Getter() -- old text file method
+		end
+		S = gettext
+	else -- boilerplate function
+		S = function(str, ...)
+			local args = {...}
+			return str:gsub("@%d+", function(match)
+				return args[tonumber(match:sub(2))]
+			end)
+		end
+	end
+end
+
+mobs.intllib_monster = S
 
 
 -- Check for custom mob spawn file
@@ -43,4 +65,4 @@ end
 dofile(path .. "lucky_block.lua")
 
 
-print (S("[MOD] Mobs Redo Monsters loaded"))
+print ("[MOD] Mobs Redo Monsters loaded")

intllib.lua

@@ -1,3 +0,0 @@
--- Support for the old multi-load method
-dofile(minetest.get_modpath("intllib").."/init.lua")
-

land_guard.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 
 local guard_types = {

lava_flan.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
-
 
 -- Lava Flan by Zeg9 (additional textures by JurajVajda)
 

license.txt

@@ -30,3 +30,7 @@ mobs.fireball.png was originally made by Sapier and edited by Benrob:
 --
 -- (c) Sapier
 -- Contact sapier a t gmx net
+
+Textures created by wwar (cc0)
+  mobs_dungeon_master_nether.png
+  mobs_dungeon_master_netherdeep.png

locale/mobs_monster.es.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=Telarania
+Dirt Monster=Mounstro de tierra
+Dungeon Master=Maestro de mazmorra
+Lava Flan=Flan de lava
+Lava Pickaxe=Hacha de lava
+Lava orb=Esfera de lava
+Mese Monster=Mounstro de mese
+#Obsidian Flan=
+Oerkki=Oerkki
+Sand Monster=Mounstro de arena
+Spider=Arania
+Stone Monster=Mounstro de piedra
+Tree Monster=Mounstro de madera

mese_monster.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
-
 
 -- Mese Monster by Zeg9
 
@@ -12,6 +11,9 @@ mobs:register_mob("mobs_monster:mese_monster", {
 	shoot_interval = 0.5,
 	arrow = "mobs_monster:mese_arrow",
 	shoot_offset = 2,
+--arrow_override = function(self)
+--	self.velocity = 20
+--end,
 	hp_min = 10,
 	hp_max = 25,
 	armor = 80,

mod.conf

@@ -1,4 +1,4 @@
 name = mobs_monster
-depends = default, mobs
+depends = mobs
-optional_depends = lucky_block, toolranks, intllib
+optional_depends = default, lucky_block, toolranks, intllib
 description = Adds many types of monsters.

oerkki.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
-
 
 -- Oerkki by PilzAdam
 

sand_monster.lua

@@ -1,6 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
-
 
 -- custom particle effects
 local effect = function(

spider.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local get_velocity = function(self)
 

stone_monster.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local stone_types = {
 

tree_monster.lua

@@ -1,5 +1,5 @@
 
-local S = mobs.intllib
+local S = mobs.intllib_monster
 
 local tree_types = {