1
0
Fork 0

Update drowning settings in mobs_mc

This commit is contained in:
Wuzzy 2019-10-02 18:31:16 +02:00
parent 14d4bec8a9
commit b71c9204ec
36 changed files with 12 additions and 93 deletions

View File

@ -40,9 +40,6 @@ mobs:register_mob("mobs_mc:bat", {
]] ]]
}, },
water_damage = 1,
lava_damage = 4,
light_damage = 0,
fall_damage = 0, fall_damage = 0,
view_range = 16, view_range = 16,

View File

@ -35,9 +35,6 @@ mobs:register_mob("mobs_mc:chicken", {
min = 0, min = 0,
max = 2,}, max = 2,},
}, },
water_damage = 1,
lava_damage = 4,
light_damage = 0,
fall_damage = 0, fall_damage = 0,
fall_speed = -2.25, fall_speed = -2.25,
sounds = { sounds = {

View File

@ -26,9 +26,6 @@ local cow_def = {
min = 0, min = 0,
max = 2,}, max = 2,},
}, },
water_damage = 1,
lava_damage = 5,
light_damage = 0,
runaway = true, runaway = true,
sounds = { sounds = {
random = "mobs_mc_cow", random = "mobs_mc_cow",

View File

@ -47,9 +47,7 @@ mobs:register_mob("mobs_mc:enderdragon", {
min = 1, min = 1,
max = 1}, max = 1},
}, },
water_damage = 0,
lava_damage = 0, lava_damage = 0,
light_damage = 0,
on_rightclick = nil, on_rightclick = nil,
attack_type = "dogshoot", attack_type = "dogshoot",
arrow = "mobs_mc:fireball2", arrow = "mobs_mc:fireball2",

View File

