diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index f7f2d47be5..46b157118e 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -11,9 +11,10 @@ local cow_def = { collisionbox = {-0.45, -0.01, -0.45, 0.45, 1.39, 0.45}, visual = "mesh", mesh = "mobs_mc_cow.b3d", - textures = { - {"mobs_mc_cow.png"}, - }, + textures = { { + "mobs_mc_cow.png", + "blank.png", + }, }, visual_size = {x=2.8, y=2.8}, makes_footstep_sound = true, walk_velocity = 1, @@ -79,7 +80,7 @@ mobs:register_mob("mobs_mc:cow", cow_def) local mooshroom_def = table.copy(cow_def) mooshroom_def.mesh = "mobs_mc_cow.b3d" -mooshroom_def.textures = { {"mobs_mc_mooshroom.png^mobs_mc_mooshroom_mooshroom.png"}, } +mooshroom_def.textures = { {"mobs_mc_mooshroom.png", "mobs_mc_mushroom_red.png"}, } mooshroom_def.on_rightclick = function(self, clicker) if mobs:feed_tame(self, clicker, 1, true, true) then return end if mobs:protect(self, clicker) then return end diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua index dd6c2aa599..1e9fab03e7 100644 --- a/mods/ENTITIES/mobs_mc/enderman.lua +++ b/mods/ENTITIES/mobs_mc/enderman.lua @@ -15,8 +15,12 @@ local S, NS = dofile(MP.."/intllib.lua") --################### local pr = PseudoRandom(os.time()*(-334)) -local take_frequency = 10 -local place_frequency = 10 + +-- How freqeuntly to take and place blocks, in seconds +local take_frequency_min = 25 +local take_frequency_max = 90 +local place_frequency_min = 10 +local place_frequency_max = 30 -- Create the textures table for the enderman, depending on which kind of block -- the enderman holds (if any). @@ -191,14 +195,16 @@ mobs:register_mob("mobs_mc:enderman", { _taken_node = "", do_custom = function(self, dtime) -- Take and put nodes - if not self._take_place_timer then + if not self._take_place_timer or not self._next_take_place_time then self._take_place_timer = 0 + self._next_take_place_time = math.random(take_frequency_min, take_frequency_max) return end self._take_place_timer = self._take_place_timer + dtime - if (self._taken_node == nil or self._taken_node == "") and self._take_place_timer >= take_frequency then + if (self._taken_node == nil or self._taken_node == "") and self._take_place_timer >= self._next_take_place_time then -- Take random node self._take_place_timer = 0 + self._next_take_place_time = math.random(place_frequency_min, place_frequency_max) local pos = self.object:getpos() local takable_nodes = minetest.find_nodes_in_area({x=pos.x-2, y=pos.y-1, z=pos.z-2}, {x=pos.x+2, y=pos.y+1, z=pos.z+2}, mobs_mc.enderman_takable) if #takable_nodes >= 1 then @@ -242,9 +248,10 @@ mobs:register_mob("mobs_mc:enderman", { end end end - elseif self._taken_node ~= nil and self._taken_node ~= "" and self._take_place_timer >= place_frequency then + elseif self._taken_node ~= nil and self._taken_node ~= "" and self._take_place_timer >= self._next_take_place_time then -- Place taken node self._take_place_timer = 0 + self._next_take_place_time = math.random(take_frequency_min, take_frequency_max) local pos = self.object:getpos() local yaw = self.object:get_yaw() -- Place node at looking direction diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua index d689993d4c..0db7163a3a 100644 --- a/mods/ENTITIES/mobs_mc/llama.lua +++ b/mods/ENTITIES/mobs_mc/llama.lua @@ -23,7 +23,16 @@ mobs:register_mob("mobs_mc:llama", { collisionbox = {-0.45, -0.01, -0.45, 0.45, 1.86, 0.45}, visual = "mesh", mesh = "mobs_mc_llama.b3d", - textures = {{"mobs_mc_llama.png"},{"mobs_mc_llama_brown.png"},{"mobs_mc_llama_creamy.png"},{"mobs_mc_llama_white.png"},{"mobs_mc_llama_gray.png"}}, + textures = { -- 1: chest -- 2: decor -- 3: llama base texture + {"blank.png", "blank.png", "mobs_mc_llama_brown.png"}, + {"blank.png", "blank.png", "mobs_mc_llama_creamy.png"}, + {"blank.png", "blank.png", "mobs_mc_llama_gray.png"}, + {"blank.png", "blank.png", "mobs_mc_llama_white.png"}, + {"blank.png", "blank.png", "mobs_mc_llama.png"}, + --{"mobs_mc_llama.png", "blank.png", "mobs_mc_llama.png"}, --lama with chest + --{"blank.png", "mobs_mc_decor_green.png", "mobs_mc_llama.png"}, --lama with decor + --{"mobs_mc_llama.png", "mobs_mc_decor_green.png", "mobs_mc_llama.png"}, --lama with everything + }, visual_size = {x=3, y=3}, makes_footstep_sound = true, runaway = true, diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d index 5d481aeefd..9ab4fc10cc 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d index 641b7e4a1e..2f13ba9c46 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d index 47f19fbd9a..bfeb5a6b62 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_guardian.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_guardian.b3d index 853b41e0f9..d1fed68ba4 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_guardian.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_guardian.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_illusioner.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_illusioner.b3d index ed0ae9d278..7bb719ffbf 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_illusioner.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_illusioner.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_iron_golem.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_iron_golem.b3d index dd1a986068..a7fbd352b3 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_iron_golem.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_iron_golem.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_llama.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_llama.b3d index cbcf1a6da5..5d6dd6b37a 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_llama.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_llama.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_polarbear.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_polarbear.b3d index bd8c734f9e..bb64b2b792 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_polarbear.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_polarbear.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_rabbit.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_rabbit.b3d index 3a9acff5a2..ad2067d7b5 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_rabbit.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_rabbit.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_silverfish.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_silverfish.b3d index b3d761479f..b550d563bb 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_silverfish.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_silverfish.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_spider.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_spider.b3d index fb55e49e92..aec461a6b6 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_spider.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_spider.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_squid.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_squid.b3d index fe1265533c..887576b28a 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_squid.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_squid.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_villager.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_villager.b3d index 0d974d55a0..1b92adfa59 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_villager.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_villager.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_zvillager.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_villager_zombie.b3d similarity index 52% rename from mods/ENTITIES/mobs_mc/models/mobs_mc_zvillager.b3d rename to mods/ENTITIES/mobs_mc/models/mobs_mc_villager_zombie.b3d index 76391dc7cd..9958b281aa 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_zvillager.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_villager_zombie.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_vindicator.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_vindicator.b3d index 17e779b7d3..ae14e8edbe 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_vindicator.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_vindicator.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_wither.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_wither.b3d index 32a24248f8..4669f3eb54 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_wither.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_wither.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_wolf.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_wolf.b3d index 9abd31a056..63db5e0970 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_wolf.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_wolf.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_zombie.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_zombie.b3d index 369722dc15..f357f68b52 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_zombie.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_zombie.b3d differ diff --git a/mods/ENTITIES/mobs_mc/shulker.lua b/mods/ENTITIES/mobs_mc/shulker.lua index aed2d2433f..f7f4dabca7 100644 --- a/mods/ENTITIES/mobs_mc/shulker.lua +++ b/mods/ENTITIES/mobs_mc/shulker.lua @@ -83,7 +83,7 @@ mobs:register_arrow("mobs_mc:shulkerbullet", { mobs:register_egg("mobs_mc:shulker", S("Shulker"), "mobs_mc_spawn_icon_shulker.png", 0) -mobs:spawn_specific("mobs_mc:shulker", mobs_mc.spawn.end_city, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 15000, 2, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max) +mobs:spawn_specific("mobs_mc:shulker", mobs_mc.spawn.end_city, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 5000, 2, mobs_mc.spawn_height.end_min, mobs_mc.spawn_height.end_max) if minetest.settings:get_bool("log_mods") then minetest.log("action", "MC Shulkers loaded") diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua index 73f37cc661..a04f705dff 100644 --- a/mods/ENTITIES/mobs_mc/spider.lua +++ b/mods/ENTITIES/mobs_mc/spider.lua @@ -54,10 +54,15 @@ local spider = { light_damage = 0, fear_height = 4, animation = { - speed_normal = 25, speed_run = 50, - stand_start = 40, stand_end = 80, - walk_start = 0, walk_end = 40, - run_start = 0, run_end = 40, + stand_speed = 10, + walk_speed = 25, + run_speed = 50, + stand_start = 20, + stand_end = 40, + walk_start = 0, + walk_end = 20, + run_start = 0, + run_end = 20, }, blood_amount = 0, } diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken.png index e76c85e74d..b9d69278e4 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png deleted file mode 100644 index 082901fd78..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist.png index f595dad95f..e6a0f86a62 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist_bow.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist_bow.png deleted file mode 100644 index 27e6703196..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_illusionist_bow.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_axe.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_axe.png new file mode 100644 index 0000000000..2fd16d0919 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_axe.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_golem.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_golem.png index 439ddbd178..99d2c56564 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_golem.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_golem.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama.png index 4eda8ab498..4a08544cfc 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_brown.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_brown.png index 3ee823af69..6cf366deb7 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_brown.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_brown.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_chest.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_chest.png deleted file mode 100644 index 85e321cda0..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_chest.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_creamy.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_creamy.png index 87901b4661..e1df4612f9 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_creamy.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_creamy.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_gray.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_gray.png index 43f9d59b64..b0830e0871 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_gray.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_gray.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_white.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_white.png index 8cf55f8274..85c291d7eb 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_white.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_white.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_mooshroom_mooshroom.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_mooshroom_mooshroom.png deleted file mode 100644 index eada719af8..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_mooshroom_mooshroom.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_mushroom_red.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_mushroom_red.png new file mode 100644 index 0000000000..8c22bd62a4 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_mushroom_red.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_cave_spider.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_cave_spider.png index 20fec90d74..d5f453de8d 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_cave_spider.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_cave_spider.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_enderman.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_enderman.png index e8b4227c43..da9ad35553 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_enderman.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_enderman.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_endermite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_endermite.png index 436f93ee02..8e0fdba942 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_endermite.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_endermite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_evoker.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_evoker.png index 08724e99a2..01908a557f 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_evoker.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_evoker.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_ghast.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_ghast.png index 0934eef091..ed3370dec3 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_ghast.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_ghast.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_skeleton.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_skeleton.png index 51288c552f..0f11de7c9f 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_skeleton.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_skeleton.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_zombie.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_zombie.png index 20f7729e9a..9c7db22490 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_zombie.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_horse_zombie.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_illusioner.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_illusioner.png index 8e8bb029dc..953e90f447 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_illusioner.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_illusioner.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_magmacube.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_magmacube.png index f1a3151d90..5d6d58d3f6 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_magmacube.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_magmacube.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_parrot.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_parrot.png index 988b8b1801..0deacd4c1c 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_parrot.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_parrot.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_skeleton.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_skeleton.png index 351c2f9cf9..ad6d9f228a 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_skeleton.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_skeleton.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_slime.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_slime.png index 5069e6fa88..6f2e397023 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_slime.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_slime.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_spider.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_spider.png index 1b9d6dfff4..f89a6ade25 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_spider.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_spider.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_squid.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_squid.png index 0e304ccc4a..73e475f467 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_squid.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_squid.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vex.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vex.png index 631a2fc156..8d01c05c29 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vex.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vex.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_villager.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_villager.png index 08c3d106b9..6b0d0c0836 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_villager.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_villager.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vindicator.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vindicator.png index dcc34566f0..a8b208c838 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vindicator.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_vindicator.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_zombie.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_zombie.png index f8b7b621a1..3d16dbb93f 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_zombie.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_spawn_icon_zombie.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_axe.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_axe.png deleted file mode 100644 index e8bf0611e2..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_axe.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png index e92d810e91..512eae60a1 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vindicator_base.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_witch.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_witch.png index 7595a5fc43..acdf2ff930 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_witch.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_witch.png differ diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 76a728e2f2..d4fdfcd815 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -22,12 +22,30 @@ mobs:register_mob("mobs_mc:villager", { visual = "mesh", mesh = "mobs_mc_villager.b3d", textures = { - {"mobs_mc_villager.png"}, - {"mobs_mc_villager_farmer.png"}, - {"mobs_mc_villager_priest.png"}, - {"mobs_mc_villager_librarian.png"}, - {"mobs_mc_villager_butcher.png"}, - {"mobs_mc_villager_smith.png"}, + { + "mobs_mc_villager.png", + "mobs_mc_villager.png", --hat + }, + { + "mobs_mc_villager_farmer.png", + "mobs_mc_villager_farmer.png", --hat + }, + { + "mobs_mc_villager_priest.png", + "mobs_mc_villager_priest.png", --hat + }, + { + "mobs_mc_villager_librarian.png", + "mobs_mc_villager_librarian.png", --hat + }, + { + "mobs_mc_villager_butcher.png", + "mobs_mc_villager_butcher.png", --hat + }, + { + "mobs_mc_villager_smith.png", + "mobs_mc_villager_smith.png", --hat + }, }, visual_size = {x=3, y=3}, makes_footstep_sound = true, @@ -42,7 +60,7 @@ mobs:register_mob("mobs_mc:villager", { }, animation = { stand_speed = 25, walk_speed = 25, run_speed = 50, - stand_start = 0, stand_end = 0, + stand_start = 40, stand_end = 59, walk_start = 0, walk_end = 40, run_start = 0, run_end = 40, }, diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua index 567f64dd9c..05ac68d415 100644 --- a/mods/ENTITIES/mobs_mc/villager_evoker.lua +++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua @@ -22,11 +22,12 @@ mobs:register_mob("mobs_mc:evoker", { hp_max = 24, collisionbox = {-0.4, -0.01, -0.4, 0.4, 1.95, 0.4}, visual = "mesh", - mesh = "mobs_mc_evoker.b3d", - textures = { - {"mobs_mc_evoker_base.png"}, + mesh = "mobs_mc_villager.b3d", + textures = { { + "mobs_mc_evoker_base.png", + "blank.png", --no hat -- TODO: Attack glow - }, + } }, visual_size = {x=3, y=3}, makes_footstep_sound = true, damage = 6, @@ -75,11 +76,12 @@ mobs:register_mob("mobs_mc:evoker", { stand_speed = 5, walk_start = 0, walk_end = 40, - shoot_start = 60, - shoot_end = 80, + shoot_start = 120, + shoot_end = 140, -- TODO: Implement and fix death animation - --die_start = 80, - --die_end = 130, + --die_start = 190, + --die_end = 200, + --die_speed = 15, --die_loop = false, }, water_damage = 0, diff --git a/mods/ENTITIES/mobs_mc/villager_illusioner.lua b/mods/ENTITIES/mobs_mc/villager_illusioner.lua index 8907ac535d..1c097b2c2d 100644 --- a/mods/ENTITIES/mobs_mc/villager_illusioner.lua +++ b/mods/ENTITIES/mobs_mc/villager_illusioner.lua @@ -18,9 +18,11 @@ mobs:register_mob("mobs_mc:illusioner", { collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, visual = "mesh", mesh = "mobs_mc_illusioner.b3d", - textures = { - {"mobs_mc_illusionist.png^mobs_mc_illusionist_bow.png"}, - }, + textures = { { + "mobs_mc_illusionist.png", + "mobs_mc_illusionist.png", --hat + "mcl_throwing_bow.png", + }, }, visual_size = {x=3, y=3}, walk_velocity = 0.6, run_velocity = 2, @@ -32,13 +34,14 @@ mobs:register_mob("mobs_mc:illusioner", { stand_end = 59, walk_start = 0, walk_end = 40, - shoot_start = 90, - shoot_end = 110, + shoot_start = 150, + shoot_end = 170, -- TODO: Implement and fix death animation - --die_start = 110, - --die_end = 130, + --die_start = 170, + --die_end = 180, + --die_speed = 15, --die_loop = false, - -- 60-80 magic arm swinging, 80-90 transition between magic to bow shooting + -- 120-140 magic arm swinging, 140-150 transition between magic to bow shooting }, view_range = 16, fear_height = 4, diff --git a/mods/ENTITIES/mobs_mc/villager_vindicator.lua b/mods/ENTITIES/mobs_mc/villager_vindicator.lua index 4c9dfa5208..821e4e0dc8 100644 --- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua +++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua @@ -22,10 +22,14 @@ mobs:register_mob("mobs_mc:vindicator", { collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, visual = "mesh", mesh = "mobs_mc_vindicator.b3d", - textures = { - {"mobs_mc_vindicator_axe.png"}, - -- TODO: Glow when attacking (mobs_mc_vindicator.png) - }, + textures = { + { + "mobs_mc_vindicator_base.png", + "blank.png", --no hat + "mobs_mc_iron_axe.png", + -- TODO: Glow when attacking (mobs_mc_vindicator.png) + }, + }, visual_size = {x=3, y=3}, makes_footstep_sound = true, damage = 13, @@ -49,18 +53,19 @@ mobs:register_mob("mobs_mc:vindicator", { damage = "Villagerhurt1", }, animation = { + stand_speed = 25, walk_speed = 25, run_speed = 25, + punch_speed = 25, stand_start = 40, stand_end = 59, - stand_speed = 5, walk_start = 0, walk_end = 40, punch_start = 90, punch_end = 110, -- TODO: Implement and fix death animation - --die_start = 110, - --die_end = 130, + --die_start = 170, + --die_end = 180, --die_loop = false, }, water_damage = 1, diff --git a/mods/ENTITIES/mobs_mc/villager_zombie.lua b/mods/ENTITIES/mobs_mc/villager_zombie.lua index b5c079c876..8993ef4755 100644 --- a/mods/ENTITIES/mobs_mc/villager_zombie.lua +++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua @@ -21,7 +21,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_zvillager.b3d", + mesh = "mobs_mc_villager_zombie.b3d", textures = { {"mobs_mc_zombie_butcher.png"}, {"mobs_mc_zombie_farmer.png"},