[crawl-ref-commits] master branch updated: 0.10-a0-1013-g62073ec

[<gi...@cr...>]

       via  62073eca300b35bfca02989c50080772965c3293 (commit)
       via  d2e0e9fcb46cebd0f7d75b46241157c3230cbf3a (commit)
      from  57c139695c6f4b021b145273035b0c5ff260973f (commit)

-----------------------------------------------------------------------
commit 62073eca300b35bfca02989c50080772965c3293
Author: Raphael Langella <rap...@gm...>
Date:   Thu Sep 29 23:46:18 2011 +0200

    Update the skill screen help.

commit d2e0e9fcb46cebd0f7d75b46241157c3230cbf3a
Author: Raphael Langella <rap...@gm...>
Date:   Thu Sep 29 23:36:43 2011 +0200

    Fix potions of experience when skill_focus is set to false.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/dat/database/help.txt |   16 +++++++---------
 crawl-ref/source/skill_menu.cc         |    2 +-
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/crawl-ref/source/dat/database/help.txt b/crawl-ref/source/dat/database/help.txt
index 664a3b6..57ca481 100644
--- a/crawl-ref/source/dat/database/help.txt
+++ b/crawl-ref/source/dat/database/help.txt
@@ -178,13 +178,13 @@ It is not a bug if you gain a skill level in Axes after killing a monster with
 a spell.
 
 You can toggle a skill by pressing its letter. If a skill is deselected
-(<darkgrey>darkened</darkgrey>), it will not be trained at all.  A skill set to
-focus (marked with <w>*</w>) will be trained faster than others.
+(<darkgrey>darkened</darkgrey>), it will not be trained at all. A skill set to focus (marked with <w>*</w>)
+will be trained faster than others.
 
-To gain new skills, you have to practise them. This means using a weapon in
-combat, casting spells or disarming traps for example. The skill will then
-be trained when you gain experience, and when it reaches level 1, you will
-be able to disable or focus it like any other.
+To train skills, you need to be able to practise them. This means carrying a
+weapon of the appropriate type, or knowing a spell from the school you want to
+train. Some skills like Dodging and Spellcasting have no restrictions and can
+always be trained.
 
 Training can be done in two modes:
 * automatic: Skills are trained by your use of them.
@@ -211,8 +211,6 @@ example god powers. These skill modifiers are shown in <blue>blue</blue>.
 Apart from (de)selecting skills, you also have the following commands:
 <w>/</w> :  Switch between automatic and manual training.
 <w>?</w> :  Allows you to read the descriptions of skills.
-<w>*</w> :  Shows all skills, even those you don't have yet.
-<w>!</w> :  Switch between progress (how far on the way to the next level) and
-      training rate, i.e. how much experience is spent on a skill.
+<w>*</w> :  Shows all skills, even those you can't train yet.
 <w>_</w> :  Shows/hides skill modifiers, e.g. from god powers.
 %%%%
diff --git a/crawl-ref/source/skill_menu.cc b/crawl-ref/source/skill_menu.cc
index cce297c..ceeef86 100644
--- a/crawl-ref/source/skill_menu.cc
+++ b/crawl-ref/source/skill_menu.cc
@@ -813,7 +813,7 @@ int SkillMenu::get_saved_skill_level(skill_type sk, bool real)
 
 skill_menu_state SkillMenu::get_state(skill_menu_switch sw)
 {
-    if (is_set(SKMF_EXPERIENCE) && !m_switches[sw])
+    if (is_set(SKMF_EXPERIENCE))
     {
         switch (sw)
         {


-- 
Dungeon Crawl Stone Soup