12 Commits

Author SHA1 Message Date
b2a94399ec Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-06-20 15:49:44 +02:00
7383549476 Corrige spawn palmiers sur mud et corrige warning démarrage 2020-06-14 15:05:07 +02:00
ac9dd5503c Annule changement settings. Again. 2020-06-14 11:38:37 +02:00
5ee036f0f4 Annule les changements dans default_settings.txt
Revient au valeurs par défaut. Les paramètres seront lus depuis le
dossier du world.
2020-06-14 11:09:46 +02:00
fab2944277 Désactive génération de moretrees au profit de celle de nalc
Ajoute la terre méditérranéenne comme terrain de spawn
2020-06-13 14:34:28 +02:00
e72c539cdc add minimum minetest version key for contentdb 2020-06-03 13:00:26 -04:00
c8aaaf20ed Active les barrières et les feuilles d'arbres simplifiés 2020-05-08 19:26:52 +02:00
93553670d2 Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-05-08 16:21:00 +02:00
66fd6724c5 Merge branch 'respect_protection' into 'master'
Respect protection when placing saplings

See merge request VanessaE/moretrees!6
2020-04-23 02:40:25 +00:00
fa83e1b262 Respect protection when placing saplings 2020-04-22 22:09:04 +00:00
f94f1bea26 Merge branch 'patch-1' into 'master'
Fix missing comma messing with load order

See merge request VanessaE/moretrees!5
2020-04-20 08:14:05 +00:00
09f08b50bc Fix missing comma messing with load order 2020-04-20 08:04:21 +00:00
3 changed files with 36 additions and 9 deletions

View File

@ -1,3 +1,4 @@
name = moretrees
depends = default, biome_lib, vessels
optional_depends = doors stairs, moreblocks, intllib, farming
optional_depends = doors, stairs, moreblocks, intllib, farming
min_minetest_version = 5.2.0

View File

@ -26,6 +26,7 @@ local dirs3 = { 14, 11, 16, 5, 14 }
local moretrees_new_leaves_drawtype = "allfaces_optional"
local moretrees_plantlike_leaves_visual_scale = 1
local moretrees_new_leaves_waving = 1
if moretrees.plantlike_leaves then
moretrees_new_leaves_drawtype = "plantlike"
@ -119,15 +120,24 @@ for i in ipairs(moretrees.treelist) do
},
groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
sounds = default.node_sound_defaults(),
on_place = function(itemstack, placer, pointed_thing)
itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
"moretrees:" ..treename.. "_sapling",
-- minp, maxp to be checked, relative to sapling pos
-- minp_relative.y = 1 because sapling pos has been checked
{x = -3, y = 1, z = -3},
{x = 3, y = 6, z = 3},
-- maximum interval of interior volume check
4)
return itemstack
end,
})
local moretrees_leaves_inventory_image = nil
local moretrees_new_leaves_waving = nil
if moretrees.plantlike_leaves then
moretrees_leaves_inventory_image = minetest.inventorycube("moretrees_"..treename.."_leaves.png")
else
moretrees_new_leaves_waving = 1
end
minetest.register_node("moretrees:"..treename.."_leaves", {
@ -261,7 +271,19 @@ for i in ipairs(moretrees.treelist) do
},
groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1},
sounds = default.node_sound_defaults(),
drop = "moretrees:"..treename.."_sapling"
drop = "moretrees:"..treename.."_sapling",
on_place = function(itemstack, placer, pointed_thing)
itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
"moretrees:" ..treename.. "_sapling_ongen",
-- minp, maxp to be checked, relative to sapling pos
-- minp_relative.y = 1 because sapling pos has been checked
{x = -3, y = 1, z = -3},
{x = 3, y = 6, z = 3},
-- maximum interval of interior volume check
4)
return itemstack
end,
})
local fruitname = nil
@ -366,8 +388,6 @@ for color = 1, #jungleleaves do
if moretrees.plantlike_leaves then
moretrees_leaves_inventory_image = minetest.inventorycube("moretrees_jungletree_leaves_"..jungleleaves[color]..".png")
else
moretrees_new_leaves_waving = 1
end
minetest.register_node(leave_name, {

View File

@ -6,6 +6,9 @@
local dirt_surfaces = {
set = true,
["default:dirt"] = true,
["default:dirt_with_snow"] = true,
["default:dry_dirt"] = true,
["default:dry_dirt_with_dry_grass"] = true,
["default:dirt_with_grass"] = true,
["default:dirt_with_dry_grass"] = true,
["default:dirt_with_coniferous_litter"] = true,
@ -13,7 +16,8 @@ local dirt_surfaces = {
["woodsoils:dirt_with_leaves_1"] = true,
["woodsoils:dirt_with_leaves_2"] = true,
["woodsoils:grass_with_leaves_1"] = true,
["woodsoils:grass_with_leaves_2"] = true
["woodsoils:grass_with_leaves_2"] = true,
["meditteranean_biome:dirt_with_mediterranean_grass"] = true
}
local conifer_surfaces = {
@ -27,7 +31,8 @@ local conifer_surfaces = {
["woodsoils:dirt_with_leaves_2"] = true,
["woodsoils:grass_with_leaves_1"] = true,
["woodsoils:grass_with_leaves_2"] = true,
["default:dirt_with_snow"] = true
["default:dirt_with_snow"] = true,
["meditteranean_biome:dirt_with_mediterranean_grass"] = true
}
local sand_surfaces = {
@ -35,6 +40,7 @@ local sand_surfaces = {
["default:sand"] = true,
["default:desert_sand"] = true,
["cottages:loam"] = true,
["darkage:mud"] = true,
-- note, no silver sand here.
-- too cold for a palm, too... well... sandy for anything else.
}