Merge pull request #2 from VanessaE/master

height_min/max --> y_min/max

README.txt

@@ -14,7 +14,7 @@ OtherGen Module: Adds generation aside from ores.
 
 Parts Module: Adds some bits and bobs for machinery and some minor blocks.
 
-Table Module: Adds tables. Yay?
+Tech Module: Adds the "tech" of glooptest.
 
 Tools Module: Adds extra kinds of tools.
 

glooptest/biome_module/init.lua

@@ -1,68 +0,0 @@
-glooptest.biome_module = {}
-glooptest.debug("MESSAGE","Loading Biome Module Now!")
-
-<<<<<<< HEAD
-=======
-local stone_sounds = default.node_sound_stone_defaults()
-
-minetest.register_node("glooptest:slate", {
-	description = "Slate",
-	tiles = {"glooptest_slate.png"},
-	is_ground_content = true,
-	groups = {cracky=3, stone=1},
-	sounds = stone_sounds,
-})
-
->>>>>>> *boop*
-minetest.register_biome({
-	name           = "glooptest_flatlands",
-	height_min     = 1,
-	height_max     = 3,
-	heat_point     = 40.0,
-	humidity_point = 40.0,
-})
-
-minetest.register_biome({
-	name           = "glooptest_wetlands",
-	height_min     = -4,
-	height_max     = 5,
-	heat_point     = 40.0,
-	humidity_point = 70.0,
-})
-
-minetest.register_biome({
-	name           = "glooptest_wasteland",
-	height_min     = 3,
-	height_max     = 20,
-	node_top       = "default:sand",
-	depth_top      = 1,
-	node_filler    = "default:desert_sand",
-	depth_filler   = 1,
-	heat_point     = 40.0,
-	humidity_point = 10.0,
-})
-
-minetest.register_biome({
-<<<<<<< HEAD
-	name           = "glooptest_mountains",
-	height_min     = 1,
-	height_max     = 200,
-	node_top       = "default:stone",
-	depth_top      = 1,
-	node_filler    = "default:stone",
-	depth_filler   = 1,
-	heat_point     = 30.0,
-	humidity_point = 40.0,
-})
-=======
-	name           = "glooptest_plateau",
-	height_min     = 190,
-	height_max     = 200,
-	node_top       = "glooptest:slate",
-	depth_top      = 100,
-	node_filler    = "glooptest:slate",
-	depth_filler   = 100,
-	heat_point     = 30.0,
-	humidity_point = 40.0,
-})
->>>>>>> *boop*

glooptest/init.lua

@@ -40,8 +40,8 @@ if LOAD_PARTS_MODULE == true then
 	modules_loaded = modulecount+1
 end
 
-if LOAD_TABLE_MODULE == true then
-	dofile(minetest.get_modpath("glooptest").."/table_module/init.lua")
+if LOAD_TECH_MODULE == true then
+	dofile(minetest.get_modpath("glooptest").."/tech_module/init.lua")
 	local modulecount = modules_loaded
 	modules_loaded = modulecount+1
 end
@@ -52,12 +52,6 @@ if LOAD_OTHERGEN_MODULE == true then
 	modules_loaded = modulecount+1
 end
 
-if LOAD_BIOME_MODULE == true then
-	dofile(minetest.get_modpath("glooptest").."/biome_module/init.lua")
-	local modulecount = modules_loaded
-	modules_loaded = modulecount+1
-end
-
 if LOAD_COMPAT_MODULE == true then
 	dofile(minetest.get_modpath("glooptest").."/compat_module/init.lua")
 	local modulecount = modules_loaded

glooptest/module.cfg

@@ -14,18 +14,8 @@ LOAD_TOOLS_MODULE = true
 -- Allow parts module to load. (Recommended with: Ore Module)
 LOAD_PARTS_MODULE = true
 
--- Allow table module to load. (Recommended with: Ore Module)
-LOAD_TABLE_MODULE = true
-
--- Allow biome module to load. (Requires: Mapgen v7) 
--- Disabled by default until mapgen v7 is standard
-LOAD_BIOME_MODULE = true
+-- Allow tech module to load. (Recommended with: Ore Module and Parts Module)
+LOAD_TECH_MODULE = true
 
 -- Allow othergen module to load. (Recommended with: Ore Module and Tools Module)
 LOAD_OTHERGEN_MODULE = true
-
-<<<<<<< HEAD
--- Allow biome module to load. (Requires: Mapgen v7) (Disabled by default until mapgen v7 is standard)
-LOAD_BIOME_MODULE = false
-=======
->>>>>>> *boop*

glooptest/ore_module/api.lua

@@ -91,8 +91,8 @@ function glooptest.ore_module.register_ore(modname, name, desc, uses)
 			clust_scarcity = uses.ore.generate.chunks_per_mapblock,
 			clust_num_ores = uses.ore.generate.max_blocks_per_chunk,
 			clust_size     = uses.ore.generate.chunk_size,
