diff --git a/mods/ENTITIES/mobs_mc/bat.lua b/mods/ENTITIES/mobs_mc/bat.lua index 5492add7..e5a7b60b 100644 --- a/mods/ENTITIES/mobs_mc/bat.lua +++ b/mods/ENTITIES/mobs_mc/bat.lua @@ -14,12 +14,11 @@ mobs:register_mob("mobs_mc:bat", { hp_min = 6, hp_max = 6, collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.89, 0.25}, - visual = "mesh", - mesh = "mobs_mc_bat.b3d", + visual = "sprite", textures = { - {"mobs_mc_bat.png"}, + {"mobs_mc_bat_sprite.png"}, }, - visual_size = {x=1, y=1}, + visual_size = {x=0.5*2, y=0.9*2}, sounds = { random = "mobs_mc_bat_idle", damage = "mobs_mc_bat_hurt", diff --git a/mods/ENTITIES/mobs_mc/blaze.lua b/mods/ENTITIES/mobs_mc/blaze.lua index 0f62c538..80f2ad6e 100644 --- a/mods/ENTITIES/mobs_mc/blaze.lua +++ b/mods/ENTITIES/mobs_mc/blaze.lua @@ -23,13 +23,12 @@ mobs:register_mob("mobs_mc:blaze", { --rotate = 270, collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.79, 0.3}, rotate = -180, - visual = "mesh", - mesh = "mobs_mc_blaze.b3d", + visual = "sprite", textures = { - {"mobs_mc_blaze.png"}, + {"mobs_mc_blaze_sprite.png"}, }, armor = { fleshy = 100, snowball_vulnerable = 100, water_vulnerable = 100 }, - visual_size = {x=3, y=3}, + visual_size = {x=0.6*2, y=1.8*2}, sounds = { random = "mobs_mc_blaze_breath", death = "mobs_mc_blaze_died", diff --git a/mods/ENTITIES/mobs_mc/chicken.lua b/mods/ENTITIES/mobs_mc/chicken.lua index ffaebca2..9506399d 100644 --- a/mods/ENTITIES/mobs_mc/chicken.lua +++ b/mods/ENTITIES/mobs_mc/chicken.lua @@ -21,12 +21,11 @@ mobs:register_mob("mobs_mc:chicken", { skittish = true, fall_slow = true, floats = 1, - visual = "mesh", - mesh = "mobs_mc_chicken.b3d", + visual = "sprite", textures = { - {"mobs_mc_chicken.png"}, + {"mobs_mc_chicken_sprite.png"}, }, - visual_size = {x=2.2, y=2.2}, + visual_size = {x=0.4*2, y=0.7*2}, rotate = 270, makes_footstep_sound = true, walk_velocity = 1, diff --git a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua index 17c4e1e6..fae43a0d 100644 --- a/mods/ENTITIES/mobs_mc/cow+mooshroom.lua +++ b/mods/ENTITIES/mobs_mc/cow+mooshroom.lua @@ -12,13 +12,11 @@ local cow_def = { xp_max = 3, rotate = 270, 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", - "blank.png", - }, }, - visual_size = {x=2.8, y=2.8}, + visual = "sprite", + textures = { + "mobs_mc_cow_sprite.png", + }, + visual_size = {x=0.9*2, y=1.4*2}, makes_footstep_sound = true, walk_velocity = 1, run_velocity = 3, diff --git a/mods/ENTITIES/mobs_mc/creeper.lua b/mods/ENTITIES/mobs_mc/creeper.lua index a7e33d1b..eec4c34b 100644 --- a/mods/ENTITIES/mobs_mc/creeper.lua +++ b/mods/ENTITIES/mobs_mc/creeper.lua @@ -20,13 +20,11 @@ mobs:register_mob("mobs_mc:creeper", { xp_max = 5, collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.69, 0.3}, pathfinding = 1, - visual = "mesh", - mesh = "mobs_mc_creeper.b3d", + visual = "sprite", textures = { - {"mobs_mc_creeper.png", - "mobs_mc_empty.png"}, + "mobs_mc_creeper_sprite.png", }, - visual_size = {x=3, y=3}, + visual_size = {x=0.6*2, y=1.7*2}, sounds = { attack = "tnt_ignite", death = "mobs_mc_creeper_death", diff --git a/mods/ENTITIES/mobs_mc/guardian.lua b/mods/ENTITIES/mobs_mc/guardian.lua index 3e1a4f85..1d505224 100644 --- a/mods/ENTITIES/mobs_mc/guardian.lua +++ b/mods/ENTITIES/mobs_mc/guardian.lua @@ -22,12 +22,11 @@ mobs:register_mob("mobs_mc:guardian", { damage = 6, reach = 3, collisionbox = {-0.425, 0.25, -0.425, 0.425, 1.1, 0.425}, - visual = "mesh", - mesh = "mobs_mc_guardian.b3d", + visual = "sprite", textures = { - {"mobs_mc_guardian.png"}, + {"mobs_mc_guardian_sprite.png"}, }, - visual_size = {x=3, y=3}, + visual_size = {x=0.95*2, y=0.85*2}, sounds = { random = "mobs_mc_guardian_random", war_cry = "mobs_mc_guardian_random", diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua index 4b33515d..a3f8b613 100644 --- a/mods/ENTITIES/mobs_mc/horse.lua +++ b/mods/ENTITIES/mobs_mc/horse.lua @@ -138,6 +138,11 @@ local horse = { }, do_custom = function(self, dtime) + if not self._horse_nametag_set then + self.nametag = "juan." + self._horse_nametag_set = true + mobs.update_tag(self) + end -- set needed values if not already present if not self._regentimer then diff --git a/mods/ENTITIES/mobs_mc/iron_golem.lua b/mods/ENTITIES/mobs_mc/iron_golem.lua index 939412ab..82e2a4c6 100644 --- a/mods/ENTITIES/mobs_mc/iron_golem.lua +++ b/mods/ENTITIES/mobs_mc/iron_golem.lua @@ -23,12 +23,11 @@ mobs:register_mob("mobs_mc:iron_golem", { neutral = true, breath_max = -1, collisionbox = {-0.7, -0.01, -0.7, 0.7, 2.69, 0.7}, - visual = "mesh", - mesh = "mobs_mc_iron_golem.b3d", + visual = "sprite", textures = { - {"mobs_mc_iron_golem.png"}, + {"mobs_mc_iron_golem_sprite.png"}, }, - visual_size = {x=3, y=3}, + visual_size = {x=1.4*2, y=2.7*2}, makes_footstep_sound = true, -- TODO: sounds view_range = 16, diff --git a/mods/ENTITIES/mobs_mc/pig.lua b/mods/ENTITIES/mobs_mc/pig.lua index 84ff996f..43ff661b 100644 --- a/mods/ENTITIES/mobs_mc/pig.lua +++ b/mods/ENTITIES/mobs_mc/pig.lua @@ -13,13 +13,11 @@ mobs:register_mob("mobs_mc:pig", { xp_min = 1, xp_max = 3, collisionbox = {-0.45, -0.01, -0.45, 0.45, 0.865, 0.45}, - visual = "mesh", + visual = "sprite", mesh = "mobs_mc_pig.b3d", - textures = {{ - "blank.png", -- baby - "mobs_mc_pig.png", -- base - "blank.png", -- saddle - }}, + textures = { + "mobs_mc_pig_sprite.png", + }, --head code has_head = true, @@ -36,7 +34,7 @@ mobs:register_mob("mobs_mc:pig", { head_pitch_modifier = 0, --end head code - visual_size = {x=2.5, y=2.5}, + visual_size = {x=0.9*2, y=0.866*2}, makes_footstep_sound = true, walk_velocity = 1, run_velocity = 3, @@ -133,9 +131,7 @@ mobs:register_mob("mobs_mc:pig", { if item:get_name() == mobs_mc.items.saddle and self.saddle ~= "yes" then self.base_texture = { - "blank.png", -- baby - "mobs_mc_pig.png", -- base - "mobs_mc_pig_saddle.png", -- saddle + "mobs_mc_pig_sprite.png" } self.object:set_properties({ textures = self.base_texture diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua index 51235a3f..3ee29dd1 100644 --- a/mods/ENTITIES/mobs_mc/rabbit.lua +++ b/mods/ENTITIES/mobs_mc/rabbit.lua @@ -101,6 +101,7 @@ killer_bunny.do_custom = function(self) if not self._killer_bunny_nametag_set then self.nametag = S("The Killer Bunny") self._killer_bunny_nametag_set = true + mobs.update_tag(self) end end diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua index f0e728e0..6f81aab6 100644 --- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua +++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua @@ -29,8 +29,7 @@ local skeleton = { collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.98, 0.3}, pathfinding = 1, group_attack = true, - visual = "mesh", - mesh = "mobs_mc_skeleton.b3d", + visual = "sprite", --head code has_head = false, @@ -47,14 +46,10 @@ local skeleton = { head_pitch_modifier = 0, --end head code - visual_size = {x=1, y=1}, + visual_size = {x=0.6*2, y=1.99*2}, makes_footstep_sound = true, textures = { - { - "mobs_mc_empty.png", -- armor - "mobs_mc_skeleton.png", -- texture - "mcl_bows_bow_0.png", -- wielded_item - } + "mobs_mc_skeleton_sprite.png", }, walk_velocity = 1.2, run_velocity = 2.4, diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_bat_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_bat_sprite.png new file mode 100644 index 00000000..0d338ebc Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_bat_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_blaze_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_blaze_sprite.png new file mode 100644 index 00000000..13d75164 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_blaze_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken_sprite.png new file mode 100644 index 00000000..b0bcea71 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_chicken_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_cow_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_cow_sprite.png new file mode 100644 index 00000000..fdb22a08 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_cow_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_creeper_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_creeper_sprite.png new file mode 100644 index 00000000..859a19db Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_creeper_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_dragon_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_dragon_sprite.png new file mode 100644 index 00000000..ac019df4 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_dragon_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_guardian_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_guardian_sprite.png new file mode 100644 index 00000000..22664362 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_guardian_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_sprite.png new file mode 100644 index 00000000..6058b62b Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_horse_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_golem_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_golem_sprite.png new file mode 100644 index 00000000..dc93b7cf Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_iron_golem_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_pig_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_pig_sprite.png new file mode 100644 index 00000000..02fb095c Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_pig_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton_sprite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton_sprite.png new file mode 100644 index 00000000..3a6c63f7 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_skeleton_sprite.png differ diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua index c21a089d..220760cd 100644 --- a/mods/ENTITIES/mobs_mc/wolf.lua +++ b/mods/ENTITIES/mobs_mc/wolf.lua @@ -52,7 +52,7 @@ local wolf = { textures = { {"mobs_mc_wolf_sprite.png"}, }, - visual_size = {x=1.5, y=3}, + visual_size = {x=0.6*2, y=0.866*2}, makes_footstep_sound = true, sounds = { attack = "mobs_mc_wolf_bark",