diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-27 11:12:31 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-27 11:12:31 +0000 |
| commit | 612b5c431864991b19105694131ba1314012e631 (patch) | |
| tree | d5603abb33e3d28c6af8091e6e44cc328f374535 /crawl-ref/source/skills2.cc | |
| parent | ddb3328fdce3844daff10045995f8ee2c097fff0 (diff) | |
| download | crawl-ref-612b5c431864991b19105694131ba1314012e631.tar.gz crawl-ref-612b5c431864991b19105694131ba1314012e631.zip | |
Some spacing clean-up in the tutorial code (thanks for the additions,
Matthew!) and fix BR 1974056 (wrong colouring of tutorial skills
information).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5293 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/skills2.cc')
| -rw-r--r-- | crawl-ref/source/skills2.cc | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/crawl-ref/source/skills2.cc b/crawl-ref/source/skills2.cc index e3d7f6555d..baf2d7f8d5 100644 --- a/crawl-ref/source/skills2.cc +++ b/crawl-ref/source/skills2.cc @@ -38,6 +38,7 @@ #include "randart.h" #include "stuff.h" #include "transfor.h" +#include "tutorial.h" #include "view.h" /* Basic goals for titles: @@ -1793,12 +1794,12 @@ static void _display_skill_table(bool show_aptitudes) (prev_needed * spec_abil) / 100) * 100) / (((needed - prev_needed) * spec_abil) / 100); - if ( percent_done == 100 ) + if (percent_done == 100) --percent_done; - if ( percent_done == 0 ) + if (percent_done == 0) ++percent_done; - if ( !show_aptitudes ) + if (!show_aptitudes) { textcolor(CYAN); cprintf( " (%2d%%)", (percent_done / 5) * 5 ); @@ -1809,12 +1810,12 @@ static void _display_skill_table(bool show_aptitudes) // Modify Spellcasting, Evocations, Invocations for // aptitude display. - if ( x == SK_SPELLCASTING ) + if (x == SK_SPELLCASTING) { spec_abil *= 10; spec_abil /= 13; } - else if ( x == SK_INVOCATIONS || x == SK_EVOCATIONS ) + else if (x == SK_INVOCATIONS || x == SK_EVOCATIONS) { spec_abil *= 4; spec_abil /= 3; @@ -1830,20 +1831,13 @@ static void _display_skill_table(bool show_aptitudes) if (Options.tutorial_left) { - textcolor(MAGENTA); cgotoxy(1, bottom_line-5); - formatted_string::parse_block( - "This screen shows the skill set of your character. You can pick up new" EOL - "skills by performing the corresponding actions. The number next to the" EOL - "skill is your current level, the higher the better. The blue percent " EOL - "value shows your progress towards the next skill level. You can toggle" EOL - "which skills to train by pressing their slot letters. A <darkgrey>greyish</darkgrey> skill " EOL - "will increase at a decidedly slower rate and ease training of others. ", - false).display(); + // Doesn't mention the toggle between progress/aptitudes. + print_tut_skills_info(); } else { - // if any more skills added, must adapt letters to go into caps + // NOTE: If any more skills added, must adapt letters to go into caps. cgotoxy(1, bottom_line-1); textcolor(LIGHTGREY); cprintf("Press the letter of a skill to choose " |