-			height_min     = uses.ore.generate.miny,
-			height_max     = uses.ore.generate.maxy,
+			y_min     = uses.ore.generate.miny,
+			y_max     = uses.ore.generate.maxy,
 		})
 	end
 	if uses.lump ~= nil and uses.lump.makes ~= false then

glooptest/ore_module/init.lua

@@ -7,6 +7,7 @@ dofile(minetest.get_modpath("glooptest").."/ore_module/api.lua")
 
 -- HUGE NOTE HERE:
 -- I did not make the textures. celeron55/erlehmann made the textures which were licensed under CC-BY-SA, and then edited by me.
+-- The textures for non-gem ores are thus CC-BY-SA, with respect to celeron55/erlehmann
 -- Suck it, minetest community.
 
 glooptest.ore_module.register_ore("glooptest", "kalite", "Kalite", {
@@ -87,7 +88,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "fuel",
-	recipe = "gloopores:kalite_lump",
+	recipe = "glooptest:kalite_lump",
 	burntime = 30,
 })
 
@@ -307,36 +308,36 @@ glooptest.ore_module.register_ore("glooptest", "arol", "Arol", {
 		caps = {
 			sword = {
 				full_punch_interval = 0.5,
-				max_drop_level = 0,
+				max_drop_level = 2,
 				groupcaps = {
-					fleshy = {times={[2]=1.00, [3]=0.80}, uses=300, maxlevel=1},
-					snappy = {times={[2]=1.00, [3]=0.80}, uses=300, maxlevel=1},
-					choppy = {times={[3]=1.20}, uses=300, maxlevel=0}
+					fleshy = {times={[2]=1.30, [3]=1.10}, uses=300, maxlevel=2},
+					snappy = {times={[2]=1.30, [3]=1.10}, uses=300, maxlevel=2},
+					choppy = {times={[3]=1.60}, uses=300, maxlevel=1}
 				},
 				damage_groups = {fleshy=6},
 			},
 			axe = {
 				full_punch_interval = 0.5,
-				max_drop_level = 0,
+				max_drop_level = 2,
 				groupcaps = {
-					choppy = {times={[1]=3.00, [2]=1.00, [3]=0.70}, uses=300, maxlevel=1},
-					fleshy = {times={[2]=1.30, [3]=0.70}, uses=300, maxlevel=1}
+					choppy = {times={[1]=3.30, [2]=1.30, [3]=1.00}, uses=300, maxlevel=2},
+					fleshy = {times={[2]=1.60, [3]=1.00}, uses=300, maxlevel=2}
 				},
 				damage_groups = {fleshy=3},
 			},
 			pick = {
 				full_punch_interval = 0.5,
-				max_drop_level = 0,
+				max_drop_level = 2,
 				groupcaps = {
-					cracky = {times={[1]=3.00, [2]=1.20, [3]=0.80}, uses=300, maxlevel=1}
+					cracky = {times={[1]=3.60, [2]=1.90, [3]=1.40}, uses=300, maxlevel=2}
 				},
 				damage_groups = {fleshy=3},
 			},
 			shovel = {
 				full_punch_interval = 0.5,
-				max_drop_level = 0,
+				max_drop_level = 2,
 				groupcaps = {
-					crumbly = {times={[1]=1.50, [2]=0.75, [3]=0.45}, uses=300, maxlevel=1}
+					crumbly = {times={[1]=2.70, [2]=1.45, [3]=0.85}, uses=300, maxlevel=2}
 				},
 				damage_groups = {fleshy=3},
 			}
@@ -403,10 +404,17 @@ glooptest.ore_module.register_ore("glooptest", "ruby", "Ruby", {
 			chunks_per_mapblock = 15*15*15,
 			chunk_size = 5,
 			max_blocks_per_chunk = 5,
-			miny = -110,
+			miny = -3000,
 			maxy = -30
 		},
 	},
+	block = {
+		makes = true,
+		texture = "glooptest_ruby_block.png",
+		groups = {bendy=3,cracky=2,level=1},
+		sounds = stone_sounds,
+		fromingots = false
+	}
 })
 
 minetest.register_craftitem("glooptest:ruby_gem", {
@@ -414,6 +422,20 @@ minetest.register_craftitem("glooptest:ruby_gem", {
 	inventory_image = "glooptest_gem_ruby.png",
 	groups = {glooptest_gem=1},
 })
+minetest.register_craft({
+	output = "glooptest:rubyblock",
+	recipe = {
+		{"glooptest:ruby_gem", "glooptest:ruby_gem", "glooptest:ruby_gem"},
+		{"glooptest:ruby_gem", "glooptest:ruby_gem", "glooptest:ruby_gem"},
+		{"glooptest:ruby_gem", "glooptest:ruby_gem", "glooptest:ruby_gem"}
+	}
+})
+minetest.register_craft({
+	output = "glooptest:ruby_gem 9",
+	recipe = {
+		{"glooptest:rubyblock"}
+	}
+})
 
 glooptest.ore_module.register_ore("glooptest", "sapphire", "Sapphire", {
 	ore = {
@@ -430,10 +452,17 @@ glooptest.ore_module.register_ore("glooptest", "sapphire", "Sapphire", {
 			chunks_per_mapblock = 15*15*15,
 			chunk_size = 5,
 			max_blocks_per_chunk = 5,
-			miny = -138,
+			miny = -3000,
 			maxy = -30
 		},
 	},
+	block = {
+		makes = true,
+		texture = "glooptest_sapphire_block.png",
+		groups = {bendy=3,cracky=2,level=1},
+		sounds = stone_sounds,
+		fromingots = false
+	}
 })
 
 minetest.register_craftitem("glooptest:sapphire_gem", {
@@ -441,6 +470,20 @@ minetest.register_craftitem("glooptest:sapphire_gem", {
 	inventory_image = "glooptest_gem_sapphire.png",
 	groups = {glooptest_gem=1},
 })
+minetest.register_craft({
+	output = "glooptest:sapphireblock",
+	recipe = {
+		{"glooptest:sapphire_gem", "glooptest:sapphire_gem", "glooptest:sapphire_gem"},
+		{"glooptest:sapphire_gem", "glooptest:sapphire_gem", "glooptest:sapphire_gem"},
+		{"glooptest:sapphire_gem", "glooptest:sapphire_gem", "glooptest:sapphire_gem"}
+	}
+})
+minetest.register_craft({
+	output = "glooptest:sapphire_gem 9",
+	recipe = {
+		{"glooptest:sapphireblock"}
+	}
+})
 
 glooptest.ore_module.register_ore("glooptest", "emerald", "Emerald", {
 	ore = {
@@ -457,10 +500,17 @@ glooptest.ore_module.register_ore("glooptest", "emerald", "Emerald", {
 			chunks_per_mapblock = 15*15*15,
 			chunk_size = 4,
 			max_blocks_per_chunk = 4,
-			miny = -200,
+			miny = -5000,
 			maxy = -70
 		},
 	},
+	block = {
+		makes = true,
+		texture = "glooptest_emerald_block.png",
+		groups = {bendy=3,cracky=2,level=1},
+		sounds = stone_sounds,
+		fromingots = false
+	}
 })
 
 minetest.register_craftitem("glooptest:emerald_gem", {
@@ -468,6 +518,20 @@ minetest.register_craftitem("glooptest:emerald_gem", {
 	inventory_image = "glooptest_gem_emerald.png",
 	groups = {glooptest_gem=1},
 })
+minetest.register_craft({
+	output = "glooptest:emeraldblock",
+	recipe = {
+		{"glooptest:emerald_gem", "glooptest:emerald_gem", "glooptest:emerald_gem"},
+		{"glooptest:emerald_gem", "glooptest:emerald_gem", "glooptest:emerald_gem"},
+		{"glooptest:emerald_gem", "glooptest:emerald_gem", "glooptest:emerald_gem"}
+	}
+})
+minetest.register_craft({
+	output = "glooptest:emerald_gem 9",
+	recipe = {
+		{"glooptest:emeraldblock"}
+	}
+})
 
 glooptest.ore_module.register_ore("glooptest", "topaz", "Topaz", {
 	ore = {
@@ -484,10 +548,17 @@ glooptest.ore_module.register_ore("glooptest", "topaz", "Topaz", {
 			chunks_per_mapblock = 15*15*15,
 			chunk_size = 4,
 			max_blocks_per_chunk = 4,
-			miny = -250,
+			miny = -5000,
 			maxy = -70
 		},
 	},
+	block = {
+		makes = true,
+		texture = "glooptest_topaz_block.png",
+		groups = {bendy=3,cracky=2,level=1},
+		sounds = stone_sounds,
+		fromingots = false
+	}
 })
 
 minetest.register_craftitem("glooptest:topaz_gem", {
@@ -495,6 +566,20 @@ minetest.register_craftitem("glooptest:topaz_gem", {
 	inventory_image = "glooptest_gem_topaz.png",
 	groups = {glooptest_gem=1},
 })
+minetest.register_craft({
+	output = "glooptest:topazblock",
+	recipe = {
+		{"glooptest:topaz_gem", "glooptest:topaz_gem", "glooptest:topaz_gem"},
+		{"glooptest:topaz_gem", "glooptest:topaz_gem", "glooptest:topaz_gem"},
+		{"glooptest:topaz_gem", "glooptest:topaz_gem", "glooptest:topaz_gem"}
+	}
+})
+minetest.register_craft({
+	output = "glooptest:topaz_gem 9",
+	recipe = {
+		{"glooptest:topazblock"}
+	}
+})
 
 glooptest.ore_module.register_ore("glooptest", "amethyst", "Amethyst", {
 	ore = {
@@ -515,6 +600,13 @@ glooptest.ore_module.register_ore("glooptest", "amethyst", "Amethyst", {
 			maxy = -128
 		},
 	},
+	block = {
+		makes = true,
+		texture = "glooptest_amethyst_block.png",
+		groups = {bendy=3,cracky=2,level=1},
+		sounds = stone_sounds,
+		fromingots = false
+	}
 })
 
 minetest.register_craftitem("glooptest:amethyst_gem", {
@@ -522,3 +614,17 @@ minetest.register_craftitem("glooptest:amethyst_gem", {
 	inventory_image = "glooptest_gem_amethyst.png",
 	groups = {glooptest_gem=1},
 })
+minetest.register_craft({
+	output = "glooptest:amethystblock",
+	recipe = {
+		{"glooptest:amethyst_gem", "glooptest:amethyst_gem", "glooptest:amethyst_gem"},
+		{"glooptest:amethyst_gem", "glooptest:amethyst_gem", "glooptest:amethyst_gem"},
+		{"glooptest:amethyst_gem", "glooptest:amethyst_gem", "glooptest:amethyst_gem"}
+	}
+})
+minetest.register_craft({
+	output = "glooptest:amethyst_gem 9",
+	recipe = {
+		{"glooptest:amethystblock"}
+	}
+})

glooptest/tech_module/init.lua

@@ -1,7 +1,7 @@
-glooptest.table_module = {}
-glooptest.debug("MESSAGE","Loading Table Module Now!")
+glooptest.tech_module = {}
+glooptest.debug("MESSAGE","Loading Tech Module Now!")
 
---dofile(minetest.get_modpath("glooptest").."/table_module/api.lua")
+--dofile(minetest.get_modpath("glooptest").."/tech_module/api.lua")
 
 local fixed = {
     { -8/16, -8/16, -8/16, 8/16, -4/16, 8/16 }, -- base
@@ -13,13 +13,13 @@ local fixed = {
 }
 
 -- {used item, produced node}
-glooptest.table_module.table_changers = {
+glooptest.tech_module.table_changers = {
 	{},
 }
 
-function glooptest.table_module.register_table(used_item, produced_node)
+function glooptest.tech_module.register_table(used_item, produced_node)
 	if minetest.registered_items[used_item] ~= nil and minetest.registered_items[produced_node] ~= nil then
-		table.insert(glooptest.table_module.table_changers, {used_item, produced_node})
+		table.insert(glooptest.tech_module.table_changers, {item = used_item, node = produced_node})
 	end
 end
 
@@ -34,6 +34,17 @@ minetest.register_node("glooptest:wooden_table", {
         type = "fixed",
         fixed = fixed,
     },
+	--[[
+	on_rightclick = function(pos, node, clicker, itemstack)
+		local clicking_item = itemstack
+		for ind,content in glooptest.tech_module.table_changers do
+			if content.item == clicking_item:get_name() then
+				minetest.place_node(pos, {name=content.node})
+				return ItemStack(clicking_item:get_name().." "..tostring(clicking_item:get_count()-1))
+			end
+		end
+	end,
+	--]]
 })
 
 minetest.register_craft({
@@ -53,9 +64,9 @@ minetest.register_craftitem("glooptest:upgrade_core", {
 minetest.register_craft({
 	output = "glooptest:upgrade_core",
 	recipe = {
-		{"", "glooptest:akalin_ingot", ""},
-		{"glooptest:akalin_ingot", "default:mese_crystal_fragment", "glooptest:akalin_ingot"},
-		{"", "glooptest:akalin_ingot", ""},
+		{"glooptest:akalin_ingot", "glooptest:crystal_glass", "glooptest:akalin_ingot"},
+		{"glooptest:crystal_glass", "default:mese_crystal_fragment", "glooptest:crystal_glass"},
+		{"glooptest:akalin_ingot", "glooptest:crystal_glass", "glooptest:akalin_ingot"},
 	},
 })
 

glooptest/tools_module/init.lua

@@ -3,7 +3,7 @@ glooptest.debug("MESSAGE","Loading Tools Module Now!")
 
 dofile(minetest.get_modpath("glooptest").."/tools_module/api.lua")
 
-glooptest.tools_module.register_tools("glooptest", "wood", "Wooden", "default:wood", {
+glooptest.tools_module.register_tools("glooptest", "wood", "Wooden", "group:wood", {
 	handsaw = {
 		makes = true,
 		texture = "glooptest_tool_woodhandsaw.png",