Merge branch 'github'

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

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?

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
@@ -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",