Modify textures, add map generator necessities
authorPerttu Ahola <celeron55@gmail.com>
Wed, 28 Mar 2012 23:27:40 +0000 (02:27 +0300)
committerPerttu Ahola <celeron55@gmail.com>
Wed, 28 Mar 2012 23:27:40 +0000 (02:27 +0300)
35 files changed:
mods/default/init.lua
mods/default/mapgen.lua [new file with mode: 0644]
mods/default/textures/default_chest_front.png [changed mode: 0644->0755]
mods/default/textures/default_chest_lock.png
mods/default/textures/default_chest_side.png [changed mode: 0644->0755]
mods/default/textures/default_chest_top.png [changed mode: 0644->0755]
mods/default/textures/default_cobble.png [changed mode: 0644->0755]
mods/default/textures/default_dirt.png [changed mode: 0644->0755]
mods/default/textures/default_grass.png [changed mode: 0644->0755]
mods/default/textures/default_grass_side.png [changed mode: 0644->0755]
mods/default/textures/default_jungletree.png
mods/default/textures/default_jungletree_top.png
mods/default/textures/default_lava.png
mods/default/textures/default_leaves.png [changed mode: 0644->0755]
mods/default/textures/default_mese.png
mods/default/textures/default_mossycobble.png [changed mode: 0644->0755]
mods/default/textures/default_sand.png [changed mode: 0644->0755]
mods/default/textures/default_sapling.png
mods/default/textures/default_sign_wall.png [changed mode: 0644->0755]
mods/default/textures/default_stone.png [changed mode: 0644->0755]
mods/default/textures/default_tool_mesepick.png [changed mode: 0644->0755]
mods/default/textures/default_tool_steelpick.png [changed mode: 0644->0755]
mods/default/textures/default_tool_steelshovel.png [changed mode: 0644->0755]
mods/default/textures/default_tool_steelsword.png [changed mode: 0644->0755]
mods/default/textures/default_tool_stonepick.png [changed mode: 0644->0755]
mods/default/textures/default_tool_stoneshovel.png [changed mode: 0644->0755]
mods/default/textures/default_tool_woodpick.png [changed mode: 0644->0755]
mods/default/textures/default_tool_woodshovel.png [changed mode: 0644->0755]
mods/default/textures/default_torch.png
mods/default/textures/default_torch_on_ceiling.png
mods/default/textures/default_torch_on_floor.png
mods/default/textures/default_tree.png [changed mode: 0644->0755]
mods/default/textures/default_tree_top.png [changed mode: 0644->0755]
mods/default/textures/default_water.png [changed mode: 0644->0755]
mods/default/textures/default_wood.png

