Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

dirt_monster.lua

@@ -31,6 +31,7 @@ mobs:register_mob("mobs_monster:dirt_monster", {
 	jump = true,
 	drops = {
 		{name = "default:dirt", chance = 1, min = 0, max = 2},
+	   {name = "maptools:silver_coin", chance = 2, min = 1, max = 1,},
 	},
 	water_damage = 1,
 	lava_damage = 5,

dungeon_master.lua

@@ -42,6 +42,9 @@ mobs:register_mob("mobs_monster:dungeon_master", {
 		{name = "default:mese_crystal", chance = 3, min = 0, max = 2},
 		{name = "default:diamond", chance = 4, min = 0, max = 1},
 		{name = "default:diamondblock", chance = 30, min = 0, max = 1},
+		{name = "mobs_monster:dungeon_master_blood", chance = 2, min = 0, max = 2,},
+		{name = "mobs_monster:dungeon_master_diamond", chance = 6, min = 0, max = 1,},
+		{name = "maptools:gold_coin", chance = 20, min = 0, max = 1,},
 	},
 	water_damage = 1,
 	lava_damage = 1,
@@ -64,7 +67,7 @@ mobs:register_mob("mobs_monster:dungeon_master", {
 
 mobs:spawn({
 	name = "mobs_monster:dungeon_master",
-	nodes = {"default:stone"},
+	nodes = {"default:stone", "default:sandstone", "nether:netherrack"},
 	max_light = 5,
 	chance = 9000,
 	active_object_count = 1,
@@ -138,4 +141,16 @@ mobs:register_arrow("mobs_monster:fireball", {
 	end
 })
 
---minetest.override_item("default:obsidian", {on_blast = function() end})
+minetest.register_craftitem(":mobs:dungeon_master_blood", {
+	description = "Dungeon Master Blood",
+	inventory_image = "mobs_dungeon_master_blood.png",
+	groups = {magic = 1},
+})
+minetest.register_alias("mobs_monster:dungeon_master_blood", "mobs:dungeon_master_blood")
+
+minetest.register_craftitem(":mobs:dungeon_master_diamond", {
+	description = "Dungeon Master Diamond",
+	inventory_image = "mobs_dungeon_master_diamond.png",
+	groups = {magic = 1},
+})
+minetest.register_alias("mobs_monster:dungeon_master_diamond", "mobs:dungeon_master_diamond")

init.lua

@@ -27,6 +27,7 @@ dofile(path .. "/tree_monster.lua")
 dofile(path .. "/lava_flan.lua") -- Zeg9
 dofile(path .. "/mese_monster.lua")
 dofile(path .. "/spider.lua") -- AspireMint
+dofile(path .. "/minotaur.lua") -- NALC(sys4 fork MFF) Kalabasa
 
 dofile(path .. "/lucky_block.lua")
 

mese_monster.lua

@@ -37,6 +37,8 @@ mobs:register_mob("mobs_monster:mese_monster", {
 	drops = {
 		{name = "default:mese_crystal", chance = 9, min = 0, max = 2},
 		{name = "default:mese_crystal_fragment", chance = 1, min = 0, max = 2},
+		{name = "maptools:silver_coin", chance = 1, min = 0, max = 2},
+		{name = "returnmirror:mirror_inactive", chance = 50, min = 1, max = 1},
 	},
 	water_damage = 1,
 	lava_damage = 1,
@@ -58,7 +60,7 @@ mobs:register_mob("mobs_monster:mese_monster", {
 
 mobs:spawn({
 	name = "mobs_monster:mese_monster",
-	nodes = {"default:stone"},
+	nodes = {"default:stone", "default:sandstone"},
 	max_light = 7,
 	chance = 5000,
 	active_object_count = 1,

minotaur.lua

@@ -0,0 +1,111 @@
+
+-- Minotaur Monster by ???
+
+mobs:register_mob("mobs_monster:minotaur", {
+	-- animal, monster, npc, barbarian
+	type = "monster",
+	-- aggressive, deals 11 damage to player when hit
+	passive = false,
+	attack_type = "dogfight",
+	pathfinding = false,
+	reach = 2,
+	damage = 6,
+	-- health & armor
+	hp_min = 45,
+	hp_max = 55,
+	armor = 90,
+	-- textures and model
+	collisionbox = {-0.9,-0.01,-0.9, 0.9,2.5,0.9},
+	visual = "mesh",
+	mesh = "mobs_minotaur.b3d",
+	textures = {
+		{"mobs_minotaur.png"},
+	},
+	visual_size = {x=1, y=1},
+	blood_texture = "mobs_blood.png",
+	-- sounds
+	makes_footstep_sound = true,
+	-- sounds = {
+		-- random = "mobs_zombie",
+		-- damage = "mobs_zombie_hit",
+		-- attack = "mobs_zombie_attack",
+		-- death = "mobs_zombie_death",
+	-- },
+	-- speed and jump
+	walk_velocity = 1,
+	run_velocity = 3,
+	jump = true,
+	floats = 1,
+	view_range = 16,
+	knock_back = 0.05,	--this is a test
+	-- drops desert_sand and coins when dead
+	drops = {
+		{name = "maptools:gold_coin", chance = 40, min = 1, max = 1,},
+		{name = "mobs_monster:minotaur_eye", chance = 2, min = 1, max = 2,},
+		{name = "mobs_monster:minotaur_horn", chance = 4, min = 1, max = 2,},
+		{name = "mobs_monster:minotaur_fur", chance = 1, min = 1, max = 3,},
+	},
+	water_damage = 0,
+	lava_damage = 5,
+	light_damage = 0,
+	-- model animation
+	animation = {
+		speed_normal = 15,		speed_run = 15,
+		stand_start  = 0,		stand_end = 19,
+		walk_start = 20,		walk_end  = 39,
+		run_start  = 20,		run_end = 39,
+		punch_start = 40,		punch_end = 50,
+	},
+					   })
+mobs:alias_mob("mobs:minotaur", "mobs_monster:minotaur")
+
+-- spawns on desert sand between -1 and 20 light, 1 in 100000 chance, 1 Minotaur in area up to 31000 in height
+--mobs:spawn_specific("mobs_monster:minotaur", {"default:dirt_with_dry_grass"}, {"air"}, -1, 20, 30, 50000, 1, -31000, 31000, false)
+mobs:spawn({
+	name = "mobs_monster:minotaur",
+	nodes = {"default:dirt_with_dry_grass", "default:desert_sand", "default:desert_stone"},
+	min_light = 0,
+	max_light = default.LIGHT_MAX,
+	chance = 7000,
+	active_object_count = 1,
+	min_height = -31000,
+	max_height = 31000,
+})
+
+-- register spawn egg
+mobs:register_egg("mobs_monster:minotaur", "Minotaur", "mobs_minotaur_inv.png", 1)
+
+minetest.register_craftitem(":mobs:minotaur_eye", {
+	description = "Minotaur Eye",
+	inventory_image = "mobs_minotaur_eye.png",
+	groups = {magic = 1},
+							 })
+mobs:alias_mob("mobs_monster:minotaur_eye", "mobs:minotaur_eye")
+
+minetest.register_craftitem(":mobs:minotaur_horn", {
+	description = "Minotaur Horn",
+	inventory_image = "mobs_minotaur_horn.png",
+	groups = {magic = 1},
+							  })
+mobs:alias_mob("mobs_monster:minotaur_horn", "mobs:minotaur_horn")
+
+minetest.register_craftitem(":mobs:minotaur_fur", {
+	description = "Minotaur Fur",
+	inventory_image = "mobs_minotaur_fur.png",
+	groups = {magic = 1},
+							 })
+mobs:alias_mob("mobs_monster:minotaur_fur", "mobs:minotaur_fur")
+
+minetest.register_craftitem(":mobs:minotaur_lots_of_fur", {
+	description = "Lot of Minotaur Fur",
+	inventory_image = "mobs_minotaur_lots_of_fur.png",
+	groups = {magic = 1},
+								 })
+mobs:alias_mob("mobs_monster:minotaur_lots_of_fur", "mobs:minotaur_lots_of_fur")
+
+minetest.register_craft({
+	output = "mobs_monster:minotaur_lots_of_fur",
+	recipe = {{"mobs_monster:minotaur_fur", "mobs_monster:minotaur_fur"},
+		{"mobs_monster:minotaur_fur", "mobs_monster:minotaur_fur"},
+	},
+})

oerkki.lua

@@ -32,6 +32,7 @@ mobs:register_mob("mobs_monster:oerkki", {
 	drops = {
 		{name = "default:obsidian", chance = 3, min = 0, max = 2},
 		{name = "default:gold_lump", chance = 2, min = 0, max = 2},
+	   {name = "maptools:silver_coin", chance = 1, min = 0, max = 1},
 	},
 	water_damage = 2,
 	lava_damage = 4,

sand_monster.lua

@@ -62,6 +62,7 @@ mobs:register_mob("mobs_monster:sand_monster", {
 	floats = 0,
 	drops = {
 		{name = "default:desert_sand", chance = 1, min = 3, max = 5},
+	   {name = "maptools:silver_coin", chance = 10, min = 1, max = 1,},
 	},
 	water_damage = 3,
 	lava_damage = 4,

spider.lua

@@ -47,6 +47,7 @@ mobs:register_mob("mobs_monster:spider", {
 	floats = 0,
 	drops = {
 		{name = "farming:string", chance = 1, min = 0, max = 2},
+		{name = "maptools:silver_coin", chance = 3, min = 0, max = 1,},
 	},
 	water_damage = 5,
 	lava_damage = 5,
@@ -242,3 +243,5 @@ minetest.register_craft({
 		{"farming:string", "", "farming:string"},
 	}
 })
+
+minetest.register_alias("mobs:spider_cobweb", "mobs:cobweb")

stone_monster.lua

@@ -35,6 +35,8 @@ mobs:register_mob("mobs_monster:stone_monster", {
 		{name = "default:cobble", chance = 1, min = 0, max = 2},
 		{name = "default:coal_lump", chance = 3, min = 0, max = 2},
 		{name = "default:iron_lump", chance = 5, min = 0, max = 2},
+		{name = "maptools:silver_coin", chance = 1, min = 0, max = 1,},
+		{name = "default:torch", chance = 2, min = 3, max = 5},
 	},
 	water_damage = 0,
 	lava_damage = 1,

tree_monster.lua

@@ -36,6 +36,8 @@ mobs:register_mob("mobs_monster:tree_monster", {
 		{name = "default:sapling", chance = 2, min = 0, max = 2},
 		{name = "default:junglesapling", chance = 3, min = 0, max = 2},
 		{name = "default:apple", chance = 4, min = 1, max = 2},
+		{name = "maptools:superapple", chance = 4, min = 0, max = 1,},
+		{name = "maptools:silver_coin", chance = 3, min = 0, max = 1,},
 	},
 	water_damage = 0,
 	lava_damage = 0,
@@ -69,7 +71,7 @@ mobs:register_mob("mobs_monster:tree_monster", {
 
 mobs:spawn({
 	name = "mobs_monster:tree_monster",
-	nodes = {"default:leaves", "default:jungleleaves"},
+	nodes = {"default:leaves", "default:jungleleaves", "moretrees:beech_leaves"},
 	max_light = 7,
 	chance = 7000,
 	min_height = 0,