diff --git a/mods/ENTITIES/mobs_mc/0_gameconfig.lua b/mods/ENTITIES/mobs_mc/0_gameconfig.lua index c52c1ce5c..692f6245d 100644 --- a/mods/ENTITIES/mobs_mc/0_gameconfig.lua +++ b/mods/ENTITIES/mobs_mc/0_gameconfig.lua @@ -167,7 +167,6 @@ mobs_mc.follow = { dog = { mobs_mc.items.rabbit_raw, mobs_mc.items.rabbit_cooked, mobs_mc.items.mutton_raw, mobs_mc.items.mutton_cooked, mobs_mc.items.beef_raw, mobs_mc.items.beef_cooked, mobs_mc.items.chicken_raw, mobs_mc.items.chicken_cooked, mobs_mc.items.rotten_flesh, -- Mobs Redo items "mobs:meat", "mobs:meat_raw" }, -e } -- Contents for replace_what diff --git a/mods/ENTITIES/mobs_mc/LICENSE-media.md b/mods/ENTITIES/mobs_mc/LICENSE-media.md index 7d0ec928a..e0fe99763 100644 --- a/mods/ENTITIES/mobs_mc/LICENSE-media.md +++ b/mods/ENTITIES/mobs_mc/LICENSE-media.md @@ -49,7 +49,7 @@ Origin of those models: * `mobs_mc_parrot_grey.png` * `mobs_mc_parrot_red_blue.png` * `mobs_mc_parrot_yellow_blue.png` - * `mobs_mc_evoker_base.png` + * `mobs_mc_evoker_base.png` (modified by kingoscargames) * `mobs_mc_illusionist_bow.png` * `mobs_mc_illusionist.png` * `mobs_mc_vindicator_axe.png` @@ -58,6 +58,13 @@ Origin of those models: * Additions by kingoscargames: * `mobs_mc_vex.png` * `mobs_mc_vex_charging.png` + * `mobs_mc_llama.png` + * `mobs_mc_llama_creamy.png` + * `mobs_mc_llama_brown.png` + * `mobs_mc_llama_white.png` + * `mobs_mc_llama_gray.png` + * `mobs_mc_llama_chest.png` + * `mobs_mc_endermite.png` * “Spawn egg” textures (`mobs_mc_spawn_icon_*`) by 22i * Any other texture not mentioned here are licensed under the MIT License diff --git a/mods/ENTITIES/mobs_mc/blaze.lua b/mods/ENTITIES/mobs_mc/blaze.lua index 6ee6a069c..767d5760f 100644 --- a/mods/ENTITIES/mobs_mc/blaze.lua +++ b/mods/ENTITIES/mobs_mc/blaze.lua @@ -34,6 +34,7 @@ mobs:register_mob("mobs_mc:blaze", { walk_velocity = .8, run_velocity = 1.6, damage = 6, + reach = 2, pathfinding = 1, drops = { {name = mobs_mc.items.blaze_rod, diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua index 43bbd615a..d18a441fd 100644 --- a/mods/ENTITIES/mobs_mc/enderman.lua +++ b/mods/ENTITIES/mobs_mc/enderman.lua @@ -42,6 +42,7 @@ mobs:register_mob("mobs_mc:enderman", { walk_velocity = 0.2, run_velocity = 3.4, damage = 7, + reach = 2, drops = { {name = mobs_mc.items.ender_pearl, chance = 1, diff --git a/mods/ENTITIES/mobs_mc/endermite.lua b/mods/ENTITIES/mobs_mc/endermite.lua index 106a8b994..6c40f8c29 100644 --- a/mods/ENTITIES/mobs_mc/endermite.lua +++ b/mods/ENTITIES/mobs_mc/endermite.lua @@ -33,6 +33,7 @@ mobs:register_mob("mobs_mc:endermite", { fear_height = 4, view_range = 16, damage = 2, + reach = 1, blood_amount = 0, }) diff --git a/mods/ENTITIES/mobs_mc/guardian.lua b/mods/ENTITIES/mobs_mc/guardian.lua index 6f4d3c87a..73063129f 100644 --- a/mods/ENTITIES/mobs_mc/guardian.lua +++ b/mods/ENTITIES/mobs_mc/guardian.lua @@ -19,6 +19,7 @@ mobs:register_mob("mobs_mc:guardian", { walk_velocity = 2, run_velocity = 4, damage = 6, + reach = 3, collisionbox = {-0.425, 0.25, -0.425, 0.425, 1.1, 0.425}, visual = "mesh", mesh = "mobs_mc_guardian.b3d", diff --git a/mods/ENTITIES/mobs_mc/guardian_elder.lua b/mods/ENTITIES/mobs_mc/guardian_elder.lua index ec6d9939a..9b74aca07 100644 --- a/mods/ENTITIES/mobs_mc/guardian_elder.lua +++ b/mods/ENTITIES/mobs_mc/guardian_elder.lua @@ -19,6 +19,7 @@ mobs:register_mob("mobs_mc:guardian_elder", { walk_velocity = 2, run_velocity = 4, damage = 8, + reach = 3, collisionbox = {-0.99875, 0.5, -0.99875, 0.99875, 2.4975, 0.99875}, visual = "mesh", mesh = "mobs_mc_guardian.b3d", diff --git a/mods/ENTITIES/mobs_mc/iron_golem.lua b/mods/ENTITIES/mobs_mc/iron_golem.lua index adcf3eed1..0c30e6d67 100644 --- a/mods/ENTITIES/mobs_mc/iron_golem.lua +++ b/mods/ENTITIES/mobs_mc/iron_golem.lua @@ -40,6 +40,7 @@ mobs:register_mob("mobs_mc:iron_golem", { run_velocity = 1.2, -- Approximation damage = 14, + reach = 3, group_attack = true, attacks_monsters = true, attack_type = "dogfight", diff --git a/mods/ENTITIES/mobs_mc/ocelot.lua b/mods/ENTITIES/mobs_mc/ocelot.lua index 05a5d4762..cd9e2e3a6 100644 --- a/mods/ENTITIES/mobs_mc/ocelot.lua +++ b/mods/ENTITIES/mobs_mc/ocelot.lua @@ -64,6 +64,7 @@ local ocelot = { attack_type = "dogfight", pathfinding = 1, damage = 2, + reach = 1, attack_animals = true, specific_attack = { "mobs_mc:chicken" }, on_rightclick = function(self, clicker) diff --git a/mods/ENTITIES/mobs_mc/polar_bear.lua b/mods/ENTITIES/mobs_mc/polar_bear.lua index 9f292dad4..24858bcb9 100644 --- a/mods/ENTITIES/mobs_mc/polar_bear.lua +++ b/mods/ENTITIES/mobs_mc/polar_bear.lua @@ -27,6 +27,7 @@ mobs:register_mob("mobs_mc:polar_bear", { visual_size = {x=3.0, y=3.0}, makes_footstep_sound = true, damage = 6, + reach = 2, walk_velocity = 1.2, run_velocity = 2.4, group_attack = true, diff --git a/mods/ENTITIES/mobs_mc/rabbit.lua b/mods/ENTITIES/mobs_mc/rabbit.lua index b0cbaded8..f0a440403 100644 --- a/mods/ENTITIES/mobs_mc/rabbit.lua +++ b/mods/ENTITIES/mobs_mc/rabbit.lua @@ -7,7 +7,7 @@ local S, NS = dofile(MP.."/intllib.lua") local rabbit = { type = "animal", passive = true, - reach = 2, + reach = 1, hp_min = 3, hp_max = 3, diff --git a/mods/ENTITIES/mobs_mc/silverfish.lua b/mods/ENTITIES/mobs_mc/silverfish.lua index cc1f68297..b7f518291 100644 --- a/mods/ENTITIES/mobs_mc/silverfish.lua +++ b/mods/ENTITIES/mobs_mc/silverfish.lua @@ -41,6 +41,7 @@ mobs:register_mob("mobs_mc:silverfish", { view_range = 16, attack_type = "dogfight", damage = 1, + reach = 1, blood_amount = 0, }) diff --git a/mods/ENTITIES/mobs_mc/skeleton+stray.lua b/mods/ENTITIES/mobs_mc/skeleton+stray.lua index d5808fce7..0d170c43a 100644 --- a/mods/ENTITIES/mobs_mc/skeleton+stray.lua +++ b/mods/ENTITIES/mobs_mc/skeleton+stray.lua @@ -39,6 +39,7 @@ local skeleton = { walk_velocity = 1.2, run_velocity = 2.4, damage = 2, + reach = 2, drops = { {name = mobs_mc.items.arrow, chance = 1, @@ -63,19 +64,17 @@ local skeleton = { animation = { stand_start = 0, stand_end = 40, - speed_stand = 5, + stand_speed = 5, walk_start = 40, walk_end = 60, - speed_walk = 50, + walk_speed = 50, shoot_start = 70, shoot_end = 90, punch_start = 70, punch_end = 90, die_start = 120, die_end = 130, - speed_die = 5, - hurt_start = 100, - hurt_end = 120, + die_loop = false, }, water_damage = 1, lava_damage = 4, diff --git a/mods/ENTITIES/mobs_mc/skeleton_wither.lua b/mods/ENTITIES/mobs_mc/skeleton_wither.lua index ca1d3ce7f..f102e8369 100644 --- a/mods/ENTITIES/mobs_mc/skeleton_wither.lua +++ b/mods/ENTITIES/mobs_mc/skeleton_wither.lua @@ -39,6 +39,7 @@ mobs:register_mob("mobs_mc:witherskeleton", { walk_velocity = 1.2, run_velocity = 2.4, damage = 7, + reach = 2, drops = { {name = mobs_mc.items.coal, chance = 1, @@ -58,17 +59,19 @@ mobs:register_mob("mobs_mc:witherskeleton", { animation = { stand_start = 0, stand_end = 40, - speed_stand = 5, + stand_speed = 5, walk_start = 40, walk_end = 60, - speed_walk = 50, + walk_speed = 50, shoot_start = 70, shoot_end = 90, punch_start = 70, punch_end = 90, die_start = 120, die_end = 130, - speed_die = 5, + die_loop = false, + + -- Not supported yet hurt_start = 100, hurt_end = 120, }, diff --git a/mods/ENTITIES/mobs_mc/spider.lua b/mods/ENTITIES/mobs_mc/spider.lua index ff320367e..bb2f2db70 100644 --- a/mods/ENTITIES/mobs_mc/spider.lua +++ b/mods/ENTITIES/mobs_mc/spider.lua @@ -23,6 +23,7 @@ local spider = { attack_type = "dogfight", pathfinding = 1, damage = 2, + reach = 2, hp_min = 16, hp_max = 16, collisionbox = {-0.7, -0.01, -0.7, 0.7, 0.89, 0.7}, diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_endermite.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_endermite.png index 6427b3198..40f9b47c7 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_endermite.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_endermite.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png index ed763c2a9..eec707c5c 100644 Binary files a/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_evoker_base.png differ diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama.png new file mode 100644 index 000000000..4eda8ab49 Binary files /dev/null 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 new file mode 100644 index 000000000..3ee823af6 Binary files /dev/null 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 new file mode 100644 index 000000000..85e321cda Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_chest.png 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 new file mode 100644 index 000000000..87901b466 Binary files /dev/null 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 new file mode 100644 index 000000000..43f9d59b6 Binary files /dev/null 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 new file mode 100644 index 000000000..8cf55f827 Binary files /dev/null and b/mods/ENTITIES/mobs_mc/textures/mobs_mc_llama_white.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 19e9010cf..ff67da909 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/vex.lua b/mods/ENTITIES/mobs_mc/vex.lua index 7691d7628..74136c090 100644 --- a/mods/ENTITIES/mobs_mc/vex.lua +++ b/mods/ENTITIES/mobs_mc/vex.lua @@ -31,6 +31,7 @@ mobs:register_mob("mobs_mc:vex", { }, visual_size = {x=1.25, y=1.25}, damage = 9, + reach = 2, view_range = 16, walk_velocity = 3.2, run_velocity = 5.9, diff --git a/mods/ENTITIES/mobs_mc/villager_evoker.lua b/mods/ENTITIES/mobs_mc/villager_evoker.lua index 03e7f05d6..40e59836f 100644 --- a/mods/ENTITIES/mobs_mc/villager_evoker.lua +++ b/mods/ENTITIES/mobs_mc/villager_evoker.lua @@ -68,17 +68,18 @@ mobs:register_mob("mobs_mc:evoker", { distance = 16, }, animation = { - speed_normal = 25, - speed_run = 25, + walk_speed = 25, + run_speed = 25, stand_start = 40, stand_end = 59, - speed_stand = 5, + stand_speed = 5, walk_start = 0, walk_end = 40, shoot_start = 60, shoot_end = 80, die_start = 80, die_end = 130, + die_loop = false, }, water_damage = 0, lava_damage = 4, diff --git a/mods/ENTITIES/mobs_mc/villager_illusioner.lua b/mods/ENTITIES/mobs_mc/villager_illusioner.lua index e27155745..6714ab37e 100644 --- a/mods/ENTITIES/mobs_mc/villager_illusioner.lua +++ b/mods/ENTITIES/mobs_mc/villager_illusioner.lua @@ -28,19 +28,16 @@ mobs:register_mob("mobs_mc:illusioner", { animation = { walk_speed = 25, run_speed = 25, - shoot_speed = 25, stand_start = 40, stand_end = 59, - stand_speed = 5, walk_start = 0, walk_end = 40, - --speed_walk = 50, shoot_start = 90, shoot_end = 110, die_start = 110, die_end = 130, - die_speed = 5, - -- 60-80 magic arm swinging, 80-90 transition between magic to bow shooting + die_loop = false, + -- 60-80 magic arm swinging, 80-90 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 785554d79..443be2a16 100644 --- a/mods/ENTITIES/mobs_mc/villager_vindicator.lua +++ b/mods/ENTITIES/mobs_mc/villager_vindicator.lua @@ -29,6 +29,7 @@ mobs:register_mob("mobs_mc:vindicator", { visual_size = {x=3, y=3}, makes_footstep_sound = true, damage = 13, + reach = 2, walk_velocity = 1.2, run_velocity = 2.4, attack_type = "dogfight", @@ -55,13 +56,11 @@ mobs:register_mob("mobs_mc:vindicator", { stand_speed = 5, walk_start = 0, walk_end = 40, - --speed_walk = 50, - punch_speed = 25, punch_start = 90, punch_end = 110, - die_speed = 25, die_start = 110, die_end = 130, + die_loop = false, }, water_damage = 1, lava_damage = 4, diff --git a/mods/ENTITIES/mobs_mc/villager_zombie.lua b/mods/ENTITIES/mobs_mc/villager_zombie.lua index 93b0c4f36..e5094f2ee 100644 --- a/mods/ENTITIES/mobs_mc/villager_zombie.lua +++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua @@ -33,6 +33,7 @@ mobs:register_mob("mobs_mc:villager_zombie", { visual_size = {x=3, y=3}, makes_footstep_sound = true, damage = 3, + reach = 2, walk_velocity = 1.2, run_velocity = 2.4, attack_type = "dogfight", diff --git a/mods/ENTITIES/mobs_mc/witch.lua b/mods/ENTITIES/mobs_mc/witch.lua index ce2f92a65..b414d1a24 100644 --- a/mods/ENTITIES/mobs_mc/witch.lua +++ b/mods/ENTITIES/mobs_mc/witch.lua @@ -29,6 +29,7 @@ mobs:register_mob("mobs_mc:witch", { visual_size = {x=3, y=3}, makes_footstep_sound = true, damage = 2, + reach = 2, walk_velocity = 1.2, run_velocity = 2.4, pathfinding = 1, diff --git a/mods/ENTITIES/mobs_mc/wolf.lua b/mods/ENTITIES/mobs_mc/wolf.lua index 736de544b..cf17b3b59 100644 --- a/mods/ENTITIES/mobs_mc/wolf.lua +++ b/mods/ENTITIES/mobs_mc/wolf.lua @@ -47,6 +47,7 @@ local wolf = { run_velocity = 3, stepheight = 1.1, damage = 4, + reach = 2, attack_type = "dogfight", fear_height = 4, water_damage = 0, diff --git a/mods/ENTITIES/mobs_mc/zombie.lua b/mods/ENTITIES/mobs_mc/zombie.lua index 6732231fb..8d2dda473 100644 --- a/mods/ENTITIES/mobs_mc/zombie.lua +++ b/mods/ENTITIES/mobs_mc/zombie.lua @@ -38,6 +38,7 @@ local zombie = { walk_velocity = .8, run_velocity = 1.6, damage = 3, + reach = 2, fear_height = 4, pathfinding = 1, jump = true, diff --git a/mods/ENTITIES/mobs_mc/zombiepig.lua b/mods/ENTITIES/mobs_mc/zombiepig.lua index 4ff64fb8e..6b2ad65e4 100644 --- a/mods/ENTITIES/mobs_mc/zombiepig.lua +++ b/mods/ENTITIES/mobs_mc/zombiepig.lua @@ -23,6 +23,7 @@ local pigman = { attack_type = "dogfight", group_attack = true, damage = 9, + reach = 2, collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, visual = "mesh", mesh = "mobs_mc_zombie_pigman.b3d",