Merge pull request 'remove manager postfixes' (#8) from feature-remove-manager-postfixes into master

Reviewed-on: #8

.luacheckrc

@@ -3,13 +3,15 @@
 
 globals = {
   "Util",
-  "DecisionManager",
+  "Decision",
-  "ScreenManager",
+  "Screen",
   "UI",
   "Print",
   "Input",
   "Audio",
   "Context",
+  "Meters",
+  "Minigames",
   "mset",
   "mget",
   "btnp",
@@ -30,7 +32,7 @@ globals = {
   "exit",
   "trace",
   "index_menu",
-  "MapManager",
+  "Map",
   "map",
 }
 

inc/decision/decision.go_to_home.lua

@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_home",
   label = "Go to Home",
   handle = function()

inc/decision/decision.go_to_office.lua

@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_office",
   label = "Go to Office",
   handle = function()

inc/decision/decision.go_to_toilet.lua

@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_toilet",
   label = "Go to Toilet",
   handle = function()

inc/decision/decision.go_to_walking_to_home.lua

@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_walking_to_home",
   label = "Walking to home",
   handle = function()

inc/decision/decision.go_to_walking_to_office.lua

@@ -1,4 +1,4 @@
-DecisionManager.register({
+Decision.register({
   id = "go_to_walking_to_office",
   label = "Walking to office",
   handle = function()

inc/decision/decision.manager.lua

@@ -1,6 +1,6 @@
 local _decisions = {}
 
-function DecisionManager.register(decision)
+function Decision.register(decision)
   if not decision or not decision.id then
     PopupWindow.show({"Error: Invalid decision object registered (missing id)!"})
     return
@@ -22,10 +22,10 @@ function DecisionManager.register(decision)
   _decisions[decision.id] = decision
 end
 
-function DecisionManager.get(id)
+function Decision.get(id)
   return _decisions[id]
 end
 
-function DecisionManager.get_all()
+function Decision.get_all()
   return _decisions
 end

inc/decision/decision.play_button_mash.lua

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

inc/decision/decision.play_ddr.lua

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

inc/decision/decision.play_rhythm.lua

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

inc/init/init.context.lua

@@ -67,7 +67,7 @@ local function reset_context_to_initial_state()
   Context.screen_indices_by_id = {}
   local screen_order = {"home", "toilet", "walking_to_office", "office", "walking_to_home"}
   for i, screen_id in ipairs(screen_order) do
-    local screen_data = ScreenManager.get_by_id(screen_id)
+    local screen_data = Screen.get_by_id(screen_id)
     if screen_data then
       table.insert(Context.screens, screen_data)
       Context.screen_indices_by_id[screen_id] = i

inc/init/init.modules.lua

@@ -11,9 +11,9 @@ local MinigameDDRWindow = {}
 Util = {}
 Meters = {}
 Minigames = {}
-DecisionManager = {}
+Decision = {}
-ScreenManager = {}
+Screen = {}
-MapManager = {}
+Map = {}
 UI = {}
 Print = {}
 Input = {}

inc/map/map.bedroom.lua

@@ -1,4 +1,4 @@
-MapManager.register({
+Map.register({
   id = "bedroom",
   from_x =  0,
   from_y =  0,

inc/map/map.manager.lua

@@ -1,6 +1,6 @@
 local _maps = {}
 
-function MapManager.get_maps_array()
+function Map.get_maps_array()
   local maps_array = {}
   for _, map_data in pairs(_maps) do
     table.insert(maps_array, map_data)
@@ -8,19 +8,19 @@ function MapManager.get_maps_array()
   return maps_array
 end
 
-function MapManager.register(map_data)
+function Map.register(map_data)
   if _maps[map_data.id] then
     trace("Warning: Overwriting map with id: " .. map_data.id)
   end
   _maps[map_data.id] = map_data
 end
 
-function MapManager.get_by_id(map_id)
+function Map.get_by_id(map_id)
   return _maps[map_id]
 end
 
-function MapManager.draw(map_id)
+function Map.draw(map_id)
-  local map_data = MapManager.get_by_id(map_id)
+  local map_data = Map.get_by_id(map_id)
   if not map_data then
     return
   end

inc/screen/screen.home.lua

@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "home",
   name = "Home",
   decisions = {

inc/screen/screen.manager.lua

@@ -1,6 +1,6 @@
 local _screens = {}
 
-function ScreenManager.get_screens_array()
+function Screen.get_screens_array()
   local screens_array = {}
   for _, screen_data in pairs(_screens) do
     table.insert(screens_array, screen_data)
@@ -8,13 +8,13 @@ function ScreenManager.get_screens_array()
   return screens_array
 end
 
-function ScreenManager.register(screen_data)
+function Screen.register(screen_data)
   if _screens[screen_data.id] then
     trace("Warning: Overwriting screen with id: " .. screen_data.id)
   end
   _screens[screen_data.id] = screen_data
 end
 
-function ScreenManager.get_by_id(screen_id)
+function Screen.get_by_id(screen_id)
   return _screens[screen_id]
 end

inc/screen/screen.office.lua

@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "office",
   name = "Office",
   decisions = {

inc/screen/screen.toilet.lua

@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "toilet",
   name = "Toilet",
   decisions = {

inc/screen/screen.walking_to_home.lua

@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "walking_to_home",
   name = "Walking to home",
   decisions = {

inc/screen/screen.walking_to_office.lua

@@ -1,4 +1,4 @@
-ScreenManager.register({
+Screen.register({
   id = "walking_to_office",
   name = "Walking to office",
   decisions = {

inc/window/window.game.lua

@@ -1,11 +1,11 @@
 function GameWindow.draw()
   local screen = Context.screens[Context.current_screen]
-  MapManager.draw(screen.background)
+  Map.draw(screen.background)
   UI.draw_top_bar(screen.name)
   if screen and screen.decisions and #screen.decisions > 0 then
     local available_decisions = {}
     for _, decision_id in ipairs(screen.decisions) do
-      local decision = DecisionManager.get(decision_id)
+      local decision = Decision.get(decision_id)
       if decision and decision.condition() then
         table.insert(available_decisions, decision)
       end
@@ -39,7 +39,7 @@ function GameWindow.update()
   if screen and screen.decisions and #screen.decisions > 0 then
     local available_decisions = {}
     for _, decision_id in ipairs(screen.decisions) do
-      local decision = DecisionManager.get(decision_id)
+      local decision = Decision.get(decision_id)
       if decision and decision.condition() then         table.insert(available_decisions, decision)
       end
     end