more changes to json

minerdream/api.lua

@@ -1,5 +1,8 @@
 local S=minerdream.intllib
 
+local agroup={helmet="armor_head",chestplate="armor_torso",leggings="armor_legs",boots="armor_feet",shield="armor_shield"}
+local orelump={ore="lump",poorore="nugget"}
+
 local tier_definition = basic_functions.import_csv(minerdream.path.."/tiers.txt",{col_num={"name"},})
 local local_item_insert=function(name,ttype,def)
 	if minerdream.items[name] == nil then
@@ -133,8 +136,15 @@ minerdream.register_ore=function(i,tdef)
 		end
 		minerdream.items[ore_name]=tdef
 
-		local orelump={ore="lump",poorore="nugget"}
 		for o,l in pairs(orelump) do
+			-- register only ore
+			if tdef[o] ~= nil and tdef[l] == nil then
+				tdef[o].ore_name=ore_name
+				tdef[o].lump_name=ore_name
+				minerdream.register_node_ore(tdef,tdef[o],l)
+				minerdream.register_node_mapgen(tdef,tdef[o])
+			end
+			-- register if ore and lump is defined
 			if tdef[o] ~= nil and tdef[l] ~= nil then
 				-- register ore
 				if tdef[o] ~= nil then
@@ -186,9 +196,14 @@ minerdream.register_ore=function(i,tdef)
 		end
 		
 		if tdef["3d_armor"] ~= nil  then
-			print("test")
 			minerdream.register_3d_armor(tdef,tdef["3d_armor"])
 		end
+		
+		if tdef.fuel ~= nil then
+			if tdef.fuel.burntime ~= nil then
+				
+			end
+		end
 --		print(dump(tdef))
 	end
 end
@@ -203,7 +218,12 @@ minerdream.register_node_lump=function(tdef,ldef)
 			inventory_image=ldef.inventory_image or node_name:gsub(":","_")..".png"
 			}
 		minetest.register_craftitem(lump_def.name,lump_def)
-		
+		if ldef.burntime ~= nil then
+			minetest.register_craft({
+				type = "fuel",
+				recipe = lump_def.name,
+				burntime = ldef.burntime})
+		end
 	end
 end
 
@@ -214,7 +234,7 @@ minerdream.register_node_ore=function(tdef,odef,ltype)
 		odef.lump_name=tdef.ore_name.."_"..ltype
 	end
 	if odef.lump_node_name == nil then
-		odef.lump_node_name=tdef.ore_modname..":"..tdef.ore_name.."_"..ltype
+		odef.lump_node_name=tdef.ore_modname..":"..odef.lump_name
 	end
 	-- check, if some kind of stone is defined, where the ore can appear
 	if odef.wherein == nil then
@@ -230,14 +250,16 @@ minerdream.register_node_ore=function(tdef,odef,ltype)
 	end
 	local ore_def={description=S(odef.ore_name:gsub("^%l", string.upper):gsub("_"," ")),
 		groups={cracky=odef.crack},
-		sound=default.node_sound_stone_defaults(),
-		drop=odef.lump_node_name
+		sound=default.node_sound_stone_defaults()
 		}
+	if odef.lump_name ~= odef.ore_name then
+		ore_def.drop=odef.lump_node_name
+	end
 	if tdef.groups.is_metall then
-		ore_def.groups["metall"..tdef.groups.is_metall]=tdef.groups.is_metall
+		ore_def.groups["metall"]=tdef.groups.is_metall
 	end
 	if tdef.groups.is_mineral then
-		ore_def.groups["mineral"..tdef.groups.is_mineral]=tdef.groups.is_mineral
+		ore_def.groups["mineral"]=tdef.groups.is_mineral
 	end
 	if odef.stackmax then
 		ore_def.stack_max=odef.stackmax
@@ -245,10 +267,24 @@ minerdream.register_node_ore=function(tdef,odef,ltype)
 	if tdef.tier then
 		ore_def.description=core.colorize("#00FF00", ore_def.description.."\n")..tdef.tier_string
 	end
