Merge branch 'master' into feature/remove-hard-dependency-on-default

This commit is contained in:
Juraj Vajda 2023-03-29 20:42:56 -04:00
commit 7456543f37
15 changed files with 130 additions and 3 deletions

View File

@ -1056,6 +1056,11 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file)
- everness_ice_hit.3.ogg - everness_ice_hit.3.ogg
- everness_ice_hit.4.ogg - everness_ice_hit.4.ogg
**CC-BY-4.0, by SFXAFRIK**, https://freesound.org/people/SFXAFRIK/sounds/584855/
- everness_door_glass_close.ogg
- everness_door_glass_open.ogg
**CC0-1.0, by Nox_Sound**, https://freesound.org **CC0-1.0, by Nox_Sound**, https://freesound.org
- everness_stone_dug.1.ogg - everness_stone_dug.1.ogg

View File

@ -95,6 +95,15 @@ minetest.register_craft({
} }
}) })
minetest.register_craft({
output = 'everness:trapdoor_crystal_wood 2',
recipe = {
{ 'everness:crystal_wood', 'everness:crystal_wood', 'everness:crystal_wood' },
{ 'everness:crystal_wood', 'everness:crystal_wood', 'everness:crystal_wood' },
{ '', '', '' },
}
})
minetest.register_craft({ minetest.register_craft({
output = 'everness:bamboo_mosaic_wood', output = 'everness:bamboo_mosaic_wood',
recipe = { recipe = {
@ -234,6 +243,13 @@ minetest.register_craft({
} }
}) })
minetest.register_craft({
output = 'everness:crystal_wood 4',
recipe = {
{ 'everness:crystal_tree' },
}
})
minetest.register_craft({ minetest.register_craft({
output = 'everness:coral_sandstone 4', output = 'everness:coral_sandstone 4',
recipe = { recipe = {
@ -584,6 +600,12 @@ minetest.register_craft({
burntime = 15, burntime = 15,
}) })
minetest.register_craft({
type = 'fuel',
recipe = 'everness:crystal_wood',
burntime = 15,
})
minetest.register_craft({ minetest.register_craft({
type = 'fuel', type = 'fuel',
recipe = 'everness:bamboo_mosaic_wood', recipe = 'everness:bamboo_mosaic_wood',
@ -602,6 +624,12 @@ minetest.register_craft({
burntime = 7, burntime = 7,
}) })
minetest.register_craft({
type = 'fuel',
recipe = 'everness:trapdoor_crystal_wood',
burntime = 7,
})
minetest.register_craft({ minetest.register_craft({
type = 'fuel', type = 'fuel',
recipe = 'everness:door_bamboo', recipe = 'everness:door_bamboo',

View File

@ -22,7 +22,7 @@ doors.register('everness:door_bamboo', {
tiles = { { name = 'everness_door_bamboo.png', backface_culling = true } }, tiles = { { name = 'everness_door_bamboo.png', backface_culling = true } },
description = S('Bamboo Door'), description = S('Bamboo Door'),
inventory_image = 'everness_door_bamboo_item.png', inventory_image = 'everness_door_bamboo_item.png',
groups = { node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 }, groups = { node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1 },
sounds = Everness.node_sound_bamboo_defaults({ sounds = Everness.node_sound_bamboo_defaults({
dug = { name = 'everness_bamboo_hit', gain = 1.25 } dug = { name = 'everness_bamboo_hit', gain = 1.25 }
}), }),
@ -64,7 +64,7 @@ doors.register('everness:door_bone_pyrite', {
tiles = { { name = 'everness_door_bone_pyrite.png', backface_culling = true } }, tiles = { { name = 'everness_door_bone_pyrite.png', backface_culling = true } },
description = S('Bone Pyrit Door'), description = S('Bone Pyrit Door'),
inventory_image = 'everness_door_bone_pyrite_item.png', inventory_image = 'everness_door_bone_pyrite_item.png',
groups = { node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 }, groups = { node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1 },
sounds = Everness.node_sound_wood_defaults(), sounds = Everness.node_sound_wood_defaults(),
recipe = { recipe = {
{ 'everness:pyrite_ingot', 'everness:bone' }, { 'everness:pyrite_ingot', 'everness:bone' },
@ -77,7 +77,7 @@ doors.register('everness:door_willow', {
tiles = { { name = 'everness_door_willow.png', backface_culling = true } }, tiles = { { name = 'everness_door_willow.png', backface_culling = true } },
description = S('Willow Door'), description = S('Willow Door'),
inventory_image = 'everness_door_willow_item.png', inventory_image = 'everness_door_willow_item.png',
groups = { node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 }, groups = { node = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, door = 1 },
sounds = Everness.node_sound_wood_defaults(), sounds = Everness.node_sound_wood_defaults(),
recipe = { recipe = {
{ 'everness:willow_wood', 'everness:willow_wood' }, { 'everness:willow_wood', 'everness:willow_wood' },
@ -85,3 +85,43 @@ doors.register('everness:door_willow', {
{ 'everness:willow_wood', 'everness:willow_wood' }, { 'everness:willow_wood', 'everness:willow_wood' },
} }
}) })
doors.register('everness:door_crystal_wood', {
description = S('Crystal Wood Door'),
tiles = { 'everness_door_crystal_wood.png' },
inventory_image = 'everness_door_crystal_wood_item.png',
use_texture_alpha = true,
groups = { node = 1, cracky = 3, oddly_breakable_by_hand = 3, door = 1 },
sounds = Everness.node_sound_glass_defaults(),
sound_open = 'everness_door_glass_open',
sound_close = 'everness_door_glass_close',
gain_open = 0.3,
gain_close = 0.25,
recipe = {
{ 'everness:crystal_wood', 'everness:crystal_wood' },
{ 'everness:crystal_wood', 'everness:crystal_wood' },
{ 'everness:crystal_wood', 'everness:crystal_wood' },
}
})
doors.register_trapdoor('everness:trapdoor_crystal_wood', {
description = S('Crystal Wood Trapdoor'),
inventory_image = 'everness_door_trapdoor_crystal_wood.png',
wield_image = 'everness_door_trapdoor_crystal_wood.png',
tile_front = 'everness_door_trapdoor_crystal_wood.png',
tile_side = 'everness_door_trapdoor_crystal_wood_side.png',
use_texture_alpha = true,
sounds = Everness.node_sound_glass_defaults(),
sound_open = 'everness_door_glass_open',
sound_close = 'everness_door_glass_close',
gain_open = 0.3,
gain_close = 0.25,
groups = { node = 1, cracky = 3, oddly_breakable_by_hand = 3, door = 1 },
})
doors.register_fencegate('everness:gate_crystal_wood', {
description = S('Crystal Wood Fence Gate'),
texture = 'everness_crystal_wood.png^[transformR90',
material = 'everness:crystal_wood',
groups = { choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 }
})

View File

@ -81,3 +81,35 @@ default.register_mesepost('everness:mese_post_light_bamboo_wood', {
texture = 'everness_fence_bamboo_wood.png^[transformFY', texture = 'everness_fence_bamboo_wood.png^[transformFY',
material = 'everness:bamboo_wood', material = 'everness:bamboo_wood',
}) })
-- Crystal Wood
default.register_fence('everness:fence_crystal_wood', {
description = S('Crystal Wood Fence'),
texture = 'everness_fence_crystal_wood.png',
inventory_image = 'default_fence_overlay.png^everness_crystal_wood.png^' ..
'default_fence_overlay.png^[makealpha:255,126,126',
wield_image = 'default_fence_overlay.png^everness_crystal_wood.png^' ..
'default_fence_overlay.png^[makealpha:255,126,126',
material = 'everness:crystal_wood',
groups = { choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 },
sounds = default.node_sound_wood_defaults()
})
default.register_fence_rail('everness:fence_rail_crystal_wood', {
description = S('Crystal Wood Fence Rail'),
texture = 'everness_fence_rail_crystal_wood.png^[transformR90',
inventory_image = 'default_fence_rail_overlay.png^everness_crystal_wood.png^' ..
'default_fence_rail_overlay.png^[makealpha:255,126,126',
wield_image = 'default_fence_rail_overlay.png^everness_crystal_wood.png^' ..
'default_fence_rail_overlay.png^[makealpha:255,126,126',
material = 'everness:crystal_wood',
groups = { choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 },
sounds = default.node_sound_wood_defaults()
})
default.register_mesepost('everness:mese_post_light_bamboo_wood', {
description = S('Crystal Wood Mese Post Light'),
texture = 'everness_fence_crystal_wood.png^[transformFY',
material = 'everness:crystal_wood',
})

View File

@ -1607,6 +1607,16 @@ Everness:register_node('everness:crystal_tree', {
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
}) })
minetest.register_node('everness:crystal_wood', {
description = S('Crystal Wood Planks'),
paramtype2 = 'facedir',
place_param2 = 0,
tiles = { 'everness_crystal_wood.png' },
is_ground_content = false,
groups = { choppy = 2, oddly_breakable_by_hand = 2, flammable = 2, wood = 1 },
sounds = default.node_sound_wood_defaults(),
})
-- Everness:register_node('everness:mese_tree', { -- Everness:register_node('everness:mese_tree', {
-- description = S('Mese Tree Trunk'), -- description = S('Mese Tree Trunk'),
-- short_description = S('Mese Tree Trunk'), -- short_description = S('Mese Tree Trunk'),

Binary file not shown.

Binary file not shown.

View File

@ -268,6 +268,18 @@ stairs.register_stair_and_slab(
true true
) )
-- Crystal Wood
stairs.register_stair_and_slab(
'crystal_wood',
'everness:crystal_wood',
{ choppy = 2, oddly_breakable_by_hand = 2, flammable = 2 },
{ 'everness_crystal_wood.png' },
S('Crystal Wood Stair'),
S('Crystal Wood Slab'),
default.node_sound_wood_defaults(),
true
)
-- Magma Cobble -- Magma Cobble

Binary file not shown.

After

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B