Some stuff.

README.md

@@ -1,11 +1,12 @@
-# README #
-
-This is a [nback](https://en.wikipedia.org/wiki/N-back) training game.
-Original [article](http://www.pnas.org/content/pnas/105/19/6829.full.pdf)
-
-There are 4 type of signals - sound, position, color and figure form. You can setup
-back level and pause between signals.
-
-## Install & run
-* Download and install [LOVE2D framework](https://love2d.org/)
-* Clone repository to your machine.
+# README #
+
+Игра - попытка воссоздать эксперимент "эн-назад".
+This is a [nback](https://en.wikipedia.org/wiki/N-back) training game.
+Original [article](http://www.pnas.org/content/pnas/105/19/6829.full.pdf)
+
+There are 4 type of signals - sound, position, color and figure form. You can setup
+back level and pause between signals.
+
+## Install & run
+* Download and install [LOVE2D framework](https://love2d.org/)
+* Clone repository to your machine.

nback.lua

@@ -1,27 +1,26 @@
 local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local coroutine = _tl_compat and _tl_compat.coroutine or coroutine; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local math = _tl_compat and _tl_compat.math or math; local os = _tl_compat and _tl_compat.os or os; local pcall = _tl_compat and _tl_compat.pcall or pcall; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table
 
-require("common")
-require("layout")
-require("snippets")
-require("button")
-require("drawstat")
-require("coroprocessor")
 require("Timer")
-require("signal_quad_field")
-
-require("nbtypes")
+require("button")
 require("cmn")
+require("common")
+require("coroprocessor")
+require("drawstat")
+require("layout")
 require("menu")
+require("nbtypes")
+require("signal_quad_field")
+require("snippets")
 require("tiledbackground")
 
 
-local i18n = require("i18n")
+
 local colorConstants = require("colorconstants")
 local g = love.graphics
-local gr = love.graphics
 local generator = require("generator")
 local getTime = love.timer.getTime
-
+local gr = love.graphics
+local i18n = require("i18n")
 local pallete = require("pallete")
 local serpent = require("serpent")
 local setupmenu = require("setupmenu")
@@ -114,11 +113,6 @@ local yield = coroutine.yield
 
 
 
-
-
-
-
-
 
 
 
@@ -280,7 +274,7 @@ function Nback:createSetupMenu()
 
 
    local expositionList = { "1", "2", "3", "4", "5", "6" }
-   local activeExpositionItem = 3
+   local activeExpositionItem = 2
 
    local parameterColor = { 0, 0.9, 0 }
 
@@ -305,6 +299,7 @@ function Nback:createSetupMenu()
 
    self.setupmenu:addItem({
       oninit = function()
+
          local fullStr = i18n("setupMenu.expTime_plural", { count = tonumber(expositionList[activeExpositionItem]) })
          print("------", tonumber(expositionList[activeExpositionItem]))
          print("------", i18n("setupMenu.expTime_plural", { count = tonumber(expositionList[activeExpositionItem]) }))

nback.tl

@@ -1,27 +1,26 @@
 -- vim: set foldmethod=indent
 
-require "common"
-require "layout"
-require "snippets"
-require "button"
-require "drawstat"
-require "coroprocessor"
 require "Timer"
-require "signal_quad_field"
---require "globals"
-require "nbtypes"
+require "button"
 require "cmn"
+require "common"
+require "coroprocessor"
+require "drawstat"
+require "layout"
 require "menu"
+require "nbtypes"
+require "signal_quad_field"
+require "snippets"
 require "tiledbackground"
 
 --local hex = require "hex"
-local i18n = require "i18n"
+--local inspect = require "inspect"
 local colorConstants = require "colorconstants"
 local g = love.graphics
-local gr = love.graphics
 local generator = require "generator"
 local getTime = love.timer.getTime
---local inspect = require "inspect"
+local gr = love.graphics
+local i18n = require "i18n"
 local pallete = require "pallete"
 local serpent = require "serpent"
 local setupmenu = require "setupmenu"
@@ -67,7 +66,6 @@ global type Nback = record
     written: boolean
     pause: boolean
     signals: Signals
-    --show_statistic: boolean
     timestamp: number
     pressed: Signals.Eq
     signal: SignalView
@@ -95,10 +93,6 @@ global type Nback = record
     durationSec: number
     signalsInspected: boolean
 
-    --startcx: number
-    --startcy: number
-    --hexField: H
-    --hexMesh: love.graphics.Mesh
     map: {{number}}
 
     new: function(): Nback
@@ -305,6 +299,7 @@ function Nback:createSetupMenu()
     -- выбор продолжительности экспозиции
     self.setupmenu:addItem({
         oninit = function(): {string}, boolean, boolean
+            --debug.debug()
             local fullStr = i18n("setupMenu.expTime_plural", {count = tonumber(expositionList[activeExpositionItem])})
             print("------", tonumber(expositionList[activeExpositionItem]))
             print("------", i18n("setupMenu.expTime_plural", {count = tonumber(expositionList[activeExpositionItem])}))