Commit 780258a3 authored by Milan's avatar Milan
Browse files

fix mergeconflict

parents 85b88993 5cabfdff

depends.txt

+1 −0
Original line number Diff line number Diff line 
default

mobs

intllib?

lucky_block?

dirt_monster.lua

+22 −5
Original line number Diff line number Diff line 


local S = mobs.intllib





-- Dirt Monster by PilzAdam



mobs:register_mob("mobs_monster:dirt_monster", {
@@ -33,7 +34,7 @@ mobs:register_mob("mobs_monster:dirt_monster", { 
	},

	water_damage = 1,

	lava_damage = 5,

	light_damage = 2,

	light_damage = 3,

	fear_height = 4,

	animation = {

		speed_normal = 15,
@@ -49,10 +50,26 @@ mobs:register_mob("mobs_monster:dirt_monster", { 
	},

})



mobs:register_spawn("mobs_monster:dirt_monster",

	{"default:dirt_with_grass", "ethereal:gray_dirt"}, 7, 0, 7000, 3, 31000, false)



local spawn_on = "default:dirt_with_grass"



if minetest.get_modpath("ethereal") then

	spawn_on = "ethereal:gray_dirt"

end



mobs:spawn({

	name = "mobs_monster:dirt_monster",

	nodes = {spawn_on},

	min_light = 0,

	max_light = 7,

	chance = 7000,

	active_object_count = 2,

	min_height = 0,

	day_toggle = false,

})





mobs:register_egg("mobs_monster:dirt_monster", S("Dirt Monster"), "default_dirt.png", 1)



-- compatibility

mobs:alias_mob("mobs:dirt_monster", "mobs_monster:dirt_monster")
 


mobs:alias_mob("mobs:dirt_monster", "mobs_monster:dirt_monster") -- compatibility

dungeon_master.lua

+19 −6
Original line number Diff line number Diff line 


local S = mobs.intllib





-- Dungeon Master by PilzAdam



mobs:register_mob("mobs_monster:dungeon_master", {
@@ -58,12 +59,22 @@ mobs:register_mob("mobs_monster:dungeon_master", { 
	},

})



mobs:register_spawn("mobs_monster:dungeon_master", {"default:stone"}, 7, 0, 7000, 2, -70)



mobs:spawn({

	name = "mobs_monster:dungeon_master",

	nodes = {"default:stone"},

	max_light = 7,

	chance = 7000,

	active_object_count = 1,

	max_height = -70,

})





mobs:register_egg("mobs_monster:dungeon_master", S("Dungeon Master"), "fire_basic_flame.png", 1, true)



-- compatibility

mobs:alias_mob("mobs:dungeon_master", "mobs_monster:dungeon_master")



mobs:alias_mob("mobs:dungeon_master", "mobs_monster:dungeon_master") -- compatibility





-- fireball (weapon)

mobs:register_arrow("mobs_monster:fireball", {
@@ -71,9 +82,11 @@ mobs:register_arrow("mobs_monster:fireball", { 
	visual_size = {x = 1, y = 1},

	textures = {"mobs_fireball.png"},

	velocity = 6,

--	tail = 1,

--	tail_texture = "mobs_fireball.png",

--	tail_size = 10,

	tail = 1,

	tail_texture = "mobs_fireball.png",

	tail_size = 10,

	glow = 5,

	expire = 0.1,



	-- direct hit, no fire... just plenty of pain

	hit_player = function(self, player)

init.lua

+2 −0
Original line number Diff line number Diff line
@@ -22,4 +22,6 @@ dofile(path .. "/lava_flan.lua") -- Zeg9 
dofile(path .. "/mese_monster.lua")

dofile(path .. "/spider.lua") -- AspireMint



dofile(path .. "/lucky_block.lua")



print ("[MOD] Mobs Redo 'Monsters' loaded")

lava_flan.lua

+14 −3
Original line number Diff line number Diff line 


local S = mobs.intllib





-- Lava Flan by Zeg9 (additional textures by JurajVajda)



mobs:register_mob("mobs_monster:lava_flan", {
@@ -56,12 +57,21 @@ mobs:register_mob("mobs_monster:lava_flan", { 
	end,

})



mobs:register_spawn("mobs_monster:lava_flan", {"default:lava_source"}, 15, 0, 1000, 3, 0)



mobs:spawn({

	name = "mobs_monster:lava_flan",

	nodes = {"default:lava_source"},

	chance = 1000,

	active_object_count = 2,

	max_height = 0,

})





mobs:register_egg("mobs_monster:lava_flan", S("Lava Flan"), "default_lava.png", 1)



-- compatibility

mobs:alias_mob("mobs:lava_flan", "mobs_monster:lava_flan")



mobs:alias_mob("mobs:lava_flan", "mobs_monster:lava_flan") -- compatibility





-- lava orb

minetest.register_craftitem(":mobs:lava_orb", {
@@ -77,6 +87,7 @@ minetest.register_craft({ 
	burntime = 80,

})





-- Lava Pick (digs and smelts at same time)



local old_handle_node_drops = minetest.handle_node_drops