fiddlerwoaroof/crawl - Change NY5JJY33IHF5EKTLPDFVYTN3PFNKV4A3MAH5MRQ3AWH53L2HFIQQC

On HUD:

Draw player name/race in yellow. Not great, I think; the rest of the HUD draws labels in, yellow and actual content in white, and this conflicts with that. Remove gold; shrink HUD by one line. Experience: David's idea Experiment: use ===— for hp/mp bar

On % screen: Make spelling and order of AC/Ev/Sh consistent with HUD Move gold to below HP/MP so god name is not cut off ("The Shining On***" looks awful)

Did not do: HP->Health on HUD; currently not enough space for "Health: 123/456 (789)"

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4068 c06c8d41-db1a-0410-9941-cceddc491573

Created by pauldubois on April 4, 2008

NY5JJY33IHF5EKTLPDFVYTN3PFNKV4A3MAH5MRQ3AWH53L2HFIQQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 4904 [6.16817]
B:BD[5.202] → [5.202:226]
```
#  define HUD_HEIGHT 15
```
[5.202]
[5.226]
```
#  define HUD_HEIGHT 14
```
Insertion in crawl-ref/source/skills.cc at line 27 [6.745542]
[7.164538]
[6.746114]
```
#include "output.h"
```
Insertion in crawl-ref/source/religion.cc at line 64 [6.804403]
[6.805616]
[6.805616]
```
#include "output.h"
```

Deletion in crawl-ref/source/player.h at line 315 [6.945993]

∅:D[8.224] → [6.958157:958335]

∅:D[3.2574] → [6.958157:958335]

B:BD[6.958157] → [6.958157:958335]

B:BD[6.958335] → [9.1023:1103]


/* ***********************************************************************
 * called from: skills
 * *********************************************************************** */
void redraw_skill(const std::string &your_name, const std::string &class_name);

Deletion in crawl-ref/source/player.cc at line 3947 [6.962854]
B:BD[6.1035911] → [6.1035911:1035912]
B:BD[6.1035912] → [9.1105:1184]
∅:D[9.1184] → [6.1035989:1035991]
B:BD[6.1035989] → [6.1035989:1035991]
B:BD[6.1035991] → [9.1185:1243]
∅:D[9.1243] → [6.1036142:1036143]
B:BD[6.1036142] → [6.1036142:1036143]
B:BD[6.1036143] → [9.1244:1277]
∅:D[9.1277] → [6.1036180:1036277]
B:BD[6.1036180] → [6.1036180:1036277]
B:BD[6.1036277] → [9.1278:1373]
∅:D[9.1373] → [6.1036410:1036411]
B:BD[6.1036410] → [6.1036410:1036411]
B:BD[6.1036411] → [9.1374:1448]
∅:D[9.1448] → [6.1036486:1036545]
∅:D[7.352481] → [6.1036486:1036545]
B:BD[6.1036486] → [6.1036486:1036545]
B:BD[6.1036545] → [9.1449:1546]
```
void redraw_skill(const std::string &your_name, const std::string &class_name)
{
    std::string title = your_name + " the " + class_name;
    int in_len = title.length();
    if (in_len > 40)
    {
        in_len -= 3;  // what we're getting back from removing "the"
        const int name_len = your_name.length();
        std::string trimmed_name = your_name;
        // squeeze name if required, the "- 8" is to not squeeze too much
        if (in_len > 40 && (name_len - 8) > (in_len - 40))
            trimmed_name =
                trimmed_name.substr(0, name_len - (in_len - 40) - 1);
```
Deletion in crawl-ref/source/player.cc at line 3948 [6.962854]
B:BD[6.1036668] → [9.1547:1597]
∅:D[9.1597] → [6.1036749:1036756]
B:BD[6.1036749] → [6.1036749:1036756]
B:BD[6.1036756] → [10.4232:4262]
∅:D[10.4262] → [6.1036926:1036955]
∅:D[11.7426] → [6.1036926:1036955]
∅:D[12.5747524] → [6.1036926:1036955]
B:BD[6.1036926] → [6.1036926:1036955]
B:BD[6.1036955] → [9.1598:1639]
∅:D[9.1639] → [13.1060:1061]
B:BD[6.1037034] → [13.1060:1061]
```
        title = trimmed_name + ", " + class_name;
    }
    cgotoxy(1, 1, GOTO_STAT);
    textcolor( LIGHTGREY );
    cprintf( "%-41s", title.c_str() );
}
```

