diff --git a/mods/ENTITIES/mobs_mc/1_items_default.lua b/mods/ENTITIES/mobs_mc/1_items_default.lua index 9e7d36c32..07b3ba633 100644 --- a/mods/ENTITIES/mobs_mc/1_items_default.lua +++ b/mods/ENTITIES/mobs_mc/1_items_default.lua @@ -335,8 +335,8 @@ end if c("porkchop_raw") and c("porkchop_cooked") then minetest.register_craft({ type = "cooking", - output = "mobs_mc:porkchop_raw", - recipe = "mobs_mc:porkchop_cooked", + output = "mobs_mc:porkchop_cooked", + recipe = "mobs_mc:porkchop_raw", cooktime = 5, }) end diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md index 5af2ee46b..d207c733d 100644 --- a/mods/ENTITIES/mobs_mc/LICENSE-media.md +++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md @@ -23,9 +23,28 @@ Origin of those models: ## Textures -* Mob and item textures from [Pixel Perfection](https://www.planetminecraft.com/texture_pack/131pixel-perfection/), a texture pack for Minecraft. - * Author: [XSSheep](https://www.planetminecraft.com/member/xssheep/) - * License: CC BY-SA 4.0 +* Mob and item textures are heavily based on [Pixel Perfection](https://www.planetminecraft.com/texture_pack/131pixel-perfection/), a texture pack for Minecraft. + * Original author: [XSSheep](https://www.planetminecraft.com/member/xssheep/) + * License (if not mentioned otherwise): CC BY-SA 4.0 + * Some textures have been modified or added + * Modifications by MysticTempest: + * `mobs_mc_cave_spider.png` + * `mobs_mc_enderman_eyes.png` + * `mobs_mc_enderman.png` + * `mobs_mc_ghast.png` + * `mobs_mc_skeleton.png` + * `mobs_mc_slime.png` + * `mobs_mc_spider_eyes.png` + * `mobs_mc_spider.png` + * `mobs_mc_squid.png` + * `mobs_mc_zombie.png` + * Additions by MysticTempest: + * `mobs_mc_parrot_blue.png` + * `mobs_mc_parrot_green.png` + * `mobs_mc_parrot_grey.png` + * `mobs_mc_parrot_red_blue.png` + * `mobs_mc_parrot_yellow_blue.png` + * “Spawn egg” textures (`mobs_mc_spawn_icon_*`) by 22i * Any other texture not mentioned here are licensed under the MIT License @@ -67,4 +86,11 @@ Origin of those models: * `mobs_spider.ogg` * BrandonReese (LGPL v2.1) * `mobs_eerie.ogg` - +* [Under7dude](https://freesound.org/people/Under7dude/) (CC0) + * `mobs_mc_zombie_idle.ogg` + * Source: +* [haratman](https://freesound.org/people/haratman/) (CC0) + * `mobs_mc_zombie_death.ogg` + * Source: + * `mobs_mc_zombie_hurt.ogg` + * Source: diff --git a/mods/ENTITIES/mobs_mc/README.md b/mods/ENTITIES/mobs_mc/README.md index 6803451a4..a52bce090 100644 --- a/mods/ENTITIES/mobs_mc/README.md +++ b/mods/ENTITIES/mobs_mc/README.md @@ -9,6 +9,7 @@ This mod adds mobs which closely resemble the mobs from the game Minecraft, vers * [toby109tt](https://github.com/tobyplowy): Mapping fixes - better 2D planes * [22i](https://github.com/22i): Models (done in Blender) and mob icons for spawn eggs * [XSSheep](https://www.planetminecraft.com/member/xssheep/): Mob and item textures (from [Pixel Perfection](https://www.planetminecraft.com/texture_pack/131pixel-perfection/) +* MysticTempest: More mob textures * See `LICENSE_media.md` for detailed credits about each file ## Licensing diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua index 47e0940d0..34c29ede5 100644 --- a/mods/ENTITIES/mobs_mc/horse.lua +++ b/mods/ENTITIES/mobs_mc/horse.lua @@ -282,9 +282,10 @@ zombie_horse.drops = { max = 2,}, } zombie_horse.sounds = { - random = "zombie1", - death = "zombiedeath", - damage = "zombiehurt1", + random = "mobs_mc_zombie_idle", + war_cry = "mobs_mc_zombie_idle", + death = "mobs_mc_zombie_death", + damage = "mobs_mc_zombie_hurt", distance = 16, } mobs:register_mob("mobs_mc:zombie_horse", zombie_horse) diff --git a/mods/ENTITIES/mobs_mc/init.lua b/mods/ENTITIES/mobs_mc/init.lua index 63e98704d..22d9848eb 100644 --- a/mods/ENTITIES/mobs_mc/init.lua +++ b/mods/ENTITIES/mobs_mc/init.lua @@ -29,28 +29,9 @@ dofile(path .. "/0_gameconfig.lua") --Items dofile(path .. "/1_items_default.lua") ---IN CASE THROWING IS NOT INSTALLED, THIS FIXES IT -if not minetest.get_modpath("throwing") then - dofile(minetest.get_modpath("mobs_mc").."/2_throwing.lua") - minetest.register_alias("throwing:bow_wood", "mobs:bow_wood") - minetest.register_alias("throwing:arrow", "mobs:arrow") - mobs:alias_mob("throwing:arrow_entity", "mobs:arrow_entity") -else - minetest.register_alias("_:bow_wood", "throwing:bow_wood") - minetest.register_alias("_:arrow", "throwing:arrow") - mobs:alias_mob("_:arrow_entity", "throwing:arrow_entity") -end +-- Bow, arrow and throwables +dofile(path .. "/2_throwing.lua") -if not minetest.get_modpath("mcl_throwing") then - dofile(minetest.get_modpath("mobs_mc").."/2_throwing.lua") - minetest.register_alias("throwing:bow_wood", "mcl_throwing:bow") - minetest.register_alias("throwing:arrow", "mcl_throwing:arrow") - mobs:alias_mob("throwing:arrow_entity", "mcl_throwing:arrow_entity") -else - minetest.register_alias("_:bow", "throwing:bow_wood") - minetest.register_alias("_:arrow", "throwing:arrow") - mobs:alias_mob("_:arrow_entity", "throwing:arrow_entity") -end -- Shared functions dofile(path .. "/3_shared.lua") diff --git a/mods/ENTITIES/mobs_mc/parrot.lua b/mods/ENTITIES/mobs_mc/parrot.lua index 8c1e95ab6..21e1b965c 100644 --- a/mods/ENTITIES/mobs_mc/parrot.lua +++ b/mods/ENTITIES/mobs_mc/parrot.lua @@ -89,7 +89,7 @@ mobs:register_mob("mobs_mc:parrot", { --spawn -- TODO: Increase spawn chance if polished ---mobs:spawn_specific("mobs_mc:parrot", mobs_mc.spawn.jungle, {"air"}, 0, minetest.LIGHT_MAX+1, 20, 20000, 2, 15, 20) +mobs:spawn_specific("mobs_mc:parrot", mobs_mc.spawn.jungle, {"air"}, 0, minetest.LIGHT_MAX+1, 20, 20000, 2, 15, 20) -- spawn eggs mobs:register_egg("mobs_mc:parrot", S("Parrot"), "mobs_mc_spawn_icon_parrot.png", 0) diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_death.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_death.ogg new file mode 100644 index 000000000..9a54d3575 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_death.ogg differ diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_growl.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_growl.ogg new file mode 100644 index 000000000..5e8132eeb Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_growl.ogg differ diff --git a/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_hurt.ogg b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_hurt.ogg new file mode 100644 index 000000000..845a71ccb Binary files /dev/null and b/mods/ENTITIES/mobs_mc/sounds/mobs_mc_zombie_hurt.ogg differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_TEMP_wither_projectile.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_TEMP_wither_projectile.png new file mode 100644 index 000000000..dfd13dfa8 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_TEMP_wither_projectile.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_cave_spider.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_cave_spider.png index 5701ebc67..9fb9d35e5 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_cave_spider.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_cave_spider.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_dragon_fireball.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_dragon_fireball.png new file mode 100644 index 000000000..69e643b13 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_dragon_fireball.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman.png index c2c9cb0e4..e9475a222 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_eyes.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_eyes.png index 6e4e8f2b4..ee3ab74e8 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_eyes.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_enderman_eyes.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_ghast.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_ghast.png index 47335ec96..dc2addc1d 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_ghast.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_ghast.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_blue.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_blue.png new file mode 100644 index 000000000..b21c4f25f Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_blue.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_green.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_green.png new file mode 100644 index 000000000..448444e34 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_green.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_grey.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_grey.png new file mode 100644 index 000000000..ce723561c Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_grey.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_red_blue.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_red_blue.png new file mode 100644 index 000000000..03eefc74f Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_red_blue.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_yellow_blue.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_yellow_blue.png new file mode 100644 index 000000000..1979d9076 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_parrot_yellow_blue.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton.png index abcfdbeb7..0af86cd6a 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_slime.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_slime.png index e1f29babe..19e9010cf 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_slime.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_slime.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider.png index 7146ba2a9..155544c19 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider_eyes.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider_eyes.png index 2bbc2696c..6a134bb5c 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider_eyes.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spider_eyes.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_squid.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_squid.png index 0ad839506..463b39294 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_squid.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_squid.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_zombie.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_zombie.png index 734327f48..ef85701e8 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_zombie.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_zombie.png differ diff --git a/mods/ENTITIES/mobs_mc/villager_zombie.lua b/mods/ENTITIES/mobs_mc/villager_zombie.lua index 79809ee55..93b0c4f36 100644 --- a/mods/ENTITIES/mobs_mc/villager_zombie.lua +++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua @@ -59,9 +59,10 @@ mobs:register_mob("mobs_mc:villager_zombie", { max = 1,}, }, sounds = { - random = "Villager1", - death = "Villagerdead", - damage = "Villagerhurt1", + random = "mobs_mc_zombie_idle", + war_cry = "mobs_mc_zombie_idle", + death = "mobs_mc_zombie_death", + damage = "mobs_mc_zombie_hurt", distance = 16, }, animation = { diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua index d1c57a13f..6732231fb 100644 --- a/mods/ENTITIES/mobs_mc/zombie.lua +++ b/mods/ENTITIES/mobs_mc/zombie.lua @@ -29,9 +29,10 @@ local zombie = { visual_size = {x=3, y=3}, makes_footstep_sound = true, sounds = { - random = "zombie1", - death = "zombiedeath", - damage = "zombiehurt1", + random = "mobs_mc_zombie_idle", + war_cry = "mobs_mc_zombie_idle", + death = "mobs_mc_zombie_death", + damage = "mobs_mc_zombie_hurt", distance = 16, }, walk_velocity = .8, diff --git a/mods/ENTITIES/mobs_mc/zombiepig.lua b/mods/ENTITIES/mobs_mc/zombiepig.lua index f88a244d7..4ff64fb8e 100644 --- a/mods/ENTITIES/mobs_mc/zombiepig.lua +++ b/mods/ENTITIES/mobs_mc/zombiepig.lua @@ -29,9 +29,10 @@ local pigman = { textures = {{"mobs_mc_zombie_pigman.png^mobs_mc_zombie_pigman_sword.png"}}, visual_size = {x=3, y=3}, sounds = { - random = "zombie1", -- TODO: replace - death = "zombiedeath", -- TODO: replace - damage = "zombiehurt1", -- TODO: replace + random = "mobs_mc_zombie_idle", + war_cry = "mobs_mc_zombie_idle", + death = "mobs_mc_zombie_death", + damage = "mobs_mc_zombie_hurt", distance = 16, }, jump = true,