Merge branch 'unstable'

This commit is contained in:
AntumDeluge 2017-05-28 21:48:11 -07:00
commit 24cc8134c4
3 changed files with 7 additions and 2 deletions

View File

@ -525,7 +525,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
[patch.minetest]: https://github.com/AntumDeluge/mtgame-minetest/tree/914595e
[patch.mobf_core]: https://github.com/AntumDeluge/mtmp-mobf_core/tree/e6fa3b7
[patch.mobs_goblins]: https://github.com/AntumDeluge/mtmod-mobs_goblins/tree/2b40fab
[patch.mobs_redo]: https://github.com/AntumDeluge/mtmod-mobs_redo/tree/58e123a
[patch.mobs_redo]: https://github.com/AntumDeluge/mtmod-mobs_redo/tree/a6613ec
[patch.moreblocks]: https://github.com/AntumDeluge/mtmod-moreblocks/tree/b52a403
[patch.moremesecons]: https://github.com/AntumDeluge/mtmp-moremesecons/tree/cae948e
[patch.moreores]: https://github.com/AntumDeluge/mtmod-moreores/tree/8b874f6

View File

@ -2404,6 +2404,11 @@ end
mobs.spawning_mobs = {}
local mobs_blood = "mobs_blood"
if not minetest.setting_getbool("mobs_enable_blood") then
mobs_blood = mobs_blood .. "_transparent"
end
-- register mob entity
function mobs:register_mob(name, def)
@ -2458,7 +2463,7 @@ minetest.register_entity(name, {
recovery_time = def.recovery_time or 0.5,
knock_back = def.knock_back or 3,
blood_amount = def.blood_amount or 5,
blood_texture = def.blood_texture or "mobs_blood.png",
blood_texture = def.blood_texture or mobs_blood .. ".png",
shoot_offset = def.shoot_offset or 0,
floats = def.floats or 1, -- floats in water by default
replace_rate = def.replace_rate,

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 B