Insertion in crawl-ref/source/output.h at line 59 [6.1087719]

[5.3639]

[14.4479]

void redraw_skill(const std::string &your_name, const std::string &class_name);

Replacement in crawl-ref/source/output.cc at line 130 [6.1088282]
∅:D[15.2579] → [16.2710:2761]
B:BD[12.5747672] → [16.2710:2761]
```
    const int width = crawl_view.hudsz.x - ox - 1;
```
[15.2579]
[15.2580]
```
    const int width = crawl_view.hudsz.x - (ox-1);
```
Replacement in crawl-ref/source/output.cc at line 151 [6.1088282]
B:BD[4.2612] → [4.2612:2636]
```
            putch('-');
```
[4.2612]
[4.2636]
```
            putch('=');
```
Replacement in crawl-ref/source/output.cc at line 283 [6.1088282]
B:BD[5.4697] → [5.4697:4725]
```
    // int col = -wherex();
```
[5.4697]
[17.3876]
```
    int col=-wherex();
```
Replacement in crawl-ref/source/output.cc at line 292 [6.1088282]
B:BD[6.1090044] → [5.4726:4750]
∅:D[5.4750] → [18.3677:3746]
B:BD[12.5748385] → [18.3677:3746]
```
    // col += wherex();
    int col = _count_digits(you.hp) + _count_digits(you.hp_max) + 1;
```
[6.1090044]
[17.4107]
```
    col += wherex();
```
Insertion in crawl-ref/source/output.cc at line 297 [6.1088282]
[17.4245]
[5.4789]
Replacement in crawl-ref/source/output.cc at line 773 [6.1088282]
B:BD[5.6120] → [5.6120:6145]
```
    // HP: 910/932 (999)
```
[5.6120]
[5.6145]
```
    // Health: 910/932 (999)
```
Replacement in crawl-ref/source/output.cc at line 775 [6.1088282]
B:BD[5.6163] → [5.6163:6195]
```
    // Str: 13           AC:  3
```
[5.6163]
[5.6195]
```
    // Str: 13        AC:  3
```
Deletion in crawl-ref/source/output.cc at line 778 [6.1088282]
B:BD[5.6253] → [5.6253:6269]
```
    // Gold: 30
```
Deletion in crawl-ref/source/output.cc at line 789 [6.1088282]
∅:D[5.7061] → [6.1099176:1099177]
B:BD[6.1099176] → [6.1099176:1099177]
B:BD[6.1099177] → [17.16596:16621]
∅:D[17.16621] → [6.1099231:1099237]
B:BD[6.1099231] → [6.1099231:1099237]
B:BD[6.1099237] → [5.7062:7098]
∅:D[5.7098] → [17.16657:16694]
B:BD[17.16657] → [17.16657:16694]
B:BD[17.16694] → [5.7099:7132]
∅:D[5.7132] → [17.16723:16729]
B:BD[17.16723] → [17.16723:16729]
∅:D[17.16729] → [6.1099462:1099463]
B:BD[6.1099462] → [6.1099462:1099463]
```
    if (you.redraw_gold)
    {
        cgotoxy(1+6, 8, GOTO_STAT);
        cprintf( "%-8d", you.gold );
        you.redraw_gold = false;
    }
```
Replacement in crawl-ref/source/output.cc at line 791 [6.1088282]
B:BD[17.16767] → [5.7133:7170]
```
        cgotoxy(1+12, 9, GOTO_STAT);
```
[17.16767]
[6.1100449]
```
        cgotoxy(1+12, 8, GOTO_STAT);
```

Replacement in crawl-ref/source/output.cc at line 798 [6.1088282]

B:BD[17.16983] → [17.16983:17092]

        cprintf( "%d/%lu  (%d)",
                 you.experience_level, you.experience, you.exp_available );

[17.16983]

[17.17092]

        cprintf( "Level %d  Pool %d",
                 you.experience_level, you.exp_available );

