Merge devs into master (green mon, rename)

README.md

@@ -1,5 +1,5 @@
-# Digimons - Digilines Monitors
+# Digiterms - Digilines Terminals
-Digilines monitors mod for Minetest using Display API / Font API.
+Digilines monitors and keyboards mod for Minetest using Display API / Font API.
 
 **Version**: Alpha
 

functions.lua

@@ -1,8 +1,8 @@
 --[[
-    digimons mod for Minetest - Digiline monitors using Display API / Font API
+    digiterms mod for Minetest - Digiline monitors using Display API / Font API
     (c) Pierre-Yves Rollo
 
-    This file is part of digimons.
+    This file is part of digiterms.
 
     signs is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
     along with signs.  If not, see <http://www.gnu.org/licenses/>.
 --]]
 
-digimons.columns = 30
+digiterms.columns = 30
 
 local function get_lines(pos)
   local lines = {}
@@ -73,9 +73,9 @@ local function push_text(lines, text, maxlines, maxcolumns)
 	end
 end
 
-function digimons.push_text_on_screen(pos, text)
+function digiterms.push_text_on_screen(pos, text)
   local lines = get_lines(pos)
-  push_text(lines, text, 6, 20)
+  push_text(lines, text, 6, digiterms.columns)
   set_lines(pos, lines)
   display_api.update_entities(pos)
 end

init.lua

@@ -1,8 +1,8 @@
 --[[
-    digimons mod for Minetest - Digiline monitors using Display API / Font API
+    digiterms mod for Minetest - Digiline monitors using Display API / Font API
     (c) Pierre-Yves Rollo
 
-    This file is part of digimons.
+    This file is part of digiterms.
 
     signs is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,13 +18,14 @@
     along with signs.  If not, see <http://www.gnu.org/licenses/>.
 --]]
 
-digimons = {}
+digiterms = {}
-digimons.name = minetest.get_current_modname()
+digiterms.name = minetest.get_current_modname()
-digimons.path = minetest.get_modpath(digimons.name)
+digiterms.path = minetest.get_modpath(digiterms.name)
+digiterms.font = "mozart"
 
-dofile(digimons.path.."/font_mozart.lua")
+dofile(digiterms.path.."/font_mozart.lua")
-dofile(digimons.path.."/functions.lua")
+dofile(digiterms.path.."/functions.lua")
-dofile(digimons.path.."/nodes.lua")
+dofile(digiterms.path.."/nodes.lua")
---dofile(digimons.path.."/crafts.lua")
+--dofile(digiterms.path.."/crafts.lua")
 
-display_api.register_display_entity("digimons:screen")
+display_api.register_display_entity("digiterms:screen")

nodes.lua

@@ -1,8 +1,8 @@
 --[[
-    digimons mod for Minetest - Digiline monitors using Display API / Font API
+	digiterms mod for Minetest - Digilines monitors using Display API / Font API
 	(c) Pierre-Yves Rollo
 
-    This file is part of digimons.
+	This file is part of digiterms.
 
 	signs is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -18,16 +18,69 @@
 	along with signs.  If not, see <http://www.gnu.org/licenses/>.
 --]]
 