index 60ef102396fb51a375e7feacf0602da4d2d71e4d..d5c6161216c33044abe67cb6586a9474386115d2 100644 (file)
@@ -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 (file)
index 0000000..f38eef0
--- /dev/null
@@ -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)
+
old mode 100644 (file)
new mode 100755 (executable)
index c5628af..47b7771
Binary files a/mods/default/textures/default_chest_front.png and b/mods/default/textures/default_chest_front.png differ
index ae038fae5435ba60b88b6db73296c451cd5e827e..f5346f48b9ed1c44d55bcc42c14e529ab57d78cb 100644 (file)
Binary files a/mods/default/textures/default_chest_lock.png and b/mods/default/textures/default_chest_lock.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 916dd78..5665168
Binary files a/mods/default/textures/default_chest_side.png and b/mods/default/textures/default_chest_side.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 58c7967..b4e8a12
Binary files a/mods/default/textures/default_chest_top.png and b/mods/default/textures/default_chest_top.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 7d04474..bc79696
Binary files a/mods/default/textures/default_cobble.png and b/mods/default/textures/default_cobble.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 7cb9c89..30cd4bf
Binary files a/mods/default/textures/default_dirt.png and b/mods/default/textures/default_dirt.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 3610bb2..4e1f0f1
Binary files a/mods/default/textures/default_grass.png and b/mods/default/textures/default_grass.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 4f4f680..6ca1a6f
Binary files a/mods/default/textures/default_grass_side.png and b/mods/default/textures/default_grass_side.png differ
index ccd20ac7403a35d9d288524afaf94e6e50939d26..d8c263552439436c63c2db2f4179f01bb861640b 100644 (file)
Binary files a/mods/default/textures/default_jungletree.png and b/mods/default/textures/default_jungletree.png differ
index 2a9b51373d939d19e3486f735761bf57c88614a9..805272a7363ee3df080e6aa061e1f2ac226d8e40 100644 (file)
Binary files a/mods/default/textures/default_jungletree_top.png and b/mods/default/textures/default_jungletree_top.png differ
index cb02ada1318a66f6af28e2095b73d79b103080ed..2c7d9ad9931acc4ec391ac1c56fa432651831ed3 100644 (file)
Binary files a/mods/default/textures/default_lava.png and b/mods/default/textures/default_lava.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 7a25126..d0258ed
Binary files a/mods/default/textures/default_leaves.png and b/mods/default/textures/default_leaves.png differ
index 4c876cdc57e2f061fcd3ff3ebe9bc4c26e08487d..18d3bcfb42cc3f7ae3add97228ea0ce11400e78e 100644 (file)
Binary files a/mods/default/textures/default_mese.png and b/mods/default/textures/default_mese.png differ
old mode 100644 (file)
new mode 100755 (executable)
index fad1b33..ca72717
Binary files a/mods/default/textures/default_mossycobble.png and b/mods/default/textures/default_mossycobble.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 15101a7..2a48456
Binary files a/mods/default/textures/default_sand.png and b/mods/default/textures/default_sand.png differ
index 73f502306a4d767241f2850fdf037385ee2e8887..d03c3e421e93ed59cd8682fb429231b9d008b060 100644 (file)
Binary files a/mods/default/textures/default_sapling.png and b/mods/default/textures/default_sapling.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 06eac1e..d5c6dcd
Binary files a/mods/default/textures/default_sign_wall.png and b/mods/default/textures/default_sign_wall.png differ
old mode 100644 (file)
new mode 100755 (executable)
index cad0dbe..17c3f56
Binary files a/mods/default/textures/default_stone.png and b/mods/default/textures/default_stone.png differ
old mode 100644 (file)
new mode 100755 (executable)
index a1f3812..4828f0f
Binary files a/mods/default/textures/default_tool_mesepick.png and b/mods/default/textures/default_tool_mesepick.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 7982daf..1d5a2d1
Binary files a/mods/default/textures/default_tool_steelpick.png and b/mods/default/textures/default_tool_steelpick.png differ
old mode 100644 (file)
new mode 100755 (executable)
index a745812..036b03f
Binary files a/mods/default/textures/default_tool_steelsword.png and b/mods/default/textures/default_tool_steelsword.png differ
old mode 100644 (file)
new mode 100755 (executable)
index b34de6f..71ff0b5
Binary files a/mods/default/textures/default_tool_stonepick.png and b/mods/default/textures/default_tool_stonepick.png differ
old mode 100644 (file)
new mode 100755 (executable)
index ea728cc..7346630
Binary files a/mods/default/textures/default_tool_woodpick.png and b/mods/default/textures/default_tool_woodpick.png differ
index 7a953c2222c831a5619cac7e3f080de8563b1adb..b9444af38d8a0b54baee1b9223f887cefcb8c679 100644 (file)
Binary files a/mods/default/textures/default_torch.png and b/mods/default/textures/default_torch.png differ
index 6965d380e3ec0df3037b6fcc47bbf331f968a700..8deef965e981e504a5e9c49656adf958c6dd4dec 100644 (file)
Binary files a/mods/default/textures/default_torch_on_ceiling.png and b/mods/default/textures/default_torch_on_ceiling.png differ
index 76d1dd5ac90f3333cf496218d45b419911aeb172..0b2195fd9d60c0d6cf84dd39289673524b1d3fea 100644 (file)
Binary files a/mods/default/textures/default_torch_on_floor.png and b/mods/default/textures/default_torch_on_floor.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 65abfc2..ab12501
Binary files a/mods/default/textures/default_tree.png and b/mods/default/textures/default_tree.png differ
old mode 100644 (file)
new mode 100755 (executable)
index 2cdd94f..6d62006
Binary files a/mods/default/textures/default_tree_top.png and b/mods/default/textures/default_tree_top.png differ
old mode 100644 (file)
new mode 100755 (executable)
index e5f8cdc..eb506f1
Binary files a/mods/default/textures/default_water.png and b/mods/default/textures/default_water.png differ
index 57c1d7c124971fd9fef4f8dc90b86ac7cc45a742..66f2b7228161d6681ab3da2e94a7c2931475d3de 100644 (file)
Binary files a/mods/default/textures/default_wood.png and b/mods/default/textures/default_wood.png differ