Remove Viridisium from crafting, for now.

elepower_dynamics/components.lua

@@ -15,7 +15,7 @@ local list_def = {
 	{material = "electrum",   description = "Electrum",   color = "#ebeb90", dust = true, plate = true, gear = true},
 	{material = "viridisium", description = "Viridisium", color = "#5b9751", dust = true, plate = true, gear = true},
 	{material = "zinc",       description = "Zinc",       color = "#598a9e", dust = true, plate = true},
-	{material = "coal",       description = "Coal",       color = "#0b0b0b", dust = true},
+	{material = "coal",       description = "Coal",       color = "#1f1f1f", dust = true},
 	{material = "wood",       description = "Wood",       color = "#847454", dust = "Sawdust", gear = true}
 }
 

elepower_dynamics/crafting.lua

@@ -1,6 +1,4 @@
 
-local easycrafting = minetest.settings:get("elepower_easy_crafting") == "true"
-
 ---------------
 -- Overrides --
 ---------------
@@ -212,7 +210,6 @@ minetest.register_craft({
 	}
 })
 
-if easycrafting then
 	minetest.register_craft({
 	output = "elepower_dynamics:pcb_blank",
 	recipe = {
@@ -220,9 +217,9 @@ if easycrafting then
 		{"default:copper_ingot", "default:mese_crystal", "default:copper_ingot"},
 		{"default:gold_ingot", "default:gold_ingot", "default:gold_ingot"},
 	}
-	})
+})
 
-	minetest.register_craft({
+minetest.register_craft({
 	type = "shapeless",
 	output = "elepower_dynamics:acidic_compound",
 	recipe = {
@@ -232,53 +229,17 @@ if easycrafting then
 		"elepower_dynamics:copper_dust",
 		"farming:seed_wheat",
 	}
-	})
+})
 
