mirror of
https://github.com/minetest-mods/technic.git
synced 2024-09-12 08:18:30 +02:00
Add spheres to the CNC machine
Note: this required renaming the base node name for the oblate spheroid object, which previously had been named simply "sphere". The result is that all such nodes in an old world will change to actual spheres. Since this includes a formspec change, machines will have to be dug and re-placed to get the new program button to show up, and/or if the image on the Oblate Spheroid button shows wrongly.
This commit is contained in:
parent
4874e29025
commit
cf75916ea7
@ -17,6 +17,7 @@ local onesize_products = {
|
|||||||
pyramid = 2,
|
pyramid = 2,
|
||||||
spike = 1,
|
spike = 1,
|
||||||
cylinder = 2,
|
cylinder = 2,
|
||||||
|
oblate_spheroid = 1,
|
||||||
sphere = 1,
|
sphere = 1,
|
||||||
stick = 8,
|
stick = 8,
|
||||||
slope_upsdown = 2,
|
slope_upsdown = 2,
|
||||||
@ -44,13 +45,14 @@ local cnc_formspec =
|
|||||||
"image_button[4,0.5;1,1;technic_cnc_pyramid.png;pyramid; ]"..
|
"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[5,0.5;1,1;technic_cnc_spike.png;spike; ]"..
|
||||||
"image_button[6,0.5;1,1;technic_cnc_cylinder.png;cylinder; ]"..
|
"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[7,0.5;1,1;technic_cnc_oblate_spheroid.png;oblate_spheroid; ]"..
|
||||||
"image_button[8,0.5;1,1;technic_cnc_stick.png;stick; ]"..
|
"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[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[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[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[4,1.5;1,1;technic_cnc_cylinder_horizontal.png;cylinder_horizontal; ]"..
|
||||||
|
"image_button[5,1.5;1,1;technic_cnc_sphere.png;sphere; ]"..
|
||||||
|
|
||||||
"image_button[1,2.5;1,1;technic_cnc_slope_lying.png;slope_lying; ]"..
|
"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[2,2.5;1,1;technic_cnc_onecurvededge.png;onecurvededge; ]"..
|
||||||
|
@ -82,9 +82,9 @@ technic.cnc.programs = {
|
|||||||
desc = S("Element Straight")
|
desc = S("Element Straight")
|
||||||
},
|
},
|
||||||
|
|
||||||
{ suffix = "technic_cnc_sphere",
|
{ suffix = "technic_cnc_oblate_spheroid",
|
||||||
model = "technic_oblatesphere.obj",
|
model = "technic_oblate_spheroid.obj",
|
||||||
desc = S("Oblate Sphere"),
|
desc = S("Oblate spheroid"),
|
||||||
cbox = {
|
cbox = {
|
||||||
type = "fixed",
|
type = "fixed",
|
||||||
fixed = {
|
fixed = {
|
||||||
@ -95,6 +95,11 @@ technic.cnc.programs = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ suffix = "technic_cnc_sphere",
|
||||||
|
model = "technic_sphere.obj",
|
||||||
|
desc = S("Sphere")
|
||||||
|
},
|
||||||
|
|
||||||
{ suffix = "technic_cnc_cylinder_horizontal",
|
{ suffix = "technic_cnc_cylinder_horizontal",
|
||||||
model = "technic_cylinder_horizontal.obj",
|
model = "technic_cylinder_horizontal.obj",
|
||||||
desc = S("Horizontal Cylinder")
|
desc = S("Horizontal Cylinder")
|
||||||
@ -261,7 +266,7 @@ technic.cnc.programs = {
|
|||||||
technic.cnc.programs_disable = {
|
technic.cnc.programs_disable = {
|
||||||
-- ["default:brick"] = {"technic_cnc_stick"}, -- Example: Disallow the stick for brick
|
-- ["default:brick"] = {"technic_cnc_stick"}, -- Example: Disallow the stick for brick
|
||||||
-- ...
|
-- ...
|
||||||
["default:dirt"] = {"technic_cnc_sphere", "technic_cnc_slope_upsdown", "technic_cnc_edge",
|
["default:dirt"] = {"technic_cnc_oblate_spheroid", "technic_cnc_slope_upsdown", "technic_cnc_edge",
|
||||||
"technic_cnc_inner_edge", "technic_cnc_slope_edge_upsdown",
|
"technic_cnc_inner_edge", "technic_cnc_slope_edge_upsdown",
|
||||||
"technic_cnc_slope_inner_edge_upsdown", "technic_cnc_stick",
|
"technic_cnc_slope_inner_edge_upsdown", "technic_cnc_stick",
|
||||||
"technic_cnc_cylinder_horizontal"}
|
"technic_cnc_cylinder_horizontal"}
|
||||||
@ -325,7 +330,7 @@ end
|
|||||||
|
|
||||||
-- REGISTER NEW TECHNIC_CNC_API's PART 2: technic.cnc..register_element_end(subname, recipeitem, groups, images, desc_element_xyz)
|
-- REGISTER NEW TECHNIC_CNC_API's PART 2: technic.cnc..register_element_end(subname, recipeitem, groups, images, desc_element_xyz)
|
||||||
-----------------------------------------------------------------------------------------------------------------------
|
-----------------------------------------------------------------------------------------------------------------------
|
||||||
function technic.cnc.register_slope_edge_etc(recipeitem, groups, images, desc_slope, desc_slope_lying, desc_slope_upsdown, desc_slope_edge, desc_slope_inner_edge, desc_slope_upsdwn_edge, desc_slope_upsdwn_inner_edge, desc_pyramid, desc_spike, desc_onecurvededge, desc_twocurvededge, desc_cylinder, desc_cylinder_horizontal, desc_sphere, desc_element_straight, desc_element_edge, desc_element_t, desc_element_cross, desc_element_end)
|
function technic.cnc.register_slope_edge_etc(recipeitem, groups, images, desc_slope, desc_slope_lying, desc_slope_upsdown, desc_slope_edge, desc_slope_inner_edge, desc_slope_upsdwn_edge, desc_slope_upsdwn_inner_edge, desc_pyramid, desc_spike, desc_onecurvededge, desc_twocurvededge, desc_cylinder, desc_cylinder_horizontal, desc_spheroid, desc_element_straight, desc_element_edge, desc_element_t, desc_element_cross, desc_element_end)
|
||||||
|
|
||||||
technic.cnc.register_slope(recipeitem, groups, images, desc_slope)
|
technic.cnc.register_slope(recipeitem, groups, images, desc_slope)
|
||||||
technic.cnc.register_slope_lying(recipeitem, groups, images, desc_slope_lying)
|
technic.cnc.register_slope_lying(recipeitem, groups, images, desc_slope_lying)
|
||||||
@ -340,7 +345,7 @@ function technic.cnc.register_slope_edge_etc(recipeitem, groups, images, desc_sl
|
|||||||
technic.cnc.register_twocurvededge(recipeitem, groups, images, desc_twocurvededge)
|
technic.cnc.register_twocurvededge(recipeitem, groups, images, desc_twocurvededge)
|
||||||
technic.cnc.register_cylinder(recipeitem, groups, images, desc_cylinder)
|
technic.cnc.register_cylinder(recipeitem, groups, images, desc_cylinder)
|
||||||
technic.cnc.register_cylinder_horizontal(recipeitem, groups, images, desc_cylinder_horizontal)
|
technic.cnc.register_cylinder_horizontal(recipeitem, groups, images, desc_cylinder_horizontal)
|
||||||
technic.cnc.register_sphere(recipeitem, groups, images, desc_sphere)
|
technic.cnc.register_spheroid(recipeitem, groups, images, desc_spheroid)
|
||||||
technic.cnc.register_element_straight(recipeitem, groups, images, desc_element_straight)
|
technic.cnc.register_element_straight(recipeitem, groups, images, desc_element_straight)
|
||||||
technic.cnc.register_element_edge(recipeitem, groups, images, desc_element_edge)
|
technic.cnc.register_element_edge(recipeitem, groups, images, desc_element_edge)
|
||||||
technic.cnc.register_element_t(recipeitem, groups, images, desc_element_t)
|
technic.cnc.register_element_t(recipeitem, groups, images, desc_element_t)
|
||||||
|
@ -9,11 +9,6 @@ technic.cnc.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"},
|
||||||
S("Dirt"))
|
S("Dirt"))
|
||||||
technic.cnc.programs_disable["default:dirt"] = {"technic_cnc_sphere", "technic_cnc_slope_upsdown",
|
|
||||||
"technic_cnc_edge", "technic_cnc_inner_edge",
|
|
||||||
"technic_cnc_slope_edge_upsdown", "technic_cnc_slope_inner_edge_upsdown",
|
|
||||||
"technic_cnc_stick", "technic_cnc_cylinder_horizontal"}
|
|
||||||
|
|
||||||
-- WOOD
|
-- WOOD
|
||||||
-------
|
-------
|
||||||
technic.cnc.register_all("default:wood",
|
technic.cnc.register_all("default:wood",
|
||||||
|
1927
technic/models/technic_sphere.obj
Normal file
1927
technic/models/technic_sphere.obj
Normal file
File diff suppressed because it is too large
Load Diff
BIN
technic/textures/technic_cnc_oblate_spheroid.png
Normal file
BIN
technic/textures/technic_cnc_oblate_spheroid.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 8.7 KiB After Width: | Height: | Size: 5.6 KiB |
Loading…
Reference in New Issue
Block a user