mirror of
https://git.minetest.land/VoxeLibre/VoxeLibre.git
synced 2024-12-23 08:29:34 +01:00
Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2
This commit is contained in:
commit
484ffc924a
6 changed files with 308 additions and 304 deletions
|
@ -11,7 +11,7 @@ function mobs:spawn_abm_check(pos, node, name)
|
||||||
elseif is_forbidden_node(pos, node) or is_forbidden_node(vector.add(pos, vector.new(0, 1, 0))) then
|
elseif is_forbidden_node(pos, node) or is_forbidden_node(vector.add(pos, vector.new(0, 1, 0))) then
|
||||||
return true
|
return true
|
||||||
-- Spawn on opaque or liquid nodes
|
-- Spawn on opaque or liquid nodes
|
||||||
elseif minetest.get_item_group(node.name, "opaque") ~= 0 or minetest.registered_nodes[node.name].liquidtype ~= "none" then
|
elseif minetest.get_item_group(node.name, "opaque") ~= 0 or minetest.registered_nodes[node.name].liquidtype ~= "none" or node.name == "mcl_core:grass_path" then
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1067,7 +1067,7 @@ mobs:register_mob("mobs_mc:villager", {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mobs:spawn_specific("mobs_mc:villager", mobs_mc.spawn.village, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 8000, 4, mobs_mc.spawn_height.water+1, mobs_mc.spawn_height.overworld_max)
|
mobs:spawn_specific("mobs_mc:villager", mobs_mc.spawn.village, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 20, 4, mobs_mc.spawn_height.water+1, mobs_mc.spawn_height.overworld_max)
|
||||||
|
|
||||||
-- spawn eggs
|
-- spawn eggs
|
||||||
mobs:register_egg("mobs_mc:villager", S("Villager"), "mobs_mc_spawn_icon_villager.png", 0)
|
mobs:register_egg("mobs_mc:villager", S("Villager"), "mobs_mc_spawn_icon_villager.png", 0)
|
||||||
|
|
|
@ -225,6 +225,7 @@ mobs_mc.override.spawn = {
|
||||||
nether_fortress = { "mcl_nether:nether_brick", "mcl_nether:netherrack" },
|
nether_fortress = { "mcl_nether:nether_brick", "mcl_nether:netherrack" },
|
||||||
nether_portal = { mobs_mc.override.items.nether_portal },
|
nether_portal = { mobs_mc.override.items.nether_portal },
|
||||||
wolf = { mobs_mc.override.items.grass_block, "mcl_core:dirt", "mcl_core:dirt_with_grass_snow", "mcl_core:snow", "mcl_core:snowblock", "mcl_core:podzol" },
|
wolf = { mobs_mc.override.items.grass_block, "mcl_core:dirt", "mcl_core:dirt_with_grass_snow", "mcl_core:snow", "mcl_core:snowblock", "mcl_core:podzol" },
|
||||||
|
village = { "mcl_villages:stonebrickcarved", "mcl_core:grass_path", "mcl_core:sandstonesmooth2" },
|
||||||
}
|
}
|
||||||
|
|
||||||
-- This table contains important spawn height references for the mob spawn height.
|
-- This table contains important spawn height references for the mob spawn height.
|
||||||
|
|
|
@ -188,6 +188,7 @@ function settlements.place_schematics(settlement_info, pr)
|
||||||
local schem_lua = minetest.serialize_schematic(building,
|
local schem_lua = minetest.serialize_schematic(building,
|
||||||
"lua",
|
"lua",
|
||||||
{lua_use_comments = false, lua_num_indent_spaces = 0}).." return(schematic)"
|
{lua_use_comments = false, lua_num_indent_spaces = 0}).." return(schematic)"
|
||||||
|
schem_lua = schem_lua:gsub("mcl_core:stonebrickcarved", "mcl_villages:stonebrickcarved")
|
||||||
-- replace material
|
-- replace material
|
||||||
if replace_wall then
|
if replace_wall then
|
||||||
--Note, block substitution isn't matching node names exactly; so nodes that are to be substituted that have the same prefixes cause bugs.
|
--Note, block substitution isn't matching node names exactly; so nodes that are to be substituted that have the same prefixes cause bugs.
|
||||||
|
|
|
@ -13,18 +13,24 @@ dofile(settlements.modpath.."/paths.lua")
|
||||||
settlements_in_world = settlements.load()
|
settlements_in_world = settlements.load()
|
||||||
settlements.grundstellungen()
|
settlements.grundstellungen()
|
||||||
|
|
||||||
--[[ Disable custom node spawning.
|
|
||||||
--
|
--
|
||||||
-- register block for npc spawn
|
-- register block for npc spawn
|
||||||
--
|
--
|
||||||
minetest.register_node("settlements:junglewood", {
|
minetest.register_node("mcl_villages:stonebrickcarved", {
|
||||||
description = "special junglewood floor",
|
description = ("Chiseled Stone Village Bricks"),
|
||||||
tiles = {"default_junglewood.png"},
|
_doc_items_longdesc = doc.sub.items.temp.build,
|
||||||
groups = {choppy=3, wood=2},
|
tiles = {"mcl_core_stonebrick_carved.png"},
|
||||||
sounds = default.node_sound_wood_defaults(),
|
stack_max = 64,
|
||||||
|
drop = "mcl_core:stonebrickcarved",
|
||||||
|
groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, material_stone=1},
|
||||||
|
sounds = mcl_sounds.node_sound_stone_defaults(),
|
||||||
|
is_ground_content = false,
|
||||||
|
_mcl_blast_resistance = 6,
|
||||||
|
_mcl_hardness = 1.5,
|
||||||
})
|
})
|
||||||
|
|
||||||
--]]
|
|
||||||
|
|
||||||
|
|
||||||
--[[ Enable for testing, but use MineClone2's own spawn code if/when merging.
|
--[[ Enable for testing, but use MineClone2's own spawn code if/when merging.
|
||||||
|
|
|
@ -35,24 +35,20 @@ minetest.register_globalstep(function(dtime)
|
||||||
if controls.sneak and player:get_attach() == nil then
|
if controls.sneak and player:get_attach() == nil then
|
||||||
-- controls head pitch when sneaking
|
-- controls head pitch when sneaking
|
||||||
player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+36,0,0))
|
player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+36,0,0))
|
||||||
-- sets collisionbox, eye height, and nametag color accordingly
|
-- sets eye height, and nametag color accordingly
|
||||||
if player:get_properties().collisionbox ~= {-0.35,0,-0.35,0.35,1.35,0.35} then
|
player:set_properties({eye_height = 1.35, nametag_color = { r = 225, b = 225, a = 0, g = 225 }})
|
||||||
player:set_properties({collisionbox = {-0.35,0,-0.35,0.35,1.35,0.35}, eye_height = 1.35, nametag_color = { r = 255, b = 225, a = 0, g = 225 }})
|
|
||||||
end
|
|
||||||
elseif minetest.get_item_group(mcl_playerinfo[name].node_stand, "water") ~= 0 then
|
elseif minetest.get_item_group(mcl_playerinfo[name].node_stand, "water") ~= 0 then
|
||||||
-- controls head pitch when swiming
|
-- controls head pitch when swiming
|
||||||
player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90,0,0))
|
player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90,0,0))
|
||||||
-- sets collisionbox, eye height, and nametag color accordingly
|
-- sets eye height, and nametag color accordingly
|
||||||
if player:get_properties().collisionbox ~= {-0.35,0.2,-0.35,0.35,1.8,0.35} then
|
player:set_properties({eye_height = 1.65, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})
|
||||||
player:set_properties({collisionbox = {-0.35,0.2,-0.35,0.35,1.8,0.35}, eye_height = 1.65, nametag_color = { r = 255, b = 225, a = 225, g = 225 }})
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
-- controls head pitch when not sneaking
|
-- controls head pitch when not sneaking
|
||||||
player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch,0,0))
|
player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch,0,0))
|
||||||
-- sets collisionbox, eye height, and nametag color accordingly
|
-- sets eye height, and nametag color accordingly
|
||||||
if player:get_properties().collisionbox ~= {-0.35,0,-0.35,0.35,1.8,0.35} then
|
player:set_properties({eye_height = 1.65, nametag_color = { r = 225, b = 225, a = 225, g = 225 }})
|
||||||
player:set_properties({collisionbox = {-0.35,0,-0.35,0.35,1.8,0.35}, eye_height = 1.65, nametag_color = { r = 255, b = 225, a = 225, g = 225 }})
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
if mcl_playerplus_internal[name].jump_cooldown > 0 then
|
if mcl_playerplus_internal[name].jump_cooldown > 0 then
|
||||||
|
|
Loading…
Reference in a new issue