+	
+	if tdef.groups.is_gemstone ~= nil then
+		ore_def.description=ore_name:gsub("^%l", string.upper)
+		ore_def.paramtype="light"
+		ore_def.drawtype = "mesh"
+		ore_def.mesh = "gemstone_cubic_pillars.obj"
+		ore_def.walkable = "true"
+		ore_def.tiles = {"minerdream_"..tdef.ore_name.."_rock.png"}
+		ore_def.selection_box = {type = "fixed",
+			fixed = {{-0.4, -0.5, -0.4, 0.4, 0.0, 0.4},},}
+		ore_def.node_box = {type = "fixed",
+			fixed = {{-0.4, -0.5, -0.4, 0.4, 0.0, 0.4},},}
+	end
+	
 	-- for each stone, where the node can appear, add the name
 	odef.node_name={}
 	if odef.wherein==nil then
-		odef.wherein="stone"
+		odef.wherein={"stone"}
 	end
 	-- for each stone create definition table and register node
 	for _,wi in ipairs(odef.wherein) do
@@ -528,12 +564,13 @@ minerdream.register_dust=function(tdef,ddef)
 			end
 		end
 		
-		minetest.register_craft({type="cooking",
-			cooktime=tdef.dust.cooking_time,
-			output=tdef.ingot.node_name,
-			recipe=tdef.dust.node_name,
-		})
-		
+		if tdef.ingot ~= nil then
+			minetest.register_craft({type="cooking",
+				cooktime=tdef.dust.cooking_time,
+				output=tdef.ingot.node_name,
+				recipe=tdef.dust.node_name,
+			})
+		end
 	end
 end
 
@@ -593,7 +630,6 @@ end
 
 minerdream.register_3d_armor=function(tdef,adef)
 	if adef ~= nil then
-		print("test2")
 		for _,tool in pairs({"helmet","chestplate","boots","leggings","shield"}) do
 			if adef[tool] ~= nil then
 				local ttv=adef[tool]
@@ -630,7 +666,6 @@ minerdream.register_3d_armor=function(tdef,adef)
 				for _,gc in pairs({"cracky","crumbly","choppy","snappy"}) do
 					tt_def.damage_groups[gc]=ttv[gc]
 				end
-				agroup={helmet="armor_head",chestplate="armor_torso",leggings="armor_legs",boots="armor_feet",shield="armorg_shield"}
 				print(tool)
 				print(agroup[tool])
 				tt_def.groups[agroup[tool]]=1

minerdream/config/amethyst.json

@@ -1,14 +1,19 @@
-{"clust_size":1,
-"crack":4,
-"groups":{"has_block":1,
+{"groups":{"has_block":1,
 "has_brick":3,
 "is_lump_gemstone":1,
 "is_mineral":5},
 "name":"amethyst",
-"num_ores":1,
 "ore_modname":"minerdream",
-"scarcity":15,
 "stackmax":"200",
 "tier":5,
-"y_max":-650,
-"y_min":-31000}
+"ore":{
+	"wherein":["stone","desert_stone"],
+	"crack":4,
+	"inventory_image":"minerdream_amthyst_gem.png",
+	"clust_size":1,
+	"num_ores":1,
+	"scarcity":15,
+	"y_max":-650,
+	"y_min":-31000
+}
+}

minerdream/config/bituminous_coal.json

@@ -1,10 +1,37 @@
-{"clust_size":3,
-"crack":4,
+{"crack":4,
 "groups":{"has_lump":1},
 "name":"bituminous_coal",
-"num_ores":10,
 "ore_modname":"minerdream",
-"scarcity":13,
 "tier":5,
-"y_max":-500,
-"y_min":-31000}
+"ore":{
+	"wherein":["stone","desert_stone"],
+	"crack":4,
+	"inventory_image":"minerdream_bituminous_coal_ore.png",
+	"clust_size":3,
+	"num_ores":10,
+	"scarcity":13,
+	"y_max":-500,
+	"y_min":-31000
+},
+"poorore":{
+	"wherein":["stone","desert_stone"],
+	"crack":3,
+	"inventory_image":"minerdream_bituminous_coal_poorore.png",
+	"clust_size":3,
+	"num_ores":10,
+	"scarcity":13,
+	"y_max":-350,
+	"y_min":-31000
+},
+"lump":{
+	"crack":4,
+	"inventory_image":"minerdream_bituminous_coal.png",
+	"stack_max":99,
+	"burntime":125
+},
+"nugget":{
+	"crack":3,
+	"inventory_image":"minerdream_bituminous_coal_nugget.png",
+	"stack_max":99,
+	"burntime":30
+}}

minerdream/config/calcium.json

@@ -12,8 +12,24 @@
 	"inventory_image":"minerdream_calcium_ingot.png"
 },
 "ore":{
+	"wherein":["stone"],
 	"crack":2,
-	"inventory_image":"minerdream_calcium_ore.png"
+	"inventory_image":"minerdream_calcium_ore.png",
+	"clust_size":2,
+	"num_ores":5,
+	"scarcity":12,
+	"y_max":120,
+	"y_min":-31000
+},
+"poorore":{
+	"wherein":["stone"],
+	"crack":2,
+	"inventory_image":"minerdream_calcium_poorore.png",
+	"clust_size":2,
+	"num_ores":5,
+	"scarcity":12,
+	"y_max":200,
+	"y_min":-31000
 },
 "lump":{
 	"crack":2,
@@ -27,13 +43,6 @@
 	"cooking_time":1,
 	"inventory_image":"minerdream_calcium_dust.png"
 },
