aboutsummaryrefslogtreecommitdiff
path: root/games/minimal/mods
diff options
context:
space:
mode:
Diffstat (limited to 'games/minimal/mods')
-rw-r--r--games/minimal/mods/default/init.lua104
-rw-r--r--games/minimal/mods/default/mapgen.lua156
-rw-r--r--games/minimal/mods/default/textures/default_jungletree.pngbin210 -> 0 bytes
-rw-r--r--games/minimal/mods/default/textures/default_jungletree_top.pngbin205 -> 0 bytes
4 files changed, 135 insertions, 125 deletions
diff --git a/games/minimal/mods/default/init.lua b/games/minimal/mods/default/init.lua
index 01bf65b95..bff7860e3 100644
--- a/games/minimal/mods/default/init.lua
+++ b/games/minimal/mods/default/init.lua
@@ -452,9 +452,7 @@ minetest.register_craft({
}
})
---
--- Crafting (tool repair)
---
+-- Tool repair
minetest.register_craft({
type = "toolrepair",
additional_wear = -0.02,
@@ -478,12 +476,6 @@ minetest.register_craft({
minetest.register_craft({
type = "cooking",
- output = "default:coal_lump",
- recipe = "default:jungletree",
-})
-
-minetest.register_craft({
- type = "cooking",
output = "default:stone",
recipe = "default:cobble",
})
@@ -512,12 +504,6 @@ minetest.register_craft({
minetest.register_craft({
type = "fuel",
- recipe = "default:jungletree",
- burntime = 30,
-})
-
-minetest.register_craft({
- type = "fuel",
recipe = "default:junglegrass",
burntime = 2,
})
@@ -707,7 +693,7 @@ function default.node_sound_glass_defaults(table)
return table
end
---
+-- Register nodes
minetest.register_node("default:stone", {
description = "Stone",
@@ -736,7 +722,9 @@ minetest.register_node("default:stone_with_iron", {
minetest.register_node("default:dirt_with_grass", {
description = "Dirt with grass",
- tiles ={"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+ tiles ={"default_grass.png", "default_dirt.png",
+ {name = "default_dirt.png^default_grass_side.png",
+ tileable_vertical = false}},
groups = {crumbly=3, soil=1},
drop = 'default:dirt',
sounds = default.node_sound_dirt_defaults({
@@ -746,7 +734,9 @@ minetest.register_node("default:dirt_with_grass", {
minetest.register_node("default:dirt_with_grass_footsteps", {
description = "Dirt with grass and footsteps",
- tiles ={"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
+ tiles ={"default_grass_footsteps.png", "default_dirt.png",
+ {name = "default_dirt.png^default_grass_side.png",
+ tileable_vertical = false}},
groups = {crumbly=3, soil=1},
drop = 'default:dirt',
sounds = default.node_sound_dirt_defaults({
@@ -798,6 +788,7 @@ minetest.register_node("default:clay", {
minetest.register_node("default:brick", {
description = "Brick",
tiles ={"default_brick.png"},
+ is_ground_content = false,
groups = {cracky=3},
drop = 'default:clay_brick 4',
sounds = default.node_sound_stone_defaults(),
@@ -806,13 +797,7 @@ minetest.register_node("default:brick", {
minetest.register_node("default:tree", {
description = "Tree",
tiles ={"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
- groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1},
- sounds = default.node_sound_wood_defaults(),
-})
-
-minetest.register_node("default:jungletree", {
- description = "Jungle Tree",
- tiles ={"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
+ is_ground_content = false,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1},
sounds = default.node_sound_wood_defaults(),
})
@@ -878,6 +863,7 @@ minetest.register_node("default:papyrus", {
minetest.register_node("default:bookshelf", {
description = "Bookshelf",
tiles ={"default_wood.png", "default_wood.png", "default_bookshelf.png"},
+ is_ground_content = false,
groups = {snappy=2,choppy=3,oddly_breakable_by_hand=2},
sounds = default.node_sound_wood_defaults(),
})
@@ -887,6 +873,7 @@ minetest.register_node("default:glass", {
drawtype = "glasslike",
tiles ={"default_glass.png"},
paramtype = "light",
+ is_ground_content = false,
sunlight_propagates = true,
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(),
@@ -899,6 +886,7 @@ minetest.register_node("default:fence_wood", {
inventory_image = "default_fence.png",
wield_image = "default_fence.png",
paramtype = "light",
+ is_ground_content = false,
selection_box = {
type = "fixed",
fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
@@ -914,6 +902,7 @@ minetest.register_node("default:rail", {
inventory_image = "default_rail.png",
wield_image = "default_rail.png",
paramtype = "light",
+ is_ground_content = false,
walkable = false,
selection_box = {
type = "fixed",
@@ -930,6 +919,7 @@ minetest.register_node("default:ladder", {
wield_image = "default_ladder.png",
paramtype = "light",
paramtype2 = "wallmounted",
+ is_ground_content = false,
walkable = false,
climbable = true,
selection_box = {
@@ -946,6 +936,7 @@ minetest.register_node("default:ladder", {
minetest.register_node("default:wood", {
description = "Wood",
tiles ={"default_wood.png"},
+ is_ground_content = false,
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
sounds = default.node_sound_wood_defaults(),
})
@@ -960,6 +951,7 @@ minetest.register_node("default:mese", {
minetest.register_node("default:cloud", {
description = "Cloud",
tiles ={"default_cloud.png"},
+ is_ground_content = false,
sounds = default.node_sound_defaults(),
})
@@ -978,6 +970,7 @@ minetest.register_node("default:water_flowing", {
pointable = false,
diggable = false,
buildable_to = true,
+ is_ground_content = false,
drowning = 1,
liquidtype = "flowing",
liquid_alternative_flowing = "default:water_flowing",
@@ -1002,6 +995,7 @@ minetest.register_node("default:water_source", {
pointable = false,
diggable = false,
buildable_to = true,
+ is_ground_content = false,
drowning = 1,
liquidtype = "source",
liquid_alternative_flowing = "default:water_flowing",
@@ -1034,6 +1028,7 @@ minetest.register_node("default:lava_flowing", {
pointable = false,
diggable = false,
buildable_to = true,
+ is_ground_content = false,
drowning = 1,
liquidtype = "flowing",
liquid_alternative_flowing = "default:lava_flowing",
@@ -1062,6 +1057,7 @@ minetest.register_node("default:lava_source", {
pointable = false,
diggable = false,
buildable_to = true,
+ is_ground_content = false,
drowning = 1,
liquidtype = "source",
liquid_alternative_flowing = "default:lava_flowing",
@@ -1146,7 +1142,8 @@ minetest.register_node("default:chest", {
meta:set_string("formspec",
"size[8,9]"..
"list[current_name;main;0,0;8,4;]"..
- "list[current_player;main;0,5;8,4;]")
+ "list[current_player;main;0,5;8,4;]" ..
+ "listring[]")
meta:set_string("infotext", "Chest")
local inv = meta:get_inventory()
inv:set_size("main", 8*4)
@@ -1185,7 +1182,8 @@ minetest.register_node("default:chest_locked", {
meta:set_string("formspec",
"size[8,9]"..
"list[current_name;main;0,0;8,4;]"..
- "list[current_player;main;0,5;8,4;]")
+ "list[current_player;main;0,5;8,4;]" ..
+ "listring[]")
meta:set_string("infotext", "Locked Chest")
meta:set_string("owner", "")
local inv = meta:get_inventory()
@@ -1249,7 +1247,11 @@ default.furnace_inactive_formspec =
"list[current_name;fuel;2,3;1,1;]"..
"list[current_name;src;2,1;1,1;]"..
"list[current_name;dst;5,1;2,2;]"..
- "list[current_player;main;0,5;8,4;]"
+ "list[current_player;main;0,5;8,4;]" ..
+ "listring[current_name;dst]" ..
+ "listring[current_player;main]" ..
+ "listring[current_name;src]" ..
+ "listring[current_player;main]"
minetest.register_node("default:furnace", {
description = "Furnace",
@@ -1386,7 +1388,11 @@ minetest.register_abm({
"list[current_name;fuel;2,3;1,1;]"..
"list[current_name;src;2,1;1,1;]"..
"list[current_name;dst;5,1;2,2;]"..
- "list[current_player;main;0,5;8,4;]")
+ "list[current_player;main;0,5;8,4;]" ..
+ "listring[current_name;dst]" ..
+ "listring[current_player;main]" ..
+ "listring[current_name;src]" ..
+ "listring[current_player;main]")
return
end
@@ -1430,6 +1436,7 @@ minetest.register_abm({
minetest.register_node("default:cobble", {
description = "Cobble",
tiles ={"default_cobble.png"},
+ is_ground_content = false,
groups = {cracky=3},
sounds = default.node_sound_stone_defaults(),
})
@@ -1437,6 +1444,7 @@ minetest.register_node("default:cobble", {
minetest.register_node("default:mossycobble", {
description = "Mossy Cobble",
tiles ={"default_mossycobble.png"},
+ is_ground_content = false,
groups = {cracky=3},
sounds = default.node_sound_stone_defaults(),
})
@@ -1444,6 +1452,7 @@ minetest.register_node("default:mossycobble", {
minetest.register_node("default:steelblock", {
description = "Steel Block",
tiles ={"default_steel_block.png"},
+ is_ground_content = false,
groups = {snappy=1,bendy=2},
sounds = default.node_sound_stone_defaults(),
})
@@ -1489,6 +1498,7 @@ minetest.register_node("default:apple", {
tiles ={"default_apple.png"},
inventory_image = "default_apple.png",
paramtype = "light",
+ is_ground_content = false,
sunlight_propagates = true,
walkable = false,
groups = {fleshy=3,dig_immediate=3},
@@ -1496,6 +1506,9 @@ minetest.register_node("default:apple", {
sounds = default.node_sound_defaults(),
})
+--
+-- Grow tree function
+--
local c_air = minetest.get_content_id("air")
local c_ignore = minetest.get_content_id("ignore")
@@ -1568,13 +1581,19 @@ function default.grow_tree(data, a, pos, is_apple_tree, seed)
end
end
+--
+-- ABMs
+--
+
minetest.register_abm({
nodenames = {"default:sapling"},
interval = 10,
chance = 50,
action = function(pos, node)
- local is_soil = minetest.registered_nodes[minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name].groups.soil
- if is_soil == nil or is_soil == 0 then return end
+ if minetest.get_item_group(minetest.get_node(
+ {x = pos.x, y = pos.y - 1, z = pos.z}).name, "soil") == 0 then
+ return
+ end
print("A sapling grows into a tree at "..minetest.pos_to_string(pos))
local vm = minetest.get_voxel_manip()
local minp, maxp = vm:read_from_map({x=pos.x-16, y=pos.y, z=pos.z-16}, {x=pos.x+16, y=pos.y+16, z=pos.z+16})
@@ -1674,29 +1693,9 @@ minetest.register_craftitem("default:scorched_stuff", {
})
--
--- Aliases for the current map generator outputs
+-- Support old code
--
-minetest.register_alias("mapgen_air", "air")
-minetest.register_alias("mapgen_stone", "default:stone")
-minetest.register_alias("mapgen_tree", "default:tree")
-minetest.register_alias("mapgen_leaves", "default:leaves")
-minetest.register_alias("mapgen_apple", "default:apple")
-minetest.register_alias("mapgen_water_source", "default:water_source")
-minetest.register_alias("mapgen_dirt", "default:dirt")
-minetest.register_alias("mapgen_sand", "default:sand")
-minetest.register_alias("mapgen_gravel", "default:gravel")
-minetest.register_alias("mapgen_clay", "default:clay")
-minetest.register_alias("mapgen_lava_source", "default:lava_source")
-minetest.register_alias("mapgen_cobble", "default:cobble")
-minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
-minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
-minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
-minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
-minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
-minetest.register_alias("mapgen_mese", "default:mese")
-
--- Support old code
function default.spawn_falling_node(p, nodename)
spawn_falling_node(p, nodename)
end
@@ -1795,3 +1794,4 @@ test_get_craft_result()
--dump2(minetest.registered_entities)
-- END
+
diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua
index dd839b9a0..2082d5983 100644
--- a/games/minimal/mods/default/mapgen.lua
+++ b/games/minimal/mods/default/mapgen.lua
@@ -1,126 +1,136 @@
--- minetest/default/mapgen.lua
-
--
-- Aliases for map generator outputs
--
+
minetest.register_alias("mapgen_stone", "default:stone")
-minetest.register_alias("mapgen_tree", "default:tree")
-minetest.register_alias("mapgen_leaves", "default:leaves")
-minetest.register_alias("mapgen_apple", "default:apple")
-minetest.register_alias("mapgen_water_source", "default:water_source")
minetest.register_alias("mapgen_dirt", "default:dirt")
+minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
minetest.register_alias("mapgen_sand", "default:sand")
-minetest.register_alias("mapgen_gravel", "default:gravel")
-minetest.register_alias("mapgen_clay", "default:clay")
+minetest.register_alias("mapgen_water_source", "default:water_source")
minetest.register_alias("mapgen_lava_source", "default:lava_source")
-minetest.register_alias("mapgen_cobble", "default:cobble")
-minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
-minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
+minetest.register_alias("mapgen_gravel", "default:gravel")
+
+minetest.register_alias("mapgen_tree", "default:tree")
+minetest.register_alias("mapgen_leaves", "default:leaves")
+minetest.register_alias("mapgen_apple", "default:apple")
minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
-minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
-minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
-minetest.register_alias("mapgen_mese", "default:mese")
+
+minetest.register_alias("mapgen_cobble", "default:cobble")
minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
+minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
+
--
-- Ore generation
--
+
+-- Blob ore first to avoid other ores inside blobs
+
+minetest.register_ore({
+ ore_type = "blob",
+ ore = "default:clay",
+ wherein = {"default:sand"},
+ clust_scarcity = 24*24*24,
+ clust_size = 7,
+ y_min = -15,
+ y_max = 0,
+ noise_threshhold = 0,
+ noise_params = {
+ offset=0.35,
+ scale=0.2,
+ spread={x=5, y=5, z=5},
+ seed=-316,
+ octaves=1,
+ persist=0.5
+ },
+})
+
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_coal",
wherein = "default:stone",
clust_scarcity = 8*8*8,
- clust_num_ores = 5,
+ clust_num_ores = 8,
clust_size = 3,
- height_min = -31000,
- height_max = 64,
+ y_min = -31000,
+ y_max = 64,
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_iron",
wherein = "default:stone",
- clust_scarcity = 16*16*16,
- clust_num_ores = 5,
- clust_size = 3,
- height_min = -5,
- height_max = 7,
+ clust_scarcity = 12*12*12,
+ clust_num_ores = 3,
+ clust_size = 2,
+ y_min = -15,
+ y_max = 2,
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_iron",
wherein = "default:stone",
- clust_scarcity = 12*12*12,
+ clust_scarcity = 9*9*9,
clust_num_ores = 5,
clust_size = 3,
- height_min = -16,
- height_max = -5,
+ y_min = -63,
+ y_max = -16,
})
minetest.register_ore({
ore_type = "scatter",
ore = "default:stone_with_iron",
wherein = "default:stone",
- clust_scarcity = 9*9*9,
+ clust_scarcity = 7*7*7,
clust_num_ores = 5,
clust_size = 3,
- height_min = -31000,
- height_max = -17,
+ y_min = -31000,
+ y_max = -64,
})
-minetest.register_on_generated(function(minp, maxp, seed)
- -- Generate clay
- if maxp.y >= 2 and minp.y <= 0 then
- -- Assume X and Z lengths are equal
- local divlen = 4
- local divs = (maxp.x-minp.x)/divlen+1;
- for divx=0+1,divs-1-1 do
- for divz=0+1,divs-1-1 do
- local cx = minp.x + math.floor((divx+0.5)*divlen)
- local cz = minp.z + math.floor((divz+0.5)*divlen)
- if minetest.get_node({x=cx,y=1,z=cz}).name == "default:water_source" and
- minetest.get_node({x=cx,y=0,z=cz}).name == "default:sand" then
- local is_shallow = true
- local num_water_around = 0
- if minetest.get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then
- num_water_around = num_water_around + 1 end
- if minetest.get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then
- num_water_around = num_water_around + 1 end
- if minetest.get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then
- num_water_around = num_water_around + 1 end
- if minetest.get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then
- num_water_around = num_water_around + 1 end
- if num_water_around >= 2 then
- is_shallow = false
- end
- if is_shallow then
- for x1=-divlen,divlen do
- for z1=-divlen,divlen do
- if minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" then
- minetest.set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"})
- end
- end
- end
- end
- end
- end
- end
- end
-end)
--
--- Register biome for biome API
+-- Register biomes for biome API
--
+
+minetest.clear_registered_biomes()
+minetest.clear_registered_decorations()
+
minetest.register_biome({
- name = "Grassland",
- -- Will use defaults of omitted parameters
- y_min = -31000,
- y_max = 31000,
- heat_point = 50,
+ name = "default:grassland",
+ --node_dust = "",
+ node_top = "default:dirt_with_grass",
+ depth_top = 1,
+ node_filler = "default:dirt",
+ depth_filler = 1,
+ --node_stone = "",
+ --node_water_top = "",
+ --depth_water_top = ,
+ --node_water = "",
+ y_min = 5,
+ y_max = 31000,
+ heat_point = 50,
+ humidity_point = 50,
+})
+
+minetest.register_biome({
+ name = "default:grassland_ocean",
+ --node_dust = "",
+ node_top = "default:sand",
+ depth_top = 1,
+ node_filler = "default:sand",
+ depth_filler = 2,
+ --node_stone = "",
+ --node_water_top = "",
+ --depth_water_top = ,
+ --node_water = "",
+ y_min = -31000,
+ y_max = 4,
+ heat_point = 50,
humidity_point = 50,
})
diff --git a/games/minimal/mods/default/textures/default_jungletree.png b/games/minimal/mods/default/textures/default_jungletree.png
deleted file mode 100644
index a1fd36a51..000000000
--- a/games/minimal/mods/default/textures/default_jungletree.png
+++ /dev/null
Binary files differ
diff --git a/games/minimal/mods/default/textures/default_jungletree_top.png b/games/minimal/mods/default/textures/default_jungletree_top.png
deleted file mode 100644
index a13fdae4a..000000000
--- a/games/minimal/mods/default/textures/default_jungletree_top.png
+++ /dev/null
Binary files differ