Merge branch 'github'

* Use colorized base texture of white monitor and keyboard for beige
  and black variants.
* Remove alpha channel of textures.

README.md

@@ -1,11 +1,14 @@
 # Digiterms - Digilines Terminals
-Version 0.1
+Version 0.2
 
-Digilines monitors mod for Minetest using Display API / Font API.
+Digilines monitors and keyboards mod for Minetest using Display API / Font API.
 
 ![Presentation image of Digiterms](screenshot.png)
 
 Monitors display text received on their digiline channel and works like digilines lcd monitor.
+
+Keyboards send text ofer their digiline channel. In protected areas, keyboard can be set to "Public" to be usable by anybody. Else, only players granted rights on the area can use the keyboard.
+
 Craft recipes depend on installed mods, please refer to craft guide in game.
 
 If `scifi_nodes` mod is enabled, scifi monitors can be turned into digiterms by crafting scifi monitor with a digiline (some texture are derivated from D00Med mod).
@@ -20,6 +23,9 @@ If `scifi_nodes` mod is enabled, scifi monitors can be turned into digiterms by
 
 ## Changelog
 
+### 2018-12-13 (Version 0.2)
+- Keyboards (Beige, white and black).
+- Third cathodic monitor, the black one.
 ### 2018-12-09 (Version 0.1)
 - Cathodic (2) and LCD monitors and corresponding craft recipes.
 - Scifi nodes monitors : tallscreen, widescreen, glassscreen and keysmonitor

depends.txt

@@ -1,13 +0,0 @@
-display_api
-font_api
-digilines
-dye
-default
-xpane?
-scifi_nodes?
-basic_materials?
-homedecor?
-mesecons_microcontroller?
-mesecons_luacontroller?
-mesecons_button?
-mesecons_materials?

functions.lua

@@ -77,7 +77,7 @@ local function push_text(lines, text, maxlines, maxcolumns)
 		elseif b >= 0xC2 then	pos = pos + 2
 	  else pos = pos + 1 end-- Invalid char
 	end
-	if pos - 1 > start then
+	if pos - 1 >= start then
 		push_line(lines, text:sub(start, pos - 1), maxlines)
 	end
 end

init.lua

@@ -35,3 +35,5 @@ if minetest.get_modpath("scifi_nodes") then
   dofile(digiterms.path.."/scifi_nodes.lua")
   dofile(digiterms.path.."/scifi_crafts.lua")
 end
+
+minetest.log("action", "[digiterms] loaded.")

mod.conf

@@ -0,0 +1,4 @@
+name = digiterms
+depends = display_api, font_api, digilines, dye, default
+optional_depends = xpane, scifi_nodes, basic_materials, homedecor, mesecons_microcontroller, mesecons_luacontroller, mesecons_button, mesecons_materials
+description = Digilines monitors mod for Minetest using Display API / Font API

nodes.lua

@@ -105,13 +105,19 @@ digiterms.register_monitor('digiterms:cathodic_beige_monitor', {
 		},
 	},
 }, {
-	tiles = { "digiterms_beige_top.png",   "digiterms_beige_bottom.png",
+	tiles = {
-						"digiterms_beige_sides.png", "digiterms_beige_sides.png^[transformFX]",
+		"digiterms_white_top.png^[colorize:#FFDF00:48",
-						"digiterms_beige_back.png",  "digiterms_beige_front.png",},
+		"digiterms_white_bottom.png^[colorize:#FFDF00:48",
+		"digiterms_white_sides.png^[colorize:#FFDF00:48",
+		"digiterms_white_sides.png^[colorize:#FFDF00:48^[transformFX",
+		"digiterms_white_back.png^[colorize:#FFDF00:48", "digiterms_beige_front.png",},
 }, {
-	tiles = { "digiterms_beige_top.png",   "digiterms_beige_bottom.png",
+	tiles = {
-						"digiterms_beige_sides.png", "digiterms_beige_sides.png^[transformFX]",
+		"digiterms_white_top.png^[colorize:#FFDF00:48",
-						"digiterms_beige_back.png",  "digiterms_beige_front_off.png",},
+		"digiterms_white_bottom.png^[colorize:#FFDF00:48",
+		"digiterms_white_sides.png^[colorize:#FFDF00:48",
+		"digiterms_white_sides.png^[colorize:#FFDF00:48^[transformFX]",
+		"digiterms_white_back.png^[colorize:#FFDF00:48", "digiterms_beige_front_off.png",},
 })
 minetest.register_alias('digiterms:cathodic_amber_monitor', 'digiterms:cathodic_beige_monitor')
 minetest.register_alias('digiterms:cathodic_amber_monitor_off', 'digiterms:cathodic_beige_monitor_off')