-"mapgen":{
-	"clust_size":2,
-	"num_ores":5,
-	"scarcity":12,
-	"y_max":120,
-	"y_min":-31000
-},
 "nugget":{
 	"inventory_image":"minerdream_calcium_poorore.png",
 	"cracky":1,

minerdream/config/nickel.json

@@ -52,7 +52,7 @@
 "tools":{"maxlevel":2,"tool_stick":"group:stick","use":80,
 	"axe":{"choppy":[2.275,1.2,0.75],"fleshy":6.75},
 	"shovel":{"crumbly":[1.3,0.75,0.325],"fleshy":3.75},
-	"spear":{"range":6.2,"fleshy":7.75,"snappy":[2.2,0.95,.0275]},
+	"spear":{"range":6.2,"fleshy":7.75,"snappy":[2.2,0.95,0.0275]},
 	"sword":{"fleshy":6.75,"snappy":[2.2,0.95,0.275]},
 	"pick":{"cracky":[3.4,1.3,0.65],"fleshy":5.25}
 },

minerdream/config/palladium.json

@@ -52,9 +52,8 @@
 "tools":{"maxlevel":3,"tool_stick":"minerdream:expensivestick","use":80,
 	"axe":{"choppy":[1.1,0.35,0.225],"fleshy":12},
 	"spear":{"range":7.5,"fleshy":17,"snappy":[1.2,0.5,0.04]},
-	"sword":{"fleshy":14.5,"snappy":[1.25,0.55,0.05]},
-	"pick":{"cracky":[1.2,0.45,0.175,2.75,3,4,6],"fleshy":12,"crumbly":[0.55,0.225,0.1]}
-},
+	"sword":{"fleshy":14.5,"snappy":[1.25,0.55,0.05]}
+	},
 "3d_armor":{"cracky":2,"crumbly":1,"heal":8.35,"use":80,"snappy":3,"level":2,"choppy":2,"tool_cotton":"steel_wire",
 "boots":{"fleshy":15,"gravity":-0.08,"jump":0.09,"speed":0.12},
 "chestplate":{"fleshy":15,"gravity":-0.08,"jump":0.09,"speed":0.12},

minerdream/config/potassium.json

@@ -1,22 +1,46 @@
-{"clust_size":3,
-"color":"9b9b9bD0",
-"crack":3,
+{"color":"87A9AFD0",
 "groups":{"drop_as_lump":1,
-"has_bar":1,
-"has_bar_block":3,
-"has_block":1,
-"has_bow":1,
-"has_brick":3,
-"has_dust":1,
-"has_lump":1,
-"has_nugget":3,
 "in_desert":1,
-"is_mineral":1},
-"lump_cooking_time":2,
+"is_metall":1},
 "name":"potassium",
-"num_ores":7,
 "ore_modname":"minerdream",
-"scarcity":12,
 "tier":1,
-"y_max":420,
-"y_min":-31000}
+"ore":{
+	"wherein":["stone"],
+	"crack":2,
+	"inventory_image":"minerdream_potassium_ore.png",
+	"clust_size":3,
+	"num_ores":7,
+	"scarcity":12,
+	"y_max":420,
+	"y_min":-31000
+},
+"poorore":{
+	"wherein":["stone"],
+	"crack":2,
+	"inventory_image":"minerdream_potassium_poorore.png",
+	"clust_size":2,
+	"num_ores":5,
+	"scarcity":12,
+	"y_max":500,
+	"y_min":-31000
+},
+"lump":{
+	"crack":2,
+	"inventory_image":"minerdream_potassium_lump.png",
+	"stack_max":99
+},
+"dust":{
+	"cracky":1,
+	"grind_time":1,
+	"inventory_image":"minerdream_potassium_dust.png"
+},
+"nugget":{
+	"inventory_image":"minerdream_potassium_poorore.png",
+	"cracky":1,
+	"clust_size":2,
+	"num_ores":7,
+	"scarcity":12,
+	"y_max":420
+}
+}

