remove prular defitions

inc/decision/decision.play_button_mash.lua

@@ -1,5 +1,5 @@
 Decision.register({
   id = "play_button_mash",
   label = "Play Button Mash",
-  handle = function() Meters.hide() MinigameButtonMashWindow.start(WINDOW_GAME) end,
+  handle = function() Meter.hide() MinigameButtonMashWindow.start(WINDOW_GAME) end,
 })

inc/decision/decision.play_ddr.lua

@@ -1,5 +1,5 @@
 Decision.register({
   id = "play_ddr",
   label = "Play DDR (Random)",
-  handle = function() Meters.hide() MinigameDDRWindow.start(WINDOW_GAME, nil) end,
+  handle = function() Meter.hide() MinigameDDRWindow.start(WINDOW_GAME, nil) end,
 })

inc/decision/decision.play_rhythm.lua

@@ -1,5 +1,5 @@
 Decision.register({
   id = "play_rhythm",
   label = "Play Rhythm Game",
-  handle = function() Meters.hide() MinigameRhythmWindow.start(WINDOW_GAME) end,
+  handle = function() Meter.hide() MinigameRhythmWindow.start(WINDOW_GAME) end,
 })

inc/init/init.context.lua

@@ -44,10 +44,10 @@ on than meets the eye.]]
     selected_decision_index = 1,
     game_in_progress = false,
     screens = {},
-    minigame_ddr = Minigames.get_default_ddr(),
-    minigame_button_mash = Minigames.get_default_button_mash(),
-    minigame_rhythm = Minigames.get_default_rhythm(),
-    meters = Meters.get_initial(),
+    minigame_ddr = Minigame.get_default_ddr(),
+    minigame_button_mash = Minigame.get_default_button_mash(),
+    minigame_rhythm = Minigame.get_default_rhythm(),
+    meters = Meter.get_initial(),
     --- Active sprites.
     sprites = {},
     --- Current situation ID.

inc/init/init.meters.lua

@@ -7,14 +7,14 @@ local COMBO_MAX_BONUS = 0.16
 local COMBO_TIMEOUT_FRAMES = 600
 
 -- Internal meters for tracking game progress and player stats.
-Meters.COLOR_ISM = Config.colors.red
-Meters.COLOR_WPM = Config.colors.blue
-Meters.COLOR_BM = Config.colors.black
-Meters.COLOR_BG = Config.colors.meter_bg
+Meter.COLOR_ISM = Config.colors.red
+Meter.COLOR_WPM = Config.colors.blue
+Meter.COLOR_BM = Config.colors.black
+Meter.COLOR_BG = Config.colors.meter_bg
 
 --- Gets initial meter values.
 -- @return table A table of initial meter values.
