diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_skeleton.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_skeleton.b3d index a5f007cf15..be4094c1bc 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_skeleton.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_skeleton.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_stray.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_stray.b3d index aab6342f31..c8eefe0332 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_stray.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_stray.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_vex.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_vex.b3d index b6f79b45c8..f52772dd6d 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_vex.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_vex.b3d differ diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua index 7632adcd71..195e833816 100644 --- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua +++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua @@ -25,9 +25,10 @@ local skeleton = { group_attack = true, visual = "mesh", mesh = "mobs_mc_skeleton.b3d", - textures = { - {"mobs_mc_skeleton.png^mobs_mc_skeleton_bow.png"}, - }, + textures = { { + "mcl_bows_bow_0.png", -- bow + "mobs_mc_skeleton.png", -- skeleton + } }, visual_size = {x=3, y=3}, makes_footstep_sound = true, sounds = { @@ -104,7 +105,11 @@ mobs:register_mob("mobs_mc:skeleton", skeleton) local stray = table.copy(skeleton) stray.mesh = "mobs_mc_stray.b3d" stray.textures = { - {"mobs_mc_stray.png"}, + { + "mcl_bows_bow_0.png", + "mobs_mc_stray.png", + "mobs_mc_stray_overlay.png", + }, } -- TODO: different sound (w/ echo) -- TODO: stray's arrow inflicts slowness status diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton_bow.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton_bow.png deleted file mode 100644 index 1dfcc18d67..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton_bow.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray.png index d97b8065e8..21f15614db 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_bow.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_bow.png deleted file mode 100644 index 6116fe2a79..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_bow.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_overlay.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_overlay.png new file mode 100644 index 0000000000..ab00032b22 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_stray_overlay.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_sword.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_sword.png deleted file mode 100644 index 340ca52a83..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_vex_sword.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_zombie_pigman_sword.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_zombie_pigman_sword.png deleted file mode 100644 index 976d3abf46..0000000000 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_zombie_pigman_sword.png and /dev/null differ diff --git a/mods/ENTITIES/mobs_mc/vex.lua b/mods/ENTITIES/mobs_mc/vex.lua index 74136c0903..b7d1570d3b 100644 --- a/mods/ENTITIES/mobs_mc/vex.lua +++ b/mods/ENTITIES/mobs_mc/vex.lua @@ -7,14 +7,10 @@ local MP = minetest.get_modpath(minetest.get_current_modname()) local S, NS = dofile(MP.."/intllib.lua") - ---dofile(minetest.get_modpath("mobs").."/api.lua") --################### --################### VEX --################### - - mobs:register_mob("mobs_mc:vex", { type = "monster", pathfinding = 1, @@ -27,7 +23,10 @@ mobs:register_mob("mobs_mc:vex", { visual = "mesh", mesh = "mobs_mc_vex.b3d", textures = { - {"mobs_mc_vex.png^mobs_mc_vex_sword.png"}, + { + "default_tool_steelsword.png", + "mobs_mc_vex.png", + }, }, visual_size = {x=1.25, y=1.25}, damage = 9, @@ -42,21 +41,26 @@ mobs:register_mob("mobs_mc:vex", { distance = 16, }, animation = { - stand_speed = 25, walk_speed = 25, run_speed = 50, - stand_start = 40, stand_end = 80, - walk_start = 0, walk_end = 40, - run_start = 0, run_end = 40, + stand_speed = 25, + walk_speed = 25, + run_speed = 50, + stand_start = 40, + stand_end = 80, + walk_start = 0, + walk_end = 40, + run_start = 0, + run_end = 40, }, do_custom = function(self, dtime) -- Glow red while attacking if self.state == "attack" then - if self.base_texture[1] ~= "mobs_mc_vex_charging.png^mobs_mc_vex_sword.png" then - self.base_texture = {"mobs_mc_vex_charging.png^mobs_mc_vex_sword.png"} + if self.base_texture[2] ~= "mobs_mc_vex_charging.png" then + self.base_texture[2] = "mobs_mc_vex_charging.png" self.object:set_properties({textures=self.base_texture}) end else - if self.base_texture[1] ~= "mobs_mc_vex.png^mobs_mc_vex_sword.png" then - self.base_texture = {"mobs_mc_vex.png^mobs_mc_vex_sword.png"} + if self.base_texture[1] ~= "default_tool_steelsword.png" then + self.base_texture[1] = "default_tool_steelsword.png" self.object:set_properties({textures=self.base_texture}) end end diff --git a/mods/ENTITIES/mobs_mc/zombiepig.lua b/mods/ENTITIES/mobs_mc/zombiepig.lua index d84c68db5f..a21f18734f 100644 --- a/mods/ENTITIES/mobs_mc/zombiepig.lua +++ b/mods/ENTITIES/mobs_mc/zombiepig.lua @@ -27,11 +27,11 @@ local pigman = { collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, visual = "mesh", mesh = "mobs_mc_zombie_pigman.b3d", - textures = { + textures = { { "blank.png", --baby "default_tool_goldsword.png", --sword "mobs_mc_zombie_pigman.png", --pigman - }, + } }, visual_size = {x=3, y=3}, sounds = { random = "mobs_mc_zombie_idle", @@ -91,11 +91,11 @@ mobs:register_mob("mobs_mc:pigman", pigman) local baby_pigman = table.copy(pigman) baby_pigman.collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.94, 0.25} baby_pigman.visual_size = {x=pigman.visual_size.x/2, y=pigman.visual_size.y/2} -baby_pigman.textures = { - "mobs_mc_zombie_pigman.png", --baby - "default_tool_goldsword.png", --sword - "mobs_mc_zombie_pigman.png", --pigman -} +baby_pigman.textures = { { + "mobs_mc_zombie_pigman.png", --baby + "default_tool_goldsword.png", --sword + "mobs_mc_zombie_pigman.png", --pigman +} } baby_pigman.walk_velocity = 1.2 baby_pigman.run_velocity = 2.4 baby_pigman.light_damage = 0