minerdream/config/saltpeter.json

@@ -1,17 +1,48 @@
-{"clust_size":2,
-"color":"FFC90ED0",
-"crack":3,
+{"color":"87A9AFD0",
 "groups":{"drop_as_lump":1,
-"has_dust":1,
-"has_lump":1,
-"has_nugget":3,
 "in_desert":1,
-"is_mineral":2},
+"is_metall":1},
 "name":"saltpeter",
-"num_ores":5,
 "ore_modname":"minerdream",
-"scarcity":15,
-"stackmax":"200",
-"tier":2,
-"y_max":420,
-"y_min":-31000}
+"tier":1,
+"ore":{
+	"wherein":["stone"],
+	"crack":2,
+	"inventory_image":"minerdream_saltpeter_ore.png",
+	"clust_size":3,
+	"num_ores":5,
+	"scarcity":15,
+	"y_max":420,
+	"y_min":-31000
+},
+"poorore":{
+	"wherein":["stone"],
+	"crack":2,
+	"inventory_image":"minerdream_saltpeter_poorore.png",
+	"clust_size":3,
+	"num_ores":5,
+	"scarcity":15,
+	"y_max":500,
+	"y_min":-31000
+},
+"lump":{
+	"crack":2,
+	"inventory_image":"minerdream_saltpeter_lump.png",
+	"stack_max":200
+},
+"dust":{
+	"cracky":1,
+	"grind_time":1,
+	"inventory_image":"minerdream_saltpeter_dust.png",
+	"stack_max":200
+},
+"nugget":{
+	"inventory_image":"minerdream_saltpeter_poorore.png",
+	"cracky":1,
+	"clust_size":2,
+	"num_ores":7,
+	"scarcity":12,
+	"y_max":420,
+	"stack_max":200
+}
+}

minerdream/config/steel.json

@@ -1,8 +0,0 @@
-{"groups":{"has_bar_block":3,
-"has_bow":1,
-"is_metall":2},
-"name":"steel",
-"ore_modname":"minerdream",
-"orig_mod":"default",
-"tier":2
-}

minerdream/config/sulfur.json

@@ -1,13 +0,0 @@
-{"color":"E89700D0",
-"crack":3,
-"groups":{"drop_as_lump":1,
-"has_lump":1,
-"has_nugget":3,
-"in_desert":1,
-"is_mineral":2},
-"ingot_name":"",
-"name":"sulfur",
-"ore_modname":"minerdream",
-"overrides":"technic:mineral_sulfur",
-"tier":2
-}

minerdream/config/tantalum.json

