From c600ea648fb9082a778d53543551bae50176eee0 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 20 May 2021 14:04:28 -0700 Subject: [PATCH] Update dungeon_master mod to Git commit 00c890f... https://github.com/AntumMT/mod-mob_dungeon_master/tree/00c890f --- README.md | 3 +++ mods/mobiles/dungeon_master/depends.txt | 3 --- mods/mobiles/dungeon_master/init.lua | 18 +++++++++++++++--- mods/mobiles/dungeon_master/mod.conf | 3 +++ 4 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 mods/mobiles/dungeon_master/depends.txt create mode 100644 mods/mobiles/dungeon_master/mod.conf diff --git a/README.md b/README.md index 9762f12f..9942ca94 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [chicken][creatures] ([Zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [b126cdb Git][ver.chicken] *2021-05-19* * [cow][mobs_cow] ([MIT][lic.mobs_cow]) -- version: [85af09a Git][ver.mobs_cow] *2021-05-19* * [dirt_monster][mobs_monster] ([MIT][lic.dirt_monster] -- version: [40c48e0 Git][ver.dirt_monster] *2021-05-20* + * [dungeon_master][mobs_monster] ([MIT][lic.dungeon_master] -- version: [00c890f Git][ver.dungeon_master] *2021-05-20* * [folks][] ([GPL][lic.gpl3.0]) -- version: [0.2.0][ver.folks] *2021-02-23* * [ghost][creatures] ([Zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [c09aacb Git][ver.ghost] *2021-05-19* * [horse][] ([MIT][lic.horse]) -- version: [3240dde Git][ver.horse] *2021-05-19* @@ -406,6 +407,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [lic.deploy_nodes]: mods/modpacks/deploy_nodes/LICENSE [lic.dirt_monster]: mods/mobiles/dirt_monster/license.txt [lic.drawers]: mods/storage/drawers/LICENSE.txt +[lic.dungeon_master]: mods/mobiles/dungeon_master/license.txt [lic.elevator]: mods/buildings/elevator/readme.txt [lic.enchanting]: mods/enchanting/LICENSE [lic.equip_exam]: mods/tools/equip_exam/LICENSE.txt @@ -525,6 +527,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.dinosaurs_aggressive]: https://github.com/AntumMT/mp-dinosaurs_aggressive/tree/874f299 [ver.dirt_monster]: https://github.com/AntumMT/mod-mob_dirt_monster/tree/40c48e0 [ver.drawers]: https://github.com/minetest-mods/drawers/releases/tag/v0.6.2 +[ver.dungeon_master]: https://github.com/AntumMT/mod-mob_dungeon_master/tree/00c890f [ver.enchanting]: https://github.com/minetest-mods/enchanting/tree/13ea31c [ver.equip_exam]: https://github.com/AntumMT/mod-equip_exam/releases/tag/v1.2 [ver.ethereal]: https://notabug.org/TenPlus1/ethereal/src/90cdf94ea6c54cd5e3fcc7f77d3b6121f963c379 diff --git a/mods/mobiles/dungeon_master/depends.txt b/mods/mobiles/dungeon_master/depends.txt deleted file mode 100644 index a3172c85..00000000 --- a/mods/mobiles/dungeon_master/depends.txt +++ /dev/null @@ -1,3 +0,0 @@ -default -mobs -intllib? diff --git a/mods/mobiles/dungeon_master/init.lua b/mods/mobiles/dungeon_master/init.lua index ead2e5b7..eaaa0494 100644 --- a/mods/mobiles/dungeon_master/init.lua +++ b/mods/mobiles/dungeon_master/init.lua @@ -4,7 +4,7 @@ local S = mobs.intllib -- Dungeon Master by PilzAdam -mobs:register_mob("mobs:dungeon_master", { +mobs:register_mob(":mobs:dungeon_master", { type = "monster", passive = false, damage = 4, @@ -71,11 +71,23 @@ mobs:spawn({ }) -mobs:register_egg("mobs:dungeon_master", S("Dungeon Master"), "fire_basic_flame.png", 1, true) +--mobs:register_egg("mobs:dungeon_master", S("Dungeon Master"), "fire_basic_flame.png", 1, true) +if core.global_exists("asm") then + asm.addEgg({ + name = "dungeon_master", + title = S("Dungeon Master"), + inventory_image = "fire_basic_flame.png", + spawn = "mobs:dungeon_master", + ingredients = "fire:permanent_flame", + }) +end +core.register_alias("mobs:dungeon_master", "spawneggs:dungeon_master") + +mobs:alias_mob("mobs_monster:dungeon_master", "mobs:dungeon_master") -- compatibility -- fireball (weapon) -mobs:register_arrow("mobs:fireball", { +mobs:register_arrow(":mobs:fireball", { visual = "sprite", visual_size = {x = 1, y = 1}, textures = {"mobs_fireball.png"}, diff --git a/mods/mobiles/dungeon_master/mod.conf b/mods/mobiles/dungeon_master/mod.conf new file mode 100644 index 00000000..de1fd945 --- /dev/null +++ b/mods/mobiles/dungeon_master/mod.conf @@ -0,0 +1,3 @@ +name = dungeon_master +depends = default, fire, mobs +optional_depends = intllib, asm_spawneggs