-function Meters.get_initial()
+function Meter.get_initial()
   return {
     ism = METER_DEFAULT,
     wpm = METER_DEFAULT,
@@ -26,24 +26,24 @@ function Meters.get_initial()
 end
 
 --- Hides meters.
-function Meters.hide()
+function Meter.hide()
   if Context and Context.meters then Context.meters.hidden = true end
 end
 
 --- Shows meters.
-function Meters.show()
+function Meter.show()
   if Context and Context.meters then Context.meters.hidden = false end
 end
 
 --- Gets max meter value.
 -- @return number The maximum meter value.
-function Meters.get_max()
+function Meter.get_max()
   return METER_MAX
 end
 
 --- Gets combo multiplier.
 -- @return number The current combo multiplier.
-function Meters.get_combo_multiplier()
+function Meter.get_combo_multiplier()
   if not Context or not Context.meters then return 1 end
   local combo = Context.meters.combo
   if combo == 0 then return 1 end
@@ -51,7 +51,7 @@ function Meters.get_combo_multiplier()
 end
 
 --- Updates all meters.
-function Meters.update()
+function Meter.update()
   if not Context or not Context.game_in_progress or not Context.meters then return end
   local m = Context.meters
   m.ism = math.max(0, m.ism - METER_DECAY_PER_FRAME)
@@ -69,7 +69,7 @@ end
 --- Adds amount to a meter.
 -- @param key string The meter key (e.g., "wpm", "ism", "bm").
 -- @param amount number The amount to add.
-function Meters.add(key, amount)
+function Meter.add(key, amount)
   if not Context or not Context.meters then return end
   local m = Context.meters
   if m[key] ~= nil then
@@ -78,12 +78,12 @@ function Meters.add(key, amount)
 end
 
 --- Called on minigame completion.
-function Meters.on_minigame_complete()
+function Meter.on_minigame_complete()
   local m = Context.meters
-  local gain = math.floor(METER_GAIN_PER_CHORE * Meters.get_combo_multiplier())
-  Meters.add("wpm", gain)
-  Meters.add("ism", gain)
-  Meters.add("bm", gain)
+  local gain = math.floor(METER_GAIN_PER_CHORE * Meter.get_combo_multiplier())
+  Meter.add("wpm", gain)
+  Meter.add("ism", gain)
+  Meter.add("bm", gain)
   m.combo = m.combo + 1
   m.combo_timer = 0
 end

inc/init/init.minigames.lua

@@ -1,5 +1,5 @@
 -- Manages minigame configurations and initial states.
-Minigames = {}
+Minigame = {}
 
 --- Applies parameters to defaults.
 -- @param defaults table The default configuration table.
@@ -15,7 +15,7 @@ end
 
 --- Gets default DDR minigame configuration.
 -- @return table The default DDR minigame configuration.
-function Minigames.get_default_ddr()
+function Minigame.get_default_ddr()
   local arrow_size = 12
   local arrow_spacing = 30
   local total_width = (4 * arrow_size) + (3 * arrow_spacing)
@@ -56,7 +56,7 @@ end
 
 --- Gets default button mash minigame configuration.
 -- @return table The default button mash minigame configuration.
-function Minigames.get_default_button_mash()
+function Minigame.get_default_button_mash()
   return {
     bar_fill = 0,
     max_fill = 100,
@@ -78,7 +78,7 @@ end
 
 --- Gets default rhythm minigame configuration.
 -- @return table The default rhythm minigame configuration.
-function Minigames.get_default_rhythm()
+function Minigame.get_default_rhythm()
   return {
     line_position = 0,
     line_speed = 0.015,
@@ -108,20 +108,20 @@ end
 --- Configures DDR minigame.
 -- @param params table Optional parameters to override defaults.
 -- @return table The configured DDR minigame state.
-function Minigames.configure_ddr(params)
-  return apply_params(Minigames.get_default_ddr(), params)
+function Minigame.configure_ddr(params)
+  return apply_params(Minigame.get_default_ddr(), params)
 end
 
 --- Configures button mash minigame.
 -- @param params table Optional parameters to override defaults.
 -- @return table The configured button mash minigame state.
-function Minigames.configure_button_mash(params)
-  return apply_params(Minigames.get_default_button_mash(), params)
+function Minigame.configure_button_mash(params)
+  return apply_params(Minigame.get_default_button_mash(), params)
 end
 
 --- Configures rhythm minigame.
 -- @param params table Optional parameters to override defaults.
 -- @return table The configured rhythm minigame state.
-function Minigames.configure_rhythm(params)
-  return apply_params(Minigames.get_default_rhythm(), params)
+function Minigame.configure_rhythm(params)
+  return apply_params(Minigame.get_default_rhythm(), params)
 end

inc/init/init.modules.lua

@@ -9,8 +9,8 @@ MinigameButtonMashWindow = {}
 MinigameRhythmWindow = {}
 MinigameDDRWindow = {}
 Util = {}
-Meters = {}
-Minigames = {}
+Meter = {}
+Minigame = {}
 Decision = {}
 Situation = {}
 Screen = {}

inc/system/system.main.lua

@@ -60,7 +60,7 @@ function TIC()
   if handler then
     handler()
   end
-  Meters.update()
+  Meter.update()
   if Context.game_in_progress then
     UI.draw_meters()
   end

inc/system/system.ui.lua

@@ -135,7 +135,7 @@ function UI.draw_meters()
   if Context.meters.hidden then return end
 
   local m = Context.meters
-  local max = Meters.get_max()
+  local max = Meter.get_max()
   local bar_w = 44
   local bar_h = 2
   local bar_x = 182
@@ -145,16 +145,16 @@ function UI.draw_meters()
   local bar_offset = math.floor((line_h - bar_h) / 2)
 
   local meter_list = {
-    { key = "wpm", label = "WPM", color = Meters.COLOR_WPM, row = 0 },
-    { key = "ism", label = "ISM", color = Meters.COLOR_ISM, row = 1 },
-    { key = "bm", label = "BM", color = Meters.COLOR_BM, row = 2 },
+    { key = "wpm", label = "WPM", color = Meter.COLOR_WPM, row = 0 },
+    { key = "ism", label = "ISM", color = Meter.COLOR_ISM, row = 1 },
+    { key = "bm", label = "BM", color = Meter.COLOR_BM, row = 2 },
   }
 
   for _, meter in ipairs(meter_list) do
     local label_y = start_y + meter.row * line_h
     local bar_y = label_y + bar_offset
     local fill_w = math.max(0, math.floor((m[meter.key] / max) * bar_w))
-    rect(bar_x, bar_y, bar_w, bar_h, Meters.COLOR_BG)
+    rect(bar_x, bar_y, bar_w, bar_h, Meter.COLOR_BG)
     if fill_w > 0 then
       rect(bar_x, bar_y, fill_w, bar_h, meter.color)
     end

inc/window/window.minigame.ddr.lua

@@ -1,7 +1,7 @@
 --- Initializes DDR minigame state.
 -- @param params table Optional parameters for configuration.
 function MinigameDDRWindow.init(params)
-  Context.minigame_ddr = Minigames.configure_ddr(params)
+  Context.minigame_ddr = Minigame.configure_ddr(params)
 end
 
 --- Starts the DDR minigame.
@@ -99,16 +99,16 @@ end
 function MinigameDDRWindow.update()
   local mg = Context.minigame_ddr
   if mg.bar_fill >= mg.max_fill then
-    Meters.on_minigame_complete()
-    Meters.show()
+    Meter.on_minigame_complete()
+    Meter.show()
     Context.active_window = mg.return_window
     return
   end
   mg.frame_counter = mg.frame_counter + 1
   if mg.use_pattern and mg.current_song and mg.current_song.end_frame then
     if mg.frame_counter > mg.current_song.end_frame and #mg.arrows == 0 then
-      Meters.on_minigame_complete()
-      Meters.show()
+      Meter.on_minigame_complete()
+      Meter.show()
       Context.active_window = mg.return_window
       return
     end

inc/window/window.minigame.mash.lua

@@ -1,7 +1,7 @@
 --- Initializes button mash minigame state.
 -- @param params table Optional parameters for configuration.
 function MinigameButtonMashWindow.init(params)
-  Context.minigame_button_mash = Minigames.configure_button_mash(params)
+  Context.minigame_button_mash = Minigame.configure_button_mash(params)
 end
 
 --- Starts the button mash minigame.
@@ -24,8 +24,8 @@ function MinigameButtonMashWindow.update()
     end
   end
   if mg.bar_fill >= mg.max_fill then
-    Meters.on_minigame_complete()
-    Meters.show()
+    Meter.on_minigame_complete()
+    Meter.show()
     Context.active_window = mg.return_window
     return
   end

inc/window/window.minigame.rhythm.lua

@@ -1,7 +1,7 @@
 --- Initializes rhythm minigame state.
 -- @param params table Optional parameters for configuration.
 function MinigameRhythmWindow.init(params)
-  Context.minigame_rhythm = Minigames.configure_rhythm(params)
+  Context.minigame_rhythm = Minigame.configure_rhythm(params)
 end
 
 --- Starts the rhythm minigame.
@@ -46,8 +46,8 @@ function MinigameRhythmWindow.update()
     end
   end
   if mg.score >= mg.max_score then
-    Meters.on_minigame_complete()
-    Meters.show()
+    Meter.on_minigame_complete()
+    Meter.show()
     Context.active_window = mg.return_window
     return
   end