@@ -1,92 +1,65 @@
-{"axe":{"choppy":[1.2,0.4,0.25],
-"fleshy":12,
-"maxlevel":3},
-"boots":{"choppy":2,
-"cracky":2,
-"crumbly":1,
-"fleshy":14.5,
-"gravity":-0.09,
-"heal":8.2,
-"jump":0.1,
-"level":2,
-"snappy":3,
-"speed":0.16,
-"use":60},
-"chestplate":{"choppy":2,
-"cracky":2,
-"crumbly":1,
-"fleshy":19.5,
-"gravity":-0.09,
-"heal":8.2,
-"jump":0.1,
-"level":2,
-"snappy":3,
-"speed":0.16,
-"use":60},
-"clust_size":3,
-"color":"594967D0",
-"crack":5,
-"groups":{"drop_as_lump":1,
-"has_bar":1,
-"has_bar_block":3,
-"has_block":1,
+{"color":"594967D0",
+"groups":{
 "has_bow":1,
-"has_brick":3,
-"has_dust":1,
-"has_lump":1,
-"has_nugget":3,
 "in_desert":1,
-"is_metall":6},
-"helmet":{"choppy":2,
-"cracky":2,
-"crumbly":1,
-"fleshy":14.5,
-"gravity":-0.09,
-"heal":8.2,
-"jump":0.1,
-"level":2,
-"snappy":3,
-"speed":0.16,
-"use":60},
-"leggings":{"choppy":2,
-"cracky":2,
-"crumbly":1,
-"fleshy":19.5,
-"gravity":-0.09,
-"heal":8.2,
-"jump":0.1,
-"level":2,
-"snappy":3,
-"speed":0.16,
-"use":60},
-"lump_cooking_time":64,
+"is_metall":5},
 "name":"tantalum",
-"num_ores":3,
-"ore_modname":"minerdream",
-"pick":{"cracky":[1.25,0.5,0.2,3,4,6],
-"crumbly":[0.6,0.25,0.1],
-"fleshy":12,
-"maxlevel":3},
-"scarcity":16,
-"shields":{"choppy":2,
-"cracky":2,
-"crumbly":1,
-"fleshy":14.5,
-"gravity":-0.09,
-"heal":8.2,
-"jump":0.1,
-"level":2,
-"snappy":3,
-"speed":0.16,
-"use":60},
-"spear":{"fleshy":15,
-"range":7.25,
-"snappy":[1.25,0.55,0.05]},
-"sword":{"fleshy":14,
-"maxlevel":3,
-"snappy":[1.25,0.55,0.05]},
-"tier":6,
-"tool_cotton":"steel_wire",
-"tool_stick":"minerdream:expensivestick",
-"y_max":-1500,
-"y_min":-31000}
+"block":{
+	"inventory_image":"minerdream_tantalum_block.png"
+	},
+"ingot":{
+	"grind_time":28,
+	"inventory_image":"minerdream_tantalum_ingot.png"
+},
+"ore":{
+	"wherein":["stone","desert_stone"],
+	"crack":5,
+	"inventory_image":"minerdream_tantalum_ore.png",
+	"clust_size":3,
+	"num_ores":2,
+	"scarcity":16,
+	"y_max":-1500,
+	"y_min":-31000
+},
+"lump":{
+	"crack":5,
+	"inventory_image":"minerdream_tantalum_lump.png",
+	"stack_max":99,
+	"cooking_time":60,
+	"grind_time":33
+},
+"dust":{
+	"crack":4,
+	"cooking_time":31,
+	"inventory_image":"minerdream_tantalum_dust.png"
+},
+"nugget":{
+	"crack":5,
+	"inventory_image":"minerdream_tantalum_nugget.png",
+	"stack_max":99,
+	"cooking_time":31
+},
+"poorore":{
+	"wherein":["stone","desert_stone"],
+	"inventory_image":"minerdream_tantalum_poorore.png",
+	"crack":5,
+	"clust_size":3,
+	"num_ores":2,
+	"scarcity":16,
+	"y_max":-1250
+},
+"tier":7,
+"tools":{"maxlevel":3,"tool_stick":"minerdream:expensivestick","use":60,
+	"axe":{"choppy":[1.2,0.4,0.25],"fleshy":12},
+	"spear":{"range":7.25,"fleshy":15,"snappy":[1.25,0.55,0.05]},
+	"sword":{"fleshy":14,"snappy":[1.25,0.55,0.05]},
+	"pick":{"cracky":[1.25,0.5,0.2,3,4,6],"fleshy":12,"crumbly":[0.6,0.25,0.1]}
+},
+"3d_armor":{"cracky":2,"crumbly":1,"heal":8.2,"use":60,"snappy":3,"level":2,"choppy":2,"tool_cotton":"steel_wire",
+"boots":{"fleshy":14.5,"gravity":-0.09,"jump":0.1,"speed":0.16},
+"chestplate":{"fleshy":19.5,"gravity":-0.09,"jump":0.1,"speed":0.16},
+"helmet":{"fleshy":14.5,"gravity":-0.09,"jump":0.1,"speed":0.16},
+"leggings":{"fleshy":19.5,"gravity":-0.09,"jump":0.1,"speed":0.16},
+"shields":{"fleshy":14.5,"gravity":-0.09,"jump":0.1,"speed":0.16}
+	}
+}

