diff --git a/mods/default/init.lua b/mods/default/init.lua
index 60ef102396fb51a375e7feacf0602da4d2d71e4d..d5c6161216c33044abe67cb6586a9474386115d2 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -11,6 +11,9 @@ LIGHT_MAX = 14
-- Definitions made by this mod that other mods can use too
default = {}
+-- Register and define map generator stuff
+dofile(minetest.get_modpath("default").."/mapgen.lua")
+
--
-- Tool definition
--
@@ -25,7 +28,7 @@ minetest.register_item(":", {
max_drop_level = 0,
groupcaps = {
fleshy = {times={[2]=2.00, [3]=1.00}, maxwear=0, maxlevel=1},
- crumbly = {times={[3]=0.70}, maxwear=0, maxlevel=1},
+ crumbly = {times={[2]=3.00, [3]=0.70}, maxwear=0, maxlevel=1},
snappy = {times={[3]=0.40}, maxwear=0, maxlevel=1},
oddly_breakable_by_hand = {times={[1]=3.50,[2]=2.00,[3]=0.70}, maxwear=0, maxlevel=3},
}
@@ -38,7 +41,7 @@ minetest.register_tool("default:pick_wood", {
tool_capabilities = {
max_drop_level=0,
groupcaps={
- cracky={times={[2]=1.50, [3]=0.80}, maxwear=0.1, maxlevel=1}
+ cracky={times={[2]=2.00, [3]=1.20}, maxwear=0.1, maxlevel=1}
}
},
})
@@ -48,7 +51,7 @@ minetest.register_tool("default:pick_stone", {
tool_capabilities = {
max_drop_level=0,
groupcaps={
- cracky={times={[1]=1.50, [2]=0.80, [3]=0.60}, maxwear=0.05, maxlevel=1}
+ cracky={times={[1]=2.00, [2]=1.20, [3]=0.80}, maxwear=0.05, maxlevel=1}
}
},
})
@@ -58,7 +61,7 @@ minetest.register_tool("default:pick_steel", {
tool_capabilities = {
max_drop_level=1,
groupcaps={
- cracky={times={[1]=1.00, [2]=0.60, [3]=0.40}, maxwear=0.1, maxlevel=2}
+ cracky={times={[1]=1.20, [2]=0.80, [3]=0.50}, maxwear=0.1, maxlevel=2}
}
},
})
@@ -1524,11 +1527,4 @@ minetest.register_on_chat_message(function(name, message)
end
end)
---
--- Done, print some random stuff
---
-
---print("minetest.registered_entities:")
---dump2(minetest.registered_entities)
-
-- END
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
new file mode 100644
index 0000000000000000000000000000000000000000..f38eef0f2bae919f1888156710d39b6d510c9ad8
--- /dev/null
+++ b/mods/default/mapgen.lua
@@ -0,0 +1,46 @@
+-- minetest/default/mapgen.lua
+
+local function generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume, ore_per_chunk, height_min, height_max)
+ if maxp.y < height_min or minp.y > height_max then
+ return
+ end
+ local y_min = math.max(minp.y, height_min)
+ local y_max = math.min(maxp.y, height_max)
+ local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
+ local pr = PseudoRandom(seed)
+ local num_chunks = math.floor(chunks_per_volume * volume)
+ local inverse_chance = math.floor(27 / ore_per_chunk)
+ --print("generate_ore num_chunks: "..dump(num_chunks))
+ for i=1,num_chunks do
+ local y0 = pr:next(y_min, y_max)
+ if y0 >= height_min and y0 <= height_max then
+ local x0 = pr:next(minp.x, maxp.x)
+ local z0 = pr:next(minp.z, maxp.z)
+ local p0 = {x=x0, y=y0, z=z0}
+ for x1=-1,1 do
+ for y1=-1,1 do
+ for z1=-1,1 do
+ if pr:next(1,inverse_chance) == 1 then
+ local x2 = x0+x1
+ local y2 = y0+y1
+ local z2 = z0+z1
+ local p2 = {x=x2, y=y2, z=z2}
+ if minetest.env:get_node(p2).name == wherein then
+ minetest.env:set_node(p2, {name=name})
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+ --print("generate_ore done")
+end
+
+minetest.register_on_generated(function(minp, maxp, seed)
+ generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed, 1/8/8/8, 5, -64, 64)
+ generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/16/16/16, 5, 3, 7)
+ generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/12/12/12, 5, -16, 2)
+ generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/9/9/9, 5, -64, -17)
+end)
+
diff --git a/mods/default/textures/default_chest_front.png b/mods/default/textures/default_chest_front.png
old mode 100644
new mode 100755
index c5628af946d1c41ca21248c6fd6eca7d9ab8d4a7..47b7771baee292ab32b66304cb7fca3d6514fb72
Binary files a/mods/default/textures/default_chest_front.png and b/mods/default/textures/default_chest_front.png differ
diff --git a/mods/default/textures/default_chest_lock.png b/mods/default/textures/default_chest_lock.png
index ae038fae5435ba60b88b6db73296c451cd5e827e..f5346f48b9ed1c44d55bcc42c14e529ab57d78cb 100644
Binary files a/mods/default/textures/default_chest_lock.png and b/mods/default/textures/default_chest_lock.png differ
diff --git a/mods/default/textures/default_chest_side.png b/mods/default/textures/default_chest_side.png
old mode 100644
new mode 100755
index 916dd784d008eb82c4eac20225f6d7f5c84ecefb..5665168c9534ec8d426775e36a166c93b6b984cc
Binary files a/mods/default/textures/default_chest_side.png and b/mods/default/textures/default_chest_side.png differ
diff --git a/mods/default/textures/default_chest_top.png b/mods/default/textures/default_chest_top.png
old mode 100644
new mode 100755
index 58c79674d95d1fb6e947b1239234853cccdec621..b4e8a1253d23487a4efba00237e89ee53583b27f
Binary files a/mods/default/textures/default_chest_top.png and b/mods/default/textures/default_chest_top.png differ
diff --git a/mods/default/textures/default_cobble.png b/mods/default/textures/default_cobble.png
old mode 100644
new mode 100755
index 7d044741964a58ac04278550959002890ff6bea4..bc79696c68bb7e7ae134065660b54a727cb515ae
Binary files a/mods/default/textures/default_cobble.png and b/mods/default/textures/default_cobble.png differ
diff --git a/mods/default/textures/default_dirt.png b/mods/default/textures/default_dirt.png
old mode 100644
new mode 100755
index 7cb9c89a637584b4e53c82a7c6eb1ec7109befae..30cd4bff67ff055c8e1bad2386c06d94cd2766f9
Binary files a/mods/default/textures/default_dirt.png and b/mods/default/textures/default_dirt.png differ
diff --git a/mods/default/textures/default_grass.png b/mods/default/textures/default_grass.png
old mode 100644
new mode 100755
index 3610bb2bc54cc561abd9d59f2ee78c9ea9d1a5a0..4e1f0f1be0ab0f1cb6a622c5ee4851b5cdf3b13c
Binary files a/mods/default/textures/default_grass.png and b/mods/default/textures/default_grass.png differ
diff --git a/mods/default/textures/default_grass_side.png b/mods/default/textures/default_grass_side.png
old mode 100644
new mode 100755
index 4f4f680be6b2e065222a0a43c22edf446a3b7631..6ca1a6fb096dbe1871ce81aec835621b623bbfd1
Binary files a/mods/default/textures/default_grass_side.png and b/mods/default/textures/default_grass_side.png differ
diff --git a/mods/default/textures/default_jungletree.png b/mods/default/textures/default_jungletree.png
index ccd20ac7403a35d9d288524afaf94e6e50939d26..d8c263552439436c63c2db2f4179f01bb861640b 100644
Binary files a/mods/default/textures/default_jungletree.png and b/mods/default/textures/default_jungletree.png differ
diff --git a/mods/default/textures/default_jungletree_top.png b/mods/default/textures/default_jungletree_top.png
index 2a9b51373d939d19e3486f735761bf57c88614a9..805272a7363ee3df080e6aa061e1f2ac226d8e40 100644
Binary files a/mods/default/textures/default_jungletree_top.png and b/mods/default/textures/default_jungletree_top.png differ
diff --git a/mods/default/textures/default_lava.png b/mods/default/textures/default_lava.png
index cb02ada1318a66f6af28e2095b73d79b103080ed..2c7d9ad9931acc4ec391ac1c56fa432651831ed3 100644
Binary files a/mods/default/textures/default_lava.png and b/mods/default/textures/default_lava.png differ
diff --git a/mods/default/textures/default_leaves.png b/mods/default/textures/default_leaves.png
old mode 100644
new mode 100755
index 7a25126e94888ac1135b4640d084815103410a65..d0258eda0b6b14281789026453e685172228530a
Binary files a/mods/default/textures/default_leaves.png and b/mods/default/textures/default_leaves.png differ
diff --git a/mods/default/textures/default_mese.png b/mods/default/textures/default_mese.png
index 4c876cdc57e2f061fcd3ff3ebe9bc4c26e08487d..18d3bcfb42cc3f7ae3add97228ea0ce11400e78e 100644
Binary files a/mods/default/textures/default_mese.png and b/mods/default/textures/default_mese.png differ
diff --git a/mods/default/textures/default_mossycobble.png b/mods/default/textures/default_mossycobble.png
old mode 100644
new mode 100755
index fad1b33ff7dadc8147da9e75df67b303a14ad5a5..ca727177b226c6c1e628536001da3a8ec9581fb9
Binary files a/mods/default/textures/default_mossycobble.png and b/mods/default/textures/default_mossycobble.png differ
diff --git a/mods/default/textures/default_sand.png b/mods/default/textures/default_sand.png
old mode 100644
new mode 100755
index 15101a7eb0ba9b929426eacdf144628dc6382bc7..2a484569bdb6f456012598a06c99603055ba5637
Binary files a/mods/default/textures/default_sand.png and b/mods/default/textures/default_sand.png differ
diff --git a/mods/default/textures/default_sapling.png b/mods/default/textures/default_sapling.png
index 73f502306a4d767241f2850fdf037385ee2e8887..d03c3e421e93ed59cd8682fb429231b9d008b060 100644
Binary files a/mods/default/textures/default_sapling.png and b/mods/default/textures/default_sapling.png differ
diff --git a/mods/default/textures/default_sign_wall.png b/mods/default/textures/default_sign_wall.png
old mode 100644
new mode 100755
index 06eac1ee902967573d7036eadac70fb849dd4800..d5c6dcd35295220c56a5acdaee68250b7a4a445e
Binary files a/mods/default/textures/default_sign_wall.png and b/mods/default/textures/default_sign_wall.png differ
diff --git a/mods/default/textures/default_stone.png b/mods/default/textures/default_stone.png
old mode 100644
new mode 100755
index cad0dbe2b428e955f6a345baccefba3c5428dfeb..17c3f563ce101bdf8daa8dffc4f9cbbeaaa6be19
Binary files a/mods/default/textures/default_stone.png and b/mods/default/textures/default_stone.png differ
diff --git a/mods/default/textures/default_tool_mesepick.png b/mods/default/textures/default_tool_mesepick.png
old mode 100644
new mode 100755
index a1f3812e0992e9b575f00944c0a2580ce78f640d..4828f0fd2f926fd99f7a795fc31afad69e13ad30
Binary files a/mods/default/textures/default_tool_mesepick.png and b/mods/default/textures/default_tool_mesepick.png differ
diff --git a/mods/default/textures/default_tool_steelpick.png b/mods/default/textures/default_tool_steelpick.png
old mode 100644
new mode 100755
index 7982dafebf650bcc5d6492e33212365f57625d7c..1d5a2d1c82c79d676ba3e68295f95259387c7d55
Binary files a/mods/default/textures/default_tool_steelpick.png and b/mods/default/textures/default_tool_steelpick.png differ
diff --git a/mods/default/textures/default_tool_steelshovel.png b/mods/default/textures/default_tool_steelshovel.png
old mode 100644
new mode 100755
diff --git a/mods/default/textures/default_tool_steelsword.png b/mods/default/textures/default_tool_steelsword.png
old mode 100644
new mode 100755
index a74581238cad9a6f90e319a980b4c83eda9e8e2e..036b03f9ec6ae24c4491dc242edbe0f3ea26d05e
Binary files a/mods/default/textures/default_tool_steelsword.png and b/mods/default/textures/default_tool_steelsword.png differ
diff --git a/mods/default/textures/default_tool_stonepick.png b/mods/default/textures/default_tool_stonepick.png
old mode 100644
new mode 100755
index b34de6f327a633d5127acaf39974c4a8aac219ec..71ff0b558602649e9a77a92659ec804f796ce2b0
Binary files a/mods/default/textures/default_tool_stonepick.png and b/mods/default/textures/default_tool_stonepick.png differ
diff --git a/mods/default/textures/default_tool_stoneshovel.png b/mods/default/textures/default_tool_stoneshovel.png
old mode 100644
new mode 100755
diff --git a/mods/default/textures/default_tool_woodpick.png b/mods/default/textures/default_tool_woodpick.png
old mode 100644
new mode 100755
index ea728cca3fd583d1cc76a702ea48b7f0961fd51a..7346630499682172b807b517dd91f115da701f3c
Binary files a/mods/default/textures/default_tool_woodpick.png and b/mods/default/textures/default_tool_woodpick.png differ
diff --git a/mods/default/textures/default_tool_woodshovel.png b/mods/default/textures/default_tool_woodshovel.png
old mode 100644
new mode 100755
diff --git a/mods/default/textures/default_torch.png b/mods/default/textures/default_torch.png
index 7a953c2222c831a5619cac7e3f080de8563b1adb..b9444af38d8a0b54baee1b9223f887cefcb8c679 100644
Binary files a/mods/default/textures/default_torch.png and b/mods/default/textures/default_torch.png differ
diff --git a/mods/default/textures/default_torch_on_ceiling.png b/mods/default/textures/default_torch_on_ceiling.png
index 6965d380e3ec0df3037b6fcc47bbf331f968a700..8deef965e981e504a5e9c49656adf958c6dd4dec 100644
Binary files a/mods/default/textures/default_torch_on_ceiling.png and b/mods/default/textures/default_torch_on_ceiling.png differ
diff --git a/mods/default/textures/default_torch_on_floor.png b/mods/default/textures/default_torch_on_floor.png
index 76d1dd5ac90f3333cf496218d45b419911aeb172..0b2195fd9d60c0d6cf84dd39289673524b1d3fea 100644
Binary files a/mods/default/textures/default_torch_on_floor.png and b/mods/default/textures/default_torch_on_floor.png differ
diff --git a/mods/default/textures/default_tree.png b/mods/default/textures/default_tree.png
old mode 100644
new mode 100755
index 65abfc243e868f5e03a058bdd26ab473adae4f6d..ab1250123c0bec828df1dd9d7bd22f6b2ab67bc5
Binary files a/mods/default/textures/default_tree.png and b/mods/default/textures/default_tree.png differ
diff --git a/mods/default/textures/default_tree_top.png b/mods/default/textures/default_tree_top.png
old mode 100644
new mode 100755
index 2cdd94f80c0c991c90309ffff6f1d91f0ad188c9..6d620069402c138da424cc7fec497a7510f04a15
Binary files a/mods/default/textures/default_tree_top.png and b/mods/default/textures/default_tree_top.png differ
diff --git a/mods/default/textures/default_water.png b/mods/default/textures/default_water.png
old mode 100644
new mode 100755
index e5f8cdc25e9c48cc8307d470cc28e5ca268a3a4b..eb506f14ed7918fc290af38fbf017773f752e69c
Binary files a/mods/default/textures/default_water.png and b/mods/default/textures/default_water.png differ
diff --git a/mods/default/textures/default_wood.png b/mods/default/textures/default_wood.png
index 57c1d7c124971fd9fef4f8dc90b86ac7cc45a742..66f2b7228161d6681ab3da2e94a7c2931475d3de 100644
Binary files a/mods/default/textures/default_wood.png and b/mods/default/textures/default_wood.png differ