@@ -137,11 +143,13 @@ digiterms.register_monitor('digiterms:cathodic_white_monitor', {
 		},
 	},
 }, {
-	tiles = { "digiterms_white_top.png",   "digiterms_white_bottom.png",
+	tiles = {
+		"digiterms_white_top.png",   "digiterms_white_bottom.png",
 		"digiterms_white_sides.png", "digiterms_white_sides.png^[transformFX]",
 		"digiterms_white_back.png",  "digiterms_white_front.png",},
 }, {
-	tiles = { "digiterms_white_top.png", "digiterms_white_bottom.png",
+	tiles = {
+		"digiterms_white_top.png",   "digiterms_white_bottom.png",
 		"digiterms_white_sides.png", "digiterms_white_sides.png^[transformFX]",
 		"digiterms_white_back.png",  "digiterms_white_front_off.png",},
 })
@@ -169,13 +177,19 @@ digiterms.register_monitor('digiterms:cathodic_black_monitor', {
 		},
 	},
 }, {
-	tiles = { "digiterms_black_top.png",   "digiterms_black_bottom.png",
+	tiles = {
-						"digiterms_black_sides.png", "digiterms_black_sides.png^[transformFX]",
+		"digiterms_white_top.png^[colorize:#120F02:186",
-						"digiterms_black_back.png",  "digiterms_black_front.png",},
+		"digiterms_white_bottom.png^[colorize:#120F02:186",
+		"digiterms_white_sides.png^[colorize:#120F02:186",
+		"digiterms_white_sides.png^[colorize:#120F02:186^[transformFX]",
+		"digiterms_white_back.png^[colorize:#120F02:186", "digiterms_black_front.png",},
 }, {
-	tiles = { "digiterms_black_top.png", "digiterms_black_bottom.png",
+	tiles = {
-						"digiterms_black_sides.png", "digiterms_black_sides.png^[transformFX]",
+		"digiterms_white_top.png^[colorize:#120F02:186",
-						"digiterms_black_back.png", "digiterms_black_front_off.png",},
+		"digiterms_white_bottom.png^[colorize:#120F02:186",
+		"digiterms_white_sides.png^[colorize:#120F02:186",
+		"digiterms_white_sides.png^[colorize:#120F02:186^[transformFX]",
+		"digiterms_white_back.png^[colorize:#120F02:186", "digiterms_black_front_off.png",},
 })
 
 -- KEYBOARDS
