Merge pull request #359 from Ruin0x11/fix/walking-speed

Random fixes

src/api/gui/menu/InventoryMenu.lua

@@ -86,7 +86,6 @@ function InventoryMenu:init(ctxt, returns_item)
    self.cargo_weight = 0
    self.detail_view = nil
    self.subtext_column = self.ctxt.proto.window_detail_header or "ui.inv.window.weight"
-   self.is_drawing = true
    self.total_weight_text = ""
    self.text_equip_slots = {}
    self.play_sound = false
@@ -458,8 +457,12 @@ function InventoryMenu:update_filtering(play_sound)
    end
 end
 
+function InventoryMenu:is_menu_visible()
+   return self.ctxt:is_menu_visible()
+end
+
 function InventoryMenu:draw()
-   if not self.ctxt:is_menu_visible() then
+   if not self:is_menu_visible() then
       return
    end
 

src/api/gui/menu/InventoryWrapper.lua

@@ -179,7 +179,7 @@ function InventoryWrapper:relayout(x, y, width, height)
 end
 
 function InventoryWrapper:draw()
-   if not self.submenu.is_drawing then
+   if not self.submenu:is_menu_visible() then
       return
    end
    Draw.set_color(255, 255, 255)

src/ext/table.lua

@@ -676,3 +676,13 @@ function table.clear(tbl)
       tbl[k] = nil
    end
 end
+
+function table.reverse(tbl)
+   local n = #tbl
+   local i = 1
+   while i < n do
+      tbl[i], tbl[n] = tbl[n], tbl[i]
+      i = i + 1
+      n = n - 1
+   end
+end

src/game/field_layer.lua

@@ -285,11 +285,11 @@ function field_layer:update_scrolling()
 
       if config.base.scroll_type == "classic" then
          -- >>>>>>>> elona122/shade2/screen.hsp:1224 *screen_scroll ...
-         local frames = 5
+         local frames = 3
          if self.scrolling_mode == "fast" then
-            frames = 3
+            frames = 4 -- TODO config option: running speed (?)
          elseif self.scrolling_mode == "slow" then
-            frames = 6
+            frames = 5 -- TODO config option: walking speed
          end
          if self:player_is_running() then
             frames = 1
@@ -322,7 +322,7 @@ function field_layer:update_scrolling()
                self.draw_callbacks:update(dt)
                self.keys:update_repeats(dt)
                ms = ms + dt
-            until ms > 33.0 / 1000.0
+            until ms > 20.0 / 1000.0
          end
          -- <<<<<<<< elona122/shade2/screen.hsp:1267 	return ..
       else

src/mod/elona/api/ExHelp.lua

@@ -1,6 +1,7 @@
 local Chara = require("api.Chara")
 local ExHelpPrompt = require("mod.elona.api.gui.ExHelpPrompt")
 local Gui = require("api.Gui")
+local I18N = require("api.I18N")
 
 local ExHelp = {}
 
@@ -16,13 +17,19 @@ function ExHelp.show(id, force)
       return
    end
 
+   local text = I18N.get_optional(("elona.ex_help._.%s"):format(id))
+   if not text then
+      Log.error("missing help text for %s", id)
+      return
+   end
+
    local player = Chara.player()
    if not Chara.is_alive(player) or (player:has_activity() and not player:has_activity("elona.traveling")) then
       return
    end
 
    Gui.update_screen()
-   ExHelpPrompt:new(id):query()
+   ExHelpPrompt:new(text):query()
    save.elona.ex_help_shown[id] = true
    -- <<<<<<<< shade2/init.hsp:4272 	#define global help(%%1,%%2=0) if cfg_extraHelp@:if ..
 end

src/mod/elona/api/gui/ExHelpPrompt.lua

@@ -29,11 +29,7 @@ local function split(str, delimiter)
    return result
 end
 
-function ExHelpPrompt:init(help_id)
-   data["elona.ex_help"]:ensure(help_id)
-
-   local text = assert(I18N.get_optional(("elona.ex_help._.%s"):format(help_id)), "missing help text for " .. help_id)
-
+function ExHelpPrompt:init(text)
    self.sections = split(text, "\n\n")
    if #self.sections == 0 then
       error("No sections found.")

src/mod/elona/api/gui/MapEditLayer.lua

@@ -116,7 +116,7 @@ function MapEditLayer:select_tile(id)
    self.selected_tile = id
 
    self.tile_batch:clear()
-   local width, height = Draw.get_coords:get_size()
+   local width, height = Draw.get_coords():get_size()
    self.tile_batch:add(self.selected_tile, self.width - 80, self.y + 20, width, height)
 end
 

src/mod/map_editor/api/plugin/MapEditorLayoutPlugin.lua

@@ -12,7 +12,6 @@ local UiMouseMenuButton = require("mod.mouse_ui.api.gui.UiMouseMenuButton")
 local MapEditorLayoutPlugin = class.class("MapEditorLayoutPlugin", IMapEditorPlugin)
 
 function MapEditorLayoutPlugin:init()
-   self.target_floor = 20
 end
 
 function MapEditorLayoutPlugin:on_install(map_editor)