Merge branch 'master' of https://github.com/EliasFleckenstein03/elidragon

[elidragon.git] / skyblock.lua

diff --git a/skyblock.lua b/skyblock.lua
index 7e4534fdafad2b06df145f5a0aff159d81a38818..e190bda3e9c61f77bcf084a5be699e08487eef38 100755 (executable)
--- a/skyblock.lua
+++ b/skyblock.lua
@@ -53,9 +53,9 @@ end
 function elidragon.skyblock.load_start_positions()
        local file = io.open(minetest.get_worldpath() .. "/start_positions", "r")
        if file then
-               local data = minetest.deserialize(file:read())
+               local start_positions = minetest.deserialize(file:read())
                file:close()
-               return data
+               return start_positions
        end
 end
 
@@ -227,14 +227,24 @@ minetest.after(0, function()
                        node = "default:stone_with_mese"
                elseif math.random() < 0.01 then
                        node = "default:stone_with_gold"
+               elseif math.random() < 0.01 then
+                       node = "technic:mineral_chromium"
+               elseif math.random() < 0.01 then
+                       node = "technic:mineral_zinc"
+               elseif math.random() < 0.012 then
+                       node = "technic:mineral_uranium"
                elseif math.random() < 0.015 then
                        node = "default:stone_with_tin"
                elseif math.random() < 0.02 then
                        node = "default:stone_with_copper"
+               elseif math.random() < 0.025 then
+                       node = "technic:mineral_sulfur"
                elseif math.random() < 0.033 then
                        node = "default:stone_with_iron"
                elseif math.random() < 0.04 then
                        node = "moreores:mineral_silver"
+               elseif math.random() < 0.045 then
+                       node = "technic:mineral_lead"
                elseif math.random() < 0.05 then
                        node = "default:stone_with_coal"
                else
@@ -250,7 +260,7 @@ end)
 minetest.after(0, function()
        minetest.register_alias("default:pine_leaves", "default:pine_needles")
        minetest.register_alias("default:pine_bush_leaves", "default:pine_bush_needles")
-       local trees = {"default:", "default:jungle", "default:pine_", "default:acacia_", "default:aspen_", "default:bush_", "default:blueberry_bush_", "default:acacia_bush_", "default:pine_bush_",}
+       local trees = {"default:", "default:jungle", "default:pine_", "default:acacia_", "default:aspen_", "default:bush_", "default:blueberry_bush_", "default:acacia_bush_", "default:pine_bush_", "moretrees:apple_tree_", "moretrees:beech_", "moretrees:cedar_", "moretrees:date_palm_", "moretrees:fir_", "moretrees:oak_", "moretrees:palm_", "moretrees:poplar_", "moretrees:sequoia_", "moretrees:spruce_", "moretrees:willow_", }
        for _, tree in pairs(trees) do
                local items = {}
                items[#items + 1] = {
@@ -301,8 +311,9 @@ minetest.register_craft({
 minetest.register_craft({
        output = "default:desert_stone",
        recipe = {
-               {"default:desert_sand", "default:desert_sand"},
-               {"default:desert_sand", "default:desert_sand"},
+               {"default:desert_sand", "default:desert_sand", "default:desert_sand"},
+               {"default:desert_sand", "default:desert_sand", "default:desert_sand"},
+               {"default:desert_sand", "default:desert_sand", "default:desert_sand"},
        }
 })