Merge branch 'develop' of https://github.com/dfhack/dfhack into develop

scripts/item-descriptions.lua

@@ -1,6 +1,15 @@
 -- Holds custom descriptions for view-item-info
 -- By PeridexisErrant
 
+-- Each line near the bottom has 53 characters of room until
+-- it starts clipping over the UI in an ugly fashion.
+-- For proper spacing, 50 characters is the maximum.
+-- Descriptions which aren't pushed down the page by
+-- barrel contents or such line up with the UI on the
+-- 11th line down. There is room for a 10th long line
+-- without clipping, but stopping at 9 leaves enough space
+-- for ideal legibility.
+
 -- The following people contributed descriptions:
 -- Raideau, PeridexisErrant, /u/Puffin4Tom, /u/KroyMortlach
 -- /u/genieus, /u/TeamsOnlyMedic, /u/johny5w, /u/DerTanni

scripts/view-item-info.lua

@@ -72,12 +72,12 @@ function GetMatPropertiesStringList (item)
     append(list,"Temperature: "..deg_C.."\248C ("..deg_U.."U)")
     append(list,"Color: "..df.global.world.raws.language.colors[mat.state_color.Solid].name)
     local function GetStrainDescription (number)
-        if tonumber(number) >= 50000 then return "very elastic"
-        elseif tonumber(number) < 50000 then return "elastic"
-        elseif tonumber(number) < 15001 then return "medium"
-        elseif tonumber(number) < 5001 then return "stiff"
+        if tonumber(number) < 1 then return "crystalline"
         elseif tonumber(number) < 1000 then return "very stiff"
-        elseif tonumber(number) < 1 then return "crystalline"
+        elseif tonumber(number) < 5001 then return "stiff"
+        elseif tonumber(number) < 15001 then return "medium"
+        elseif tonumber(number) < 50000 then return "elastic"
+        elseif tonumber(number) >= 50000 then return "very elastic"
         else return "unknown" end
     end
     local mat_properties_for = {"BAR", "SMALLGEM", "BOULDER", "ROUGH",