-minetest.register_node('digimons:cathodic_amber_monitor', {
+local common_node_def = {
+	groups = { display_api = 1},
+	on_place = function(itemstack, placer, pointed_thing)
+			minetest.rotate_node(itemstack, placer, pointed_thing)
+			return display_api.on_place(itemstack, placer, pointed_thing)
+		end,
+	on_destruct = display_api.on_destruct,
+	on_rotate = display_api.on_rotate,
+	on_punch = display_api.update_entities,
+	on_construct = function(pos)
+			minetest.get_meta(pos):set_string("formspec",
+				"field[channel;Channel;${channel}]")
+			display_api.on_construct(pos)
+		end,
+	on_receive_fields = function(pos, formname, fields, player)
+			local name = player:get_player_name()
+			if minetest.is_protected(pos, name) then
+				minetest.record_protection_violation(pos, name)
+				return
+			end
+
+			if (fields.channel) then
+				minetest.get_meta(pos):set_string("channel", fields.channel)
+			end
+		end,
+	digiline = {
+		receptor = {},
+		effector = {
+			action = function(pos, _, channel, msg)
+					if channel ~= minetest.get_meta(pos):get_string("channel") then
+						return
+					end
+					digiterms.push_text_on_screen(pos, msg)
+				end,
+		},
+	},
+}
+
+function digiterms.register_monitor(nodename, nodedef)
+	def = table.copy(common_node_def)
+	for key, value in pairs(nodedef) do
+		if key == 'groups' then
+			def[key] = def[key] or {}
+			for key2, value2 in pairs(value) do
+				def[key][key2] = value2
+			end
+		else
+			def[key] = value
+		end
+	end
+	minetest.register_node(nodename, def)
+end
+
+digiterms.register_monitor('digiterms:cathodic_amber_monitor', {
 	description = "Cathodic amber monitor",
 	sunlight_propagates = false,
 	paramtype = "light",
 	paramtype2 = "facedir",
-  tiles = { "digimons_amber_top.png", "digimons_amber_bottom.png",
+	tiles = { "digiterms_amber_top.png", "digiterms_amber_bottom.png",
-            "digimons_amber_sides.png", "digimons_amber_sides.png^[transformFX]",
+						"digiterms_amber_sides.png", "digiterms_amber_sides.png^[transformFX]",
-            "digimons_amber_back.png", "digimons_amber_front.png",},
+						"digiterms_amber_back.png", "digiterms_amber_front.png",},
 	drawtype = "nodebox",
-  groups = {choppy = 1, oddly_breakable_by_hand = 1, display_modpack_node = 1},
+	groups = {choppy = 1, oddly_breakable_by_hand = 1},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -40,47 +93,46 @@ minetest.register_node('digimons:cathodic_amber_monitor', {
 		},
 	},
 	display_entities = {
-    ["digimons:screen"] = {
+		["digiterms:screen"] = {
 				on_display_update = font_api.on_display_update,
 				depth = -7/16 - display_api.entity_spacing,
 				top = -1/16,
-        aspect_ratio = 0.5, maxlines = 6,
 				size = { x = 23/32, y = 10/16 },
-        color = "#FFA000", font_name = "mozart", halign="left", valing="top",
+				columns = 20, lines = 6,
-    },
+				color = "#FFA000", font_name = digiterms.font, halign="left", valing="top",
-  },
+		},
-  on_place = function(itemstack, placer, pointed_thing)
+	},
-      minetest.rotate_node(itemstack, placer, pointed_thing)
+})
-      return display_api.on_place(itemstack, placer, pointed_thing)
+
-    end,
+digiterms.register_monitor('digiterms:cathodic_green_monitor', {
-  on_construct = function(pos)
+	description = "Cathodic green monitor",
-      minetest.get_meta(pos):set_string("formspec",
+	sunlight_propagates = false,
-        "field[channel;Channel;${channel}]")
+	paramtype = "light",
-      display_api.on_construct(pos)
+	paramtype2 = "facedir",
-    end,
+	tiles = { "digiterms_green_top.png", "digiterms_green_bottom.png",
-  on_destruct = display_api.on_destruct,
+						"digiterms_green_sides.png", "digiterms_green_sides.png^[transformFX]",
-  on_rotate = display_api.on_rotate,
+						"digiterms_green_back.png", "digiterms_green_front.png",},
-  on_receive_fields = function(pos, formname, fields, player)
+	drawtype = "nodebox",
-  		local name = player:get_player_name()
+	groups = {choppy = 1, oddly_breakable_by_hand = 1},
-      if minetest.is_protected(pos, name) then
+	node_box = {
-        minetest.record_protection_violation(pos, name)
+		type = "fixed",
-      	return
+		fixed = {
-    	end
+			{-8/16, 8/16, -8/16, 8/16, 7/16, -7/16},
-
+			{-8/16, -8/16, -8/16, 8/16, -5/16, -7/16},
-    	if (fields.channel) then
+			{-8/16, 7/16, -8/16, -7/16, -5/16, -7/16},
-    		minetest.get_meta(pos):set_string("channel", fields.channel)
+			{7/16, 7/16, -8/16, 8/16, -5/16, -7/16},
-    	end
+			{-8/16, -8/16, -7/16, 8/16, 8/16, 1/16},
-    end,
+			{-6/16, 5/16, 1/16, 6/16, -8/16, 8/16}
-  on_punch = display_api.update_entities,
+		},
-  digiline = {
+	},
-    receptor = {},
+	display_entities = {
-    effector = {
+		["digiterms:screen"] = {
-      action = function(pos, _, channel, msg)
+				on_display_update = font_api.on_display_update,
-          if channel ~= minetest.get_meta(pos):get_string("channel") then
+				depth = -7/16 - display_api.entity_spacing,
-            return
+				top = -1/16,
-          end
+				size = { x = 23/32, y = 10/16 },
-          digimons.push_text_on_screen(pos, msg)
+				columns = 20, lines = 6,
-        end,
+				color = "#00FF00", font_name = digiterms.font, halign="left", valing="top",
 		},
 	},
 })