room-list: use getRoomDescription()

lethosor · lethosor · commit 8dfd2ec2e9e7 · 2018-05-12T16:58:23.000-04:00
diff --git a/gui/room-list.lua b/gui/room-list.lua
@@ -17,39 +17,18 @@ local gui = require 'gui'
 local guidm = require 'gui.dwarfmode'
 
 local room_type_table = {
-    [df.building_bedst] = { token = 'bed', qidx = 2, tile = 233 },
-    [df.building_tablest] = { token = 'table', qidx = 3, tile = 209 },
-    [df.building_chairst] = { token = 'chair', qidx = 4, tile = 210 },
-    [df.building_coffinst] = { token = 'coffin', qidx = 5, tile = 48 },
-}
-
-local room_quality_table = {
-    { 1, 'Meager Quarters', 'Meager Dining Room', 'Meager Office', 'Grave' },
-    { 100, 'Modest Quarters', 'Modest Dining Room', 'Modest Office', "Servant's Burial Chamber" },
-    { 250, 'Quarters', 'Dining Room', 'Office', 'Burial Chamber' },
-    { 500, 'Decent Quarters', 'Decent Dining Room', 'Decent Office', 'Tomb' },
-    { 1000, 'Fine Quarters', 'Fine Dining Room', 'Splendid Office', 'Fine Tomb' },
-    { 1500, 'Great Bedroom', 'Great Dining Room', 'Throne Room', 'Mausoleum' },
-    { 2500, 'Grand Bedroom', 'Grand Dining Room', 'Opulent Throne Room', 'Grand Mausoleum' },
-    { 10000, 'Royal Bedroom', 'Royal Dining Room', 'Royal Throne Room', 'Royal Mausoleum' }
+    [df.building_bedst] = { token = 'bed', tile = 233 },
+    [df.building_tablest] = { token = 'table', tile = 209 },
+    [df.building_chairst] = { token = 'chair', tile = 210 },
+    [df.building_coffinst] = { token = 'coffin', tile = 48 },
 }
 
 function getRoomName(building, unit)
     local info = room_type_table[building._type]
     if not info or not building.is_room then
         return utils.getBuildingName(building)
     end
-
-    local quality = building:getRoomValue(unit)
-    local row = room_quality_table[1]
-    for _,v in ipairs(room_quality_table) do
-        if v[1] <= quality then
-            row = v
-        else
-            break
-        end
-    end
-    return row[info.qidx]
+    return dfhack.buildings.getRoomDescription(building, unit)
 end
 
 function makeRoomEntry(bld, unit, is_spouse)
