diff --git a/computers/computers.lua b/computers/computers.lua index 6437c5f8..d545048e 100644 --- a/computers/computers.lua +++ b/computers/computers.lua @@ -55,41 +55,6 @@ minetest.register_node("computers:vanio_off", { end }) --- Sony PlayStation lookalike -computers.register("computers:slaystation", { - description = S("Pony SlayStation"), - inventory_image = "computers_ps1_inv.png", - tiles_off = { top=true }, - node_box = computers.pixelnodebox(32, { - -- X Y Z W H L - { 0, 0, 11, 32, 6, 21 }, -- Console - { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip - { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip - { 5, 0, 4, 5, 2, 5 }, -- Controller 1 Center - { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip - { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 4, 5, 2, 5 } -- Controller 2 Center - }) -}) - --- Sony PlayStation 2 lookalike -computers.register("computers:slaystation2", { - description = S("Pony SlayStation 2"), - inventory_image = "computers_ps2_inv.png", - tiles_off = { front=true }, - node_box = computers.pixelnodebox(32, { - -- X Y Z W H L - { 2, 2, 11, 28, 3, 19 }, -- Console (Upper part) - { 2, 0, 11, 26, 2, 19 }, -- Console (Lower part) - { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip - { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip - { 5, 0, 1, 5, 2, 8 }, -- Controller 1 Center - { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip - { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip - { 22, 0, 1, 5, 2, 8 } -- Controller 2 Center - }) -}) - -- Sinclair ZX Spectrum lookalike computers.register("computers:specter", { description = S("SX Specter"), @@ -102,18 +67,6 @@ computers.register("computers:specter", { }) }) --- Nintendo Wii lookalike -computers.register("computers:wee", { - description = S("Nientiendo Wee"), - inventory_image = "computers_wii_inv.png", - tiles_off = { front=true }, - node_box = computers.pixelnodebox(32, { - -- X Y Z W H L - { 11, 0, 3, 10, 6, 26 }, -- Base - { 12, 6, 4, 8, 22, 24 } -- Top - }) -}) - -- Apple iPad lookalike minetest.register_node("computers:piepad", { description = S("Snapple Piepad"), @@ -152,19 +105,6 @@ computers.register("computers:admiral128", { }) }) --- XBox lookalike -computers.register("computers:hueg_box", { - description = S("HUEG Box"), - tiles_off = { }, - node_box = computers.pixelnodebox(16, { - -- X Y Z W H L - { 0, 0, 7, 16, 6, 9 }, -- Console - { 2, 0, 1, 11, 3, 6 }, -- Controller - { 2, 0, 0, 2, 3, 1 }, - { 11, 0, 0, 2, 3, 1 }, - }) -}) - -- Generic Flat Screen LCD (16x9) with keyboard local mo_sbox = { type = "fixed", diff --git a/computers/tetris.lua b/computers/gaming.lua similarity index 77% rename from computers/tetris.lua rename to computers/gaming.lua index f2184608..cab3eff7 100644 --- a/computers/tetris.lua +++ b/computers/gaming.lua @@ -1,5 +1,69 @@ local S = minetest.get_translator("computers") +-- Sony PlayStation lookalike +computers.register("computers:slaystation", { + description = S("Pony SlayStation"), + inventory_image = "computers_ps1_inv.png", + tiles_off = { top=true }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 0, 0, 11, 32, 6, 21 }, -- Console + { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip + { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip + { 5, 0, 4, 5, 2, 5 }, -- Controller 1 Center + { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip + { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip + { 22, 0, 4, 5, 2, 5 } -- Controller 2 Center + }) +}) + +-- Sony PlayStation 2 lookalike +computers.register("computers:slaystation2", { + description = S("Pony SlayStation 2"), + inventory_image = "computers_ps2_inv.png", + tiles_off = { front=true }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 2, 2, 11, 28, 3, 19 }, -- Console (Upper part) + { 2, 0, 11, 26, 2, 19 }, -- Console (Lower part) + { 1, 0, 1, 4, 2, 9 }, -- Controller 1 L Grip + { 10, 0, 1, 4, 2, 9 }, -- Controller 1 R Grip + { 5, 0, 1, 5, 2, 8 }, -- Controller 1 Center + { 18, 0, 1, 4, 2, 9 }, -- Controller 2 L Grip + { 27, 0, 1, 4, 2, 9 }, -- Controller 2 R Grip + { 22, 0, 1, 5, 2, 8 } -- Controller 2 Center + }) +}) + +-- Nintendo Wii lookalike +computers.register("computers:wee", { + description = S("Nientiendo Wee"), + inventory_image = "computers_wii_inv.png", + tiles_off = { front=true }, + node_box = computers.pixelnodebox(32, { + -- X Y Z W H L + { 11, 0, 3, 10, 6, 26 }, -- Base + { 12, 6, 4, 8, 22, 24 } -- Top + }) +}) + +-- XBox lookalike +computers.register("computers:hueg_box", { + description = S("HUEG Box"), + tiles_off = { }, + node_box = computers.pixelnodebox(16, { + -- X Y Z W H L + { 0, 0, 7, 16, 6, 9 }, -- Console + { 2, 0, 1, 11, 3, 6 }, -- Controller + { 2, 0, 0, 2, 3, 1 }, + { 11, 0, 0, 2, 3, 1 }, + }) +}) + + + +-- Tetris arcade machine + local shapes = { { { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } }, diff --git a/computers/init.lua b/computers/init.lua index 9024d4aa..f4226209 100644 --- a/computers/init.lua +++ b/computers/init.lua @@ -95,5 +95,5 @@ local MODPATH = minetest.get_modpath("computers") dofile(MODPATH.."/computers.lua") dofile(MODPATH.."/printers.lua") dofile(MODPATH.."/recipes.lua") -dofile(MODPATH.."/tetris.lua") +dofile(MODPATH.."/gaming.lua") dofile(MODPATH.."/aliases.lua")