-	-- Fluid Transfer Node
+-- Fluid Transfer Node
-	minetest.register_craft({
+minetest.register_craft({
 	output = "elepower_dynamics:fluid_transfer_node 3",
 	recipe = {
 		{"group:stone",  "elepower_dynamics:control_circuit",  "group:stone"},
 		{"elepower_dynamics:electrum_gear", "elepower_dynamics:servo_valve", "elepower_dynamics:electrum_gear"},
 		{"group:stone",  "elepower_dynamics:fluid_duct",  "group:stone"},
 	}
-	})
+})
-else
-	minetest.register_craft({
-		output = "elepower_dynamics:pcb_blank",
-		recipe = {
-			{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
-			{"default:copper_ingot", "default:mese_crystal", "default:copper_ingot"},
-			{"default:gold_ingot", "elepower_dynamics:viridisium_ingot", "default:gold_ingot"},
-		}
-	})
-
-	minetest.register_craft({
-		type = "shapeless",
-		output = "elepower_dynamics:acidic_compound",
-		recipe = {
-			"elepower_dynamics:viridisium_dust",
-			"elepower_dynamics:viridisium_dust",
-			"elepower_dynamics:viridisium_dust",
-			"elepower_dynamics:viridisium_dust",
-			"farming:seed_wheat",
-			"elepower_dynamics:copper_dust",
-			"elepower_dynamics:copper_dust",
-			"elepower_dynamics:copper_dust",
-			"elepower_dynamics:copper_dust",
-		}
-	})
-
-	-- Fluid Transfer Node
-	minetest.register_craft({
-		output = "elepower_dynamics:fluid_transfer_node",
-		recipe = {
-			{"group:stone",  "elepower_dynamics:control_circuit",  "group:stone"},
-			{"elepower_dynamics:viridisium_gear", "elepower_dynamics:servo_valve", "elepower_dynamics:viridisium_gear"},
-			{"group:stone",  "elepower_dynamics:fluid_duct",  "group:stone"},
-		}
-	})
-end
 
 minetest.register_craft({
 	output = "elepower_dynamics:battery 2",

elepower_dynamics/worldgen.lua

@@ -40,6 +40,28 @@ minetest.register_ore({
 
 -- Nickel
 
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "elepower_dynamics:stone_with_nickel",
+	wherein        = "default:stone",
+	clust_scarcity = 25 * 25 * 25,
+	clust_num_ores = 4,
+	clust_size     = 3,
+	y_max          = 0,
+	y_min          = -31000,
+})
+
+minetest.register_ore({
+	ore_type       = "scatter",
+	ore            = "elepower_dynamics:stone_with_nickel",
+	wherein        = "default:stone",
+	clust_scarcity = 25 * 25 * 25,
+	clust_num_ores = 4,
+	clust_size     = 3,
+	y_max          = 31000,
+	y_min          = 0,
+})
+
 minetest.register_ore({
 	ore_type       = "scatter",
 	ore            = "elepower_dynamics:stone_with_nickel",

elepower_farming/crafting.lua

@@ -1,10 +1,4 @@
 
-local easycrafting = minetest.settings:get("elepower_easy_crafting") == "true"
-local ingot = "elepower_dynamics:viridisium_ingot"
-if easycrafting then
-	ingot = "elepower_dynamics:wound_copper_coil"
-end
-
 -----------
 -- Nodes --
 -----------
@@ -23,7 +17,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "elepower_farming:planter",
 	recipe = {
-		{ingot, "elepower_dynamics:control_circuit", ingot},
+		{"elepower_dynamics:nickel_ingot", "elepower_dynamics:control_circuit", "elepower_dynamics:nickel_ingot"},
 		{"farming:hoe_steel", "elepower_farming:device_frame", "farming:hoe_steel"},
 		{"elepower_dynamics:wound_copper_coil", "elepower_dynamics:motor", "elepower_dynamics:wound_copper_coil"},
 	}
@@ -33,7 +27,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "elepower_farming:harvester",
 	recipe = {
-		{ingot, "elepower_dynamics:control_circuit", ingot},
+		{"elepower_dynamics:nickel_ingot", "elepower_dynamics:control_circuit", "elepower_dynamics:nickel_ingot"},
 		{"default:axe_steel", "elepower_farming:device_frame", "farming:hoe_steel"},
 		{"elepower_dynamics:motor", "elepower_dynamics:diamond_gear", "elepower_dynamics:motor"},
 	}

elepower_machines/crafting.lua

@@ -1,6 +1,4 @@
 
-local easycrafting = minetest.settings:get("elepower_easy_crafting") == "true"
-
 --*****************--
 -- MACHINE RECIPES --
 --*****************--
@@ -258,11 +256,6 @@ end)
 -- Soldering --
 ---------------
 
-local induction_dust = "elepower_dynamics:viridisium_dust"
-if easycrafting then
-	induction_dust = "elepower_dynamics:zinc_dust"
-end
-
 local soldering_recipes = {
 	{
 		recipe = { "elepower_dynamics:silicon_wafer_doped", "elepower_dynamics:chip 4", "elepower_dynamics:lead_ingot 2" },
@@ -290,7 +283,7 @@ local soldering_recipes = {
 		time   = 16,
 	},
 	{
-		recipe = { "elepower_dynamics:induction_coil 4", "elepower_dynamics:copper_wire", induction_dust .. " 2" },
+		recipe = { "elepower_dynamics:induction_coil 4", "elepower_dynamics:copper_wire", "elepower_dynamics:zinc_dust 2" },
 		output = "elepower_dynamics:induction_coil_advanced",
 		time   = 18,
 	}
@@ -334,18 +327,13 @@ minetest.register_craft({
 	}
 })
 
-local ingot_machine = "elepower_dynamics:viridisium_ingot"
-if easycrafting then
-	ingot_machine = "default:steel_ingot"
-end
-
 -- Machine block
 minetest.register_craft({
 	output = "elepower_machines:machine_block",
 	recipe = {
-		{ingot_machine, "default:steel_ingot", ingot_machine},
+		{"elepower_dynamics:electrum_ingot", "default:steel_ingot", "elepower_dynamics:electrum_ingot"},
 		{"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"},
-		{ingot_machine, "elepower_dynamics:motor", ingot_machine},
+		{"elepower_dynamics:electrum_ingot", "elepower_dynamics:motor", "elepower_dynamics:electrum_ingot"},
 	}
 })
 

settingtypes.txt

@@ -1,5 +0,0 @@
-[Crafting]
-
-# Enable easier crafting recipes for Elepower
-# Removes viridisium (which is fairly rare) as a component.
-elepower_easy_crafting (Easy Crafting Recipes) bool false