projects / oweals / minetest_game.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0b025e6)
Rebalance bronze and steel tools, swap ore depths
authorParamat <paramat@users.noreply.github.com>
Fri, 20 Apr 2018 19:13:16 +0000 (20:13 +0100)
committerGitHub <noreply@github.com>
Fri, 20 Apr 2018 19:13:16 +0000 (20:13 +0100)
Reduce bronze tool capabilities to be between stone and steel.
Swap depths of iron ore and tin / copper ores for corresponding
progression.

mods/default/mapgen.lua patch | blob | history
mods/default/tools.lua patch | blob | history

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 96bfd2d73c39866bb135cfc534e264f597139872..6892743b7536169fe59d0fb206516638de985b7c 100644 (file)
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -556,14 +556,14 @@ function default.register_ores()
                y_min          = -31000,
        })
 
-       -- Iron
+       -- Tin
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_iron",
+               ore            = "default:stone_with_tin",
                wherein        = "default:stone",
-               clust_scarcity = 9 * 9 * 9,
-               clust_num_ores = 12,
+               clust_scarcity = 10 * 10 * 10,
+               clust_num_ores = 5,
                clust_size     = 3,
                y_max          = 31000,
                y_min          = 1025,
@@ -571,10 +571,10 @@ function default.register_ores()
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_iron",
+               ore            = "default:stone_with_tin",
                wherein        = "default:stone",
-               clust_scarcity = 7 * 7 * 7,
-               clust_num_ores = 5,
+               clust_scarcity = 13 * 13 * 13,
+               clust_num_ores = 4,
                clust_size     = 3,
                y_max          = -64,
                y_min          = -127,
@@ -582,22 +582,22 @@ function default.register_ores()
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_iron",
+               ore            = "default:stone_with_tin",
                wherein        = "default:stone",
-               clust_scarcity = 12 * 12 * 12,
-               clust_num_ores = 29,
-               clust_size     = 5,
+               clust_scarcity = 10 * 10 * 10,
+               clust_num_ores = 5,
+               clust_size     = 3,
                y_max          = -128,
                y_min          = -31000,
        })
 
-       -- Tin
+       -- Copper
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_tin",
+               ore            = "default:stone_with_copper",
                wherein        = "default:stone",
-               clust_scarcity = 10 * 10 * 10,
+               clust_scarcity = 9 * 9 * 9,
                clust_num_ores = 5,
                clust_size     = 3,
                y_max          = 31000,
@@ -606,34 +606,34 @@ function default.register_ores()
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_tin",
+               ore            = "default:stone_with_copper",
                wherein        = "default:stone",
-               clust_scarcity = 13 * 13 * 13,
+               clust_scarcity = 12 * 12 * 12,
                clust_num_ores = 4,
                clust_size     = 3,
-               y_max          = -128,
-               y_min          = -255,
+               y_max          = -64,
+               y_min          = -127,
        })
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_tin",
+               ore            = "default:stone_with_copper",
                wherein        = "default:stone",
-               clust_scarcity = 10 * 10 * 10,
+               clust_scarcity = 9 * 9 * 9,
                clust_num_ores = 5,
                clust_size     = 3,
-               y_max          = -256,
+               y_max          = -128,
                y_min          = -31000,
        })
 
-       -- Copper
+       -- Iron
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_copper",
+               ore            = "default:stone_with_iron",
                wherein        = "default:stone",
                clust_scarcity = 9 * 9 * 9,
-               clust_num_ores = 5,
+               clust_num_ores = 12,
                clust_size     = 3,
                y_max          = 31000,
                y_min          = 1025,
@@ -641,10 +641,10 @@ function default.register_ores()
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_copper",
+               ore            = "default:stone_with_iron",
                wherein        = "default:stone",
-               clust_scarcity = 12 * 12 * 12,
-               clust_num_ores = 4,
+               clust_scarcity = 7 * 7 * 7,
+               clust_num_ores = 5,
                clust_size     = 3,
                y_max          = -128,
                y_min          = -255,
@@ -652,11 +652,11 @@ function default.register_ores()
 
        minetest.register_ore({
                ore_type       = "scatter",
-               ore            = "default:stone_with_copper",
+               ore            = "default:stone_with_iron",
                wherein        = "default:stone",
-               clust_scarcity = 9 * 9 * 9,
-               clust_num_ores = 5,
-               clust_size     = 3,
+               clust_scarcity = 12 * 12 * 12,
+               clust_num_ores = 29,
+               clust_size     = 5,
                y_max          = -256,
                y_min          = -31000,
        })
