after review fixies

Author: brmley

docs/research-info.rst

@@ -0,0 +1,28 @@
+research-info
+=========
+
+.. dfhack-tool::
+    :summary: Show information about current scholars research progress.
+    :tags: fort units
+
+Use with a unit selected to show information about units research progress.
+
+
+Usage
+-----
+
+::
+
+    research-info
+    research-info all <RELATIONSHIP>
+    research-info <CIV_ID> <RELATIONSHIP>
+
+Examples
+--------
+
+``research-info``
+    Show the selected unit research progress.
+``research-info --unit <id>``
+    Show the specified unit research progress.
+``research-info --all``
+    Show all citizens and residents research progress.

internal/research-info/info.lua

@@ -40,7 +40,6 @@ function getGoalInfo(goal, category)
         return goal_info
     end
 
-    local goal_info = ""
     for i = 0, 31 do
         if goal[i] then
             local global_flag_index = category * 32 + i -- wizards move
@@ -59,7 +58,7 @@ local function getTopicInfo(topic)
 
     for key, value in pairs(topic) do
         if type(value) == "boolean" and value then
-            -- Если значение булевое и равно true, выводим тему как изученную
+            -- show learned topics
             topic_info = topic_info .. string.format("\n\t\t%s", key)
         end
     end
@@ -102,10 +101,8 @@ end
 function getResearchData(historical_figure)
     local knowledge = getHistoricKnowledge(historical_figure)
     local data = {
-
-        name = dfhack.translation.translateName(historical_figure.name), --dfhack.translation.TranslateName(historical_figure.name),
+        name = dfhack.translation.translateName(historical_figure.name),
         knowledge_goal_category = getKnowledgeGoalCategoryInfo(knowledge.knowledge_goal_category),
-        --knowledge_goal = getGoalInfo(knowledge.knowledge_goal),
         knowledge_goal = getGoalInfo(knowledge.knowledge_goal, knowledge.knowledge_goal_category),
         research_points = knowledge.research_points,
         research_percentage = string.format("%.2f", (knowledge.research_points / 100000) * 100),

internal/research-info/overlay.lua

@@ -10,7 +10,7 @@ local function formatKnowledgeString(str)
 
     local parts = {}
     for part in str:gmatch("[^_]+") do
-        -- Первую букву делаем заглавной, остальные - строчными
+        -- do capitalize the first letter
         local formatted = part:sub(1,1):upper() .. part:sub(2):lower()
         table.insert(parts, formatted)
     end
@@ -20,7 +20,7 @@ end
 
 function GetUnitResearchInfo(unit_id)
     local info = ''
-
+    historical_figure = df.historical_figure.find(unit_id)
     historical_figure = researchInfo.getHistoricalFigure(unit_id)
     local knowledge = researchInfo.getHistoricKnowledge(historical_figure)
     local data = {
@@ -30,7 +30,7 @@ function GetUnitResearchInfo(unit_id)
         research_percentage = string.format("%.2f", (knowledge.research_points / 100000) * 100),
         times_pondered = knowledge.times_pondered
     }
-    
+
     if((data.knowledge_goal ~= 'nil') and ((data.times_pondered > 0) or (knowledge.research_points > 0))) then
         info = data.knowledge_goal..string.format(' %s%%', data.research_percentage)..string.format(' [%d] ', data.times_pondered)
     end

research-info.lua

@@ -44,12 +44,12 @@ local selected_unit = dfhack.gui.getSelectedUnit()
 if unit then
     local research_data_list = {}
     for i, unit in pairs(dfhack.units.getCitizens()) do
-        
+
         if selected_unit and selected_unit.id ~= unit.id then
             goto continue
         end
 
-        local historical_figure = researchInfo.getHistoricalFigure(unit.id)
+        local historical_figure = df.historical_figure.find(unit.hist_figure_id)
         if historical_figure then
             local research_data, error_msg = researchInfo.getResearchData(historical_figure)
             if research_data then