Merge pull request 'Fix some formatting issues in extra_mobs and mcl_mushroom' (#267) from rudzik8/MineClone5:fixformat into master

Reviewed-on: MineClone5/MineClone5#267
This commit is contained in:
debiankaios 2022-03-28 18:45:56 +00:00
commit 5b8d9cd2f0
3 changed files with 407 additions and 377 deletions

View File

@ -246,4 +246,4 @@ water-16,
water)
--spawn egg
mobs:register_egg("extra_mobs:dolphin", S("dolphin"), "extra_mobs_spawn_icon_dolphin.png", 0)
mobs:register_egg("extra_mobs:dolphin", S("Dolphin"), "extra_mobs_spawn_icon_dolphin.png", 0)

View File

@ -296,5 +296,5 @@ minetest.LIGHT_MAX+1,
mobs_mc.spawn_height.nether_min,
mobs_mc.spawn_height.nether_max)
-- spawn eggs
mobs:register_egg("extra_mobs:piglin", S("piglin"), "extra_mobs_spawn_icon_piglin.png", 0)
mobs:register_egg("extra_mobs:piglin_brute", S("piglin Brute"), "extra_mobs_spawn_icon_piglin.png", 0)
mobs:register_egg("extra_mobs:piglin", S("Piglin"), "extra_mobs_spawn_icon_piglin.png", 0)
mobs:register_egg("extra_mobs:piglin_brute", S("Piglin Brute"), "extra_mobs_spawn_icon_piglin.png", 0)

View File

