diff --git a/README.md b/README.md index 4d1fce0b..64735212 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * [painting][] (???) -- version [8961849 Git][ver.painting] *2016-05-05* * [pipeworks][] ([LGPL][lic.lgpl3.0] / [CC BY-SA][lic.ccbysa4.0]) -- version: [2670fd8 Git][ver.pipeworks] *2021-05-06* ([patched][patch.pipeworks]) * mobiles/ - * [chicken][creatures] ([Zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [d2ddf22 Git][ver.cmer_chicken] *2021-05-24* + * [chicken][creatures] ([Zlib][lic.creatures] / [CC BY-SA][lic.ccbysa3.0]) -- version: [6d0c186 Git][ver.cmer_chicken] *2021-05-25* * [cow][mobs_animal] ([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* @@ -522,7 +522,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [ver.christmas]: https://github.com/TheZenKitteh/minetest-christmas/tree/d3bd872 [ver.cleaner]: https://github.com/AntumMT/mod-cleaner/tree/e8359d8 [ver.cmer]: https://github.com/AntumMT/mod-cmer/tree/1000562 -[ver.cmer_chicken]: http://github.com/AntumMT/mod-cmer/tree/d2ddf22 +[ver.cmer_chicken]: http://github.com/AntumMT/mod-cmer/tree/6d0c186 [ver.cmer_ghost]: https://github.com/AntumMT/mod-cmer/tree/1ace22c [ver.cmer_oerkki]: https://github.com/AntumMT/mod-cmer/tree/6e043e9 [ver.cmer_shark]: https://github.com/AntumMT/mod-shark/tree/a39634a diff --git a/mods/core/antum/items/animal.lua b/mods/core/antum/items/animal.lua deleted file mode 100644 index 6b85b9be..00000000 --- a/mods/core/antum/items/animal.lua +++ /dev/null @@ -1,6 +0,0 @@ - -core.register_craftitem(":antum:feather", { - description = "Feather", - inventory_image = "antum_feather_white.png", -}) -core.register_alias("antum:feather_white", "antum:feather") diff --git a/mods/core/antum/items/init.lua b/mods/core/antum/items/init.lua index c0d36ba9..ffc3e3a1 100644 --- a/mods/core/antum/items/init.lua +++ b/mods/core/antum/items/init.lua @@ -1,6 +1,5 @@ local scripts = { - "animal", "tool", "misc", "spawneggs", diff --git a/mods/core/antum/overrides/crafting/castle_weapons.lua b/mods/core/antum/overrides/crafting/castle_weapons.lua index 7e08fc72..e4a73450 100644 --- a/mods/core/antum/overrides/crafting/castle_weapons.lua +++ b/mods/core/antum/overrides/crafting/castle_weapons.lua @@ -24,7 +24,7 @@ if antum.dependsSatisfied({"throwing", "antum"}) then antum.registerCraft({ output = "castle_weapons:crossbow_bolt 6", recipe = { - {"antum:feather", "default:stick", "default:steel_ingot"}, + {"creatures:feather", "default:stick", "default:steel_ingot"}, }, }) @@ -32,7 +32,7 @@ if antum.dependsSatisfied({"throwing", "antum"}) then antum.registerCraft({ output = "castle_weapons:crossbow_bolt 6", recipe = { - {"default:steel_ingot", "default:stick", "antum:feather"}, + {"default:steel_ingot", "default:stick", "creatures:feather"}, }, }) end diff --git a/mods/core/antum/spawneggs/eggs.lua b/mods/core/antum/spawneggs/eggs.lua index 20a1a6f9..77d859ae 100644 --- a/mods/core/antum/spawneggs/eggs.lua +++ b/mods/core/antum/spawneggs/eggs.lua @@ -22,16 +22,6 @@ if core.get_modpath("spawneggs") then end end - --- Chicken spawnegg -if core.registered_entities["creatures:chicken"] then - asm.addEgg({ - name = "chicken", - spawn = "creatures:chicken", - ingredients = "antum:feather", - }) -end - -- cow if core.registered_entities["mobs_animal:cow"] and core.registered_items["mobs:bucket_milk"] then asm.addEgg({ diff --git a/mods/mobiles/chicken/init.lua b/mods/mobiles/chicken/init.lua index 687e399b..000f3ee0 100644 --- a/mods/mobiles/chicken/init.lua +++ b/mods/mobiles/chicken/init.lua @@ -165,3 +165,13 @@ local def = { } creatures.register_mob(def) + +if core.global_exists("asm") then + asm.addEgg({ + name = "chicken", + inventory_image = "creatures_chicken_spawnegg.png", + spawn = "creatures:chicken", + ingredients = "creatures:feather", + }) +end +core.register_alias("creatures:chicken", "spawneggs:chicken") diff --git a/mods/mobiles/chicken/mod.conf b/mods/mobiles/chicken/mod.conf index 05f705d2..346b4177 100644 --- a/mods/mobiles/chicken/mod.conf +++ b/mods/mobiles/chicken/mod.conf @@ -1,3 +1,4 @@ name = cmer_chicken title = Chicken for Revived Creatures mob engine. depends = cmer, default +optional_depends = asm_spawneggs diff --git a/mods/mobiles/chicken/textures/creatures_chicken_spawnegg.png b/mods/mobiles/chicken/textures/creatures_chicken_spawnegg.png new file mode 100644 index 00000000..02cb477c Binary files /dev/null and b/mods/mobiles/chicken/textures/creatures_chicken_spawnegg.png differ