Merge pull request #17 from kpoppel/master

Add more CNC stuff
This commit is contained in:
RealBadAngel 2013-05-07 19:46:23 -07:00
commit d0ecd857b1
6 changed files with 417 additions and 1287 deletions

View File

@ -218,7 +218,7 @@ minetest.register_abm({
end end
end end
-- dischargin registered power tools -- discharging registered power tools
if inv:is_empty("dst") == false then if inv:is_empty("dst") == false then
srcstack = inv:get_stack("dst", 1) srcstack = inv:get_stack("dst", 1)
src_item=srcstack:to_table() src_item=srcstack:to_table()
@ -297,7 +297,7 @@ table_index=1
local pos1={} local pos1={}
i=1 i=1
repeat repeat
if PR_nodes[i]==nil then break end -- gettin power from all connected producers if PR_nodes[i]==nil then break end -- getting power from all connected producers
pos1.x=PR_nodes[i].x pos1.x=PR_nodes[i].x
pos1.y=PR_nodes[i].y pos1.y=PR_nodes[i].y
pos1.z=PR_nodes[i].z pos1.z=PR_nodes[i].z

View File

@ -1,5 +1,11 @@
-- Technic CNC v1.0 by kpo -- Technic CNC v1.0 by kpo
-- Based on the NonCubic Blocks MOD v1.4 by yves_de_beck -- Based on the NonCubic Blocks MOD v1.4 by yves_de_beck
-- Idea:
-- Somehw have a tabbed/paged panel if the number of shapes should expand
-- beyond what is available in the panel today.
-- I could imagine some form of API allowing modders to come with their own node
-- box definitions and easily stuff it in the this machine for production.
local shape = {} local shape = {}
local onesize_products = { local onesize_products = {
slope = 2, slope = 2,
@ -89,61 +95,9 @@ local cnc_power_formspec=
local size = 1; local size = 1;
minetest.register_node("technic:cnc", { -- The form handler is declared here because we need it in both the inactive and active modes
description = "CNC Milling Machine", -- in order to be able to change programs wile it is running.
tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", local form_handler = function(pos, formname, fields, sender)
"technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"},
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
node_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
},
},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
},
groups = {cracky=2},
legacy_facedir_simple = true,
technic_power_machine=1,
internal_EU_buffer=0;
internal_EU_buffer_size=5000;
cnc_time = 0;
src_time = 0; -- fixme
on_construct = function(pos)
local meta = minetest.env:get_meta(pos)
meta:set_string("infotext", "CNC machine")
meta:set_float("technic_power_machine", 1)
meta:set_float("internal_EU_buffer", 0)
meta:set_float("internal_EU_buffer_size", 5000)
meta:set_string("formspec", cnc_formspec..cnc_power_formspec)
meta:set_float("cnc_time", 0)
local inv = meta:get_inventory()
inv:set_size("src", 1)
inv:set_size("dst", 4)
meta:set_string("formspec", cnc_formspec)
meta:set_string("infotext", "CNC Milling Machine")
end,
can_dig = function(pos,player)
local meta = minetest.env:get_meta(pos);
local inv = meta:get_inventory()
if not inv:is_empty("src") or not inv:is_empty("dst") then
minetest.chat_send_player(player:get_player_name(), "CNC machine cannot be removed because it is not empty");
return false
end
return true
end,
on_receive_fields = function(pos, formname, fields, sender)
-- REGISTER MILLING PROGRAMS AND OUTPUTS: -- REGISTER MILLING PROGRAMS AND OUTPUTS:
------------------------------------------ ------------------------------------------
-- Program for half/full size -- Program for half/full size
@ -178,22 +132,78 @@ minetest.register_node("technic:cnc", {
if onesize_products[k] ~= nil or (twosize_products[k] ~= nil and size==2) then if onesize_products[k] ~= nil or (twosize_products[k] ~= nil and size==2) then
meta:set_string("cnc_product", inputname .. "_technic_cnc_" .. k) meta:set_string("cnc_product", inputname .. "_technic_cnc_" .. k)
print(inputname .. "_technic_cnc_" .. k)
break break
end end
if twosize_products[k] ~= nil and size==1 then if twosize_products[k] ~= nil and size==1 then
meta:set_string("cnc_product", inputname .. "_technic_cnc_" .. k .. "_double") meta:set_string("cnc_product", inputname .. "_technic_cnc_" .. k .. "_double")
print(inputname .. "_technic_cnc_" .. k .. "_double")
break break
end end
end end
return return
end, -- callback function end -- callback function
-- The actual block inactive state
minetest.register_node("technic:cnc", {
description = "CNC Milling Machine",
tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
"technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front.png"},
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "facedir",
node_box = {
type = "fixed",
fixed = {
{-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
},
},
selection_box = {
type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
},
groups = {cracky=2},
legacy_facedir_simple = true,
technic_power_machine=1,
internal_EU_buffer=0;
internal_EU_buffer_size=5000;
cnc_time = 0;
src_time = 0; -- fixme
on_construct = function(pos)
local meta = minetest.env:get_meta(pos)
meta:set_string("infotext", "CNC Machine Inactive")
meta:set_float("technic_power_machine", 1)
meta:set_float("internal_EU_buffer", 0)
meta:set_float("internal_EU_buffer_size", 5000)
meta:set_string("formspec", cnc_formspec..cnc_power_formspec)
meta:set_float("cnc_time", 0)
local inv = meta:get_inventory()
inv:set_size("src", 1)
inv:set_size("dst", 4)
end,
can_dig = function(pos,player)
local meta = minetest.env:get_meta(pos);
local inv = meta:get_inventory()
if not inv:is_empty("src") or not inv:is_empty("dst") then
minetest.chat_send_player(player:get_player_name(), "CNC machine cannot be removed because it is not empty");
return false
end
return true
end,
on_receive_fields = form_handler,
}) })
-- Active state block
minetest.register_node("technic:cnc_active", { minetest.register_node("technic:cnc_active", {
description = "CNC Machine", description = "CNC Machine",
tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", tiles = {"technic_cnc_top_active.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
"technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"}, "technic_cnc_side.png", "technic_cnc_side.png", "technic_cnc_front_active.png"},
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {cracky=2,not_in_creative_inventory=1}, groups = {cracky=2,not_in_creative_inventory=1},
legacy_facedir_simple = true, legacy_facedir_simple = true,
@ -206,8 +216,10 @@ minetest.register_node("technic:cnc_active", {
end end
return true return true
end, end,
on_receive_fields = form_handler,
}) })
-- Action code performing the transformation
minetest.register_abm( minetest.register_abm(
{ {
nodenames = {"technic:cnc","technic:cnc_active"}, nodenames = {"technic:cnc","technic:cnc_active"},

File diff suppressed because it is too large Load Diff

View File

@ -1,354 +1,70 @@
-- REGISTER MATERIALS AND PROPERTIES FOR NONCUBIC ELEMENTS: -- REGISTER MATERIALS AND PROPERTIES FOR NONCUBIC ELEMENTS:
----------------------------------------------------------- -----------------------------------------------------------
-- WOOD
-------
technic_cnc_api.register_slope_edge_etc("default:wood",
{snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1},
{"default_wood.png"},
"Wooden Slope",
"Wooden Slope Lying",
"Wooden Slope Upside Down",
"Wooden Slope Edge",
"Wooden Slope Inner Edge",
"Wooden Slope Upside Down Edge",
"Wooden Slope Upside Down Inner Edge",
"Wooden Pyramid",
"Wooden Spike",
"Wooden One Curved Edge Block",
"Wooden Two Curved Edge Block",
"Wooden Cylinder",
"Wooden Cylinder Horizontal",
"Wooden Sphere",
"Wooden Element Straight",
"Wooden Element Edge",
"Wooden Element T",
"Wooden Element Cross",
"Wooden Element End")
-- STONE
--------
technic_cnc_api.register_slope_edge_etc("default:stone",
{cracky=3,not_in_creative_inventory=1},
{"default_stone.png"},
"Stone Slope",
"Stone Slope Lying",
"Stone Slope Upside Down",
"Stone Slope Edge",
"Stone Slope Inner Edge",
"Stone Slope Upside Down Edge",
"Stone Slope Upside Down Inner Edge",
"Stone Pyramid",
"Stone Spike",
"Stone One Curved Edge Block",
"Stone Two Curved Edge Block",
"Stone Cylinder",
"Stote Cylinder Horizontal",
"Stone Sphere",
"Stone Element Straight",
"Stone Element Edge",
"Stone Element T",
"Stone Element Cross",
"Stone Element End")
-- COBBLE
---------
technic_cnc_api.register_slope_edge_etc("default:cobble",
{cracky=3,not_in_creative_inventory=1},
{"default_cobble.png"},
"Cobble Slope",
"Cobble Slope Lying",
"Cobble Slope Upside Down",
"Cobble Slope Edge",
"Cobble Slope Inner Edge",
"Cobble Slope Upside Down Edge",
"Cobble Slope Upside Down Inner Edge",
"Cobble Pyramid",
"Cobble Spike",
"Cobble One Curved Edge Block",
"Cobble Two Curved Edge Block",
"Cobble Cylinder",
"Cobble Cylinder Horizontal",
"Cobble Sphere",
"Cobble Element Straight",
"Cobble Element Edge",
"Cobble Element T",
"Cobble Element Cross",
"Cobble Element End")
-- BRICK
--------
technic_cnc_api.register_slope_edge_etc("default:brick",
{cracky=3,not_in_creative_inventory=1},
{"default_brick.png"},
"Brick Slope",
"Brick Slope Upside Down",
"Brick Slope Edge",
"Brick Slope Inner Edge",
"Brick Slope Upside Down Edge",
"Brick Slope Upside Down Inner Edge",
"Brick Pyramid",
"Brick Spike",
"Brick One Curved Edge Block",
"Brick Two Curved Edge Block",
"Brick Cylinder",
"Brick Cylinder Horizontal",
"Brick Sphere",
"Brick Element Straight",
"Brick Element Edge",
"Brick Element T",
"Brick Element Cross",
"Brick Element End")
-- SANDSTONE
------------
technic_cnc_api.register_slope_edge_etc("default:sandstone",
{crumbly=2,cracky=2,not_in_creative_inventory=1},
{"default_sandstone.png"},
"Sandstone Slope",
"Sandstone Slope Lying",
"Sandstone Slope Upside Down",
"Sandstone Slope Edge",
"Sandstone Slope Inner Edge",
"Sandstone Slope Upside Down Edge",
"Sandstone Slope Upside Down Inner Edge",
"Sandstone Pyramid",
"Sandstone Spike",
"Sandstone One Curved Edge Block",
"Sandstone Two Curved Edge Block",
"Sandstone Cylinder",
"Sandstone Cylinder Horizontal",
"Sandstone Sphere",
"Sandstone Element Straight",
"Sandstone Element Edge",
"Sandstone Element T",
"Sandstone Element Cross",
"Sandstone Element End")
-- LEAVES
---------
technic_cnc_api.register_slope_edge_etc("default:leaves",
{snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
{"bucharest_tree.png"},
"Leaves Slope",
"Leaves Slope Lying",
"Leaves Slope Upside Down",
"Leaves Slope Edge",
"Leaves Slope Inner Edge",
"Leaves Slope Upside Down Edge",
"Leaves Slope Upside Down Inner Edge",
"Leaves Pyramid",
"Leaves Spike",
"Leaves One Curved Edge Block",
"Leaves Two Curved Edge Block",
"Leaves Cylinder",
"Leaves Cylinder Horizontal",
"Leaves Sphere",
"Leaves Element Straight",
"Leaves Element Edge",
"Leaves Element T",
"Leaves Element Cross",
"Leaves Element End")
-- DIRT -- DIRT
------- -------
technic_cnc_api.register_slope_edge_etc("default:dirt", technic_cnc_api.register_all("default:dirt",
{snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
{"default_grass.png", "default_dirt.png", "default_grass.png"}, {"default_grass.png", "default_dirt.png", "default_grass.png"},
"Dirt Slope", "Dirt")
"Dirt Slope Lying", technic_cnc_api.cnc_programs_disable["default:dirt"] = {"technic_cnc_sphere", "technic_cnc_slope_upsdown",
"Dirt Slope Upside Down", "technic_cnc_edge", "technic_cnc_inner_edge",
"Dirt Slope Edge", "technic_cnc_slope_edge_upsdown", "technic_cnc_slope_inner_edge_upsdown",
"Dirt Slope Inner Edge", "technic_cnc_stick", "technic_cnc_cylinder_horizontal"}
"Dirt Slope Upside Down Edge",
"Dirt Slope Upside Down Inner Edge",
"Dirt Pyramid",
"Dirt Spike",
"Dirt One Curved Edge Block",
"Dirt Two Curved Edge Block",
"Dirt Cylinder",
"Dirt Cylinder Horizontal",
"Dirt Sphere",
"Dirt Element Straight",
"Dirt Element Edge",
"Dirt Element T",
"Dirt Element Cross",
"Dirt Element End")
-- TREE -- TREE
------- -------
technic_cnc_api.register_slope_edge_etc("default:tree", technic_cnc_api.register_all("default:tree",
{snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,not_in_creative_inventory=1}, {snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1},
{"default_tree.png"}, {"default_tree.png"},
"Tree Slope", "Wooden")
"Tree Slope Lying",
"Tree Slope Upside Down",
"Tree Slope Edge",
"Tree Slope Inner Edge",
"Tree Slope Upside Down Edge",
"Tree Slope Upside Down Inner Edge",
"Tree Pyramid",
"Tree Spike",
"Tree One Curved Edge Block",
"Tree Two Curved Edge Block",
"Tree Cylinder",
"Tree Cylinder Horizontal",
"Tree Sphere",
"Tree Element Straight",
"Tree Element Edge",
"Tree Element T",
"Tree Element Cross",
"Tree Element End")
-- STEEL
--------
technic_cnc_api.register_slope_edge_etc("default:steelblock",
{snappy=1,bendy=2,cracky=1,melty=2,level=2,not_in_creative_inventory=1},
{"default_steel_block.png"},
"Steel Slope",
"Steel Slope Lying",
"Steel Slope Upside Down",
"Steel Slope Edge",
"Steel Slope Inner Edge",
"Steel Slope Upside Down Edge",
"Steel Slope Upside Down Inner Edge",
"Steel Pyramid",
"Steel Spike",
"Steel One Curved Edge Block",
"Steel Two Curved Edge Block",
"Steel Cylinder",
"Steel Cylinder Horizontal",
"Steel Sphere",
"Steel Element Straight",
"Steel Element Edge",
"Steel Element T",
"Steel Element Cross",
"Steel Element End")
-- REGISTER MATERIALS AND PROPERTIES FOR STICKS:
------------------------------------------------
-- WOOD -- WOOD
------- -------
technic_cnc_api.register_stick_etc("default:wood", technic_cnc_api.register_all("default:wood",
{snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1}, {snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1},
{"default_wood.png"}, {"default_wood.png"},
"Wooden Stick") "Wooden")
-- STONE -- STONE
-------- --------
technic_cnc_api.register_stick_etc("default:stone", technic_cnc_api.register_all("default:stone",
{cracky=3,not_in_creative_inventory=1}, {cracky=3,not_in_creative_inventory=1},
{"default_stone.png"}, {"default_stone.png"},
"Stone Stick") "Stone")
-- COBBLE -- COBBLE
--------- ---------
technic_cnc_api.register_stick_etc("default:cobble", technic_cnc_api.register_all("default:cobble",
{cracky=3,not_in_creative_inventory=1}, {cracky=3,not_in_creative_inventory=1},
{"default_cobble.png"}, {"default_cobble.png"},
"Cobble Stick") "Cobble")
-- BRICK -- BRICK
-------- --------
technic_cnc_api.register_stick_etc("default:brick", technic_cnc_api.register_all("default:brick",
{cracky=3,not_in_creative_inventory=1}, {cracky=3,not_in_creative_inventory=1},
{"default_brick.png"}, {"default_brick.png"},
"Brick Stick") "Brick")
-- SANDSTONE -- SANDSTONE
------------ ------------
technic_cnc_api.register_stick_etc("default:sandstone", technic_cnc_api.register_all("default:sandstone",
{crumbly=2,cracky=2,not_in_creative_inventory=1}, {crumbly=2,cracky=2,not_in_creative_inventory=1},
{"default_sandstone.png"}, {"default_sandstone.png"},
"Sandstone Stick") "Sandstone")
-- LEAVES -- LEAVES
--------- ---------
technic_cnc_api.register_stick_etc("default:leaves", technic_cnc_api.register_all("default:leaves",
{snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1}, {snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
{"bucharest_tree.png"}, {"bucharest_tree.png"},
"Leaves Stick") "Leaves")
-- TREE -- TREE
------- -------
technic_cnc_api.register_stick_etc("default:tree", technic_cnc_api.register_all("default:tree",
{snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,not_in_creative_inventory=1}, {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,not_in_creative_inventory=1},
{"default_tree.png"}, {"default_tree.png"},
"Tree Stick") "Tree")
-- STEEL -- STEEL
-------- --------
technic_cnc_api.register_stick_etc("default:steelblock", technic_cnc_api.register_all("default:steel",
{snappy=1,bendy=2,cracky=1,melty=2,level=2,not_in_creative_inventory=1}, {snappy=1,bendy=2,cracky=1,melty=2,level=2,not_in_creative_inventory=1},
{"default_steel_block.png"}, {"default_steel_block.png"},
"Steel Stick") "Steel")
-- REGISTER MATERIALS AND PROPERTIES FOR HALF AND NORMAL HEIGHT ELEMENTS:
-------------------------------------------------------------------------
-- WOOD
-------
technic_cnc_api.register_elements("default:wood",
{snappy=2,choppy=2,oddly_breakable_by_hand=2,not_in_creative_inventory=1},
{"default_wood.png"},
"Wooden Element Straight Double",
"Wooden Element Edge Double",
"Wooden Element T Double",
"Wooden Element Cross Double",
"Wooden Element End Double")
-- STONE
--------
technic_cnc_api.register_elements("default:stone",
{cracky=3,not_in_creative_inventory=1},
{"default_stone.png"},
"Stone Element Straight Double",
"Stone Element Edge Double",
"Stone Element T Double",
"Stone Element Cross Double",
"Stone Element End Double")
-- COBBLE
---------
technic_cnc_api.register_elements("default:cobble",
{cracky=3,not_in_creative_inventory=1},
{"default_cobble.png"},
"Cobble Element Straight Double",
"Cobble Element Edge Double",
"Cobble Element T Double",
"Cobble Element Cross Double",
"Cobble Element End Double")
-- BRICK
--------
technic_cnc_api.register_elements("default:brick",
{cracky=3,not_in_creative_inventory=1},
{"default_brick.png"},
"Brick Element Straight Double",
"Brick Element Edge Double",
"Brick Element T Double",
"Brick Element Cross Double",
"Brick Element End Double")
-- SANDSTONE
------------
technic_cnc_api.register_elements("default:sandstone",
{crumbly=2,cracky=2,not_in_creative_inventory=1},
{"default_sandstone.png"},
"Sandstone Element Straight Double",
"Sandstone Element Edge Double",
"Sandstone Element T Double",
"Sandstone Element Cross Double",
"Sandstone Element End Double")
-- LEAVES
---------
technic_cnc_api.register_elements("default:leaves",
{snappy=2,choppy=2,oddly_breakable_by_hand=3,not_in_creative_inventory=1},
{"bucharest_tree.png"},
"Leaves Element Straight Double",
"Leaves Element Edge Double",
"Leaves Element T Double",
"Leaves Element Cross Double",
"Leaves Element End Double")
-- TREE
-------
technic_cnc_api.register_elements("default:tree",
{snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1,not_in_creative_inventory=1},
{"default_tree.png"},
"Tree Element Straight Double",
"Tree Element Edge Double",
"Tree Element T Double",
"Tree Element Cross Double",
"Tree Element End Double")
-- STEEL
--------
technic_cnc_api.register_elements("default:steel",
{snappy=1,bendy=2,cracky=1,melty=2,level=2,not_in_creative_inventory=1},
{"default_steel_block.png"},
"Steel Element Straight Double",
"Steel Element Edge Double",
"Steel Element T Double",
"Steel Element Cross Double",
"Steel Element End Double")

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB