refact.

cmn.tl

@@ -1,17 +1,12 @@
 require "love"
 require "nbtypes"
 require "constants"
+require "globals"
 
 local i18n = require "i18n"
 --local gooi = require "gooi.gooi"
 local serpent = require "serpent"
 
-global settings: Settings
-global __DEBUG__ = false
-global onAndroid = love.system.getOS() == "Android"
-global useKeyboard = true
-global preventiveFirstRun = true
-
 function pack(...: any): any
     return {...}
 end

generator.lua

@@ -89,12 +89,15 @@ local function generate(
    return ret
 end
 
+
 local function make_hit_arr(signals, level, comparator)
    local ret = {}
    if signals then
       for k, v in ipairs(signals) do
          ret[#ret + 1] = k > level and comparator(v, signals[k - level])
       end
+   else
+      error('Something gone wrong, signals is nil')
    end
    return ret
 end
@@ -113,6 +116,7 @@ local function makeEqArrays(signals, level)
          return a == b
       end),
    }
+   logfile:write("makeEqArrays: " .. inspect(ret) .. "\n")
    return ret
 end
 
@@ -141,22 +145,6 @@ function generateAll(sig_count, level, dim, soundsNum, map)
    function genArrays(sig_count, level, _, soundsNum)
       local signals = {}
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
       logfile:write("--begin pos\n")
 
       signals.pos = generate(sig_count, level,

generator.tl

@@ -89,12 +89,15 @@ local function generate<T>(
     return ret
 end
 
+-- возвращает массив булеанов. Истина если в этот момент нужно нажать "сигнал"
 local function make_hit_arr<T>(signals: {T}, level: integer, comparator: CmpFunction<T>): {boolean}
     local ret: {boolean} = {}
     if signals then
         for k, v in ipairs(signals) do
             ret[#ret + 1] = k > level and comparator(v, signals[k - level])
         end
+    else
+        error('Something gone wrong, signals is nil')
     end
     return ret
 end
@@ -113,6 +116,7 @@ local function makeEqArrays(signals: Signals, level: integer): Signals.Eq
             return a == b 
         end),
     }
+    logfile:write("makeEqArrays: " .. inspect(ret) .. "\n")
     return ret
 end
 
@@ -141,22 +145,6 @@ function generateAll(sig_count: integer, level: integer, dim: integer, soundsNum
     function genArrays(sig_count: integer, level: integer, _: number, soundsNum: number): Signals
         local signals: Signals = {}
 
-        --function(): Signals.Pos
-            --local result: Signals.Pos = {}
-            --local x, y = math.random(1, #map), math.random(1, #map[1])
-            --local i = 0
-            --while map[x][y] ~= 1 do
-                --x, y = math.random(1, #map), math.random(1, #map[1])
-                --i = i + 1
-                --if i > 31 then
-                ----if i > 31 then
-                    --error("Something goes wrong, hmm")
-                --end
-            --end
-            --result.x, result.y = x, y
-            --return result
-        --end,
-
         logfile:write("--begin pos\n")
 
         signals.pos = generate(sig_count, level,

globals.tl

@@ -1,6 +1,15 @@
+require "nbtypes"
 
+global SETTINGS_FILENAME = "settings.lua"
+global SAVE_NAME = "nback-v0.4.lua"
 global SCENEPREFIX = "scenes/nback3/"
 
+global SETTINGS: Settings
+global __DEBUG__ = false
+global ON_ANDROID = love.system.getOS() == "Android"
+global USE_KEYBOARD = true
+global PREVENTIVE_FIRST_RUN = true
+
 --require "menu"
 --require "pviewer"
 --require "help"

nback.lua

@@ -156,6 +156,11 @@ local yield = coroutine.yield
 
 
 
+
+
+
+
+
 
 
 
@@ -275,15 +280,18 @@ function Nback:start()
 
 
    local delay = 1
-   self.timer:every(delay, function()
+   self.timer:every(delay,
+   function()
       self.start_pause_rest = self.start_pause_rest - 1
    end,
    self.start_pause_rest, function()
       self.start_pause = false
       self.isRun = true
 
       self.startTime = love.timer.getTime()
-   end, "notag")
+   end,
+   "notag")
+
 
    if onAndroid or not useKeyboard then
       self:initButtons()
@@ -526,7 +534,7 @@ function Nback:init(saveName)
    self:createSetupMenu()
    self:resize(w, h)
    self:initShaders()
-   self:initShadersTimer()
+
    self.uiState = storeUI()
 end
 
@@ -1231,6 +1239,7 @@ end
 
 
 function Nback:printStartPause()
+   print('Nback:printStartPause')
    local central_text = i18n("waitFor", { self.start_pause_rest })
    g.setFont(self.centralFont)
    g.setColor(pallete.signal)

nback.tl

@@ -96,8 +96,13 @@ global type Nback = record
     pressed: Signals.Eq
     signalView: SignalView
     stopppedSignal: number
+
+    -- время в секундах от нажатия "старт" до первого сигнала
     start_pause_rest: number
+
+    -- что за переменная?
     start_pause: boolean
+
     startTime: number
     shader: love.graphics.Shader
     setupmenu: SetupMenu
@@ -275,15 +280,18 @@ function Nback:start()
 
     -- задержка измеряется в секундах?
     local delay = 1
-    self.timer:every(delay, function() 
-        self.start_pause_rest = self.start_pause_rest - 1 
-    end, 
-    self.start_pause_rest, function()
-        self.start_pause = false
-        self.isRun = true
-        -- фиксирую время начала игры
-        self.startTime = love.timer.getTime()
-    end, "notag")
+    self.timer:every(delay, 
+        function() 
+            self.start_pause_rest = self.start_pause_rest - 1 
+        end, 
+        self.start_pause_rest, function()
+            self.start_pause = false
+            self.isRun = true
+            -- фиксирую время начала игры
+            self.startTime = love.timer.getTime()
+        end, 
+        "notag"
+    )
 
     if onAndroid or not useKeyboard then
         self:initButtons()
@@ -526,7 +534,7 @@ function Nback:init(saveName: string)
     self:createSetupMenu()
     self:resize(w, h)
     self:initShaders()
-    self:initShadersTimer()
+    --self:initShadersTimer()
     self.uiState = storeUI()
 end
 
@@ -1231,6 +1239,7 @@ end
 
 -- draw central_text - Press Space key
 function Nback:printStartPause()
+    print('Nback:printStartPause')
     local central_text = i18n("waitFor", { self.start_pause_rest })
     g.setFont(self.centralFont)
     g.setColor(pallete.signal)