Merge remote-tracking branch 'upstream/master'

depends.txt

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

description.txt

@@ -1 +0,0 @@
-Adds many types of monster.

dirt_monster.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 local dirt_types = {
 

dungeon_master.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 local master_types = {
 

fire_spirit.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 local mob_drops = {
 	{name = "fireflies:firefly", chance = 1, min = 1, max = 1}

init.lua

@@ -2,30 +2,8 @@
 -- Load support for intllib.
 local path = minetest.get_modpath(minetest.get_current_modname()) .. "/"
 
--- Check for translation method
+-- Translation support
-local S
+local S = minetest.get_translator("mobs_monster")
-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
-			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
-
-mobs.intllib_monster = S
-
 
 -- Check for custom mob spawn file
 local input = io.open(path .. "spawn.lua", "r")
@@ -37,19 +15,30 @@ if input then
 end
 
 
+-- helper function
+local function ddoo(mob)
+
+	if minetest.settings:get_bool("mobs_monster." .. mob) == false then
+		print("[Mobs_Monster] " .. mob .. " disabled!")
+		return
+	end
+
+	dofile(path .. mob .. ".lua")
+end
+
 -- Monsters
-dofile(path .. "dirt_monster.lua") -- PilzAdam
+ddoo("dirt_monster") -- PilzAdam
-dofile(path .. "dungeon_master.lua")
+ddoo("dungeon_master")
-dofile(path .. "oerkki.lua")
+ddoo("oerkki")
-dofile(path .. "sand_monster.lua")
+ddoo("sand_monster")
-dofile(path .. "stone_monster.lua")
+ddoo("stone_monster")
-dofile(path .. "tree_monster.lua")
+ddoo("tree_monster")
-dofile(path .. "lava_flan.lua") -- Zeg9
+ddoo("lava_flan") -- Zeg9
-dofile(path .. "mese_monster.lua")
+ddoo("mese_monster")
-dofile(path .. "spider.lua") -- AspireMint
+ddoo("spider") -- AspireMint
+ddoo("land_guard")
+ddoo("fire_spirit")
 dofile(path .. "minotaur.lua") -- NALC(sys4 fork MFF) Kalabasa
-dofile(path .. "land_guard.lua")
-dofile(path .. "fire_spirit.lua")
 
 
 -- Load custom spawning
@@ -64,4 +53,4 @@ if minetest.get_modpath("lucky_block") then
 end
 
 
-print ("[MOD] Mobs Redo Monsters loaded")
+print ("[MOD] Mobs Monster loaded")

land_guard.lua

@@ -1,6 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
-
 
 local guard_types = {
 

lava_flan.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 -- Lava Flan by Zeg9 (additional textures by JurajVajda)
 

locale/de.txt

@@ -1,37 +0,0 @@
-# German Translation for mobs_monster mod
-# Deutsche Übersetzung der mobs_monster Mod
-# last update: 2016/June/10
-# Author: Xanthin
-
-#dirtmonster.lua
-Dirt Monster = Erdmonster
-
-#dungeonmaster.lua
-Dungeon Master = Kerkermeister
-
-#init.lua
-[MOD] Mobs Redo 'Monsters' loaded = [MOD] Mobs Redo 'Monsters' geladen
-
-#lava_flan.lua
-Lava Flan = Lavaflan
-Lava orb = Lavakugel
-Lava Pickaxe = Lavaspitzhacke
-
-#mese_monster.lua
-Mese Monster = Mesemonster
-
-#oerkki.lua
-Oerkki = Oerkki
-
-#sandmonster.lua
-Sand Monster = Sandmonster
-
-#spider.lua
-Spider = Spinne
-Cobweb = Spinnennetz
-
-#stonemonster.lua
-Stone Monster = Steinmonster
-
-#treemonster.lua
-Tree Monster = Baummonster

locale/fr.txt

@@ -1,34 +0,0 @@
-# last update: 2016/June/10
-
-#dirtmonster.lua
-Dirt Monster =  Monstre de terre
-
-#dungeonmaster.lua
-Dungeon Master = Maître des donjons
-
-#init.lua
-[MOD] Mobs Redo 'Monsters' loaded = [MOD] Mobs Redo 'Monstres' chargé
-
-#lava_flan.lua
-Lava Flan = Flan de lave
-Lava orb = Orbe de lave
-Lava Pickaxe = Pioche de lave
-
-#mese_monster.lua
-Mese Monster = Monstre de Mese
-
-#oerkki.lua
-Oerkki = Oerkki
-
-#sandmonster.lua
-Sand Monster = Monstre de sable
-
-#spider.lua
-Spider = Araignée
-Cobweb = Toile d'arraignée
-
-#stonemonster.lua
-Stone Monster = Monstre de pierre
-
-#treemonster.lua
-Tree Monster = Monstre de bois

locale/it.txt

@@ -1,38 +0,0 @@
-# ITALIAN LOCALE FILE FOR THE MOBS MONSTER MODULE
-# Copyright (c) 2014 Krupnov Pavel and 2016 TenPlus1
-# This file is distributed under the same license as the MOBS MONSTER package.
-# Hamlet <h4mlet@riseup.net>, 2017.
-#
-
-#dirtmonster.lua
-Dirt Monster = Mostro di terra
-
-#dungeonmaster.lua
-Dungeon Master = Padrone delle segrete
-
-#init.lua
-[MOD] Mobs Redo 'Monsters' loaded = [MOD] Mobs Redo 'Monsters' caricato
-
-#lava_flan.lua
-Lava Flan = Sformato di lava
-Lava orb = Sfera di lava
-Lava Pickaxe = Piccone di lava
-
-#mese_monster.lua
-Mese Monster = Mostro di mese
-
-#oerkki.lua
-Oerkki = Oerkki
-
-#sandmonster.lua
-Sand Monster = Mostro di sabbia
-
-#spider.lua
-Spider = Ragno
-Cobweb = Ragnatela
-
-#stonemonster.lua
-Stone Monster = Mostro di pietra
-
-#treemonster.lua
-Tree Monster = Albero mostro

locale/ms.txt

@@ -1,35 +0,0 @@
-# Malay translations of mobs_monster mod
-# using template from 2016/June/10, translated on 2018/February/05
-
-#dirtmonster.lua
-Dirt Monster = Raksasa Tanah
-
-#dungeonmaster.lua
-Dungeon Master = Penjaga Kurungan Bawah Tanah
-
-#init.lua
-[MOD] Mobs Redo 'Monsters' loaded = [MODS] Mobs Redo 'Monsters' telah dimuatkan
-
-#lava_flan.lua
-Lava Flan = Raksasa Lava
-Lava orb = Bola Lava
-Lava Pickaxe = Beliung Lava
-
-#mese_monster.lua
-Mese Monster = Raksasa Mese
-
-#oerkki.lua
-Oerkki = Oerkki
-
-#sandmonster.lua
-Sand Monster = Raksasa Pasir
-
-#spider.lua
-Spider = Labah-labah
-Cobweb = Sarang Labah-labah
-
-#stonemonster.lua
-Stone Monster = Raksasa Batu
-
-#treemonster.lua
-Tree Monster = Raksasa Pokok

locale/template.txt

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

locale/tr.txt

@@ -1,39 +0,0 @@
-# Türkçe çeviri by Admicos
-# Turkish translation by Admicos
-
-# Son düzenleme: 26 Nisan 2017
-# Last edit: 26 April 2017
-
-
-#dirtmonster.lua
-Dirt Monster = Toprak Canavarı
-
-#dungeonmaster.lua
-Dungeon Master = Zindan başı
-
-#init.lua
-[MOD] Mobs Redo 'Monsters' loaded = [MOD] Mobs Redo 'Canavarlar' yüklendi
-
-#lava_flan.lua
-Lava Flan = Lav Flan
-Lava orb = Lav küre
-Lava Pickaxe = Lav kazması
-
-#mese_monster.lua
-Mese Monster = Mese Canavarı
-
-#oerkki.lua
-Oerkki = Oerkki
-
-#sandmonster.lua
-Sand Monster = Kum Canavarı
-
-#spider.lua
-Spider = Örümcek
-Cobweb = Örümcek ağı
-
-#stonemonster.lua
-Stone Monster = Taş Canavarı
-
-#treemonster.lua
-Tree Monster = Ağaç Canavarı

locale/zh_CN.txt

@@ -1,36 +0,0 @@
-# Template for translations of mobs_monster mod
-# last update: 2016/June/10
-
-#dirtmonster.lua
-Dirt Monster = 泥土怪
-
-#dungeonmaster.lua
-Dungeon Master = 地穴之主
-
-#init.lua
-[MOD] Mobs Redo 'Monsters' loaded = [模组] Mobs Redo 'Monsters' 已加载
-
-#lava_flan.lua
-Lava Flan = 岩浆饼
-Lava orb = 岩浆球
-Lava Pickaxe = 岩浆镐
-Obsidian Flan = 黑耀石饼
-
-#mese_monster.lua
-Mese Monster = 黄石怪
-
-#oerkki.lua
-Oerkki = 奥尔基
-
-#sandmonster.lua
-Sand Monster = 沙怪
-
-#spider.lua
-Spider = 蜘蛛
-Cobweb = 蜘蛛网
-
-#stonemonster.lua
-Stone Monster = 石头怪
-
-#treemonster.lua
-Tree Monster = 树怪

locale/zh_TW.txt

@@ -1,36 +0,0 @@
-# Template for translations of mobs_monster mod
-# last update: 2016/June/10
-
-#dirtmonster.lua
-Dirt Monster = 泥土怪
-
-#dungeonmaster.lua
-Dungeon Master = 地穴之主
-
-#init.lua
-[MOD] Mobs Redo 'Monsters' loaded = [模組] Mobs Redo 'Monsters' 已加載
-
-#lava_flan.lua
-Lava Flan = 岩漿餅
-Lava orb = 岩漿球
-Lava Pickaxe = 岩漿鎬
-Obsidian Flan = 黑耀石餅
-
-#mese_monster.lua
-Mese Monster = 黃石怪
-
-#oerkki.lua
-Oerkki = 奧爾基
-
-#sandmonster.lua
-Sand Monster = 沙怪
-
-#spider.lua
-Spider = 蜘蛛
-Cobweb = 蜘蛛網
-
-#stonemonster.lua
-Stone Monster = 石頭怪
-
-#treemonster.lua
-Tree Monster = 樹怪

mese_monster.lua

@@ -1,4 +1,5 @@
-local S = mobs.intllib_monster
+-- Translation support
+local S = minetest.get_translator("mobs_monster")
 
 local mese_monster_types = {
 

mod.conf

@@ -1,4 +1,5 @@
 name = mobs_monster
+description = Add many different monsters into your world.
 depends = mobs
-optional_depends = default, lucky_block, toolranks, intllib
+optional_depends = default, lucky_block, toolranks
-description = Adds many types of monsters.
+min_minetest_version = 5.0

oerkki.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 -- Oerkki by PilzAdam
 

sand_monster.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 -- custom particle effects
 local effect = function(pos, amount, texture, min_size, max_size, radius, gravity, glow)

settingtypes.txt

@@ -0,0 +1,10 @@
+mobs_monster.dirt_monster (Enable Dirt Monster) bool true
+mobs_monster.dungeon_master (Enable Dungeon Master) bool true
+mobs_monster.fire_spirit (Enable Fire Spirit) bool true
+mobs_monster.land_guard (Enable Land Guard) bool true
+mobs_monster.lava_flan (Enable Lava Flan) bool true
+mobs_monster.mese_monster (Enable Mese Monster) bool true
+mobs_monster.oerkki (Enable Oerkki) bool true
+mobs_monster.spider (Enable Spider) bool true
+mobs_monster.stone_monster (Enable Stone Monster) bool true
+mobs_monster.tree_monster (Enable Tree Monster) bool true

spawn_example.lua

@@ -171,3 +171,17 @@ mobs:spawn({
 	min_height = 0,
 	day_toggle = false,
 })
+
+-- Land Guard
+
+mobs:spawn({
+	name = "mobs_monster:land_guard",
+	nodes = {
+		"default:snow", "default:ice", "default:stone",
+		"default:dry_dirt_with_dry_grass", "ethereal:dry_dirt"
+	},
+	max_light = 7,
+	chance = 25000,
+	min_height = 0,
+	active_object_count = 1,
+})

spider.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 local get_velocity = function(self)
 
@@ -172,10 +172,12 @@ mobs:register_mob("mobs_monster:spider", {
 		-- sanity check
 		if not yaw then return end
 
-		pos.y = pos.y + self.collisionbox[2] - 0.2
+		local prop = self.object:get_properties()
 
-		local dir_x = -math.sin(yaw) * (self.collisionbox[4] + 0.5)
+		pos.y = pos.y + prop.collisionbox[2] - 0.2
-		local dir_z = math.cos(yaw) * (self.collisionbox[4] + 0.5)
+
+		local dir_x = -math.sin(yaw) * (prop.collisionbox[4] + 0.5)
+		local dir_z = math.cos(yaw) * (prop.collisionbox[4] + 0.5)
 		local nod = minetest.get_node_or_nil({
 			x = pos.x + dir_x,
 			y = pos.y + 0.5,

stone_monster.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 local stone_types = {
 

tree_monster.lua

@@ -1,5 +1,5 @@
-
+-- Translation support
-local S = mobs.intllib_monster
+local S = minetest.get_translator("mobs_monster")
 
 local tree_types = {