diff --git a/mods/default/tools.lua b/mods/default/tools.lua
index 067613d355bc7139b5feda24423d82e4120dc406..9f503ed45c79bb5b3d804a8a50745a19307afb27 100644 (file)
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@@ -50,28 +50,28 @@ minetest.register_tool("default:pick_stone", {
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:pick_steel", {
-       description = "Steel Pickaxe",
-       inventory_image = "default_tool_steelpick.png",
+minetest.register_tool("default:pick_bronze", {
+       description = "Bronze Pickaxe",
+       inventory_image = "default_tool_bronzepick.png",
        tool_capabilities = {
                full_punch_interval = 1.0,
                max_drop_level=1,
                groupcaps={
-                       cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=20, maxlevel=2},
+                       cracky = {times={[1]=4.50, [2]=1.80, [3]=0.90}, uses=20, maxlevel=2},
                },
                damage_groups = {fleshy=4},
        },
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:pick_bronze", {
-       description = "Bronze Pickaxe",
-       inventory_image = "default_tool_bronzepick.png",
+minetest.register_tool("default:pick_steel", {
+       description = "Steel Pickaxe",
+       inventory_image = "default_tool_steelpick.png",
        tool_capabilities = {
                full_punch_interval = 1.0,
                max_drop_level=1,
                groupcaps={
-                       cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=30, maxlevel=2},
+                       cracky = {times={[1]=4.00, [2]=1.60, [3]=0.80}, uses=20, maxlevel=2},
                },
                damage_groups = {fleshy=4},
        },
@@ -141,30 +141,30 @@ minetest.register_tool("default:shovel_stone", {
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:shovel_steel", {
-       description = "Steel Shovel",
-       inventory_image = "default_tool_steelshovel.png",
-       wield_image = "default_tool_steelshovel.png^[transformR90",
+minetest.register_tool("default:shovel_bronze", {
+       description = "Bronze Shovel",
+       inventory_image = "default_tool_bronzeshovel.png",
+       wield_image = "default_tool_bronzeshovel.png^[transformR90",
        tool_capabilities = {
                full_punch_interval = 1.1,
                max_drop_level=1,
                groupcaps={
-                       crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=30, maxlevel=2},
+                       crumbly = {times={[1]=1.65, [2]=1.05, [3]=0.45}, uses=25, maxlevel=2},
                },
                damage_groups = {fleshy=3},
        },
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:shovel_bronze", {
-       description = "Bronze Shovel",
-       inventory_image = "default_tool_bronzeshovel.png",
-       wield_image = "default_tool_bronzeshovel.png^[transformR90",
+minetest.register_tool("default:shovel_steel", {
+       description = "Steel Shovel",
+       inventory_image = "default_tool_steelshovel.png",
+       wield_image = "default_tool_steelshovel.png^[transformR90",
        tool_capabilities = {
                full_punch_interval = 1.1,
                max_drop_level=1,
                groupcaps={
-                       crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=40, maxlevel=2},
+                       crumbly = {times={[1]=1.50, [2]=0.90, [3]=0.40}, uses=30, maxlevel=2},
                },
                damage_groups = {fleshy=3},
        },
@@ -234,28 +234,28 @@ minetest.register_tool("default:axe_stone", {
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:axe_steel", {
-       description = "Steel Axe",
-       inventory_image = "default_tool_steelaxe.png",
+minetest.register_tool("default:axe_bronze", {
+       description = "Bronze Axe",
+       inventory_image = "default_tool_bronzeaxe.png",
        tool_capabilities = {
                full_punch_interval = 1.0,
                max_drop_level=1,
                groupcaps={
-                       choppy={times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=20, maxlevel=2},
+                       choppy={times={[1]=2.75, [2]=1.70, [3]=1.15}, uses=20, maxlevel=2},
                },
                damage_groups = {fleshy=4},
        },
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:axe_bronze", {
-       description = "Bronze Axe",
-       inventory_image = "default_tool_bronzeaxe.png",
+minetest.register_tool("default:axe_steel", {
+       description = "Steel Axe",
+       inventory_image = "default_tool_steelaxe.png",
        tool_capabilities = {
                full_punch_interval = 1.0,
                max_drop_level=1,
                groupcaps={
-                       choppy={times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=30, maxlevel=2},
+                       choppy={times={[1]=2.50, [2]=1.40, [3]=1.00}, uses=20, maxlevel=2},
                },
                damage_groups = {fleshy=4},
        },
@@ -323,28 +323,28 @@ minetest.register_tool("default:sword_stone", {
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:sword_steel", {
-       description = "Steel Sword",
-       inventory_image = "default_tool_steelsword.png",
+minetest.register_tool("default:sword_bronze", {
+       description = "Bronze Sword",
+       inventory_image = "default_tool_bronzesword.png",
        tool_capabilities = {
                full_punch_interval = 0.8,
                max_drop_level=1,
                groupcaps={
-                       snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=30, maxlevel=2},
+                       snappy={times={[1]=2.75, [2]=1.30, [3]=0.375}, uses=25, maxlevel=2},
                },
                damage_groups = {fleshy=6},
        },
        sound = {breaks = "default_tool_breaks"},
 })
 
-minetest.register_tool("default:sword_bronze", {
-       description = "Bronze Sword",
-       inventory_image = "default_tool_bronzesword.png",
+minetest.register_tool("default:sword_steel", {
+       description = "Steel Sword",
+       inventory_image = "default_tool_steelsword.png",
        tool_capabilities = {
                full_punch_interval = 0.8,
                max_drop_level=1,
                groupcaps={
-                       snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=40, maxlevel=2},
+                       snappy={times={[1]=2.5, [2]=1.20, [3]=0.35}, uses=30, maxlevel=2},
                },
                damage_groups = {fleshy=6},
        },
Unnamed repository; edit this file 'description' to name the repository.