Merge remote-tracking branch 'upstream/master'

depends.txt

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

init.lua

@@ -1,23 +1,11 @@
 
-local path = minetest.get_modpath("mobs_monster")
-
--- Intllib
-local S
-if minetest.global_exists("intllib") then
-	if intllib.make_gettext_pair then
-		-- New method using gettext.
-		S = intllib.make_gettext_pair()
-	else
-		-- Old method using text files.
-		S = intllib.Getter()
-	end
-else
-	S = function(s) return s end
-end
+-- 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
+		dofile(path .. "/intllib.lua")
 mobs.intllib = S
 
 -- Monsters
-
 dofile(path .. "/dirt_monster.lua") -- PilzAdam
 dofile(path .. "/dungeon_master.lua")
 dofile(path .. "/oerkki.lua")
@@ -29,6 +17,7 @@ dofile(path .. "/mese_monster.lua")
 dofile(path .. "/spider.lua") -- AspireMint
 dofile(path .. "/minotaur.lua") -- NALC(sys4 fork MFF) Kalabasa
 
+-- Lucky Blocks
 dofile(path .. "/lucky_block.lua")
 
-print ("[MOD] Mobs Redo Monsters loaded")
+print (S("[MOD] Mobs Redo Monsters loaded"))

intllib.lua

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

lava_flan.lua