@ -19,7 +19,7 @@ end
-- Warped fungus
-- Crimson fungus
--Functions and Biomes
-- Functions and Biomes
-- WARNING: The most comments are in german. Please Translate with an translater if you don't speak good german
@ -33,7 +33,6 @@ minetest.register_node("mcl_mushroom:warped_fungus", {
paramtype = "light",
walkable = false,
groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, compostability=65},
light_source = 1,
selection_box = {
type = "fixed",
@ -161,7 +160,8 @@ minetest.register_node("mcl_mushroom:shroomlight", {
minetest.register_node("mcl_mushroom:warped_hyphae", {
description = S("Warped Hyphae"),
tiles = {"warped_hyphae.png",
tiles = {
"warped_hyphae.png",
"warped_hyphae.png",
"warped_hyphae_side.png",
"warped_hyphae_side.png",
@ -176,7 +176,8 @@ minetest.register_node("mcl_mushroom:warped_hyphae", {
minetest.register_node("mcl_mushroom:warped_nylium", {
description = S("Warped Nylium"),
tiles = {"warped_nylium.png",
tiles = {
"warped_nylium.png",
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png^warped_nylium_side.png",
"mcl_nether_netherrack.png^warped_nylium_side.png",
@ -195,7 +196,8 @@ minetest.register_node("mcl_mushroom:warped_nylium", {
minetest.register_node("mcl_mushroom:warped_checknode", {
description = S("Warped Checknode - only to check!"),
tiles = {"mcl_nether_netherrack.png",
tiles = {
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png",
@ -215,12 +217,12 @@ minetest.register_node("mcl_mushroom:warped_hyphae_wood", {
description = S("Warped Hyphae Wood"),
tiles = {"warped_hyphae_wood.png"},
groups = {handy=5,axey=1, flammable=3,wood=1,building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=20},
paramtype2 = "facedir",
--paramtype2 = "facedir",
stack_max = 64,
_mcl_hardness = 2,
})
mcl_stairs.register_stair_and_slab_simple("warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood", S("Warped Stair"), S("Warped Slab"), S("Double Warped Slab"))
mcl_stairs.register_stair_and_slab_simple("warped_hyphae_wood", "mcl_mushroom:warped_hyphae_wood", S("Warped Stair"), S("Warped Slab"), S("Double Warped Slab"), "woodlike")
minetest.register_craft({
output = "mcl_mushroom:warped_hyphae_wood 4",
@ -276,7 +278,6 @@ minetest.register_abm({
elseif randomg > 150 and randomg <= 250 then
minetest.set_node({ x = pos.x, y = pos.y + 1, z = pos.z }, { name = "mcl_mushroom:warped_roots" })
end
else
minetest.swap_node({ x = pos.x, y = pos.y, z = pos.z }, { name = "mcl_nether:netherrack" })
end
@ -306,7 +307,6 @@ minetest.register_node("mcl_mushroom:crimson_fungus", {
paramtype = "light",
walkable = false,
groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1, compostability=65},
light_source = 1,
selection_box = {
type = "fixed",
@ -326,7 +326,6 @@ minetest.register_node("mcl_mushroom:crimson_fungus", {
end
end,
_mcl_blast_resistance = 0,
stack_max = 64,
})
@ -352,7 +351,8 @@ minetest.register_node("mcl_mushroom:crimson_roots", {
minetest.register_node("mcl_mushroom:crimson_hyphae", {
description = S("Crimson Hyphae"),
tiles = {"crimson_hyphae.png",
tiles = {
"crimson_hyphae.png",
"crimson_hyphae.png",
"crimson_hyphae_side.png",
"crimson_hyphae_side.png",
@ -376,7 +376,8 @@ minetest.register_node("mcl_mushroom:crimson_hyphae_wood", {
minetest.register_node("mcl_mushroom:crimson_nylium", {
description = S("Crimson Nylium"),
tiles = {"crimson_nylium.png",
tiles = {
"crimson_nylium.png",
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png^crimson_nylium_side.png",
"mcl_nether_netherrack.png^crimson_nylium_side.png",
@ -395,7 +396,8 @@ minetest.register_node("mcl_mushroom:crimson_nylium", {
minetest.register_node("mcl_mushroom:crimson_checknode", {
description = S("Crimson Checknode - only to check!"),
tiles = {"mcl_nether_netherrack.png",
tiles = {
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png",
"mcl_nether_netherrack.png",
@ -426,7 +428,7 @@ minetest.register_craft({
}
})
mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "Crimson Stair", "Crimson Slab", "Double Crimson Slab")
mcl_stairs.register_stair_and_slab_simple("crimson_hyphae_wood", "mcl_mushroom:crimson_hyphae_wood", "Crimson Stair", "Crimson Slab", "Double Crimson Slab", "woodlike")
minetest.register_abm({
label = "mcl_mushroom:crimson_fungus",
@ -472,37 +474,49 @@ minetest.register_abm({
function generate_warped_tree(pos)
local breakgrow = false
local breakgrow2 = false
-- Baumgenerator
-- erste und zweite Etage
-- Tree generator
-- first and second layer
for x = pos.x - 2,pos.x + 2 do
for y = pos.y + 3, pos.y + 4 do
for z = pos.z - 2, pos.z + 2 do
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then
breakgrow = true
end
end
end
end
-- dritte und vierte Etage
-- third and fourth layers
for x = pos.x - 1,pos.x + 1 do
for y = pos.y + 5, pos.y + 6 do
for z = pos.z - 1, pos.z + 1 do
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then
breakgrow = true
end
end
end
end
-- fünfte Etage
if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then breakgrow = true end
-- fifth layer
if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then
breakgrow = true
end
-- Holz
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then breakgrow = true end
-- Wood
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then
breakgrow = true
end
for y = pos.y + 1, pos.y + 4 do
if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then breakgrow = true end
if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then
breakgrow = true
end
end
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then
breakgrow2 = true
end
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:warped_fungus") then breakgrow2 = true end
if breakgrow == false then
-- Warzen
-- erste und zweite Etage
-- Warts
-- first and second layer
for x = pos.x - 2,pos.x + 2 do
for y = pos.y + 3, pos.y + 4 do
for z = pos.z - 2, pos.z + 2 do
@ -511,7 +525,7 @@ function generate_warped_tree(pos)
end
end
-- dritte und vierte Etage
-- third and fourth layers
for x = pos.x - 1,pos.x + 1 do
for y = pos.y + 5, pos.y + 6 do
for z = pos.z - 1, pos.z + 1 do
@ -520,10 +534,10 @@ function generate_warped_tree(pos)
end
end
-- fünfte Etage
-- fifth layer
minetest.set_node({x = pos.x, y = pos.y + 7, z = pos.z}, { name = "mcl_mushroom:warped_wart_block" })
-- Pilzlich
-- Fungal
local randomgenerate = math.random(1, 2)
if randomgenerate == 1 then
local randomx = math.random(-2, 2)
@ -536,50 +550,64 @@ function generate_warped_tree(pos)
local randomz = math.random(-2, 2)
minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
end
-- Holz
-- Wood
for y = pos.y, pos.y + 4 do
minetest.set_node({x = pos.x, y = y, z = pos.z}, { name = "mcl_mushroom:warped_hyphae" })
--print("Placed at " .. x .. " " .. y .. " " .. z)
end
else
if breakgrow2 == false then minetest.set_node(pos,{ name = "mcl_mushroom:warped_fungus" }) end
if breakgrow2 == false then
minetest.set_node(pos,{ name = "mcl_mushroom:warped_fungus" })
end
end
end
function generate_crimson_tree(pos)
local breakgrow = false
local breakgrow2 = false
-- Baumgenerator
-- erste und zweite Etage
-- Tree generator
-- first and second layer
for x = pos.x - 2,pos.x + 2 do
for y = pos.y + 3, pos.y + 4 do
for z = pos.z - 2, pos.z + 2 do
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then
breakgrow = true
end
end
end
end
-- dritte und vierte Etage
-- third and fourth layers
for x = pos.x - 1,pos.x + 1 do
for y = pos.y + 5, pos.y + 6 do
for z = pos.z - 1, pos.z + 1 do
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then breakgrow = true end
if not (minetest.get_node({x = x, y = y, z = z}).name == "air") then
breakgrow = true
end
end
end
end
-- fünfte Etage
if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then breakgrow = true end
-- fifth layer
if not (minetest.get_node({x = pos.x, y = pos.y + 7, z = pos.z}).name == "air") then
breakgrow = true
end
-- Holz
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then breakgrow = true end
-- Wood
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then
breakgrow = true
end
for y = pos.y + 1, pos.y + 4 do
if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then breakgrow = true end
if not (minetest.get_node({x = pos.x, y = y, z = pos.z}).name == "air") then
breakgrow = true
end
end
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then
breakgrow2 = true
end
if not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "air") and not (minetest.get_node({x = pos.x, y = pos.y, z = pos.z}).name == "mcl_mushroom:crimson_fungus") then breakgrow2 = true end
if breakgrow == false then
-- Warzen
-- erste und zweite Etage
-- Warts
-- first and second layer
for x = pos.x - 2,pos.x + 2 do
for y = pos.y + 3, pos.y + 4 do
for z = pos.z - 2, pos.z + 2 do
@ -588,7 +616,7 @@ function generate_crimson_tree(pos)
end
end
-- dritte und vierte Etage
-- third and fourth layers
for x = pos.x - 1,pos.x + 1 do
for y = pos.y + 5, pos.y + 6 do
for z = pos.z - 1, pos.z + 1 do
@ -597,10 +625,10 @@ function generate_crimson_tree(pos)
end
end
-- fünfte Etage
-- fifth layer
minetest.set_node({x = pos.x, y = pos.y + 7, z = pos.z}, { name = "mcl_nether:nether_wart_block" })
-- Pilzlich
-- Fungal
local randomgenerate = math.random(1, 2)
if randomgenerate == 1 then
local randomx = math.random(-2, 2)
@ -613,13 +641,15 @@ function generate_crimson_tree(pos)
local randomz = math.random(-2, 2)
minetest.set_node({x = pos.x + randomx, y = pos.y + 3, z = pos.z + randomz}, { name = "mcl_mushroom:shroomlight" })
end
-- Holz
-- Wood
for y = pos.y, pos.y + 4 do
minetest.set_node({x = pos.x, y = y, z = pos.z}, { name = "mcl_mushroom:crimson_hyphae" })
--print("Placed at " .. x .. " " .. y .. " " .. z)
end
else
if breakgrow2 == false then minetest.set_node(pos,{ name = "mcl_mushroom:crimson_fungus" }) end
if breakgrow2 == false then
minetest.set_node(pos,{ name = "mcl_mushroom:crimson_fungus" })
end
end
end