@ -320,8 +320,6 @@ mobs:register_mob("mobs_mc:enderman", {
end end
end, end,
water_damage = 8, water_damage = 8,
lava_damage = 4,
light_damage = 0,
-- TODO: Increase view range when it detects being seen -- TODO: Increase view range when it detects being seen
-- Low view range to emulate that behaviour somehow -- Low view range to emulate that behaviour somehow
view_range = 4, view_range = 4,

View File

@ -27,9 +27,6 @@ mobs:register_mob("mobs_mc:endermite", {
walk_velocity = 1, walk_velocity = 1,
run_velocity = 2, run_velocity = 2,
jump = true, jump = true,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fear_height = 4, fear_height = 4,
view_range = 16, view_range = 16,
damage = 2, damage = 2,

View File

@ -53,8 +53,6 @@ mobs:register_mob("mobs_mc:ghast", {
walk_start = 0, walk_end = 40, walk_start = 0, walk_end = 40,
run_start = 0, run_end = 40, run_start = 0, run_end = 40,
}, },
lava_damage = 4,
light_damage = 0,
fall_damage = 0, fall_damage = 0,
view_range = 100, view_range = 100,
--attack_type = "dogshoot", --attack_type = "dogshoot",

View File

@ -10,6 +10,7 @@ mobs:register_mob("mobs_mc:guardian", {
type = "monster", type = "monster",
hp_min = 30, hp_min = 30,
hp_max = 30, hp_max = 30,
breath_max = -1,
passive = false, passive = false,
attack_type = "dogfight", attack_type = "dogfight",
pathfinding = 1, pathfinding = 1,
@ -76,9 +77,6 @@ mobs:register_mob("mobs_mc:guardian", {
stepheight = 0.1, stepheight = 0.1,
jump = false, jump = false,
view_range = 16, view_range = 16,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
blood_amount = 0, blood_amount = 0,
}) })

View File

@ -10,6 +10,7 @@ mobs:register_mob("mobs_mc:guardian_elder", {
type = "monster", type = "monster",
hp_min = 80, hp_min = 80,
hp_max = 80, hp_max = 80,
breath_max = -1,
passive = false, passive = false,
attack_type = "dogfight", attack_type = "dogfight",
pathfinding = 1, pathfinding = 1,
@ -80,9 +81,6 @@ mobs:register_mob("mobs_mc:guardian_elder", {
fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source }, fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source },
stepheight = 0.1, stepheight = 0.1,
jump = false, jump = false,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
view_range = 16, view_range = 16,
blood_amount = 0, blood_amount = 0,
}) })

View File

@ -116,8 +116,6 @@ local horse = {
hp_min = 15, hp_min = 15,
hp_max = 30, hp_max = 30,
floats = 1, floats = 1,
lava_damage = 4,
water_damage = 1,
makes_footstep_sound = true, makes_footstep_sound = true,
jump = true, jump = true,
jump_height = 5.75, -- can clear 2.5 blocks jump_height = 5.75, -- can clear 2.5 blocks
@ -324,6 +322,7 @@ mobs:register_mob("mobs_mc:horse", horse)
-- Skeleton horse -- Skeleton horse
local skeleton_horse = table.copy(horse) local skeleton_horse = table.copy(horse)
skeleton_horse.breath_max = -1
skeleton_horse.textures = {{"blank.png", "mobs_mc_horse_skeleton.png", "blank.png"}} skeleton_horse.textures = {{"blank.png", "mobs_mc_horse_skeleton.png", "blank.png"}}
skeleton_horse.drops = { skeleton_horse.drops = {
{name = mobs_mc.items.bone, {name = mobs_mc.items.bone,
@ -342,6 +341,7 @@ mobs:register_mob("mobs_mc:skeleton_horse", skeleton_horse)
-- Zombie horse -- Zombie horse
local zombie_horse = table.copy(horse) local zombie_horse = table.copy(horse)
zombie_horse.breath_max = -1
zombie_horse.textures = {{"blank.png", "mobs_mc_horse_zombie.png", "blank.png"}} zombie_horse.textures = {{"blank.png", "mobs_mc_horse_zombie.png", "blank.png"}}
zombie_horse.drops = { zombie_horse.drops = {
{name = mobs_mc.items.rotten_flesh, {name = mobs_mc.items.rotten_flesh,

View File

@ -16,6 +16,7 @@ mobs:register_mob("mobs_mc:iron_golem", {
passive = true, passive = true,
hp_min = 100, hp_min = 100,
hp_max = 100, hp_max = 100,
breath_max = -1,
collisionbox = {-0.7, -0.01, -0.7, 0.7, 2.69, 0.7}, collisionbox = {-0.7, -0.01, -0.7, 0.7, 2.69, 0.7},
visual = "mesh", visual = "mesh",
mesh = "mobs_mc_iron_golem.b3d", mesh = "mobs_mc_iron_golem.b3d",
@ -48,9 +49,6 @@ mobs:register_mob("mobs_mc:iron_golem", {
min = 0, min = 0,
max = 2,}, max = 2,},
}, },
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fall_damage = 0, fall_damage = 0,
animation = { animation = {
stand_speed = 15, walk_speed = 15, run_speed = 25, punch_speed = 15, stand_speed = 15, walk_speed = 15, run_speed = 25, punch_speed = 15,

View File

@ -32,9 +32,6 @@ mobs:register_mob("mobs_mc:llama", {
min = 0, min = 0,
max = 2,}, max = 2,},
}, },
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fear_height = 4, fear_height = 4,
sounds = { sounds = {
random = "mobs_mc_llama", random = "mobs_mc_llama",

View File

@ -42,9 +42,6 @@ local ocelot = {
run_velocity = 3, run_velocity = 3,
floats = 1, floats = 1,
runaway = true, runaway = true,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fall_damage = 0, fall_damage = 0,
fear_height = 4, fear_height = 4,
sounds = { sounds = {

View File

@ -44,9 +44,6 @@ mobs:register_mob("mobs_mc:parrot", {
--fly_end = 45, --fly_end = 45,
}, },
walk_chance = 100, walk_chance = 100,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fall_damage = 0, fall_damage = 0,
fall_speed = -2.25, fall_speed = -2.25,
attack_type = "dogfight", attack_type = "dogfight",

View File

@ -25,9 +25,6 @@ mobs:register_mob("mobs_mc:pig", {
min = 1, min = 1,
max = 3,}, max = 3,},
}, },
water_damage = 1,
lava_damage = 4,
light_damage = 0,
fear_height = 4, fear_height = 4,
sounds = { sounds = {
random = "mobs_pig", random = "mobs_pig",

View File

@ -14,6 +14,7 @@ mobs:register_mob("mobs_mc:polar_bear", {
stepheight = 1.2, stepheight = 1.2,
hp_min = 30, hp_min = 30,
hp_max = 30, hp_max = 30,
breath_max = -1,
collisionbox = {-0.7, -0.01, -0.7, 0.7, 1.39, 0.7}, collisionbox = {-0.7, -0.01, -0.7, 0.7, 1.39, 0.7},
visual = "mesh", visual = "mesh",
mesh = "mobs_mc_polarbear.b3d", mesh = "mobs_mc_polarbear.b3d",
@ -41,10 +42,7 @@ mobs:register_mob("mobs_mc:polar_bear", {
max = 2,}, max = 2,},
}, },
water_damage = 0,
floats = 1, floats = 1,
lava_damage = 5,
light_damage = 0,
fear_height = 4, fear_height = 4,
-- TODO: sounds -- TODO: sounds
animation = { animation = {

View File

@ -35,9 +35,6 @@ local rabbit = {
-- TODO: Drop rabbit's foot when it's useful -- TODO: Drop rabbit's foot when it's useful
--{name = mobs_mc.items.rabbit_foot, chance = 10, min = 1, max = 1}, --{name = mobs_mc.items.rabbit_foot, chance = 10, min = 1, max = 1},
}, },
water_damage = 1,
lava_damage = 4,
light_damage = 0,
fear_height = 4, fear_height = 4,
animation = { animation = {
speed_normal = 25, speed_run = 50, speed_normal = 25, speed_run = 50,

View File

@ -67,9 +67,6 @@ mobs:register_mob("mobs_mc:sheep", {
min = 1, min = 1,
max = 1,}, max = 1,},
}, },
water_damage = 1,
lava_damage = 4,
light_damage = 0,
fear_height = 4, fear_height = 4,
sounds = { sounds = {
random = "mobs_sheep", random = "mobs_sheep",

View File

@ -47,9 +47,6 @@ mobs:register_mob("mobs_mc:shulker", {
blood_amount = 0, blood_amount = 0,
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,
water_damage = 1,
lava_damage = 4,
light_damage = 0,
}) })
-- bullet arrow (weapon) -- bullet arrow (weapon)

View File

@ -29,9 +29,6 @@ mobs:register_mob("mobs_mc:silverfish", {
walk_velocity = 0.6, walk_velocity = 0.6,
run_velocity = 2, run_velocity = 2,
jump = true, jump = true,
water_damage = 1,
lava_damage = 4,
light_damage = 0,
fear_height = 4, fear_height = 4,
replace_what = mobs_mc.replace.silverfish, replace_what = mobs_mc.replace.silverfish,
replace_rate = 2, replace_rate = 2,

View File

@ -15,6 +15,7 @@ local skeleton = {
type = "monster", type = "monster",
hp_min = 20, hp_min = 20,
hp_max = 20, hp_max = 20,
breath_max = -1,
collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.98, 0.3}, collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.98, 0.3},
pathfinding = 1, pathfinding = 1,
group_attack = true, group_attack = true,
@ -73,8 +74,6 @@ local skeleton = {
die_speed = 15, die_speed = 15,
die_loop = false, die_loop = false,
}, },
water_damage = 1,
lava_damage = 4,
sunlight_damage = 1, sunlight_damage = 1,
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,

View File

@ -13,6 +13,7 @@ mobs:register_mob("mobs_mc:witherskeleton", {
type = "monster", type = "monster",
hp_min = 20, hp_min = 20,
hp_max = 20, hp_max = 20,
breath_max = -1,
pathfinding = 1, pathfinding = 1,
group_attack = true, group_attack = true,
collisionbox = {-0.35, -0.01, -0.35, 0.35, 2.39, 0.35}, collisionbox = {-0.35, -0.01, -0.35, 0.35, 2.39, 0.35},

View File

@ -94,9 +94,6 @@ local slime_big = {
death_start = 88, death_start = 88,
death_end = 118, death_end = 118,
}, },
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fall_damage = 0, fall_damage = 0,
view_range = 16, view_range = 16,
attack_type = "dogfight", attack_type = "dogfight",

View File

@ -46,9 +46,6 @@ local spider = {
{name = mobs_mc.items.spider_eye, chance = 3, min = 1, max = 1,}, {name = mobs_mc.items.spider_eye, chance = 3, min = 1, max = 1,},
}, },
specific_attack = { "player", "mobs_mc:iron_golem" }, specific_attack = { "player", "mobs_mc:iron_golem" },
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fear_height = 4, fear_height = 4,
animation = { animation = {
stand_speed = 10, stand_speed = 10,

View File

@ -45,12 +45,10 @@ mobs:register_mob("mobs_mc:squid", {
stepheight = 0.1, stepheight = 0.1,
fly = true, fly = true,
fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source }, fly_in = { mobs_mc.items.water_source, mobs_mc.items.river_water_source },
breathes_in_water = true,
jump = false, jump = false,
fall_speed = 0.5, fall_speed = 0.5,
view_range = 16, view_range = 16,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
runaway = true, runaway = true,
fear_height = 4, fear_height = 4,
blood_texture = "mobs_mc_squid_blood.png", blood_texture = "mobs_mc_squid_blood.png",

View File

@ -84,9 +84,6 @@ mobs:register_mob("mobs_mc:vex", {
end end
end end
end, end,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
fly = true, fly = true,
fly_in = {"air"}, fly_in = {"air"},
}) })

View File

@ -945,9 +945,6 @@ mobs:register_mob("mobs_mc:villager", {
die_end = 220, die_end = 220,
die_loop = false, die_loop = false,
}, },
water_damage = 0,
lava_damage = 4,
light_damage = 0,
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,
jump = true, jump = true,

View File

@ -74,9 +74,6 @@ mobs:register_mob("mobs_mc:evoker", {
die_end = 200, die_end = 200,
die_loop = false, die_loop = false,
}, },
water_damage = 0,
lava_damage = 4,
light_damage = 0,
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,
}) })

View File

@ -48,7 +48,6 @@ mobs:register_mob("mobs_mc:illusioner", {
}, },
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,
lava_damage = 4,
}) })
mobs:register_egg("mobs_mc:illusioner", S("Illusioner"), "mobs_mc_spawn_icon_illusioner.png", 0) mobs:register_egg("mobs_mc:illusioner", S("Illusioner"), "mobs_mc_spawn_icon_illusioner.png", 0)

View File

@ -61,9 +61,6 @@ mobs:register_mob("mobs_mc:vindicator", {
die_end = 180, die_end = 180,
die_loop = false, die_loop = false,
}, },
water_damage = 1,
lava_damage = 4,
light_damage = 0,
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,

View File

@ -16,6 +16,7 @@ mobs:register_mob("mobs_mc:villager_zombie", {
type = "monster", type = "monster",
hp_min = 20, hp_min = 20,
hp_max = 20, hp_max = 20,
breath_max = -1,
armor = 90, armor = 90,
collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3},
visual = "mesh", visual = "mesh",
@ -71,8 +72,6 @@ mobs:register_mob("mobs_mc:villager_zombie", {
run_start = 0, run_start = 0,
run_end = 20, run_end = 20,
}, },
water_damage = 1,
lava_damage = 5,
sunlight_damage = 1, sunlight_damage = 1,
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,

View File

@ -63,9 +63,6 @@ mobs:register_mob("mobs_mc:witch", {
shoot_start = 50, shoot_start = 50,
shoot_end = 82, shoot_end = 82,
}, },
water_damage = 1,
lava_damage = 5,
light_damage = 0,
view_range = 16, view_range = 16,
fear_height = 4, fear_height = 4,

View File

@ -48,9 +48,7 @@ mobs:register_mob("mobs_mc:wither", {
min = 1, min = 1,
max = 1}, max = 1},
}, },
water_damage = 0,
lava_damage = 0, lava_damage = 0,
light_damage = 0,
attack_type = "dogshoot", attack_type = "dogshoot",
explosion_radius = 3, explosion_radius = 3,
explosion_fire = false, explosion_fire = false,

View File

@ -45,9 +45,6 @@ local wolf = {
reach = 2, reach = 2,
attack_type = "dogfight", attack_type = "dogfight",
fear_height = 4, fear_height = 4,
water_damage = 0,
lava_damage = 4,
light_damage = 0,
follow = mobs_mc.follow.wolf, follow = mobs_mc.follow.wolf,
on_rightclick = function(self, clicker) on_rightclick = function(self, clicker)
-- Try to tame wolf (intentionally does NOT use mobs:feed_tame) -- Try to tame wolf (intentionally does NOT use mobs:feed_tame)

View File

@ -42,6 +42,7 @@ local zombie = {
type = "monster", type = "monster",
hp_min = 20, hp_min = 20,
hp_max = 20, hp_max = 20,
breath_max = -1,
armor = 90, armor = 90,
collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3}, collisionbox = {-0.3, -0.01, -0.3, 0.3, 1.94, 0.3},
visual = "mesh", visual = "mesh",
@ -99,7 +100,6 @@ mobs:register_mob("mobs_mc:baby_zombie", baby_zombie)
local husk = table.copy(zombie) local husk = table.copy(zombie)
husk.textures = {{"mobs_mc_husk.png"}} husk.textures = {{"mobs_mc_husk.png"}}
husk.sunlight_damage = 0 husk.sunlight_damage = 0
husk.water_damage = 3
husk.drops = drops_common husk.drops = drops_common
-- TODO: Husks avoid water -- TODO: Husks avoid water

View File

@ -16,6 +16,7 @@ local pigman = {
passive = false, passive = false,
hp_min = 20, hp_min = 20,
hp_max = 20, hp_max = 20,
breath_max = -1,
armor = 90, armor = 90,
attack_type = "dogfight", attack_type = "dogfight",
group_attack = { "mobs_mc:pigman", "mobs_mc:baby_pigman" }, group_attack = { "mobs_mc:pigman", "mobs_mc:baby_pigman" },
@ -73,9 +74,7 @@ local pigman = {
punch_start = 90, punch_start = 90,
punch_end = 130, punch_end = 130,
}, },
water_damage = 1,
lava_damage = 0, lava_damage = 0,
light_damage = 0,
fear_height = 4, fear_height = 4,
view_range = 16, view_range = 16,
} }