notYoosung
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Pull Requests Activity

Remove zombie pigmen and ensure zombie piglin named correctly. Add Piglin description names.

This commit is contained in:
ancientmarinerdev 2023-05-12 00:02:30 +01:00
parent 47e26bbfe6
commit 530c8ec0da
12 changed files with 181 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ENTITIES/mobs_mc/README.md
View File

@ -39,7 +39,7 @@ This mod adds mobs which closely resemble the mobs from the game Minecraft, vers
* Cave Spider
* Enderman
* Zombie Villager
* Zombie Pigman
* Zombie Piglin
* Wither Skeleton
* Magma Cube
* Blaze

3
mods/ENTITIES/mobs_mc/init.lua
View File

@ -139,7 +139,6 @@ dofile(path .. "/silverfish.lua") -- maikerumine Mesh and animation by toby109tt
dofile(path .. "/skeleton+stray.lua") -- Mesh by Morn76 Animation by Pavel_S
dofile(path .. "/skeleton_wither.lua") -- Mesh by Morn76 Animation by Pavel_S
dofile(path .. "/zombie.lua") -- Mesh by Morn76 Animation by Pavel_S
dofile(path .. "/zombiepig.lua") -- Mesh by Morn76 Animation by Pavel_S
dofile(path .. "/slime+magma_cube.lua") -- Wuzzy
dofile(path .. "/spider.lua") -- Spider by AspireMint (fishyWET (CC-BY-SA 3.0 license for texture)
dofile(path .. "/vex.lua") -- KrupnoPavel
@ -153,7 +152,7 @@ dofile(path .. "/dolphin.lua")
dofile(path .. "/glow_squid.lua")
dofile(path .. "/piglin.lua")
dofile(path .. "/piglin.lua") -- "mobs_mc_zombie_pigman.b3d" Mesh by Morn76 Animation by Pavel_S
dofile(path .. "/hoglin+zoglin.lua")
dofile(path .. "/strider.lua")

2
mods/ENTITIES/mobs_mc/locale/mobs_mc.de.tr
View File

@ -48,7 +48,7 @@ Wither=Wither
Wolf=Wolf
Husk=Wüstenzombie
Zombie=Zombie
Zombie Pigman=Schweinezombie
Zombie Piglin=Schweinezombie
Farmer=Bauer
Fisherman=Fischer
Fletcher=Pfeilmacher

4
mods/ENTITIES/mobs_mc/locale/mobs_mc.es.tr
View File

@ -54,8 +54,8 @@ Baby Husk=Bebé Zombi Momificado
Baby Zombie=Bebé Zombi
Husk=Zombi Momificado
Zombie=Zombi
Baby Zombie Pigman=Bebé Hombrecerdo Zombi
Zombie Pigman=Hombrecerdo Zombi
Baby Zombie Piglin=Bebé Hombrecerdo Zombi
Zombie Piglin=Hombrecerdo Zombi
Cartographer=Cartógrafo
Armorer=Escudero
Leatherworker=Peletero

2
mods/ENTITIES/mobs_mc/locale/mobs_mc.fr.tr
View File

@ -49,7 +49,7 @@ Wither=Wither
Wolf=Loup
Husk=Zombie Momifié
Zombie=Zombie
Zombie Pigman=Zombie Cochon
Zombie Piglin=Zombie Cochon
Farmer=Fermier
Fisherman=Pêcheur
Fletcher=Archer

2
mods/ENTITIES/mobs_mc/locale/mobs_mc.ja.tr
View File

@ -49,7 +49,7 @@ Wither=ウィザー
Wolf=オオカミ
Husk=ハスク
Zombie=ゾンビ
Zombie Pigman=ゾンビピッグマン
Zombie Piglin=ゾンビピッグマン
Farmer=農民
Fisherman=漁師
Fletcher=矢師

2
mods/ENTITIES/mobs_mc/locale/template.txt
View File

@ -49,7 +49,7 @@ Wither=
Wolf=
Husk=
Zombie=
Zombie Pigman=
Zombie Piglin=
Farmer=
Fisherman=
Fletcher=

199
mods/ENTITIES/mobs_mc/piglin.lua
View File

@ -38,6 +38,7 @@ end
--################### piglin
--###################
local piglin = {
S("Piglin"),
type = "monster",
passive = false,
spawn_class = "hostile",
@ -181,6 +182,7 @@ mcl_mobs.register_mob("mobs_mc:piglin", piglin)
local sword_piglin = table.copy(piglin)
sword_piglin.description = S("Sword Piglin")
sword_piglin.mesh = "extra_mobs_sword_piglin.b3d"
sword_piglin.textures = {"extra_mobs_piglin.png", "default_tool_goldsword.png"}
sword_piglin.on_spawn = function(self)
@ -209,43 +211,127 @@ sword_piglin.animation = {
punch_start = 189,
punch_end = 198,
}
mcl_mobs.register_mob("mobs_mc:sword_piglin", sword_piglin)
local zombified_piglin = table.copy(piglin)
zombified_piglin.fire_resistant = 1
zombified_piglin.do_custom = function()
return
end
zombified_piglin.on_spawn = function()
return
end
zombified_piglin.on_rightclick = function()
return
end
zombified_piglin.lava_damage = 0
zombified_piglin.fire_damage = 0
zombified_piglin.attack_animals = true
zombified_piglin.mesh = "extra_mobs_sword_piglin.b3d"
zombified_piglin.textures = {"extra_mobs_zombified_piglin.png", "default_tool_goldsword.png", "extra_mobs_trans.png"}
zombified_piglin.attack_type = "dogfight"
zombified_piglin.animation = {
stand_speed = 30,
walk_speed = 30,
punch_speed = 45,
run_speed = 30,
stand_start = 0,
stand_end = 79,
walk_start = 168,
walk_end = 187,
run_start = 440,
run_end = 459,
punch_start = 189,
punch_end = 198,
-- Zombified Piglin --
local zombified_piglin = {
description = S("Zombie Piglin"),
-- type="animal", passive=false: This combination is needed for a neutral mob which becomes hostile, if attacked
type = "animal",
passive = false,
spawn_class = "passive",
hp_min = 20,
hp_max = 20,
xp_min = 6,
xp_max = 6,
armor = {undead = 90, fleshy = 90},
attack_type = "dogfight",
group_attack = {"mobs_mc:zombified_piglin", "mobs_mc:baby_zombified_piglin"},
damage = 9,
reach = 2,
head_swivel = "head.control",
bone_eye_height = 2.4,
head_eye_height = 1.4,
curiosity = 15,
collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, -- same
visual = "mesh",
mesh = "mobs_mc_zombie_pigman.b3d",
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_zombiepig_random",
war_cry = "mobs_mc_zombiepig_war_cry",
death = "mobs_mc_zombiepig_death",
damage = "mobs_mc_zombiepig_hurt",
distance = 16,
},
jump = true,
makes_footstep_sound = true,
walk_velocity = .8,
run_velocity = 2.6,
pathfinding = 1,
drops = {
{name = "mcl_mobitems:rotten_flesh",
chance = 1,
min = 1,
max = 1,
looting = "common"},
{name = "mcl_core:gold_nugget",
chance = 1,
min = 0,
max = 1,
looting = "common"},
{name = "mcl_core:gold_ingot",
chance = 40, -- 2.5%
min = 1,
max = 1,
looting = "rare"},
{name = "mcl_tools:sword_gold",
chance = 100 / 8.5,
min = 1,
max = 1,
looting = "rare"},
},
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,
punch_start = 90,
punch_end = 130,
},
lava_damage = 0,
fire_damage = 0,
fear_height = 4,
view_range = 16,
harmed_by_heal = true,
fire_damage_resistant = true,
}
mcl_mobs.register_mob("mobs_mc:zombified_piglin", zombified_piglin)
local baby_zombified_piglin = table.copy(zombified_piglin)
baby_zombified_piglin.description = S("Baby Zombie Piglin")
baby_zombified_piglin.collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.94, 0.25}
baby_zombified_piglin.xp_min = 13
baby_zombified_piglin.xp_max = 13
baby_zombified_piglin.textures = {
{
"mobs_mc_zombie_pigman.png", --baby
"default_tool_goldsword.png", --sword
"mobs_mc_zombie_pigman.png", --pigman
}
}
baby_zombified_piglin.walk_velocity = 1.2
baby_zombified_piglin.run_velocity = 2.4
baby_zombified_piglin.light_damage = 0
baby_zombified_piglin.child = 1
mcl_mobs.register_mob("mobs_mc:baby_zombified_piglin", baby_zombified_piglin)
-- Compatibility code. These were removed, and now are called zombie piglins. They don't spawn.
-- This is only to catch old cases. Maybe could be an alias?
mcl_mobs.register_mob("mobs_mc:pigman", zombified_piglin)
mcl_mobs.register_mob("mobs_mc:baby_pigman", baby_zombified_piglin)
-- Piglin Brute --
local piglin_brute = table.copy(piglin)
piglin_brute.description = S("Piglin Brute")
piglin_brute.xp_min = 20
piglin_brute.xp_max = 20
piglin_brute.hp_min = 50
@ -283,10 +369,11 @@ piglin_brute.animation = {
}
piglin_brute.can_despawn = false
piglin_brute.group_attack = { "mobs_mc:piglin", "mobs_mc:piglin_brute" }
mcl_mobs.register_mob("mobs_mc:piglin_brute", piglin_brute)
mcl_mobs:non_spawn_specific("mobs_mc:piglin","overworld",0,7)
-- Regular spawning in the Nether
mcl_mobs:spawn_specific(
"mobs_mc:piglin",
@ -303,15 +390,15 @@ minetest.LIGHT_MAX+1,
3,
mcl_vars.mg_lava_nether_max,
mcl_vars.mg_nether_max)
mcl_mobs:non_spawn_specific("mobs_mc:sword_piglin","overworld",0,7)
mcl_mobs:spawn_specific(
"mobs_mc:sword_piglin",
"nether",
"ground",
{
"Nether",
"CrimsonForest"
},
"Nether",
"CrimsonForest"
},
0,
minetest.LIGHT_MAX+1,
30,
@ -319,7 +406,45 @@ minetest.LIGHT_MAX+1,
3,
mcl_vars.mg_lava_nether_max,
mcl_vars.mg_nether_max)
-- spawn eggs
mcl_mobs:spawn_specific(
"mobs_mc:zombified_piglin",
"nether",
"ground",
{
"Nether",
"CrimsonForest",
},
0,
minetest.LIGHT_MAX+1,
30,
6000,
3,
mcl_vars.mg_nether_min,
mcl_vars.mg_nether_max)
-- Baby zombie is 20 times less likely than regular zombies
mcl_mobs:spawn_specific(
"mobs_mc:baby_zombified_piglin",
"nether",
"ground",
{
"Nether",
"CrimsonForest",
},
0,
minetest.LIGHT_MAX+1,
30,
100000,
4,
mcl_vars.mg_nether_min,
mcl_vars.mg_nether_max)
mcl_mobs:non_spawn_specific("mobs_mc:piglin","overworld",0,7)
mcl_mobs:non_spawn_specific("mobs_mc:sword_piglin","overworld",0,7)
mcl_mobs:non_spawn_specific("mobs_mc:piglin_brute","overworld",0,7)
mcl_mobs:non_spawn_specific("mobs_mc:zombified_piglin","overworld",0,minetest.LIGHT_MAX+1)
mcl_mobs.register_egg("mobs_mc:piglin", S("Piglin"), "#7b4a17","#d5c381", 0)
mcl_mobs.register_egg("mobs_mc:piglin_brute", S("Piglin Brute"), "#562b0c","#ddc89d", 0)
mcl_mobs:non_spawn_specific("mobs_mc:piglin_brute","overworld",0,7)
mcl_mobs.register_egg("mobs_mc:zombified_piglin", S("Zombie Piglin"), "#ea9393", "#4c7129", 0)