minerdream/config/tin.json

@@ -1,9 +0,0 @@
-{"groups":{"has_bar_block":3,
-"has_brick":3,
-"has_nugget":3,
-"is_metall":2},
-"name":"tin",
-"ore_modname":"minerdream",
-"orig_mod":"technic",
-"tier":2
-}

minerdream/config/titanium.json

@@ -1,19 +0,0 @@
-{"clust_size":5,
-"color":"a82f32d0",
-"crack":1,
-"groups":{"drop_as_lump":1,
-"has_bar":1,
-"has_block":1,
-"has_dust":1,
-"has_lump":1,
-"has_nugget":3,
-"in_desert":1,
-"is_metall":4},
-"lump_cooking_time":8,
-"name":"titanium",
-"num_ores":3,
-"ore_modname":"minerdream",
-"scarcity":14,
-"tier":4,
-"y_max":-225,
-"y_min":-31000}

minerdream/config/topaz.json

@@ -1,14 +0,0 @@
-{"clust_size":1,
-"crack":5,
-"groups":{"has_block":1,
-"has_brick":3,
-"is_gemstone":1,
-"is_lump_gemstone":1},
-"name":"topaz",
-"num_ores":1,
-"ore_modname":"minerdream",
-"scarcity":15,
-"stackmax":"200",
-"tier":6,
-"y_max":-1700,
-"y_min":-31000}

minerdream/config/tungsten.json

@@ -1,18 +0,0 @@
-{"clust_size":4,
-"color":"7C9871D0",
-"crack":4,
-"groups":{"drop_as_lump":1,
-"has_bar":1,
-"has_dust":1,
-"has_lump":1,
-"has_nugget":3,
-"in_desert":1,
-"is_metall":5},
-"lump_cooking_time":42,
-"name":"tungsten",
-"num_ores":4,
-"ore_modname":"minerdream",
-"scarcity":14,
-"tier":5,
-"y_max":-750,
-"y_min":-31000}

minerdream/config/unobtanium.json

@@ -1,18 +0,0 @@
-{"clust_size":3,
-"color":"0B2108C0",
-"crack":6,
-"groups":{"drop_as_lump":1,
-"has_bar":1,
-"has_dust":1,
-"has_lump":1,
-"has_nugget":3,
-"in_desert":1,
-"is_metall":8},
-"lump_cooking_time":96,
-"name":"unobtanium",
-"num_ores":3,
-"ore_modname":"minerdream",
-"scarcity":17,
-"tier":8,
-"y_max":-8700,
-"y_min":-31000}

minerdream/config/zinc.json

@@ -1,24 +0,0 @@
-{"clust_size":3,
-"color":"ADAD8ED0",
-"crack":1,
-"groups":{"drop_as_lump":1,
-"has_bar":1,
-"has_bar_block":3,
-"has_block":1,
-"has_bow":1,
-"has_brick":3,
-"has_dust":1,
-"has_lump":1,
-"has_nugget":3,
-"in_desert":1,
-"is_metall":2},
-"ingot_name":"",
-"lump_cooking_time":4,
-"name":"zinc",
-"num_ores":7,
-"ore_modname":"minerdream",
-"overrides":"technic:mineral_zinc",
-"scarcity":14,
-"tier":2,
-"y_max":-50,
-"y_min":-31000}