Mirrorlandia_minetest/technic
1
0
Fork 0
mirror of https://github.com/minetest-mods/technic.git synced 2024-12-22 22:02:32 +01:00
Code Issues Projects Releases Wiki Activity

Fixes to te machine level of service.

Browse Source
This commit is contained in:
kpoppel 2013-05-06 23:14:27 +02:00
parent d98405f129
commit c1df318e85
2 changed files with 229 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

306
technic/cnc.lua
View File

@ -1,7 +1,6 @@
-- 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
local shape = {} local shape = {}
local size = 0
local onesize_products = { local onesize_products = {
slope = 2, slope = 2,
slope_edge = 1, slope_edge = 1,
@ -11,10 +10,10 @@ local onesize_products = {
cylinder = 2, cylinder = 2,
sphere = 1, sphere = 1,
stick = 8, stick = 8,
slope_upsdwn = 2, slope_upsdown = 2,
slope_edge_upsdwn = 1, slope_edge_upsdown = 1,
slope_inner_edge_upsdwn = 1, slope_inner_edge_upsdown = 1,
cylinder_hor = 2, cylinder_horizontal = 2,
slope_lying = 2, slope_lying = 2,
onecurvededge = 1, onecurvededge = 1,
twocurvededge = 1, twocurvededge = 1,
@ -27,14 +26,69 @@ local twosize_products = {
element_edge = 2, element_edge = 2,
} }
local showbackground = "--" --cnc_recipes ={}
local max_cncruns = 99 --registered_cnc_recipes_count=1
local max_products = 99 --
--function register_cnc_recipe (string1,string2)
-- cnc_recipes[registered_cnc_recipes_count]={}
-- cnc_recipes[registered_cnc_recipes_count].src_name=string1
-- cnc_recipes[registered_cnc_recipes_count].dst_name=string2
-- registered_cnc_recipes_count=registered_cnc_recipes_count+1
-- if unified_inventory then
-- unified_inventory.register_craft({
-- type = "cnc milling",
-- output = string2,
-- items = {string1},
-- width = 0,
-- })
-- end
--end
--showlabelin = "" local cnc_formspec =
--showlabelout = "label[4.5,5.5;Out:]" "invsize[9,11;]"..
"label[1,0;Choose Milling Program:]"..
"image_button[1,0.5;1,1;technic_cnc_slope.png;slope; ]"..
"image_button[2,0.5;1,1;technic_cnc_slope_edge.png;slope_edge; ]"..
"image_button[3,0.5;1,1;technic_cnc_slope_inner_edge.png;slope_inner_edge; ]"..
"image_button[4,0.5;1,1;technic_cnc_pyramid.png;pyramid; ]"..
"image_button[5,0.5;1,1;technic_cnc_spike.png;spike; ]"..
"image_button[6,0.5;1,1;technic_cnc_cylinder.png;cylinder; ]"..
"image_button[7,0.5;1,1;technic_cnc_sphere.png;sphere; ]"..
"image_button[8,0.5;1,1;technic_cnc_stick.png;stick; ]"..
"image_button[1,1.5;1,1;technic_cnc_slope_upsdwn.png;slope_upsdown; ]"..
"image_button[2,1.5;1,1;technic_cnc_slope_edge_upsdwn.png;slope_edge_upsdown; ]"..
"image_button[3,1.5;1,1;technic_cnc_slope_inner_edge_upsdwn.png;slope_inner_edge_upsdown; ]"..
"image_button[4,1.5;1,1;technic_cnc_cylinder_horizontal.png;cylinder_horizontal; ]"..
"image_button[1,2.5;1,1;technic_cnc_slope_lying.png;slope_lying; ]"..
"image_button[2,2.5;1,1;technic_cnc_onecurvededge.png;onecurvededge; ]"..
"image_button[3,2.5;1,1;technic_cnc_twocurvededge.png;twocurvededge; ]"..
"label[1,3.5;Slim Elements half / normal height:]"..
"image_button[1,4;1,0.5;technic_cnc_full.png;full; ]"..
"image_button[1,4.5;1,0.5;technic_cnc_half.png;half; ]"..
"image_button[2,4;1,1;technic_cnc_element_straight.png;element_straight; ]"..
"image_button[3,4;1,1;technic_cnc_element_end.png;element_end; ]"..
"image_button[4,4;1,1;technic_cnc_element_cross.png;element_cross; ]"..
"image_button[5,4;1,1;technic_cnc_element_t.png;element_t; ]"..
"image_button[6,4;1,1;technic_cnc_element_edge.png;element_edge; ]"..
"label[0, 5.5;In:]"..
"list[current_name;src;0.5,5.5;1,1;]"..
"label[4, 5.5;Out:]"..
"list[current_name;dst;5,5.5;4,1;]"..
"list[current_player;main;0,7;8,4;]"
local cnc_power_formspec=
"label[0,3;Power]"..
"image[0,1;1,2;technic_power_meter_bg.png]"
local size = 1;
-- I want the CNC machine to be a two block thing
minetest.register_node("technic:cnc", { minetest.register_node("technic:cnc", {
description = "CNC Milling Machine", description = "CNC Milling Machine",
tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png", tiles = {"technic_cnc_top.png", "technic_cnc_bottom.png", "technic_cnc_side.png",
@ -53,72 +107,44 @@ minetest.register_node("technic:cnc", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}, fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5},
}, },
groups = {oddly_breakable_by_hand=2, cracky=3, dig_immediate=1}, 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) can_dig = function(pos,player)
local meta = minetest.env:get_meta(pos); local meta = minetest.env:get_meta(pos);
local inv = meta:get_inventory() local inv = meta:get_inventory()
if not inv:is_empty("input") or not inv:is_empty("output") then 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"); minetest.chat_send_player(player:get_player_name(), "CNC machine cannot be removed because it is not empty");
return false return false
end end
return true return true
end, end,
on_construct = function(pos)
local meta = minetest.env:get_meta(pos)
if technic_cnc_api.allow_menu_background == true or technic_cnc_api.allow_menu_background == 1 then
showbackground = "background[-0.15,-0.25;8.40,11.75;technic_cnc_background.png]"
end
meta:set_string("formspec", "invsize[8,11;]"..
"label[0,0;Choose Milling Program:]"..
"image_button[0,0.5;1,1;technic_cnc_slope.png;slope; ]"..
"image_button[1,0.5;1,1;technic_cnc_slope_edge.png;slope_edge; ]"..
"image_button[2,0.5;1,1;technic_cnc_slope_inner_edge.png;slope_inner_edge; ]"..
"image_button[3,0.5;1,1;technic_cnc_pyramid.png;pyramid; ]"..
"image_button[4,0.5;1,1;technic_cnc_spike.png;spike; ]"..
"image_button[5,0.5;1,1;technic_cnc_cylinder.png;cylinder; ]"..
"image_button[6,0.5;1,1;technic_cnc_sphere.png;sphere; ]"..
"image_button[7,0.5;1,1;technic_cnc_stick.png;stick; ]"..
"image_button[0,1.5;1,1;technic_cnc_slope_upsdwn.png;slope_upsdwn; ]"..
"image_button[1,1.5;1,1;technic_cnc_slope_edge_upsdwn.png;slope_upsdwn_edge; ]"..
"image_button[2,1.5;1,1;technic_cnc_slope_inner_edge_upsdwn.png;slope_upddown_inner_edge; ]"..
"image_button[5,1.5;1,1;technic_cnc_cylinder_horizontal.png;cylinder_horizontal; ]"..
"image_button[0,2.5;1,1;technic_cnc_slope_lying.png;slope_lying; ]"..
"image_button[1,2.5;1,1;technic_cnc_onecurvededge.png;onecurvededge; ]"..
"image_button[2,2.5;1,1;technic_cnc_twocurvededge.png;twocurvededge; ]"..
"label[0,3.5;Slim Elements half / normal height:]"..
"image_button[0,4;1,0.5;technic_cnc_full.png;full; ]"..
"image_button[0,4.5;1,0.5;technic_cnc_half.png;half; ]"..
"image_button[1,4;1,1;technic_cnc_element_straight.png;element_straight; ]"..
"image_button[2,4;1,1;technic_cnc_element_end.png;element_end; ]"..
"image_button[3,4;1,1;technic_cnc_element_cross.png;element_cross; ]"..
"image_button[4,4;1,1;technic_cnc_element_t.png;element_t; ]"..
"image_button[5,4;1,1;technic_cnc_element_edge.png;element_edge; ]"..
"label[0, 5.5;In:]".. -- showlabelin..
"list[current_name;input;0.5,5.5;1,1;]"..
"field[3, 6;1,1;num_cncruns;Repeat program:;${num_cncruns}]".. -- Fill default with meta data num_cncruns
"label[4, 5.5;Out:]".. -- showlabelout..
"list[current_name;output;4.5,5.5;1,1;]"..
"list[current_player;main;0,7;8,4;]"..
showbackground)
meta:set_string("infotext", "CNC Milling Machine")
meta:set_string("num_cncruns", 1 );
local inv = meta:get_inventory()
inv:set_size("input", 1)
inv:set_size("output", 1)
end,
on_receive_fields = function(pos, formname, fields, sender) on_receive_fields = function(pos, formname, fields, sender)
-- REGISTER MILLING PROGRAMMS AND OUTPUTS: -- REGISTER MILLING PROGRAMS AND OUTPUTS:
------------------------------------------ ------------------------------------------
-- Program for half/full size -- Program for half/full size
if fields["full"] then if fields["full"] then
@ -131,32 +157,12 @@ minetest.register_node("technic:cnc", {
return return
end end
-- Resolve the node name and the number of items to make
local meta = minetest.env:get_meta(pos) local meta = minetest.env:get_meta(pos)
local inv = meta:get_inventory() local inv = meta:get_inventory()
local inputstack = inv:get_stack("src", 1)
-- Limit the number entered
if( fields.num_cncruns and tonumber( fields.num_cncruns) > 0 and tonumber(fields.num_cncruns) < 100 ) then
meta:set_string( "num_cncruns", fields.num_cncruns );
else
minetest.chat_send_player(sender:get_player_name(), "CNC machine runs set to a bad value. Machine resets.");
meta:set_string( "num_cncruns", 1 );
fields.num_cncruns = 1
end
-- Do nothing if the machine is empty
if inv:is_empty("input") then
return
end
-- Do nothing if the output is not empty and the product used is not the same as what is already there
-- Resolve the node name and the number of items to make and the number of items to take
local product = ""
local produces = 1
local input_used = 1
local inputstack = inv:get_stack("input", 1)
local inputname = inputstack:get_name() local inputname = inputstack:get_name()
local multiplier = 1 local multiplier = 0
for k, _ in pairs(fields) do for k, _ in pairs(fields) do
-- Set a multipier for the half/full size capable blocks -- Set a multipier for the half/full size capable blocks
if twosize_products[k] ~= nil then if twosize_products[k] ~= nil then
@ -166,36 +172,122 @@ minetest.register_node("technic:cnc", {
end end
if onesize_products[k] ~= nil or twosize_products[k] ~= nil then if onesize_products[k] ~= nil or twosize_products[k] ~= nil then
product = inputname .. "_technic_cnc_" .. k meta:set_float( "cnc_multiplier", multiplier)
produces = math.min( fields.num_cncruns*multiplier, max_products) -- produce at most max_products meta:set_string("cnc_user", sender:get_player_name())
input_used = math.min( math.floor(produces/multiplier), inputstack:get_count()) -- use at most what we got end
produces = input_used*multiplier -- final production
print(size) if onesize_products[k] ~= nil or (twosize_products[k] ~= nil and size==2) then
print(fields.num_cncruns) meta:set_string("cnc_product", inputname .. "_technic_cnc_" .. k)
print(product) break
print(produces) end
print(input_used)
print("------------------") if twosize_products[k] ~= nil and size==1 then
meta:set_string("cnc_product", inputname .. "_technic_cnc_" .. k .. "_double")
break break
end end
end end
return
end, -- callback function
})
minetest.register_node("technic:cnc_active", {
description = "CNC 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_active.png"},
paramtype2 = "facedir",
groups = {cracky=2,not_in_creative_inventory=1},
legacy_facedir_simple = true,
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,
})
minetest.register_abm(
{
nodenames = {"technic:cnc","technic:cnc_active"},
interval = 1,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
local meta = minetest.env:get_meta(pos)
local charge= meta:get_float("internal_EU_buffer")
local max_charge= meta:get_float("internal_EU_buffer_size")
local cnc_cost=350
local load = math.floor((charge/max_charge)*100)
meta:set_string("formspec", cnc_formspec..
"image[0,1;1,2;technic_power_meter_bg.png^[lowpart:"..
(load)..":technic_power_meter_fg.png]"
)
local inv = meta:get_inventory()
local srclist = inv:get_list("src")
if inv:is_empty("src") then
meta:set_float("cnc_on",0)
meta:set_string("cnc_product", "") -- Reset the program
end
if (meta:get_float("cnc_on") == 1) then
if charge>=cnc_cost then
charge=charge-cnc_cost;
meta:set_float("internal_EU_buffer",charge)
meta:set_float("src_time", meta:get_float("src_time") + 1)
if meta:get_float("src_time") >= meta:get_float("cnc_time") then
local product = meta:get_string("cnc_product")
if inv:room_for_item("dst",product) then
-- CNC does the transformation -- CNC does the transformation
------------------------------ ------------------------------
if minetest.registered_nodes[product] ~= nil then if minetest.registered_nodes[product] ~= nil then
inv:add_item("output",product .. " " .. produces) inv:add_item("dst",product .. " " .. meta:get_float("cnc_multiplier"))
inputstack:take_item(input_used) srcstack = inv:get_stack("src", 1)
inv:set_stack("input",1,inputstack) srcstack:take_item()
else inv:set_stack("src",1,srcstack)
minetest.chat_send_player(sender:get_player_name(), "CNC machine does not know how to mill this material. Please remove it."); if inv:is_empty("src") then
meta:set_float("cnc_on",0)
meta:set_string("cnc_product", "") -- Reset the program
-- print("cnc product reset")
end
else
minetest.chat_send_player(meta:get_string("cnc_user"), "CNC machine does not know how to handle this material. Please remove it.");
end
else
minetest.chat_send_player(meta:get_string("cnc_user"), "CNC inventory full!")
end
meta:set_float("src_time", 0)
end
end
end
if (meta:get_float("cnc_on")==0) then
if not inv:is_empty("src") then
local product = meta:get_string("cnc_product")
if minetest.registered_nodes[product] ~= nil then
meta:set_float("cnc_on",1)
hacky_swap_node(pos,"technic:cnc_active")
meta:set_string("infotext", "CNC Machine Active")
cnc_time=3
meta:set_float("cnc_time",cnc_time)
meta:set_float("src_time", 0)
return
end
else
hacky_swap_node(pos,"technic:cnc")
meta:set_string("infotext", "CNC Machine Inactive")
end
end
end end
return;
end, -- callback function
}) })
----------
register_LV_machine ("technic:cnc","RE")
register_LV_machine ("technic:cnc_active","RE")
-------------------------
-- Milling Machine Recipe -- CNC Machine Recipe
------------------------- -------------------------
minetest.register_craft({ minetest.register_craft({
output = 'technic:cnc', output = 'technic:cnc',

14
technic/cnc_api.lua
View File

@ -212,7 +212,7 @@ end
-- SLOPE EDGE UPSIDE DOWN -- SLOPE EDGE UPSIDE DOWN
------------------------- -------------------------
function technic_cnc_api.register_slope_upsdown_edge(recipeitem, groups, images, description) function technic_cnc_api.register_slope_edge_upsdown(recipeitem, groups, images, description)
if recipeitem == "default:dirt" then if recipeitem == "default:dirt" then
return return
@ -223,7 +223,7 @@ local detail = technic_cnc_api.detail_level
for i = 0, detail-1 do for i = 0, detail-1 do
slopeupdwnboxedge[i+1]={(-1*(i/detail))+0.5-(1/detail), (i/detail)-0.5, (-1*(i/detail))+0.5-(1/detail), 0.5, (i/detail)-0.5+(1/detail), 0.5} slopeupdwnboxedge[i+1]={(-1*(i/detail))+0.5-(1/detail), (i/detail)-0.5, (-1*(i/detail))+0.5-(1/detail), 0.5, (i/detail)-0.5+(1/detail), 0.5}
end end
minetest.register_node(":" .. recipeitem .. "_technic_cnc_slope_upsdown_edge", { minetest.register_node(":" .. recipeitem .. "_technic_cnc_slope_edge_upsdown", {
description = description, description = description,
drawtype = "nodebox", drawtype = "nodebox",
tiles = images, tiles = images,
@ -245,13 +245,13 @@ end
-- SLOPE INNER EDGE UPSIDE DOWN -- SLOPE INNER EDGE UPSIDE DOWN
------------------------------- -------------------------------
function technic_cnc_api.register_slope_upsdown_inner_edge(recipeitem, groups, images, description) function technic_cnc_api.register_slope_inner_edge_upsdown(recipeitem, groups, images, description)
if recipename == "default:dirt" then if recipename == "default:dirt" then
return return
end end
minetest.register_node(":" .. recipeitem .. "_technic_cnc_slope_upsdown_inner_edge", { minetest.register_node(":" .. recipeitem .. "_technic_cnc_slope_inner_edge_upsdown", {
description = description, description = description,
drawtype = "nodebox", drawtype = "nodebox",
tiles = images, tiles = images,
@ -548,7 +548,7 @@ for i = 1, detail-1 do
sehne = math.sqrt(0.25 - (((i/detail)-0.5)^2)) sehne = math.sqrt(0.25 - (((i/detail)-0.5)^2))
spherebox[i]={-sehne, (i/detail)-0.5, -sehne, sehne, (i/detail)+(1/detail)-0.5, sehne} spherebox[i]={-sehne, (i/detail)-0.5, -sehne, sehne, (i/detail)+(1/detail)-0.5, sehne}
end end
minetest.register_node(":" .. recipeitem .. "_technic_cnc_cylinder_sphere", { minetest.register_node(":" .. recipeitem .. "_technic_cnc_sphere", {
description = description, description = description,
drawtype = "nodebox", drawtype = "nodebox",
tiles = images, tiles = images,
@ -939,8 +939,8 @@ function technic_cnc_api.register_slope_edge_etc(recipeitem, groups, images, des
technic_cnc_api.register_slope_upsdown(recipeitem, groups, images, desc_slope_upsdown) technic_cnc_api.register_slope_upsdown(recipeitem, groups, images, desc_slope_upsdown)
technic_cnc_api.register_slope_edge(recipeitem, groups, images, desc_slope_edge) technic_cnc_api.register_slope_edge(recipeitem, groups, images, desc_slope_edge)
technic_cnc_api.register_slope_inner_edge(recipeitem, groups, images, desc_slope_inner_edge) technic_cnc_api.register_slope_inner_edge(recipeitem, groups, images, desc_slope_inner_edge)
technic_cnc_api.register_slope_upsdown_edge(recipeitem, groups, images, desc_slope_upsdwn_edge) technic_cnc_api.register_slope_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_edge)
technic_cnc_api.register_slope_upsdown_inner_edge(recipeitem, groups, images, desc_slope_upsdwn_inner_edge) technic_cnc_api.register_slope_inner_edge_upsdown(recipeitem, groups, images, desc_slope_upsdwn_inner_edge)
technic_cnc_api.register_pyramid(recipeitem, groups, images, desc_pyramid) technic_cnc_api.register_pyramid(recipeitem, groups, images, desc_pyramid)
technic_cnc_api.register_spike(recipeitem, groups, images, desc_spike) technic_cnc_api.register_spike(recipeitem, groups, images, desc_spike)
technic_cnc_api.register_onecurvededge(recipeitem, groups, images, desc_onecurvededge) technic_cnc_api.register_onecurvededge(recipeitem, groups, images, desc_onecurvededge)