Tiles: update the skill panel regarding the latest skill changes.

1 files changed, 7 insertions, 15 deletions

diff --git a/crawl-ref/source/tilereg-skl.cc b/crawl-ref/source/tilereg-skl.cc
index 332da775bc..74950b5ca8 100644
--- a/crawl-ref/source/tilereg-skl.cc
+++ b/crawl-ref/source/tilereg-skl.cc
@@ -41,17 +41,10 @@ void SkillRegion::draw_tag()
     const int apt          = species_apt(skill, you.species);
 
     std::string progress = "";
-    // Don't display progress when unskilled or expert.
-    if (you.skills[skill] > 0 && you.skills[skill] < 27)
-    {
-        progress = make_stringf("(%d%%)  ",
-                                get_skill_percentage(skill));
-    }
 
-    std::string desc = make_stringf("%-14s Skill %2d  %s Aptitude %c%d",
+    std::string desc = make_stringf("%-14s Skill %4.1f Aptitude %c%d",
                                     skill_name(skill),
-                                    you.skills[skill],
-                                    progress.c_str(),
+                                    you.skill(skill, 10) / 10.0,
                                     apt > 0 ? '+' : ' ',
                                     apt);
 
@@ -76,8 +69,8 @@ int SkillRegion::handle_mouse(MouseEvent &event)
         }
 #endif
         m_last_clicked_item = item_idx;
-        if (you.skills[skill] == 0)
-            mpr("You cannot toggle a skill you don't have yet.");
+        if (!you.can_train[skill])
+            mpr("You cannot train this skill.");
         else if (you.skills[skill] >= 27)
             mpr("There's no point to toggling this skill anymore.");
         else
@@ -101,8 +94,7 @@ bool SkillRegion::update_tab_tip_text(std::string &tip, bool active)
 {
     const char *prefix = active ? "" : "[L-Click] ";
 
-    tip = make_stringf("%s%s",
-                       prefix, "Manage skills");
+    tip = make_stringf("%s%s", prefix, "Manage skills");
 
     return (true);
 }
@@ -236,9 +228,9 @@ void SkillRegion::update()
 
         if (skill > SK_UNARMED_COMBAT && skill < SK_SPELLCASTING)
             continue;
-
         InventoryTile desc;
-        desc.tile     = tileidx_skill(skill, you.train[skill]);
+        desc.tile     = tileidx_skill(skill, you.train[skill]
+                                             && you.can_train[skill]);
         desc.idx      = idx;
         desc.quantity = you.skills[skill];