Replacement in crawl-ref/source/output.cc at line 803 [6.1088282]
B:BD[17.17132] → [17.17132:17167]
```
        you.redraw_experience = 0;
```
[17.17132]
[17.17167]
```
        you.redraw_experience = false;
```

Replacement in crawl-ref/source/output.cc at line 805 [6.1088282]

∅:D[17.17173] → [19.227:228]

B:BD[19.227] → [19.227:228]

B:BD[19.228] → [5.7171:7329]


    if (you.wield_change)  { you.wield_change = false;  _print_stats_wp(11); }
    if (you.quiver_change) { you.quiver_change = false; _print_stats_qv(12); }

[17.17173]

[6.1100733]

    if (you.wield_change)  { you.wield_change = false;  _print_stats_wp(10); }
    if (you.quiver_change) { you.quiver_change = false; _print_stats_qv(11); }

Replacement in crawl-ref/source/output.cc at line 810 [6.1088282]
B:BD[17.17388] → [5.7330:7362]
```
        _print_stats_line1(13);
```
[17.17388]
[6.1100904]
```
        _print_stats_line1(12);
```
Replacement in crawl-ref/source/output.cc at line 813 [6.1088282]
B:BD[17.17473] → [5.7363:7395]
```
        _print_stats_line2(14);
```
[17.17473]
[6.1101067]
```
        _print_stats_line2(13);
```
Replacement in crawl-ref/source/output.cc at line 816 [6.1088282]
B:BD[17.17558] → [5.7396:7428]
```
        _print_stats_line3(15);
```
[17.17558]
[6.1101356]
```
        _print_stats_line3(14);
```
Replacement in crawl-ref/source/output.cc at line 827 [6.1088282]
B:BD[5.7541] → [5.7541:7572]
```
    cgotoxy(7, 10, GOTO_STAT);
```
[5.7541]
[5.7572]
```
    cgotoxy(7, 9, GOTO_STAT);
```

Insertion in crawl-ref/source/output.cc at line 835 [6.1088282]

[5.7741]


void redraw_skill(const std::string &your_name, const std::string &class_name)
{
    std::string title = your_name + " the " + class_name;
    int in_len = title.length();
    const int WIDTH = 40; // use crawl_view.hudsz.x instead?
    if (in_len > WIDTH)
    {
        in_len -= 3;  // what we're getting back from removing "the"

Insertion in crawl-ref/source/output.cc at line 846 [6.1088282]

[5.7742]

        const int name_len = your_name.length();
        std::string trimmed_name = your_name;
        // squeeze name if required, the "- 8" is to not squeeze too much
        if (in_len > WIDTH && (name_len - 8) > (in_len - WIDTH))
            trimmed_name =
                trimmed_name.substr(0, name_len - (in_len - WIDTH) - 1);
        title = trimmed_name + ", " + class_name;
    }
    cgotoxy(1, 1, GOTO_STAT);
    textcolor( YELLOW );
    cprintf( "%-41s", title.c_str() );
    cgotoxy(1, 2, GOTO_STAT);
    cprintf("%s", species_name( you.species, you.experience_level ).c_str());
    if (you.wizard)
    {
        textcolor( LIGHTBLUE );
        cgotoxy(1 + crawl_view.hudsz.x-9, 2, GOTO_STAT);
        cprintf(" *WIZARD*");
    }
    textcolor( LIGHTGREY );
}

Deletion in crawl-ref/source/output.cc at line 880 [6.1088282]

B:BD[5.7864] → [5.7864:8037]

    cgotoxy(1, 2, GOTO_STAT);
    cprintf( "%s %s",
             species_name( you.species, you.experience_level ).c_str(),
             (you.wizard ? "*WIZARD*" : "" ) );

Replacement in crawl-ref/source/output.cc at line 887 [6.1088282]

B:BD[5.8325] → [5.8325:8429]

    cgotoxy( 1, 8, GOTO_STAT); cprintf("Gold:");
    cgotoxy( 1, 9, GOTO_STAT); cprintf("Experience:");

[5.8325]

[5.8429]

    cgotoxy( 1, 8, GOTO_STAT); cprintf("Experience:");

