diff --git a/mods/default/init.lua b/mods/default/init.lua index 60ef1023..d5c61612 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 00000000..f38eef0f --- /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 c5628af9..47b7771b 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 ae038fae..f5346f48 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 916dd784..5665168c 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 58c79674..b4e8a125 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 7d044741..bc79696c 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 7cb9c89a..30cd4bff 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 3610bb2b..4e1f0f1b 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 4f4f680b..6ca1a6fb 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 ccd20ac7..d8c26355 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 2a9b5137..805272a7 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 cb02ada1..2c7d9ad9 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 7a25126e..d0258eda 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 4c876cdc..18d3bcfb 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 fad1b33f..ca727177 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 15101a7e..2a484569 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 73f50230..d03c3e42 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 06eac1ee..d5c6dcd3 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 cad0dbe2..17c3f563 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 a1f3812e..4828f0fd 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 7982dafe..1d5a2d1c 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 a7458123..036b03f9 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 b34de6f3..71ff0b55 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 ea728cca..73466304 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 7a953c22..b9444af3 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 6965d380..8deef965 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 76d1dd5a..0b2195fd 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 65abfc24..ab125012 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 2cdd94f8..6d620069 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 e5f8cdc2..eb506f14 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 57c1d7c1..66f2b722 100644 Binary files a/mods/default/textures/default_wood.png and b/mods/default/textures/default_wood.png differ