52
mods/ENTITIES/mobs_mc/zombiepig.lua
View File

@ -5,13 +5,14 @@
local S = minetest.get_translator("mobs_mc")
--###################
--################### ZOMBIE PIGMAN
--###################
-- TODO Alias needs to be created
-- TODO DELETE THIS FILE. No longer needed.
-- Spawning removed
-- Mob copied to piglin.lua
local pigman = {
description = S("Zombie Pigman"),
description = S("Zombie Piglin"),
-- type="animal", passive=false: This combination is needed for a neutral mob which becomes hostile, if attacked
type = "animal",
passive = false,
@ -93,13 +94,12 @@ local pigman = {
fire_damage_resistant = true,
}
mcl_mobs.register_mob("mobs_mc:pigman", pigman)
-- Baby pigman.
-- A smaller and more dangerous variant of the pigman
local baby_pigman = table.copy(pigman)
baby_pigman.description = S("Baby Zombie Pigman")
baby_pigman.description = S("Baby Zombie Piglin")
baby_pigman.collisionbox = {-0.25, -0.01, -0.25, 0.25, 0.94, 0.25}
baby_pigman.xp_min = 13
baby_pigman.xp_max = 13
@ -113,44 +113,4 @@ baby_pigman.run_velocity = 2.4
baby_pigman.light_damage = 0
baby_pigman.child = 1
mcl_mobs.register_mob("mobs_mc:baby_pigman", baby_pigman)
-- Regular spawning in the Nether
mcl_mobs:spawn_specific(
"mobs_mc:pigman",
"nether",
"ground",
{
"Nether",
"CrimsonForest",
},
0,
minetest.LIGHT_MAX+1,
30,
6000,
3,
mcl_vars.mg_nether_min,
mcl_vars.mg_nether_max)
-- Baby zombie is 20 times less likely than regular zombies
mcl_mobs:spawn_specific(
"mobs_mc:baby_pigman",
"nether",
"ground",
{
"Nether",
"CrimsonForest",
},
0,
minetest.LIGHT_MAX+1,
30,
100000,
4,
mcl_vars.mg_nether_min,
mcl_vars.mg_nether_max)
-- Spawning in Nether portals in the Overworld
--mobs:spawn_specific("mobs_mc:pigman", {"mcl_portals:portal"}, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 500, 4, mcl_vars.mg_overworld_min, mcl_vars.mg_overworld_max)
-- spawn eggs
mcl_mobs.register_egg("mobs_mc:pigman", S("Zombie Pigman"), "#ea9393", "#4c7129", 0)
mcl_mobs:non_spawn_specific("mobs_mc:pigman","overworld",0,minetest.LIGHT_MAX+1)

4
mods/HUD/mcl_death_messages/locale/mcl_death_messages.es.tr
View File

@ -56,5 +56,5 @@ A ghast scared @1 to death.=Se ha asustado @1 hasta morir.
@1 was killed by a zombie villager.=@1 fue asesinado por un aldeano zombie.
@1 was killed by a husk.=@1 fue asesinado por un husk.
@1 was killed by a baby husk.=@1 fue asesinado por un bebé husk.
@1 was killed by a zombie pigman.=@1 fue asesinado por un cerdo zombie.
@1 was killed by a baby zombie pigman.=@1 fue asesinado por un bebé cerdo zombie.
@1 was killed by a zombie piglin.=@1 fue asesinado por un cerdo zombie.
@1 was killed by a baby zombie piglin.=@1 fue asesinado por un bebé cerdo zombie.

4
mods/HUD/mcl_death_messages/locale/mcl_death_messages.ru.tr
View File

@ -57,5 +57,5 @@ A ghast scared @1 to death.=Гаст напугал @1 до смерти.
@1 was killed by a zombie villager.=@1 был(а) убит(а) зомби-жителем.
@1 was killed by a husk.=@1 был(а) убит(а) кадавром.
@1 was killed by a baby husk.=@1 был(а) убит(а) машылом-кадавром.
@1 was killed by a zombie pigman.=@1 был(а) убит(а) зомби-свиночеловеком.
@1 was killed by a baby zombie pigman.=@1 был(а) убит(а) малышом-зомби-свиночеловеком.
@1 was killed by a zombie piglin.=@1 был(а) убит(а) зомби-свиночеловеком.
@1 was killed by a baby zombie piglin.=@1 был(а) убит(а) малышом-зомби-свиночеловеком.

2
mods/ITEMS/mcl_beds/functions.lua
View File

@ -118,7 +118,7 @@ local function lay_down(player, pos, bed_pos, state, skip)
-- No sleeping if monsters nearby.
-- The exceptions above apply.
-- Zombie pigmen only prevent sleep while they are hostle.
-- Zombie piglin only prevent sleep while they are hostle.
for _, obj in pairs(minetest.get_objects_inside_radius(bed_pos, 8)) do
if obj and not obj:is_player() then
local ent = obj:get_luaentity()