Replacement in crawl-ref/source/output.cc at line 897 [6.1088282]
B:BD[5.8690] → [5.8690:8739]
```
    cgotoxy( 1,10, GOTO_STAT); cprintf("Level");
```
[5.8690]
[5.8739]
```
    cgotoxy( 1,9, GOTO_STAT); cprintf("Level");
```
Deletion in crawl-ref/source/output.cc at line 1682 [6.1088282]
∅:D[20.53448] → [21.2445:2446]
B:BD[21.2445] → [21.2445:2446]
Insertion in crawl-ref/source/output.cc at line 1686 [6.1088282]
[20.53587]
[20.53587]
```
    cols1.add_formatted(0, buf, false);
```
Insertion in crawl-ref/source/output.cc at line 1688 [6.1088282]
[20.53588]
[20.53588]
```
    snprintf(buf, sizeof buf, "Gold %d", you.gold);
```

Replacement in crawl-ref/source/output.cc at line 1712 [6.1088282]

B:BD[20.54396] → [20.54396:54426]

B:BD[20.54426] → [22.737:810]

∅:D[22.810] → [20.54499:54593]

B:BD[20.54499] → [20.54499:54593]

    snprintf(buf, sizeof buf,
             "AC %2d\n"
             "EV %2d\n"
             "Sh %2d\n",
             player_AC(),
             player_evasion(),
             player_shield_class());

[20.54396]

[20.54593]

    snprintf(buf, sizeof buf, "AC %2d" , player_AC());
    cols1.add_formatted(2, buf, false);
    if (you.equip[EQ_SHIELD] == -1)
    {
        textcolor( DARKGREY );
        snprintf(buf, sizeof buf, "Sh  <darkgrey>-</darkgrey>");
    }
    else
    {
        snprintf(buf, sizeof buf, "Sh %2d", player_shield_class());
    }

Insertion in crawl-ref/source/output.cc at line 1724 [6.1088282]

[20.54633]

    snprintf(buf, sizeof buf, "Ev %2d" , player_evasion());
    cols1.add_formatted(2, buf, false);

Replacement in crawl-ref/source/output.cc at line 1744 [6.1088282]

B:BD[20.55246] → [20.55246:55304]

            godpowers = godpowers.substr(0, 17 - prank) +

[20.55246]

[20.55304]

            godpowers = godpowers.substr(0, 29 - prank) + " " +

Replacement in crawl-ref/source/output.cc at line 1752 [6.1088282]
∅:D[23.177] → [22.931:983]
B:BD[22.931] → [22.931:983]
```
             "God: %s%s<lightgrey>      Gold: %d\n"
```
[23.177]
[22.983]
```
             "God: %s%s<lightgrey>\n"
```
Replacement in crawl-ref/source/output.cc at line 1757 [6.1088282]
∅:D[2.126] → [22.1122:1180]
∅:D[23.358] → [22.1122:1180]
B:BD[22.1122] → [22.1122:1180]
```
             god_colour_tag, godpowers.c_str(), you.gold,
```
[2.126]
[22.1180]
```
             god_colour_tag, godpowers.c_str(),
```
Insertion in crawl-ref/source/debug.cc at line 80 [6.4016436]
[8.584]
[24.101414]
```
#include "output.h"
```

On HUD:

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/view.cc at line 4904 [6.16817]

Insertion in crawl-ref/source/skills.cc at line 27 [6.745542]

Insertion in crawl-ref/source/religion.cc at line 64 [6.804403]

Deletion in crawl-ref/source/player.h at line 315 [6.945993]

Deletion in crawl-ref/source/player.cc at line 3947 [6.962854]

Deletion in crawl-ref/source/player.cc at line 3948 [6.962854]

Insertion in crawl-ref/source/output.h at line 59 [6.1087719]

Replacement in crawl-ref/source/output.cc at line 130 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 151 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 283 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 292 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 297 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 773 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 775 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 778 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 789 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 791 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 798 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 803 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 805 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 810 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 813 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 816 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 827 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 835 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 846 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 880 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 887 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 897 [6.1088282]

Deletion in crawl-ref/source/output.cc at line 1682 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 1686 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 1688 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1712 [6.1088282]

Insertion in crawl-ref/source/output.cc at line 1724 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1744 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1752 [6.1088282]

Replacement in crawl-ref/source/output.cc at line 1757 [6.1088282]

Insertion in crawl-ref/source/debug.cc at line 80 [6.4016436]