@@ -198,7 +212,7 @@ local keyboard_on_rightclick = function(pos, node, player, itemstack, pointed_th
 	if owned then
 		local fs = "size[8,5]"..
 			default.gui_bg..default.gui_bg_img..default.gui_slots..
-			"field[1,1;3,1;channel;Chanel;"..channel.."]"..
+			"field[1,1;3,1;channel;Channel;"..channel.."]"..
 			"field[1,3;6.5,1;text;Type text:;]"..
 			"field_close_on_enter[text;true]button_exit[2.5,4;3,1;send;Send]"
 		if protected then
@@ -252,9 +266,13 @@ minetest.register_node('digiterms:beige_keyboard', {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = false,
-	tiles = { "digiterms_beige_keyboard_top.png",   "digiterms_beige_keyboard_bottom.png",
+	tiles = {
-						"digiterms_beige_keyboard_sides.png", "digiterms_beige_keyboard_sides.png",
+		"digiterms_white_keyboard_top.png^[colorize:#FFDF00:48",
-						"digiterms_beige_keyboard_sides.png", "digiterms_beige_keyboard_sides.png",},
+		"digiterms_white_keyboard_bottom.png^[colorize:#FFDF00:48",
+		"digiterms_white_keyboard_sides.png^[colorize:#FFDF00:48",
+		"digiterms_white_keyboard_sides.png^[colorize:#FFDF00:48",
+		"digiterms_white_keyboard_sides.png^[colorize:#FFDF00:48",
+		"digiterms_white_keyboard_sides.png^[colorize:#FFDF00:48",},
 	drawtype = "nodebox",
 	groups = {oddly_breakable_by_hand = 3},
 	node_box = {
@@ -276,7 +294,8 @@ minetest.register_node('digiterms:white_keyboard', {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = false,
-	tiles = { "digiterms_white_keyboard_top.png",   "digiterms_white_keyboard_bottom.png",
+	tiles = {
+		"digiterms_white_keyboard_top.png",   "digiterms_white_keyboard_bottom.png",
 		"digiterms_white_keyboard_sides.png", "digiterms_white_keyboard_sides.png",
 		"digiterms_white_keyboard_sides.png", "digiterms_white_keyboard_sides.png",},
 	drawtype = "nodebox",
@@ -300,9 +319,13 @@ minetest.register_node('digiterms:black_keyboard', {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	sunlight_propagates = false,
-	tiles = { "digiterms_black_keyboard_top.png",   "digiterms_black_keyboard_bottom.png",
+	tiles = {
-						"digiterms_black_keyboard_sides.png", "digiterms_black_keyboard_sides.png",
+		"digiterms_white_keyboard_top.png^[colorize:#120F02:186",
-						"digiterms_black_keyboard_sides.png", "digiterms_black_keyboard_sides.png",},
+		"digiterms_white_keyboard_bottom.png^[colorize:#120F02:186",
+		"digiterms_white_keyboard_sides.png^[colorize:#120F02:186",
+		"digiterms_white_keyboard_sides.png^[colorize:#120F02:186",
+		"digiterms_white_keyboard_sides.png^[colorize:#120F02:186",
+		"digiterms_white_keyboard_sides.png^[colorize:#120F02:186",},
 	drawtype = "nodebox",
 	groups = {oddly_breakable_by_hand = 3},
 	node_box = {

scifi_crafts.lua

@@ -23,23 +23,23 @@ local wire = 'digilines:wire_std_00000000'
 minetest.register_craft({
   output = "digiterms:scifi_glassscreen",
   type = "shapeless",
-  recipe = { "scifi_nodes:glassscreen", "digilines:wire_std_00000000" }
+  recipe = { "scifi_nodes:glassscreen", wire }
 })
 
 minetest.register_craft({
   output = "digiterms:scifi_widescreen",
   type = "shapeless",
-  recipe = { "scifi_nodes:widescreen", "digilines:wire_std_00000000" }
+  recipe = { "scifi_nodes:widescreen", wire }
 })
 
 minetest.register_craft({
   output = "digiterms:scifi_tallscreen",
   type = "shapeless",
-  recipe = { "scifi_nodes:tallscreen", "digilines:wire_std_00000000" }
+  recipe = { "scifi_nodes:tallscreen", wire }
 })
 
 minetest.register_craft({
   output = "digiterms:scifi_keysmonitor",
   type = "shapeless",
-  recipe = { "scifi_nodes:keysmonitor", "digilines:wire_std_00000000" }
+  recipe = { "scifi_nodes:keysmonitor", wire }
 })

scifi_nodes.lua

@@ -21,9 +21,9 @@ digiterms.register_monitor("digiterms:scifi_glassscreen", {
   description = "Digiline glassscreen",
 	paramtype = "light",
 	paramtype2 = "facedir",
-  use_texture_alpha = true,
+  use_texture_alpha = "blend",
 	sunlight_propagates = true,
-  light_source = 15,
+  light_source = default.LIGHT_MAX,
   tiles = {
     "digiterms_scifi_glscrn.png",
     "digiterms_scifi_glscrn.png",