From 0d5cab932afa2bf1e66a14a8ba45b1cc839ae8a6 Mon Sep 17 00:00:00 2001 From: Brett O'Donnell Date: Wed, 26 Sep 2012 18:44:01 +0930 Subject: [PATCH] removed craft conflicts --- deploy_building/init.lua | 26 ++++++++++++------ .../textures/deploy_building_blueprint.png | Bin 0 -> 227 bytes deploy_cylinder_y/init.lua | 25 +++++++++++------ .../deploy_cylinder_y_large_blueprint.png | Bin 0 -> 227 bytes deploy_maze/init.lua | 25 +++++++++++------ .../textures/deploy_maze_blueprint.png | Bin 0 -> 227 bytes deploy_nodes/init.lua | 10 +++++++ .../textures/deploy_nodes_blueprint.png | Bin 0 -> 227 bytes deploy_sphere/init.lua | 26 ++++++++++++------ .../textures/deploy_sphere_blueprint.png | Bin 0 -> 227 bytes 10 files changed, 76 insertions(+), 36 deletions(-) create mode 100644 deploy_building/textures/deploy_building_blueprint.png create mode 100644 deploy_cylinder_y/textures/deploy_cylinder_y_large_blueprint.png create mode 100644 deploy_maze/textures/deploy_maze_blueprint.png create mode 100644 deploy_nodes/textures/deploy_nodes_blueprint.png create mode 100644 deploy_sphere/textures/deploy_sphere_blueprint.png diff --git a/deploy_building/init.lua b/deploy_building/init.lua index bca7725..c57cd9e 100644 --- a/deploy_building/init.lua +++ b/deploy_building/init.lua @@ -109,9 +109,7 @@ minetest.register_node("deploy_building:small", { minetest.register_craft({ output = "deploy_building:small", recipe = { - {"default:stone", "", "default:stone"}, - {"default:wood", "default:glass", "default:wood"}, - {"default:wood", "default:wood", "default:wood"}, + {"deploy_building:blueprint", "default:wood", "default:stone"}, }, }) @@ -127,9 +125,7 @@ minetest.register_node("deploy_building:medium", { minetest.register_craft({ output = "deploy_building:medium", recipe = { - {"default:stone", "", "default:stone"}, - {"default:wood", "default:glass", "default:wood"}, - {"deploy_building:small", "deploy_building:small", "deploy_building:small"}, + {"deploy_building:blueprint", "deploy_building:small", "deploy_building:small"}, }, }) @@ -145,11 +141,23 @@ minetest.register_node("deploy_building:large", { minetest.register_craft({ output = "deploy_building:large", recipe = { - {"default:stone", "", "default:stone"}, - {"default:wood", "default:glass", "default:wood"}, - {"deploy_building:medium", "deploy_building:medium", "deploy_building:medium"}, + {"deploy_building:blueprint", "deploy_building:medium", "deploy_building:medium"}, }, }) +-- blueprint +minetest.register_craftitem("deploy_building:blueprint", { + description = "Building Blueprint", + inventory_image = "deploy_building_blueprint.png", +}) +minetest.register_craft({ + output = "deploy_building:blueprint", + recipe = { + {"deploy_nodes:blueprint", "", "deploy_nodes:blueprint"}, + {"deploy_nodes:blueprint", "deploy_nodes:blueprint", "deploy_nodes:blueprint"}, + {"deploy_nodes:blueprint", "deploy_nodes:blueprint", "deploy_nodes:blueprint"}, + }, +}) + -- log that we started minetest.log("action", "[MOD]"..minetest.get_current_modname().." -- loaded from "..minetest.get_modpath(minetest.get_current_modname())) diff --git a/deploy_building/textures/deploy_building_blueprint.png b/deploy_building/textures/deploy_building_blueprint.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf393d659038b731ad27621d3ae5533b953b449 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvVy? zT^vI!{F8tD|8LK%Iz#EKLO1(DMji+EhlgK0Y< literal 0 HcmV?d00001 diff --git a/deploy_cylinder_y/init.lua b/deploy_cylinder_y/init.lua index 8244f73..dcf1b2c 100644 --- a/deploy_cylinder_y/init.lua +++ b/deploy_cylinder_y/init.lua @@ -78,9 +78,7 @@ deploy_cylinder_y.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_cylinder_y:"..name.."_small", recipe = { - {"", material, ""}, - {material, "", material}, - {"", material, ""}, + {"deploy_cylinder_y:blueprint", material, material}, }, }) @@ -96,9 +94,7 @@ deploy_cylinder_y.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_cylinder_y:"..name.."_medium", recipe = { - {"", "deploy_cylinder_y:"..name.."_small", ""}, - {"deploy_cylinder_y:"..name.."_small", "", "deploy_cylinder_y:"..name.."_small"}, - {"", "deploy_cylinder_y:"..name.."_small", ""}, + {"deploy_cylinder_y:blueprint", "deploy_cylinder_y:"..name.."_small", "deploy_cylinder_y:"..name.."_small"}, }, }) @@ -114,9 +110,7 @@ deploy_cylinder_y.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_cylinder_y:"..name.."_large", recipe = { - {"", "deploy_cylinder_y:"..name.."_medium", ""}, - {"deploy_cylinder_y:"..name.."_medium", "", "deploy_cylinder_y:"..name.."_medium"}, - {"", "deploy_cylinder_y:"..name.."_medium", ""}, + {"deploy_cylinder_y:blueprint", "deploy_cylinder_y:"..name.."_medium", "deploy_cylinder_y:"..name.."_medium"}, }, }) @@ -131,6 +125,19 @@ deploy_cylinder_y.register("Cobble","cobble","default:cobble","default_cobble.pn deploy_cylinder_y.register("Stone","stone","default:stone","default_stone.png") deploy_cylinder_y.register("Glass","glass","default:glass","default_glass.png") +-- blueprint +minetest.register_craftitem("deploy_cylinder_y:blueprint", { + description = "Cylinder Y Blueprint", + inventory_image = "deploy_cylinder_y_blueprint.png", +}) +minetest.register_craft({ + output = "deploy_cylinder_y:blueprint", + recipe = { + {"", "deploy_nodes:blueprint", ""}, + {"deploy_nodes:blueprint", "", "deploy_nodes:blueprint"}, + {"", "deploy_nodes:blueprint", ""}, + }, +}) -- log that we started minetest.log("action", "[MOD]"..minetest.get_current_modname().." -- loaded from "..minetest.get_modpath(minetest.get_current_modname())) diff --git a/deploy_cylinder_y/textures/deploy_cylinder_y_large_blueprint.png b/deploy_cylinder_y/textures/deploy_cylinder_y_large_blueprint.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf393d659038b731ad27621d3ae5533b953b449 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvVy? zT^vI!{F8tD|8LK%Iz#EKLO1(DMji+EhlgK0Y< literal 0 HcmV?d00001 diff --git a/deploy_maze/init.lua b/deploy_maze/init.lua index 0804cfb..7981961 100644 --- a/deploy_maze/init.lua +++ b/deploy_maze/init.lua @@ -346,9 +346,7 @@ deploy_maze.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_maze:"..name.."_small", recipe = { - {material, material, material}, - {"", material, material}, - {material, material, ""}, + {"deploy_maze:blueprint", material, material}, }, }) @@ -364,9 +362,7 @@ deploy_maze.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_maze:"..name.."_medium", recipe = { - {"deploy_maze:"..name.."_small", "deploy_maze:"..name.."_small", "deploy_maze:"..name.."_small"}, - {"", "deploy_maze:"..name.."_small", "deploy_maze:"..name.."_small"}, - {"deploy_maze:"..name.."_small", "deploy_maze:"..name.."_small", ""}, + {"deploy_maze:blueprint", "deploy_maze:"..name.."_small", "deploy_maze:"..name.."_small"}, }, }) @@ -382,9 +378,7 @@ deploy_maze.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_maze:"..name.."_large", recipe = { - {"deploy_maze:"..name.."_medium", "deploy_maze:"..name.."_medium", "deploy_maze:"..name.."_medium"}, - {"", "deploy_maze:"..name.."_medium", "deploy_maze:"..name.."_medium"}, - {"deploy_maze:"..name.."_medium", "deploy_maze:"..name.."_medium", ""}, + {"deploy_maze:blueprint", "deploy_maze:"..name.."_medium", "deploy_maze:"..name.."_medium"}, }, }) @@ -399,6 +393,19 @@ deploy_maze.register("Cobble","cobble","default:cobble","default_cobble.png") deploy_maze.register("Stone","stone","default:stone","default_stone.png") deploy_maze.register("Glass","glass","default:glass","default_glass.png") +-- blueprint +minetest.register_craftitem("deploy_maze:blueprint", { + description = "Maze Blueprint", + inventory_image = "deploy_maze_blueprint.png", +}) +minetest.register_craft({ + output = "deploy_maze:blueprint", + recipe = { + {"deploy_nodes:blueprint", "deploy_nodes:blueprint", "deploy_nodes:blueprint"}, + {"", "deploy_nodes:blueprint", "deploy_nodes:blueprint"}, + {"deploy_nodes:blueprint", "deploy_nodes:blueprint", ""}, + }, +}) -- log that we started minetest.log("action", "[MOD]"..minetest.get_current_modname().." -- loaded from "..minetest.get_modpath(minetest.get_current_modname())) diff --git a/deploy_maze/textures/deploy_maze_blueprint.png b/deploy_maze/textures/deploy_maze_blueprint.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf393d659038b731ad27621d3ae5533b953b449 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvVy? zT^vI!{F8tD|8LK%Iz#EKLO1(DMji+EhlgK0Y< literal 0 HcmV?d00001 diff --git a/deploy_nodes/init.lua b/deploy_nodes/init.lua index 0bf6c83..3dd37b4 100644 --- a/deploy_nodes/init.lua +++ b/deploy_nodes/init.lua @@ -16,5 +16,15 @@ deploy_nodes = {} -- check for non-air blocks before deploying structure deploy_nodes.check_for_space = true +-- blueprint +minetest.register_craftitem("deploy_nodes:blueprint", { + description = "Empty Blueprint", + inventory_image = "deploy_nodes_blueprint.png", +}) +minetest.register_craft({ + output = "deploy_nodes:blueprint", + recipe = {{"default:paper", "default:coal_lump", "default:stick"}}, +}) + -- log that we started minetest.log("action", "[MOD]"..minetest.get_current_modname().." -- loaded from "..minetest.get_modpath(minetest.get_current_modname())) diff --git a/deploy_nodes/textures/deploy_nodes_blueprint.png b/deploy_nodes/textures/deploy_nodes_blueprint.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf393d659038b731ad27621d3ae5533b953b449 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvVy? zT^vI!{F8tD|8LK%Iz#EKLO1(DMji+EhlgK0Y< literal 0 HcmV?d00001 diff --git a/deploy_sphere/init.lua b/deploy_sphere/init.lua index 7e56145..4f44c45 100644 --- a/deploy_sphere/init.lua +++ b/deploy_sphere/init.lua @@ -78,9 +78,7 @@ deploy_sphere.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_sphere:"..name.."_small", recipe = { - {"", material, ""}, - {material, material, material}, - {"", material, ""}, + {"deploy_sphere:blueprint", material, material}, }, }) @@ -96,9 +94,7 @@ deploy_sphere.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_sphere:"..name.."_medium", recipe = { - {"", "deploy_sphere:"..name.."_small", ""}, - {"deploy_sphere:"..name.."_small", "deploy_sphere:"..name.."_small", "deploy_sphere:"..name.."_small"}, - {"", "deploy_sphere:"..name.."_small", ""}, + {"deploy_sphere:blueprint", "deploy_sphere:"..name.."_small", "deploy_sphere:"..name.."_small"}, }, }) @@ -114,9 +110,7 @@ deploy_sphere.register = function(label,name,material,texture) minetest.register_craft({ output = "deploy_sphere:"..name.."_large", recipe = { - {"", "deploy_sphere:"..name.."_medium", ""}, - {"deploy_sphere:"..name.."_medium", "deploy_sphere:"..name.."_medium", "deploy_sphere:"..name.."_medium"}, - {"", "deploy_sphere:"..name.."_medium", ""}, + {"deploy_sphere:blueprint", "deploy_sphere:"..name.."_medium", "deploy_sphere:"..name.."_medium"}, }, }) @@ -132,5 +126,19 @@ deploy_sphere.register("Stone","stone","default:stone","default_stone.png") deploy_sphere.register("Glass","glass","default:glass","default_glass.png") +-- blueprint +minetest.register_craftitem("deploy_sphere:blueprint", { + description = "Sphere Blueprint", + inventory_image = "deploy_sphere_blueprint.png", +}) +minetest.register_craft({ + output = "deploy_sphere:blueprint", + recipe = { + {"", "deploy_nodes:blueprint", ""}, + {"deploy_nodes:blueprint", "deploy_nodes:blueprint", "deploy_nodes:blueprint"}, + {"", "deploy_nodes:blueprint", ""}, + }, +}) + -- log that we started minetest.log("action", "[MOD]"..minetest.get_current_modname().." -- loaded from "..minetest.get_modpath(minetest.get_current_modname())) diff --git a/deploy_sphere/textures/deploy_sphere_blueprint.png b/deploy_sphere/textures/deploy_sphere_blueprint.png new file mode 100644 index 0000000000000000000000000000000000000000..bbf393d659038b731ad27621d3ae5533b953b449 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3Q$0figD*u3fvVy? zT^vI!{F8tD|8LK%Iz#EKLO1(DMji+EhlgK0Y< literal 0 HcmV?d00001