Merge pull request #2 from codexp/develop

- refactor/reformat code
2018-03-30 18:20:58 -04:00 · 2018-03-30 18:20:58 -04:00 · 12270638cc
parent e2569cd0b2 8744a2c540
commit 12270638cc
94 changed files with 247 additions and 107 deletions
--- a/gen.js
+++ b/gen.js
@ -0,0 +1,75 @@
+var page = require('webpage').create();
+var w = 32;
+var h = 32;
+var con = console;
+
+//viewportSize being the actual size of the headless browser
+page.viewportSize = { width: w, height: h };
+
+//the clipRect is the portion of the page you are taking a screenshot of
+page.clipRect = { top: 0, left: 0, width: w, height: h };
+
+page.content = '<html><body><div id="character"></div></body></html>';
+
+var chars = [
+  // numbers
+  "1", "2", "3", "4", "5", "6", "7", "8", "9", "0",
+  // latin
+  "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O",
+  "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z",
+  // special chars
+  "!", "#", "$", "%", "&", "(", ")", "*", "+", ",", "-", ".", "/", ":", ";",
+  "<", "=", ">", "?", "@", '"', "'",
+  // cyrillic
+  "А", "Б", "В", "Г", "Д", "Е", "Ё", "Ж", "З", "И", "Й", "К", "Л", "М", "Н",
+  "О", "П", "Р", "С", "Т", "У", "Ф", "Х", "Ц", "Ч", "Ш", "Щ", "Ъ", "Ы", "Ь",
+  "Э", "Ю", "Я"
+];
+
+function encode_utf8(s) {
+  return unescape(encodeURIComponent(s));
+}
+
+function decode_utf8(s) {
+  return decodeURIComponent(escape(s));
+}
+
+function pad(n, width, z) {
+  z = z || '0';
+  n = n + '';
+  return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
+}
+
+page.evaluate(function () {
+  var chEl = document.getElementById('character');
+
+  document.body.style.backgroundColor = 'white';
+  document.body.style.margin = '0px';
+  chEl.style.fontSize = '24px';
+  chEl.style.fontWeight = 'bold';
+  chEl.style.marginTop = '2px';
+  chEl.style.textAlign = 'center';
+});
+
+page.render('textures/ehlphabet_000.png');
+
+chars.forEach(function (ch) {
+  var file;
+  page.evaluate(function (ch) {
+    var chEl = document.getElementById('character');
+    chEl.innerText = ch;
+  }, ch);
+
+  ch = encode_utf8(ch);
+  if (ch.length > 1) {
+    file = pad(ch.charCodeAt(0), 3) + '_' + pad(ch.charCodeAt(1), 3);
+  } else  {
+    file = pad(ch.charCodeAt(0), 3);
+  }
+
+  page.render('textures/ehlphabet_' + file + '.png');
+});
+
+console.log('done');
+
+phantom.exit();
--- a/init.lua
+++ b/init.lua
@ -1,124 +1,189 @@
-local characters = {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","1","2","3","4","5","6","7","8","9","0","!","#","$","%","&","(",")","*","+",",","-",".","/",":",";","<","=",">","?","@"}
+local digits = {"1", "2", "3", "4", "5", "6", "7", "8", "9", "0"}
+local base_chars = {
+    "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O",
+    "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"
+}
+local special_chars = {
+    "!", "#", "$", "%", "&", "(", ")", "*", "+", ",", "-", ".", "/", ":", ";",
+    "<", "=", ">", "?", "@", "'", '"'
+}
+local cyrillic_chars = {
+    "А", "Б", "В", "Г", "Д", "Е", "Ё", "Ж", "З", "И", "Й", "К", "Л", "М", "Н",
+    "О", "П", "Р", "С", "Т", "У", "Ф", "Х", "Ц", "Ч", "Ш", "Щ", "Ъ", "Ы", "Ь",
+    "Э", "Ю", "Я"
+}
+local characters = {}

--  Alias  (Och_Noe 20180124)
-local compat_characters = {"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z","1","2","3","4","5","6","7","8","9","0"}  -- for reference, unused  
--
-
--  Alias  (Och_Noe 20180124)
-create_alias = true  
--
+ehlphabet = {}
+ehlphabet.path = minetest.get_modpath(minetest.get_current_modname())

-for _, name in ipairs(characters) do --do this for all characters in the list
-   local byte = string.byte(name)
-     if byte < 10 then file = "00"..byte end
-     if byte > 10 and byte < 100 then file = "0"..byte end         
-     if byte > 100 then file = tostring(byte) end 
-   local desc = "The \'"..name.."\' Character"
-
-   minetest.register_node("ehlphabet:"..byte, {
-      description = "Ehlphabet Block \'"..name.."\'",
-      tiles = {"ehlphabet_"..file..".png"},
-      groups = {cracky=3,not_in_creative_inventory=1,not_in_crafting_guide=1}
-   })
-  minetest.register_craft ({ type="shapeless", output = "ehlphabet:block", recipe = {"ehlphabet:"..byte} })
-  if name == "!" then create_alias = false end
-
--  Alias  (Och_Noe 20180124)
-  if create_alias then
-     minetest.register_alias("abjphabet:"..name:lower(),"ehlphabet:"..byte)
-  end
--
-
+local function table_merge(t1, t2)
+    for k, v in ipairs(t2) do
+       table.insert(t1, v)
+    end
+    return t1
 end

-
-minetest.register_node("ehlphabet:machine", {
-   description = "Letter Machine",
-   tiles = {"ehlphabet_machine_top.png", "ehlphabet_machine_bottom.png", "ehlphabet_machine_side.png",
-            "ehlphabet_machine_side.png", "ehlphabet_machine_back.png", "ehlphabet_machine_front.png"},
-   paramtype = "light",
-   paramtype2 = "facedir",
-   groups = {cracky=2},
-   
-   can_dig = function(pos, player)                                                    -- "Can you dig it?" -Cyrus
-     local meta = minetest.env:get_meta(pos)
-     local inv = meta:get_inventory()
-     if not inv:is_empty("input") or not inv:is_empty("output") then
-       if player then
-         minetest.chat_send_player(player:get_player_name(), "You cannot dig the Letter Machine with blocks inside")
-       end                                                                            -- end if player
-       return false
-     end                                                                              -- end if not empty
-     return true
-   end,                                                                               -- end can_dig function
-   
-   after_place_node = function(pos, placer)
-      local meta = minetest.env:get_meta(pos)
-   end,
+local function is_multibyte(ch)
+    local byte = ch:byte()
+    return (208 == byte) or (209 == byte)
+end

-   on_construct = function(pos)
-      local meta = minetest.env:get_meta(pos)
-      meta:set_string("formspec", "invsize[8,6;]"..
-         "field[3.8,.5;1,1;lettername;Letter;]"..
-         "list[current_name;input;2.5,0.2;1,1;]"..
-         "list[current_name;output;4.5,0.2;1,1;]"..
-         "list[current_player;main;0,2;8,4;]"..
-         "button[2.54,-0.25;3,4;name;Blank -> Letter]")
-         local inv = meta:get_inventory()
-      inv:set_size("input", 1)
-      inv:set_size("output", 1)
-   end,
+table_merge(characters, base_chars)
+table_merge(characters, digits)
+table_merge(characters, special_chars)
+table_merge(characters, cyrillic_chars)

-   on_receive_fields = function(pos, formname, fields, sender)
-      local meta = minetest.env:get_meta(pos)
-      local inv = meta:get_inventory()
-      local inputstack = inv:get_stack("input", 1)
-      if fields.lettername ~= nil and inputstack:get_name()=="ehlphabet:block" then
-         for _,v in pairs(characters) do
-            if v == fields.lettername then
-               local give = {}
-               give[1] = inv:add_item("output","ehlphabet:"..string.byte(fields.lettername))
-               inputstack:take_item()
-               inv:set_stack("input",1,inputstack)
-               break
+local create_alias = true
+
+-- generate all available blocks
+for _, name in ipairs(characters) do
+    local desc = "The '" .. name .. "' Character"
+    local byte = name:byte()
+    local mb = is_multibyte(name)
+    local file, key
+
+    if mb then
+        mb = byte
+        byte = name:byte(2)
+        key = "ehlphabet:" .. mb .. byte
+        file = ("%03d_%03d"):format(mb, byte)
+    else
+        key = "ehlphabet:" .. byte
+        file = ("%03d"):format(byte)
+    end
+
+    minetest.register_node(
+        key,
+        {
+            description = "Ehlphabet Block '" .. name .. "'",
+            tiles = {"ehlphabet_" .. file .. ".png"},
+            groups = {cracky = 3, not_in_creative_inventory = 1, not_in_crafting_guide = 1}
+        }
+    )
+    minetest.register_craft({type = "shapeless", output = "ehlphabet:block", recipe = {key}})
+
+    if create_alias then
+        minetest.register_alias("abjphabet:" .. name, key)
+    end
+
+    -- deactivate alias creation on last latin character
+    if name == "Z" then
+        create_alias = false
+    end
+end
+
+minetest.register_node(
+    "ehlphabet:machine",
+    {
+        description = "Letter Machine",
+        tiles = {
+            "ehlphabet_machine_top.png",
+            "ehlphabet_machine_bottom.png",
+            "ehlphabet_machine_side.png",
+            "ehlphabet_machine_side.png",
+            "ehlphabet_machine_back.png",
+            "ehlphabet_machine_front.png"
+        },
+        paramtype = "light",
+        paramtype2 = "facedir",
+        groups = {cracky = 2},
+
+        -- "Can you dig it?" -Cyrus
+        can_dig = function(pos, player)
+            local meta = minetest.env:get_meta(pos)
+            local inv = meta:get_inventory()
+            if not inv:is_empty("input") or not inv:is_empty("output") then
+                if player then
+                    minetest.chat_send_player(
+                        player:get_player_name(),
+                        "You cannot dig the Letter Machine with blocks inside"
+                    )
+                end -- end if player
+                return false
+            end -- end if not empty
+            return true
+        end, -- end can_dig function
+
+        after_place_node = function(pos, placer)
+            local meta = minetest.env:get_meta(pos)
+        end,
+
+        on_construct = function(pos)
+            local meta = minetest.env:get_meta(pos)
+            meta:set_string(
+                "formspec",
+                "invsize[8,6;]" ..
+                "field[3.8,.5;1,1;lettername;Letter;]" ..
+                "list[current_name;input;2.5,0.2;1,1;]" ..
+                "list[current_name;output;4.5,0.2;1,1;]" ..
+                "list[current_player;main;0,2;8,4;]" ..
+                "button[2.54,-0.25;3,4;name;Blank -> Letter]"
+            )
+            local inv = meta:get_inventory()
+            inv:set_size("input", 1)
+            inv:set_size("output", 1)
+        end,
+
+        on_receive_fields = function(pos, formname, fields, sender)
+            local meta = minetest.env:get_meta(pos)
+            local inv = meta:get_inventory()
+            local inputstack = inv:get_stack("input", 1)
+            local ch = fields.lettername
+
+            if ch ~= nil and inputstack:get_name() == "ehlphabet:block" then
+                local mb = is_multibyte(ch)
+                local key = mb and (ch:byte(1) .. ch:byte(2)) or ch:byte()
+                for _, v in pairs(characters) do
+                    if v == fields.lettername then
+                        local give = {}
+                        give[1] = inv:add_item("output", "ehlphabet:" .. key)
+                        inputstack:take_item()
+                        inv:set_stack("input", 1, inputstack)
+                        break
+                    end
+                end
            end
-         end
-         
-      end   
-   end
-})
+        end
+    }
+)

-
--  Alias  (Och_Noe 20180124)
-minetest.register_alias("abjphabet:machine","ehlphabet:machine")
--
-
-minetest.register_node("ehlphabet:block", {
-  description = "Ehlphabet Block (blank)",
-  tiles = {"ehlphabet_000.png"},
-  groups = {cracky=3},
-})
+--  Alias  (Och_Noe 20180124)
+minetest.register_alias("abjphabet:machine", "ehlphabet:machine")
+--
+
+minetest.register_node(
+    "ehlphabet:block",
+    {
+        description = "Ehlphabet Block (blank)",
+        tiles = {"ehlphabet_000.png"},
+        groups = {cracky = 3}
+    }
+)

 --RECIPE: blank blocks
-minetest.register_craft({ output = "ehlphabet:block 8",
-  recipe = {
-    {'default:paper', 'default:paper', 'default:paper'},
-    {'default:paper', '', 'default:paper'},
-    {'default:paper', 'default:paper', 'default:paper'},
-  }
+minetest.register_craft({
+    output = "ehlphabet:block 8",
+    recipe = {
+        {"default:paper", "default:paper", "default:paper"},
+        {"default:paper", "", "default:paper"},
+        {"default:paper", "default:paper", "default:paper"}
+    }
 })

 --RECIPE: build the machine!
-minetest.register_craft({ output = "ehlphabet:machine",
-  recipe = {
-    {'default:stick', 'default:coal_lump', 'default:stick'},
-    {'default:coal_lump', 'ehlphabet:block', 'default:coal_lump'},
-    {'default:stick', 'default:coal_lump', 'default:stick'},
-  }
+minetest.register_craft({
+    output = "ehlphabet:machine",
+    recipe = {
+        {"default:stick", "default:coal_lump", "default:stick"},
+        {"default:coal_lump", "ehlphabet:block", "default:coal_lump"},
+        {"default:stick", "default:coal_lump", "default:stick"}
+    }
 })

 --RECIPE: craft unused blocks back into paper
-minetest.register_craft ({ output = "default:paper",
-  recipe = {"ehlphabet:block"},
-  type = "shapeless"
+minetest.register_craft({
+    output = "default:paper",
+    recipe = {"ehlphabet:block"},
+    type = "shapeless"
 })
--- a/textures/ehlphabet_000.png
+++ b/textures/ehlphabet_000.png
--- a/textures/ehlphabet_033.png
+++ b/textures/ehlphabet_033.png
--- a/textures/ehlphabet_034.png
+++ b/textures/ehlphabet_034.png
--- a/textures/ehlphabet_035.png
+++ b/textures/ehlphabet_035.png
--- a/textures/ehlphabet_036.png
+++ b/textures/ehlphabet_036.png
--- a/textures/ehlphabet_037.png
+++ b/textures/ehlphabet_037.png
--- a/textures/ehlphabet_038.png
+++ b/textures/ehlphabet_038.png
--- a/textures/ehlphabet_039.png
+++ b/textures/ehlphabet_039.png
--- a/textures/ehlphabet_040.png
+++ b/textures/ehlphabet_040.png
--- a/textures/ehlphabet_041.png
+++ b/textures/ehlphabet_041.png
--- a/textures/ehlphabet_042.png
+++ b/textures/ehlphabet_042.png
--- a/textures/ehlphabet_043.png
+++ b/textures/ehlphabet_043.png
--- a/textures/ehlphabet_044.png
+++ b/textures/ehlphabet_044.png
--- a/textures/ehlphabet_045.png
+++ b/textures/ehlphabet_045.png
--- a/textures/ehlphabet_046.png
+++ b/textures/ehlphabet_046.png
--- a/textures/ehlphabet_047.png
+++ b/textures/ehlphabet_047.png
--- a/textures/ehlphabet_048.png
+++ b/textures/ehlphabet_048.png
--- a/textures/ehlphabet_049.png
+++ b/textures/ehlphabet_049.png
--- a/textures/ehlphabet_050.png
+++ b/textures/ehlphabet_050.png
--- a/textures/ehlphabet_051.png
+++ b/textures/ehlphabet_051.png
--- a/textures/ehlphabet_052.png
+++ b/textures/ehlphabet_052.png
--- a/textures/ehlphabet_053.png
+++ b/textures/ehlphabet_053.png
--- a/textures/ehlphabet_054.png
+++ b/textures/ehlphabet_054.png
--- a/textures/ehlphabet_055.png
+++ b/textures/ehlphabet_055.png
--- a/textures/ehlphabet_056.png
+++ b/textures/ehlphabet_056.png
--- a/textures/ehlphabet_057.png
+++ b/textures/ehlphabet_057.png
--- a/textures/ehlphabet_058.png
+++ b/textures/ehlphabet_058.png
--- a/textures/ehlphabet_059.png
+++ b/textures/ehlphabet_059.png
--- a/textures/ehlphabet_060.png
+++ b/textures/ehlphabet_060.png
--- a/textures/ehlphabet_061.png
+++ b/textures/ehlphabet_061.png
--- a/textures/ehlphabet_062.png
+++ b/textures/ehlphabet_062.png
--- a/textures/ehlphabet_063.png
+++ b/textures/ehlphabet_063.png
--- a/textures/ehlphabet_064.png
+++ b/textures/ehlphabet_064.png
--- a/textures/ehlphabet_065.png
+++ b/textures/ehlphabet_065.png
--- a/textures/ehlphabet_066.png
+++ b/textures/ehlphabet_066.png
--- a/textures/ehlphabet_067.png
+++ b/textures/ehlphabet_067.png
--- a/textures/ehlphabet_068.png
+++ b/textures/ehlphabet_068.png
--- a/textures/ehlphabet_069.png
+++ b/textures/ehlphabet_069.png
--- a/textures/ehlphabet_070.png
+++ b/textures/ehlphabet_070.png
--- a/textures/ehlphabet_071.png
+++ b/textures/ehlphabet_071.png
--- a/textures/ehlphabet_072.png
+++ b/textures/ehlphabet_072.png
--- a/textures/ehlphabet_073.png
+++ b/textures/ehlphabet_073.png
--- a/textures/ehlphabet_074.png
+++ b/textures/ehlphabet_074.png
--- a/textures/ehlphabet_075.png
+++ b/textures/ehlphabet_075.png
--- a/textures/ehlphabet_076.png
+++ b/textures/ehlphabet_076.png
--- a/textures/ehlphabet_077.png
+++ b/textures/ehlphabet_077.png
--- a/textures/ehlphabet_078.png
+++ b/textures/ehlphabet_078.png
--- a/textures/ehlphabet_079.png
+++ b/textures/ehlphabet_079.png
--- a/textures/ehlphabet_080.png
+++ b/textures/ehlphabet_080.png
--- a/textures/ehlphabet_081.png
+++ b/textures/ehlphabet_081.png
--- a/textures/ehlphabet_082.png
+++ b/textures/ehlphabet_082.png
--- a/textures/ehlphabet_083.png
+++ b/textures/ehlphabet_083.png
--- a/textures/ehlphabet_084.png
+++ b/textures/ehlphabet_084.png
--- a/textures/ehlphabet_085.png
+++ b/textures/ehlphabet_085.png
--- a/textures/ehlphabet_086.png
+++ b/textures/ehlphabet_086.png
--- a/textures/ehlphabet_087.png
+++ b/textures/ehlphabet_087.png
--- a/textures/ehlphabet_088.png
+++ b/textures/ehlphabet_088.png
--- a/textures/ehlphabet_089.png
+++ b/textures/ehlphabet_089.png
--- a/textures/ehlphabet_090.png
+++ b/textures/ehlphabet_090.png
--- a/textures/ehlphabet_208_129.png
+++ b/textures/ehlphabet_208_129.png
--- a/textures/ehlphabet_208_144.png
+++ b/textures/ehlphabet_208_144.png
--- a/textures/ehlphabet_208_145.png
+++ b/textures/ehlphabet_208_145.png
--- a/textures/ehlphabet_208_146.png
+++ b/textures/ehlphabet_208_146.png
--- a/textures/ehlphabet_208_147.png
+++ b/textures/ehlphabet_208_147.png
--- a/textures/ehlphabet_208_148.png
+++ b/textures/ehlphabet_208_148.png
--- a/textures/ehlphabet_208_149.png
+++ b/textures/ehlphabet_208_149.png
--- a/textures/ehlphabet_208_150.png
+++ b/textures/ehlphabet_208_150.png
--- a/textures/ehlphabet_208_151.png
+++ b/textures/ehlphabet_208_151.png
--- a/textures/ehlphabet_208_152.png
+++ b/textures/ehlphabet_208_152.png
--- a/textures/ehlphabet_208_153.png
+++ b/textures/ehlphabet_208_153.png
--- a/textures/ehlphabet_208_154.png
+++ b/textures/ehlphabet_208_154.png
--- a/textures/ehlphabet_208_155.png
+++ b/textures/ehlphabet_208_155.png
--- a/textures/ehlphabet_208_156.png
+++ b/textures/ehlphabet_208_156.png
--- a/textures/ehlphabet_208_157.png
+++ b/textures/ehlphabet_208_157.png
--- a/textures/ehlphabet_208_158.png
+++ b/textures/ehlphabet_208_158.png
--- a/textures/ehlphabet_208_159.png
+++ b/textures/ehlphabet_208_159.png
--- a/textures/ehlphabet_208_160.png
+++ b/textures/ehlphabet_208_160.png
--- a/textures/ehlphabet_208_161.png
+++ b/textures/ehlphabet_208_161.png
--- a/textures/ehlphabet_208_162.png
+++ b/textures/ehlphabet_208_162.png
--- a/textures/ehlphabet_208_163.png
+++ b/textures/ehlphabet_208_163.png
--- a/textures/ehlphabet_208_164.png
+++ b/textures/ehlphabet_208_164.png
--- a/textures/ehlphabet_208_165.png
+++ b/textures/ehlphabet_208_165.png
--- a/textures/ehlphabet_208_166.png
+++ b/textures/ehlphabet_208_166.png
--- a/textures/ehlphabet_208_167.png
+++ b/textures/ehlphabet_208_167.png
--- a/textures/ehlphabet_208_168.png
+++ b/textures/ehlphabet_208_168.png
--- a/textures/ehlphabet_208_169.png
+++ b/textures/ehlphabet_208_169.png
--- a/textures/ehlphabet_208_170.png
+++ b/textures/ehlphabet_208_170.png
--- a/textures/ehlphabet_208_171.png
+++ b/textures/ehlphabet_208_171.png
--- a/textures/ehlphabet_208_172.png
+++ b/textures/ehlphabet_208_172.png
--- a/textures/ehlphabet_208_173.png
+++ b/textures/ehlphabet_208_173.png
--- a/textures/ehlphabet_208_174.png
+++ b/textures/ehlphabet_208_174.png
--- a/textures/ehlphabet_208_175.png
+++ b/textures/ehlphabet_208_175.png