diff --git a/0_gameconfig.lua b/0_gameconfig.lua index 14784d4..8b83b3f 100644 --- a/0_gameconfig.lua +++ b/0_gameconfig.lua @@ -33,7 +33,10 @@ mobs_mc.items = { egg = "mobs_mc:egg", ender_eye = "mobs_mc:ender_eye", ghast_tear = "mobs_mc:ghast_tear", - saddle = "mobs_mc:saddle", + saddle = "mobs:saddle", + iron_horse_armor = "mobs_mc:iron_horse_armor", + gold_horse_armor = "mobs_mc:gold_horse_armor", + diamond_horse_armor = "mobs_mc:diamond_horse_armor", porkchop_raw = "mobs_mc:porkchop_raw", porkchop_cooked = "mobs_mc:porkchop_cooked", carrot_on_a_stick = "mobs_mc:carrot_on_a_stick", diff --git a/1_items_default.lua b/1_items_default.lua index 473d0d8..5719503 100644 --- a/1_items_default.lua +++ b/1_items_default.lua @@ -236,7 +236,8 @@ end -- Saddle if c("saddle") then - minetest.register_craftitem("mobs_mc:saddle", { + -- Overwrite the saddle from Mobs Redo + minetest.register_craftitem(":mobs:saddle", { description = "Saddle", inventory_image = "mcl_mobitems_saddle.png", stack_max = 1, @@ -254,6 +255,36 @@ if c("saddle") and c("lether") and c("string") and c("iron_ingot") then }) end +-- Horse Armor +-- TODO: Balance the horse armor strength, compare with MC armor strength +if c("iron_horse_armor") then + minetest.register_craftitem("mobs_mc:iron_horse_armor", { + description = "Iron Horse Armor", + inventory_image = "mobs_mc_iron_horse_armor.png", + _horse_overlay_image = "mobs_mc_horse_armor_iron.png", + stack_max = 1, + groups = { horse_armor = 85 }, + }) +end +if c("gold_horse_armor") then + minetest.register_craftitem("mobs_mc:gold_horse_armor", { + description = "Golden Horse Armor", + inventory_image = "mobs_mc_gold_horse_armor.png", + _horse_overlay_image = "mobs_mc_horse_armor_gold.png", + stack_max = 1, + groups = { horse_armor = 60 }, + }) +end +if c("diamond_horse_armor") then + minetest.register_craftitem("mobs_mc:diamond_horse_armor", { + description = "Diamond Horse Armor", + inventory_image = "mobs_mc_diamond_horse_armor.png", + _horse_overlay_image = "mobs_mc_horse_armor_diamond.png", + stack_max = 1, + groups = { horse_armor = 45 }, + }) +end + -- Pig if c("porkchop_raw") then minetest.register_craftitem("mobs_mc:porkchop_raw", { diff --git a/_LICENSE-media b/_LICENSE-media index cb7b42e..594d83c 100644 --- a/_LICENSE-media +++ b/_LICENSE-media @@ -3,21 +3,52 @@ --made for MC like Survival game --License for code GPL and otherwise stated in readmes such as this one. -#### Links -[blender models](https://github.com/22i/minecraft-voxel-blender-models), -[mobs_mc](https://github.com/maikerumine/mobs_mc), -[how to recreate mobs from textures with Blender and Gimp](http://imgur.com/a/Iqg88) +## Links -Minecraft mobs were remade in blender -Credits:[22i](https://github.com/22i) All 3-D Models - Most of the models, otherwise stated elsewhere.[toby109tt](https://github.com/tobyplowy) mapping fixes - better 2d planes.[maikerumine](https://github.com/maikerumine) Coding behaviour, spawning, drops, and misc.[wuzzy2](https://github.com/Wuzzy2) Zombies, Husks, Item textures, and lots of code. +* [Blender models](https://github.com/22i/minecraft-voxel-blender-models), +* [mobs_mc](https://github.com/maikerumine/mobs_mc), +* [How to recreate mobs from textures with Blender and Gimp](http://imgur.com/a/Iqg88) -Sounds:  W.I.P. -Pig sounds: mobs_pig, mobs_pig_angryPig sounds taken from mobs_animal mod, licensed under MIT LicensePig textures: From Faithful Vanilla +### Credits -Chicken sounds:- `mobs_mc_chicken_lay_egg.ogg` - WTFPL, by PilzAdam and Wuzzy- `mobs_chicken.ogg` - MIT License, from `mobs_animal` and `mobs_monster` by TenPlus1 +Minecraft mobs were remade in Blender by hand -Slimes sounds:- Author: Tomas J. Luis -- Original sound for slime damage by RandomationPictures under licence CC0 1.0.http://www.freesound.org/people/RandomationPictures/sounds/138481/ -- Original sounds for slime jump, land and death by Dr. Minky under licence CC BY 3.0.http://www.freesound.org/people/DrMinky/sounds/ +* [22i](https://github.com/22i): All 3-D models, most of the models, otherwise stated elsewhere. +* [toby109tt](https://github.com/tobyplowy): mapping fixes - better 2d planes. +* [maikerumine](https://github.com/maikerumine): Coding behaviour, spawning, drops, and misc. +* [Wuzzy2](https://github.com/Wuzzy2): Zombies, Husks, Item textures, and lots of code. + +#### Textures (W.I.P.) +* Pig textures: From Faithful Vanilla + +#### Sounds (W.I.P.) +Note: “*” is a placeholder. + +* Pig + * mobs_pig.ogg, mobs_pig_angry.ogg: From `mobs_animal` mod, licensed under MIT License +* Chicken + * `mobs_mc_chicken_lay_egg.ogg` - WTFPL, by PilzAdam and Wuzzy + * `mobs_chicken.ogg` - MIT License, from `mobs_animal` by TenPlus1 +* Slime + * Author: Tomas J. Luis + * Original sound for slime damage by Randomation (CC0); + * Source: http://www.freesound.org/people/RandomationPictures/sounds/138481/ + * Original sounds for slime jump, land and death by Dr. Minky under licence CC BY 3.0; http://www.freesound.org/people/DrMinky/sounds/ +* Ender dragon + * `mobs_mc_ender_dragon_*`: NPXcoot (https://github.com/NPXcoot1) CC BY-SA 4.0 +* Cow/Mooshroom + * `mobs_mc_cow.ogg`, CC0, by Freesound.org user Zozzy + * Source: +* Sheep + * `mobs_sheep.ogg`, CC BY 3.0, created by the Blender Foundation +* Llama: + * `mobs_mc_llama.ogg`, MIT License, from `mobs_animal` by TenPlus1 + +### License links + +* [CC0](https://creativecommons.org/choose/zero/) +* [CC BY 3.0](https://creativecommons.org/licenses/by/3.0/) +* [CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/) +* [GPLv3](https://www.gnu.org/licenses/gpl-3.0.html]) +* [MIT](https://opensource.org/licenses/MIT) -Mese Dragon sounds:NPXcoot   https://github.com/NPXcoot1 The license for all the models, textures and sound is 2 CC BY-SA 4.0 diff --git a/blaze.lua b/blaze.lua index 47c0d01..6b6a3ef 100644 --- a/blaze.lua +++ b/blaze.lua @@ -24,9 +24,9 @@ mobs:register_mob("mobs_mc:blaze", { }, visual_size = {x=3, y=3}, sounds = { - random = "blaze_breath", - death = "blaze_died", - damage = "blaze_hurt1", + random = "mobs_mc_blaze_breath", + death = "mobs_mc_blaze_died", + damage = "mobs_mc_blaze_hurt", distance = 16, }, walk_velocity = .8, diff --git a/cow+mooshroom.lua b/cow+mooshroom.lua index 19d0d6a..e396447 100644 --- a/cow+mooshroom.lua +++ b/cow+mooshroom.lua @@ -28,9 +28,9 @@ local cow_def = { light_damage = 0, runaway = true, sounds = { - random = "Cow1", - death = "Cowhurt1", - damage = "Cowhurt1", + random = "mobs_mc_cow", + death = "Cowhurt1", -- TODO: Replace + damage = "Cowhurt1", -- TODO: Replace distance = 16, }, animation = { diff --git a/ender_dragon.lua b/ender_dragon.lua index a941a07..374fb78 100644 --- a/ender_dragon.lua +++ b/ender_dragon.lua @@ -42,17 +42,17 @@ mobs:register_mob("mobs_mc:enderdragon", { collisionbox = {-2, 3, -2, 2, 5, 2}, physical = false, visual = "mesh", - mesh = "mobs_mc_ender_dragon.b3d", + mesh = "mobs_mc_dragon.b3d", textures = { - {"mobs_mc_enderdragon.png"}, + {"mobs_mc_dragon.png"}, }, visual_size = {x=3, y=3}, view_range = 35, walk_velocity = 6, run_velocity = 6, sounds = { - shoot_attack = "mesed", - attack = "mese_dragon", + shoot_attack = "mobs_mc_ender_dragon_shoot", + attack = "mobs_mc_ender_dragon_attack", distance = 60, }, physical = true, diff --git a/horse.lua b/horse.lua index 4a69e3b..ddd4388 100644 --- a/horse.lua +++ b/horse.lua @@ -10,7 +10,17 @@ --################### HORSE --################### -local horse_extra_texture = function(base, saddle, chest) +-- Return overlay texture for horse/donkey/mule, e.g. chest, saddle or horse armor +local horse_extra_texture = function(horse) + local base = horse._naked_texture + local saddle = horse._saddle + local chest = horse._chest + local armor = horse._horse_armor + if armor then + if minetest.get_item_group(armor, "horse_armor") > 0 then + base = base .. "^" .. minetest.registered_items[armor]._horse_overlay_image + end + end if saddle then base = base .. "^mobs_mc_horse_saddle.png" end @@ -20,6 +30,41 @@ local horse_extra_texture = function(base, saddle, chest) return base end +-- Helper functions to determine equipment rules +local can_equip_horse_armor = function(entity_id) + return entity_id == "mobs_mc:horse" or entity_id == "mobs_mc:skeleton_horse" or entity_id == "mobs_mc:zombie_horse" +end +local can_equip_chest = function(entity_id) + return entity_id == "mobs_mc:mule" or entity_id == "mobs_mc:donkey" +end + +--[[ Generate all possible horse textures. +Horse textures are a combination of a base texture and an optional marking overlay. ]] +-- The base horse textures +local horse_base = { + "mobs_mc_horse_brown.png", + "mobs_mc_horse_darkbrown.png", + "mobs_mc_horse_white.png", + "mobs_mc_horse_gray.png", + "mobs_mc_horse_black.png", + "mobs_mc_horse_chestnut.png", +} +-- Horse marking texture overlay, to be appended to the base texture string +local horse_markings = { + "", -- no markings + "^mobs_mc_horse_markings_whitedots.png", -- snowflake appaloosa + "^mobs_mc_horse_markings_blackdots.png", -- sooty + "^mobs_mc_horse_markings_whitefield.png", -- paint + "^mobs_mc_horse_markings_white.png", -- stockings and blaze +} + +local horse_textures = {} +for b=1, #horse_base do + for m=1, #horse_markings do + table.insert(horse_textures, { horse_base[b] .. horse_markings[m] }) + end +end + -- Horse local horse = { type = "animal", @@ -28,19 +73,12 @@ local horse = { visual_size = {x=3.0, y=3.0}, collisionbox = {-0.69825, -0.01, -0.69825, 0.69825, 1.59, 0.69825}, animation = { - speed_normal = 25, speed_run = 50, - stand_start = 0, stand_end = 0, - walk_start = 0, walk_end = 40, - run_start = 0, run_end = 40, - }, - textures = { - {"mobs_mc_horse_brown.png"}, - {"mobs_mc_horse_darkbrown.png"}, - {"mobs_mc_horse_white.png"}, - {"mobs_mc_horse_gray.png"}, - {"mobs_mc_horse_black.png"}, - {"mobs_mc_horse_chestnut.png"}, + stand_speed = 25, walk_speed = 25, run_speed = 50, + stand_start = 0, stand_end = 0, + walk_start = 0, walk_end = 40, + run_start = 0, run_end = 40, }, + textures = horse_textures, fear_height = 4, fly = false, walk_chance = 60, @@ -63,6 +101,9 @@ local horse = { do_custom = function(self, dtime) -- set needed values if not already present + if not self._regentimer then + self._regentimer = 0 + end if not self.v2 then self.v2 = 0 self.max_speed_forward = 7 @@ -74,6 +115,15 @@ local horse = { self.driver_scale = {x = 1/self.visual_size.x, y = 1/self.visual_size.y} end + -- Slowly regenerate health + self._regentimer = self._regentimer + dtime + if self._regentimer >= 4 then + if self.health < self.hp_max then + self.health = self.health + 1 + end + self._regentimer = 0 + end + -- if driver present allow control of horse if self.driver then @@ -88,9 +138,11 @@ local horse = { on_die = function(self, pos) -- drop saddle when horse is killed while riding + if self._saddle then + minetest.add_item(pos, mobs_mc.items.saddle) + end -- also detach from horse properly if self.driver then - minetest.add_item(pos, mobs_mc.items.saddle) mobs.detach(self.driver, {x = 1, y = 0, z = 1}) end @@ -108,8 +160,8 @@ local horse = { return end - -- make sure tamed horse is being clicked by owner only - if self.tamed and self.owner == clicker:get_player_name() then + -- Make sure tamed horse is mature and being clicked by owner only + if self.tamed and not self.child and self.owner == clicker:get_player_name() then local inv = clicker:get_inventory() @@ -118,42 +170,72 @@ local horse = { mobs.detach(clicker, {x = 1, y = 0, z = 1}) - -- add saddle back to inventory - if inv:room_for_item("main", mobs_mc.items.saddle) then - inv:add_item("main", mobs_mc.items.saddle) - else - minetest.add_item(clicker.getpos(), mobs_mc.items.saddle) - end - - -- Update texture - local tex = horse_extra_texture(self._naked_texture, false) - self.base_texture = { tex } - self.object:set_properties({textures = self.base_texture}) - - -- attach player to horse - elseif not self.driver + -- Put on saddle if tamed + elseif not self.driver and not self._saddle and clicker:get_wielded_item():get_name() == mobs_mc.items.saddle then - self.object:set_properties({stepheight = 1.1}) - mobs.attach(self, clicker) - - -- take saddle from inventory - inv:remove_item("main", mobs_mc.items.saddle) + -- Put on saddle and take saddle from player's inventory + local w = clicker:get_wielded_item() + self._saddle = true + if not minetest.settings:get_bool("creative_mode") then + w:take_item() + clicker:set_wielded_item(w) + end -- Update texture if not self._naked_texture then -- Base horse texture without chest or saddle self._naked_texture = self.base_texture[1] end - local tex = horse_extra_texture(self._naked_texture, true) + local tex = horse_extra_texture(self) self.base_texture = { tex } self.object:set_properties({textures = self.base_texture}) + -- Put on horse armor if tamed + elseif can_equip_horse_armor(self.name) and not self.driver and not self._horse_armor + and minetest.get_item_group(clicker:get_wielded_item():get_name(), "horse_armor") > 0 then + + + -- Put on armor and take armor from player's inventory + local w = clicker:get_wielded_item() + local armor = minetest.get_item_group(w:get_name(), "horse_armor") + self._horse_armor = w:get_name() + if not minetest.settings:get_bool("creative_mode") then + w:take_item() + clicker:set_wielded_item(w) + end + + -- Set horse armor strength + --[[ WARNING: This goes deep into the entity data structure and depends on + how Mobs Redo works internally. This code assumes that Mobs Redo uses + the fleshy group for armor. ]] + -- TODO: Change this code as soon Mobs Redo officially allows to change armor afterwards + self.armor = armor + local agroups = self.object:get_armor_groups() + agroups.fleshy = self.armor + self.object:set_armor_groups(agroups) + + -- Update texture + if not self._naked_texture then + -- Base horse texture without chest or saddle + self._naked_texture = self.base_texture[1] + end + local tex = horse_extra_texture(self) + self.base_texture = { tex } + self.object:set_properties({textures = self.base_texture}) + + + -- Mount horse + elseif not self.driver and self._saddle then + + self.object:set_properties({stepheight = 1.1}) + mobs.attach(self, clicker) + + -- Used to capture horse with magic lasso + elseif not self.driver and clicker:get_wielded_item():get_name() ~= "" then + mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) end end - - -- used to capture horse with magic lasso - mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) end } @@ -174,6 +256,7 @@ skeleton_horse.sounds = { damage = "skeletonhurt1", distance = 16, } +skeleton_horse.blood_amount = 0 mobs:register_mob("mobs_mc:skeleton_horse", skeleton_horse) -- Zombie horse @@ -196,7 +279,6 @@ mobs:register_mob("mobs_mc:zombie_horse", zombie_horse) -- Donkey local d = 0.86 -- donkey scale local donkey = table.copy(horse) -donkey.mesh = "mobs_mc_horse.b3d" donkey.textures = {{"mobs_mc_horse_creamy.png"}} donkey.animation = { speed_normal = 25, diff --git a/llama.lua b/llama.lua index 5dd7894..a2ef829 100644 --- a/llama.lua +++ b/llama.lua @@ -38,9 +38,8 @@ mobs:register_mob("mobs_mc:llama", { light_damage = 0, fear_height = 4, sounds = { - random = "mobs_sheep", - death = "mobs_sheep", - damage = "mobs_sheep", + random = "mobs_mc_llama", + -- TODO: Death and damage sounds distance = 16, }, animation = { @@ -74,7 +73,7 @@ mobs:register_mob("mobs_mc:llama", { self.driver_scale = {x = 1/self.visual_size.x, y = 1/self.visual_size.y} end - -- if driver present allow control of horse + -- if driver present allow control of llama if self.driver then mobs.drive(self, "walk", "stand", false, dtime) @@ -96,22 +95,22 @@ mobs:register_mob("mobs_mc:llama", { on_rightclick = function(self, clicker) - -- make sure player is clicking + -- Make sure player is clicking if not clicker or not clicker:is_player() then return end - -- feed, tame or heal horse + -- Feed, tame or heal llama if mobs:feed_tame(self, clicker, 1, true, true) then return end - -- make sure tamed horse is being clicked by owner only - if self.tamed and self.owner == clicker:get_player_name() then + -- Make sure tamed llama is mature and being clicked by owner only + if self.tamed and not self.child and self.owner == clicker:get_player_name() then local inv = clicker:get_inventory() - -- detatch player already riding horse + -- detatch player already riding llama if self.driver and clicker == self.driver then mobs.detach(clicker, {x = 1, y = 0, z = 1}) @@ -122,10 +121,11 @@ mobs:register_mob("mobs_mc:llama", { self.object:set_properties({stepheight = 1.1}) mobs.attach(self, clicker) end - end - -- used to capture horse with magic lasso - mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) + -- Used to capture llama with lasso + elseif not self.driver and clicker:get_wielded_item():get_name() ~= "" then + mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) + end end }) diff --git a/models/mobs_mc_ender_dragon.b3d b/models/mobs_mc_dragon.b3d similarity index 100% rename from models/mobs_mc_ender_dragon.b3d rename to models/mobs_mc_dragon.b3d diff --git a/models/mobs_mc_horse_skeleton.b3d b/models/mobs_mc_horse_skeleton.b3d deleted file mode 100644 index 74ceff6..0000000 Binary files a/models/mobs_mc_horse_skeleton.b3d and /dev/null differ diff --git a/models/mobs_mc_horse_zombie.b3d b/models/mobs_mc_horse_zombie.b3d deleted file mode 100644 index de5b114..0000000 Binary files a/models/mobs_mc_horse_zombie.b3d and /dev/null differ diff --git a/models/mobs_mc_magma_cube.b3d b/models/mobs_mc_magmacube.b3d similarity index 100% rename from models/mobs_mc_magma_cube.b3d rename to models/mobs_mc_magmacube.b3d diff --git a/models/mobs_mc_polar_bear.b3d b/models/mobs_mc_polarbear.b3d similarity index 100% rename from models/mobs_mc_polar_bear.b3d rename to models/mobs_mc_polarbear.b3d diff --git a/models/mobs_mc_sheep_sheared.b3d b/models/mobs_mc_sheep_sheared.b3d deleted file mode 100644 index 0b2db9f..0000000 Binary files a/models/mobs_mc_sheep_sheared.b3d and /dev/null differ diff --git a/models/mobs_mc_wither_skeleton.b3d b/models/mobs_mc_witherskeleton.b3d similarity index 100% rename from models/mobs_mc_wither_skeleton.b3d rename to models/mobs_mc_witherskeleton.b3d diff --git a/models/mobs_mc_villager_zombie.b3d b/models/mobs_mc_zvillager.b3d similarity index 100% rename from models/mobs_mc_villager_zombie.b3d rename to models/mobs_mc_zvillager.b3d diff --git a/pig.lua b/pig.lua index 3275111..8ae69a7 100644 --- a/pig.lua +++ b/pig.lua @@ -96,6 +96,10 @@ mobs:register_mob("mobs_mc:pig", { end end + if self.child then + return + end + -- Put saddle on pig local item = clicker:get_wielded_item() if item:get_name() == mobs_mc.items.saddle and self.saddle ~= "yes" then @@ -153,10 +157,11 @@ mobs:register_mob("mobs_mc:pig", { inv:set_stack("main",self.driver:get_wield_index(), wielditem) end return - end - -- used to capture pig with magic lasso - mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) + -- Capture pig with lasso + elseif not self.driver and clicker:get_wielded_item():get_name() ~= "" then + mobs:capture_mob(self, clicker, 0, 0, 80, false, nil) + end end, }) diff --git a/polar_bear.lua b/polar_bear.lua index 0175ce4..1221553 100644 --- a/polar_bear.lua +++ b/polar_bear.lua @@ -18,7 +18,7 @@ mobs:register_mob("mobs_mc:polar_bear", { hp_max = 30, collisionbox = {-0.7, -0.01, -0.7, 0.7, 1.39, 0.7}, visual = "mesh", - mesh = "mobs_mc_polar_bear.b3d", + mesh = "mobs_mc_polarbear.b3d", textures = { {"mobs_mc_polarbear.png"}, }, diff --git a/skeleton_wither.lua b/skeleton_wither.lua index b18d284..ab2308a 100644 --- a/skeleton_wither.lua +++ b/skeleton_wither.lua @@ -21,7 +21,7 @@ mobs:register_mob("mobs_mc:witherskeleton", { group_attack = true, collisionbox = {-0.35, -0.01, -0.35, 0.35, 2.39, 0.35}, visual = "mesh", - mesh = "mobs_mc_wither_skeleton.b3d", + mesh = "mobs_mc_witherskeleton.b3d", textures = { {"mobs_mc_witherskeleton.png"}, }, diff --git a/slime+magma_cube.lua b/slime+magma_cube.lua index 8494314..412b979 100644 --- a/slime+magma_cube.lua +++ b/slime+magma_cube.lua @@ -129,7 +129,7 @@ local magma_cube_big = { visual_size = {x=12.5, y=12.5}, textures = {{ "mobs_mc_magmacube.png" }}, visual = "mesh", - mesh = "mobs_mc_magma_cube.b3d", + mesh = "mobs_mc_magmacube.b3d", blood_texture = "lava_slime_blood.png", makes_footstep_sound = true, sounds = { diff --git a/sounds/blaze_breath.ogg b/sounds/mobs_mc_blaze_breath.ogg similarity index 100% rename from sounds/blaze_breath.ogg rename to sounds/mobs_mc_blaze_breath.ogg diff --git a/sounds/blaze_died.ogg b/sounds/mobs_mc_blaze_died.ogg similarity index 100% rename from sounds/blaze_died.ogg rename to sounds/mobs_mc_blaze_died.ogg diff --git a/sounds/blaze_hurt1.ogg b/sounds/mobs_mc_blaze_hurt.ogg similarity index 100% rename from sounds/blaze_hurt1.ogg rename to sounds/mobs_mc_blaze_hurt.ogg diff --git a/sounds/mobs_mc_cow.ogg b/sounds/mobs_mc_cow.ogg new file mode 100644 index 0000000..198375c Binary files /dev/null and b/sounds/mobs_mc_cow.ogg differ diff --git a/sounds/mese_dragon.ogg b/sounds/mobs_mc_ender_dragon_attack.ogg similarity index 100% rename from sounds/mese_dragon.ogg rename to sounds/mobs_mc_ender_dragon_attack.ogg diff --git a/sounds/mesed.ogg b/sounds/mobs_mc_ender_dragon_shoot.ogg similarity index 100% rename from sounds/mesed.ogg rename to sounds/mobs_mc_ender_dragon_shoot.ogg diff --git a/sounds/mobs_mc_llama.ogg b/sounds/mobs_mc_llama.ogg new file mode 100644 index 0000000..54f62cd Binary files /dev/null and b/sounds/mobs_mc_llama.ogg differ diff --git a/sounds/mobs_sheep.ogg b/sounds/mobs_sheep.ogg index 4e7e232..87296b6 100644 Binary files a/sounds/mobs_sheep.ogg and b/sounds/mobs_sheep.ogg differ diff --git a/textures/mobs_mc_diamond_horse_armor.png b/textures/mobs_mc_diamond_horse_armor.png new file mode 100644 index 0000000..121be08 Binary files /dev/null and b/textures/mobs_mc_diamond_horse_armor.png differ diff --git a/textures/mobs_mc_enderdragon.png b/textures/mobs_mc_dragon.png similarity index 100% rename from textures/mobs_mc_enderdragon.png rename to textures/mobs_mc_dragon.png diff --git a/textures/mobs_mc_gold_horse_armor.png b/textures/mobs_mc_gold_horse_armor.png new file mode 100644 index 0000000..f6b4fdf Binary files /dev/null and b/textures/mobs_mc_gold_horse_armor.png differ diff --git a/textures/mobs_mc_horse_armor_diamond.png b/textures/mobs_mc_horse_armor_diamond.png new file mode 100644 index 0000000..577eff1 Binary files /dev/null and b/textures/mobs_mc_horse_armor_diamond.png differ diff --git a/textures/mobs_mc_horse_armor_gold.png b/textures/mobs_mc_horse_armor_gold.png new file mode 100644 index 0000000..b8ebbfe Binary files /dev/null and b/textures/mobs_mc_horse_armor_gold.png differ diff --git a/textures/mobs_mc_horse_armor_iron.png b/textures/mobs_mc_horse_armor_iron.png new file mode 100644 index 0000000..217b6c5 Binary files /dev/null and b/textures/mobs_mc_horse_armor_iron.png differ diff --git a/textures/mobs_mc_horse_markings_blackdots.png b/textures/mobs_mc_horse_markings_blackdots.png new file mode 100644 index 0000000..b0dc0fc Binary files /dev/null and b/textures/mobs_mc_horse_markings_blackdots.png differ diff --git a/textures/mobs_mc_horse_markings_white.png b/textures/mobs_mc_horse_markings_white.png new file mode 100644 index 0000000..8dadffe Binary files /dev/null and b/textures/mobs_mc_horse_markings_white.png differ diff --git a/textures/mobs_mc_horse_markings_whitedots.png b/textures/mobs_mc_horse_markings_whitedots.png new file mode 100644 index 0000000..89fdc7c Binary files /dev/null and b/textures/mobs_mc_horse_markings_whitedots.png differ diff --git a/textures/mobs_mc_horse_markings_whitefield.png b/textures/mobs_mc_horse_markings_whitefield.png new file mode 100644 index 0000000..b5a4b5d Binary files /dev/null and b/textures/mobs_mc_horse_markings_whitefield.png differ diff --git a/textures/mobs_mc_iron_horse_armor.png b/textures/mobs_mc_iron_horse_armor.png new file mode 100644 index 0000000..4f078a9 Binary files /dev/null and b/textures/mobs_mc_iron_horse_armor.png differ diff --git a/villager_zombie.lua b/villager_zombie.lua index e7c50b5..c5f13cc 100644 --- a/villager_zombie.lua +++ b/villager_zombie.lua @@ -18,7 +18,7 @@ mobs:register_mob("mobs_mc:villager_zombie", { armor = 90, collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, visual = "mesh", - mesh = "mobs_mc_villager_zombie.b3d", + mesh = "mobs_mc_zvillager.b3d", textures = { {"mobs_mc_zombie_butcher.png"}, {"mobs_mc_zombie_farmer.png"}, diff --git a/wither.lua b/wither.lua index 29d17f8..fc39e50 100644 --- a/wither.lua +++ b/wither.lua @@ -32,8 +32,8 @@ mobs:register_mob("mobs_mc:wither", { run_velocity = 4, stepheight = 1.2, sounds = { - shoot_attack = "mesed", - attack = "mese_dragon", + shoot_attack = "mobs_mc_ender_dragon_shoot", + attack = "mobs_mc_ender_dragon_attack", distance = 60, }, jump = true,