@@ -41,6 +41,7 @@ mobs:register_mob("mobs_monster:lava_flan", {
 	immune_to = {
 		{"mobs:pick_lava", -2}, -- lava pick heals 2 health
 	},
+	fly_in = {"default:lava_source", "default:lava_flowing"},
 	animation = {
 		speed_normal = 15,
 		speed_run = 15,
@@ -62,21 +63,7 @@ mobs:register_mob("mobs_monster:lava_flan", {
 
 			pos.y = pos.y + 1
 
-			minetest.add_particlespawner({
-				amount = 40,
-				time = 0.25,
-				minpos = pos,
-				maxpos = pos,
-				minvel = {x = -2, y = 0, z = -2},
-				maxvel = {x = 2, y = 2, z = 2},
-				minacc = {x = 0, y = 0, z = 0},
-				maxacc = {x = 0, y = 10, z = 0},
-				minexptime = 0.1,
-				maxexptime = 1,
-				minsize = 3.0,
-				maxsize = 5.0,
-				texture = "tnt_smoke.png",
-			})
+			mobs:effect(pos, 40, "tnt_smoke.png", 3, 5, 2, 0.5, nil, false)
 
 			minetest.sound_play("fire_extinguish_flame",
 				{pos = pos, max_hear_distance = 12, gain = 1.5}, true)
@@ -84,28 +71,16 @@ mobs:register_mob("mobs_monster:lava_flan", {
 			self.object:remove()
 
 			if math.random(4) == 1 then
-				minetest.add_entity(pos, "mobs_monster:obsidian_flan")
+				mobs:add_mob(pos, {
+					name = "mobs_monster:obsidian_flan",
+				})
 			end
 		else
 			if minetest.get_node(pos).name == "air" then
 				minetest.set_node(pos, {name = "fire:basic_flame"})
 			end
 
-			minetest.add_particlespawner({
-				amount = 20,
-				time = 0.25,
-				minpos = pos,
-				maxpos = pos,
-				minvel = {x = -2, y = -2, z = -2},
-				maxvel = {x = 2, y = 2, z = 2},
-				minacc = {x = 0, y = -10, z = 0},
-				maxacc = {x = 0, y = -10, z = 0},
-				minexptime = 0.1,
-				maxexptime = 1,
-				minsize = 1.0,
-				maxsize = 2.0,
-				texture = "fire_basic_flame.png",
-			})
+			mobs:effect(pos, 40, "fire_basic_flame.png", 2, 3, 2, 5, 10, nil)
 
 			self.object:remove()
 		end
@@ -257,9 +232,10 @@ mobs:register_mob("mobs_monster:obsidian_flan", {
 	floats = 0,
 	drops = {
 		{name = "default:obsidian_shard", chance = 1, min = 1, max = 5},
+		{name = "default:obsidian", chance = 3, min = 0, max = 2},
 	},
 	water_damage = 0,
-	lava_damage = 0,
+	lava_damage = 8,
 	light_damage = 0,
 	animation = {
 		speed_normal = 15,
@@ -321,7 +297,9 @@ mobs:register_arrow("mobs_monster:obsidian_arrow", {
 			texture = def.tiles[1]
 		end
 
-		if def.groups and def.groups.level == 2 then
+		-- do not break obsidian or diamond blocks or unbreakable nodes
+		if (def.groups and def.groups.level and def.groups.level > 1)
+		or def.groups.unbreakable then
 			return
 		end
 

locale/mobs_monster.de.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=Spinnennetz
+Dirt Monster=Erdmonster
+Dungeon Master=Kerkermeister
+Lava Flan=Lavaflan
+Lava Pickaxe=Lavaspitzhacke
+Lava orb=Lavakugel
+Mese Monster=Mesemonster
+#Obsidian Flan=
+Oerkki=Oerkki
+Sand Monster=Sandmonster
+Spider=Spinne
+Stone Monster=Steinmonster
+Tree Monster=Baummonster

locale/mobs_monster.en.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+#Cobweb=
+#Dirt Monster=
+#Dungeon Master=
+#Lava Flan=
+#Lava Pickaxe=
+#Lava orb=
+#Mese Monster=
+#Obsidian Flan=
+#Oerkki=
+#Sand Monster=
+#Spider=
+#Stone Monster=
+#Tree Monster=

locale/mobs_monster.fr.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=Toile d'arraignée
+Dirt Monster=Monstre de terre
+Dungeon Master=Maître des donjons
+Lava Flan=Lave en gelée
+Lava Pickaxe=Pioche de lave
+Lava orb=Orbe de lave
+Mese Monster=Monstre de mese
+Obsidian Flan=Obsidienne en gelée
+Oerkki=Oerkki
+Sand Monster=Monstre de sable
+Spider=Araignée
+Stone Monster=Monstre de pierre
+Tree Monster=Monstre de bois

locale/mobs_monster.it.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=Ragnatela
+Dirt Monster=Mostro di terra
+Dungeon Master=Padrone delle segrete
+Lava Flan=Sformato di lava
+Lava Pickaxe=Piccone di lava
+Lava orb=Sfera di lava
+Mese Monster=Mostro di mese
+#Obsidian Flan=
+Oerkki=Oerkki
+Sand Monster=Mostro di sabbia
+Spider=Ragno
+Stone Monster=Mostro di pietra
+Tree Monster=Albero mostro

locale/mobs_monster.ms.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=Sarang Labah-labah
+Dirt Monster=Raksasa Tanah
+Dungeon Master=Penjaga Kurungan Bawah Tanah
+Lava Flan=Raksasa Lava
+Lava Pickaxe=Beliung Lava
+Lava orb=Bola Lava
+Mese Monster=Raksasa Mese
+#Obsidian Flan=
+Oerkki=Oerkki
+Sand Monster=Raksasa Pasir
+Spider=Labah-labah
+Stone Monster=Raksasa Batu
+Tree Monster=Raksasa Pokok

locale/mobs_monster.tr.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=Örümcek ağı
+Dirt Monster=Toprak Canavarı
+Dungeon Master=Zindan başı
+Lava Flan=Lav Flan
+Lava Pickaxe=Lav kazması
+Lava orb=Lav küre
+Mese Monster=Mese Canavarı
+#Obsidian Flan=
+Oerkki=Oerkki
+Sand Monster=Kum Canavarı
+Spider=Örümcek
+Stone Monster=Taş Canavarı
+Tree Monster=Ağaç Canavarı

locale/mobs_monster.zh_CN.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=蜘蛛网
+Dirt Monster=泥土怪
+Dungeon Master=地穴之主
+Lava Flan=岩浆饼
+Lava Pickaxe=岩浆镐
+Lava orb=岩浆球
+Mese Monster=黄石怪
+#Obsidian Flan=
+Oerkki=奥尔基
+Sand Monster=沙怪
+Spider=蜘蛛
+Stone Monster=石头怪
+Tree Monster=树怪

locale/mobs_monster.zh_TW.tr

@@ -0,0 +1,14 @@
+# textdomain:mobs_monster
+Cobweb=蜘蛛網
+Dirt Monster=泥土怪
+Dungeon Master=地穴之主
+Lava Flan=岩漿餅
+Lava Pickaxe=岩漿鎬
+Lava orb=岩漿球
+Mese Monster=黃石怪
+#Obsidian Flan=
+Oerkki=奧爾基
+Sand Monster=沙怪
+Spider=蜘蛛
+Stone Monster=石頭怪
+Tree Monster=樹怪

locale/template.txt

@@ -2,34 +2,35 @@
 # last update: 2016/June/10
 
 #dirtmonster.lua
-Dirt Monster = 
+Dirt Monster=
 
 #dungeonmaster.lua
-Dungeon Master = 
+Dungeon Master=
 
 #init.lua
-[MOD] Mobs Redo 'Monsters' loaded = 
+[MOD] Mobs Redo 'Monsters' loaded=
 
 #lava_flan.lua
-Lava Flan = 
-Lava orb = 
-Lava Pickaxe = 
+Lava Flan=
+Lava orb=
+Lava Pickaxe=
+Obsidian Flan=
 
 #mese_monster.lua
-Mese Monster = 
+Mese Monster=
 
 #oerkki.lua
-Oerkki = 
+Oerkki=
 
 #sandmonster.lua
-Sand Monster = 
+Sand Monster=
 
 #spider.lua
-Spider = 
-Cobweb = 
+Spider=
+Cobweb=
 
 #stonemonster.lua
-Stone Monster = 
+Stone Monster=
 
 #treemonster.lua
-Tree Monster = 
+Tree Monster=

locale/zh_CN.txt

@@ -14,6 +14,7 @@ Dungeon Master = 地穴之主
 Lava Flan = 岩浆饼
 Lava orb = 岩浆球
 Lava Pickaxe = 岩浆镐
+Obsidian Flan = 黑耀石饼
 
 #mese_monster.lua
 Mese Monster = 黄石怪

locale/zh_TW.txt

@@ -14,6 +14,7 @@ Dungeon Master = 地穴之主
 Lava Flan = 岩漿餅
 Lava orb = 岩漿球
 Lava Pickaxe = 岩漿鎬
+Obsidian Flan = 黑耀石餅
 
 #mese_monster.lua
 Mese Monster = 黃石怪

sand_monster.lua

@@ -96,9 +96,9 @@ mobs:register_mob("mobs_monster:sand_monster", {
 ]]
 	on_die = function(self, pos)
 		pos.y = pos.y + 0.5
-		effect(pos, 30, "mobs_sand_particles.png", 0.1, 2, 3, 5)
+		mobs:effect(pos, 30, "mobs_sand_particles.png", .1, 2, 3, 5)
 		pos.y = pos.y + 0.25
-		effect(pos, 30, "mobs_sand_particles.png", 0.1, 2, 3, 5)
+		mobs:effect(pos, 30, "mobs_sand_particles.png", .1, 2, 3, 5)
 	end,
 --[[
 	on_rightclick = function(self, clicker)