PhaethonH
/
MineClone2
forked from VoxeLibre/VoxeLibre
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into dyable-leather-armor

This commit is contained in:
AFCMS 2021-05-04 10:30:10 +02:00
parent e573dd25e1 0d29688b13
commit c1eefab8d6
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mods/ENTITIES/mobs_mc/creeper.lua
View File

@ -43,10 +43,10 @@ mobs:register_mob("mobs_mc:creeper", {
eye_height = 1.25, eye_height = 1.25,
--hssssssssssss --hssssssssssss
explosion_strength = 10, explosion_strength = 3,
explosion_radius = 4, --explosion_radius = 3,
explosion_damage_radius = 6, --explosion_damage_radius = 6,
explosiontimer_reset_radius = 6, --explosiontimer_reset_radius = 6,
reach = 1.5, reach = 1.5,
defuse_reach = 4, defuse_reach = 4,
explosion_timer = 0.3, explosion_timer = 0.3,
@ -148,7 +148,7 @@ mobs:register_mob("mobs_mc:creeper", {
}) })
mobs:register_mob("mobs_mc:creeper_charged", { mobs:register_mob("mobs_mc:creeper_charged", {
description = S("Creeper"), description = S("Charged Creeper"),
type = "monster", type = "monster",
spawn_class = "hostile", spawn_class = "hostile",
hp_min = 20, hp_min = 20,
@ -182,10 +182,10 @@ mobs:register_mob("mobs_mc:creeper_charged", {
runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" }, runaway_from = { "mobs_mc:ocelot", "mobs_mc:cat" },
attack_type = "explode", attack_type = "explode",
explosion_strength = 24, explosion_strength = 6,
explosion_radius = 12, --explosion_radius = 3,
explosion_damage_radius = 18, --explosion_damage_radius = 6,
explosiontimer_reset_radius = 10, --explosiontimer_reset_radius = 3,
reach = 1.5, reach = 1.5,
defuse_reach = 4, defuse_reach = 4,
explosion_timer = 0.3, explosion_timer = 0.3,

5
mods/ITEMS/mcl_farming/pumpkin.lua
View File

@ -117,8 +117,9 @@ pumpkin_face_base_def.groups.armor_head=1
pumpkin_face_base_def.groups.non_combat_armor_head=1 pumpkin_face_base_def.groups.non_combat_armor_head=1
pumpkin_face_base_def._mcl_armor_mob_range_factor = 0 pumpkin_face_base_def._mcl_armor_mob_range_factor = 0
pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:enderman" pumpkin_face_base_def._mcl_armor_mob_range_mob = "mobs_mc:enderman"
pumpkin_face_base_def._mcl_armor_entry = "head" pumpkin_face_base_def._mcl_armor_element = "head"
pumpkin_face_base_def.groups.non_combat_armor=1 pumpkin_face_base_def._mcl_armor_texture = "mcl_farming_pumpkin_face.png"
pumpkin_face_base_def._mcl_armor_preview = "mcl_farming_pumpkin_face_preview.png"
if minetest.get_modpath("mcl_armor") then if minetest.get_modpath("mcl_armor") then
pumpkin_face_base_def.on_secondary_use = mcl_armor.equip_on_use pumpkin_face_base_def.on_secondary_use = mcl_armor.equip_on_use
end end

2
mods/ITEMS/mcl_heads/init.lua
View File

@ -112,6 +112,8 @@ local function addhead(name, texture, desc, longdesc, rangemob, rangefactor)
_mcl_armor_mob_range_mob = rangemob, _mcl_armor_mob_range_mob = rangemob,
_mcl_armor_mob_range_factor = rangefactor, _mcl_armor_mob_range_factor = rangefactor,
_mcl_armor_element = "head", _mcl_armor_element = "head",
_mcl_armor_texture = "mcl_heads_" .. name .. ".png",
_mcl_armor_preview = "mcl_heads_" .. name .. "_preview.png",
_mcl_blast_resistance = 1, _mcl_blast_resistance = 1,
_mcl_hardness = 1, _mcl_hardness = 1,
}) })