fiddlerwoaroof/crawl - Change YWYXUCZKGNIAWAUKUESIPFCAL5HZOKOEWHUEUW7X4DMAX2HG2FSAC

Added hp_colour and mp_colour per 1606160. Removed hp_attention.

hp_warning is still there for the * * * LOW HITPOINT WARNING * * * message.

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

Created by haranp on December 3, 2006

YWYXUCZKGNIAWAUKUESIPFCAL5HZOKOEWHUEUW7X4DMAX2HG2FSAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/output.cc at line 68 [3.1088282]

B:BD[3.1089532] → [3.1089532:1089663]

        const int hp_warn = MAXIMUM( 25, Options.hp_warning );
        const int hp_attent = MAXIMUM( 10, Options.hp_attention );

[3.1089532]

[3.1089663]

        const int hp_percent = (you.hp * 100) / max_max_hp;
        for ( unsigned int i = 0; i < Options.hp_colour.size(); ++i )
        {
            if ( i+1 == Options.hp_colour.size() ||
                 hp_percent > Options.hp_colour[i+1].first )
            {
                textcolor(Options.hp_colour[i].second);
                break;
            }
        }

Deletion in crawl-ref/source/output.cc at line 81 [3.1088282]

B:BD[3.1089687] → [3.1089687:1089858]

        if (you.hp <= (you.hp_max * hp_warn) / 100)
            textcolor(RED);
        else if (you.hp <= (you.hp_max * hp_attent) / 100)
            textcolor(YELLOW);

Insertion in crawl-ref/source/output.cc at line 100 [3.1088282]

[3.1090213]


        const int mp_percent = (you.magic_points * 100) / you.max_magic_points;
        for ( unsigned int i = 0; i < Options.mp_colour.size(); ++i )
        {
            if ( i+1 == Options.mp_colour.size() ||
                 mp_percent > Options.mp_colour[i+1].first )
            {
                textcolor(Options.mp_colour[i].second);
                break;
            }
        }

Replacement in crawl-ref/source/output.cc at line 113 [3.1088282]

B:BD[3.1090237] → [3.1090237:1090305]

        cprintf( "%d/%d", you.magic_points, you.max_magic_points );

[3.1090237]

[3.1090305]

        cprintf( "%d", you.magic_points);
        textcolor(LIGHTGREY);
        cprintf("/%d", you.max_magic_points );

Deletion in crawl-ref/source/initfile.cc at line 572 [3.2957258]
B:BD[4.792503] → [4.792503:792536]
```
    hp_attention           = 25;
```

Insertion in crawl-ref/source/initfile.cc at line 708 [3.2957258]

[5.396733]

[4.795561]

    hp_colour.clear();
    hp_colour.push_back(std::pair<int,int>(100, LIGHTGREY));
    hp_colour.push_back(std::pair<int,int>(50, YELLOW));
    hp_colour.push_back(std::pair<int,int>(25, RED));
    mp_colour.clear();
    mp_colour.push_back(std::pair<int, int>(100, LIGHTGREY));
    mp_colour.push_back(std::pair<int, int>(50, YELLOW));
    mp_colour.push_back(std::pair<int, int>(25, RED));

Deletion in crawl-ref/source/initfile.cc at line 1637 [3.2957258]
∅:D[4.804343] → [5.414594:414632]
B:BD[5.414594] → [5.414594:414632]
∅:D[5.414632] → [3.2976344:2976354]
B:BD[3.2976344] → [3.2976344:2976354]
B:BD[3.2976354] → [5.414633:414681]
B:BD[5.414681] → [4.804344:804442]
∅:D[5.414803] → [3.2976388:2976398]
∅:D[4.804442] → [3.2976388:2976398]
B:BD[3.2976388] → [3.2976388:2976398]
B:BD[3.2976398] → [4.804443:804473]
∅:D[4.804473] → [5.414842:414910]
B:BD[5.414842] → [5.414842:414910]
```
                     field.c_str() );
        }
    }
    else if (key == "hp_attention")
    {
        hp_attention = atoi( field.c_str() );
        if (hp_attention < 0 || hp_attention > 100)
        {
            hp_attention = 0;
            fprintf( stderr, "Bad HP attention percentage -- %s\n",
```

Replacement in crawl-ref/source/initfile.cc at line 1755 [3.2957258]

B:BD[4.806428] → [4.806428:806496]

	std::vector<std::string> thesplit =
	    split_string(":", field);

[4.806428]

[4.806496]

	std::vector<std::string> thesplit = split_string(":", field);

Insertion in crawl-ref/source/initfile.cc at line 1764 [3.2957258]

[5.417560]

[4.806674]

    else if (key == "hp_colour" || key == "hp_color")
    {
        hp_colour.clear();
        std::vector<std::string> thesplit = split_string(",", field);
        for ( unsigned i = 0; i < thesplit.size(); ++i )
        {
            std::vector<std::string> insplit = split_string(":", thesplit[i]);
            int hp_percent = 100;
            if ( insplit.size() == 0 || insplit.size() > 2 ||
                 (insplit.size() == 1 && i != 0) )
            {
                fprintf(stderr, "Bad hp_colour string: %s\n", field.c_str());
                break;
            }
            if ( insplit.size() == 2 )
                hp_percent = atoi(insplit[0].c_str());
            int scolour = str_to_colour(insplit[(insplit.size()==1) ? 0 : 1]);
            hp_colour.push_back(std::pair<int, int>(hp_percent, scolour));
        }
    }
    else if (key == "mp_color" || key == "mp_colour")
    {
        mp_colour.clear();
        std::vector<std::string> thesplit = split_string(",", field);
        for ( unsigned i = 0; i < thesplit.size(); ++i )
        {
            std::vector<std::string> insplit = split_string(":", thesplit[i]);
            int mp_percent = 100;
            if ( insplit.size() == 0 || insplit.size() > 2 ||
                 (insplit.size() == 1 && i != 0) )
            {
                fprintf(stderr, "Bad mp_colour string: %s\n", field.c_str());
                break;
            }
            if ( insplit.size() == 2 )
                mp_percent = atoi(insplit[0].c_str());
            int scolour = str_to_colour(insplit[(insplit.size()==1) ? 0 : 1]);
            mp_colour.push_back(std::pair<int, int>(mp_percent, scolour));
        }
    }

Replacement in crawl-ref/source/initfile.cc at line 1813 [3.2957258]
B:BD[4.806784] → [4.806784:806836]
```
	for ( unsigned i = 0; i < thesplit.size(); ++i ) {
```
[4.806784]
[4.806836]
```
	for ( unsigned i = 0; i < thesplit.size(); ++i )
        {
```
Replacement in crawl-ref/source/initfile.cc at line 1816 [3.2957258]
B:BD[4.806878] → [4.806878:806913]
```
	    if ( num > 0 && num <= 27 ) {
```
[4.806878]
[4.806913]
```
	    if ( num > 0 && num <= 27 )
```
Replacement in crawl-ref/source/initfile.cc at line 1818 [3.2957258]
B:BD[4.806949] → [4.806949:806968]
```
	    }
	    else {
```
[4.806949]
[4.806968]
```
	    else
            {
```
Deletion in crawl-ref/source/externs.h at line 777 [3.3270163]
B:BD[3.3284628] → [3.3284628:3284698]
```
    int         hp_attention;   // percentage hp for danger attention
```

Insertion in crawl-ref/source/externs.h at line 807 [3.3270163]

[5.443753]

[4.899475]

    std::vector<std::pair<int, int> > hp_colour;
    std::vector<std::pair<int, int> > mp_colour;

Replacement in crawl-ref/init.txt at line 153 [3.4830895]

B:BD[2.1132] → [2.1132:1152]

# hp_attention = 25

[2.1132]

[2.1152]

# hp_colour = lightgrey, 99:green, 50:yellow, 25:red
# mp_colour = lightgrey, 99:green, 50:yellow, 25:red

Replacement in crawl-ref/docs/crawl_options.txt at line 48 [6.63392]

B:BD[2.3648] → [2.3648:3703]

		hp_warning, hp_attention, always_greet, terse_hand,

[2.3648]

[2.3703]

		hp_warning, hp_colour, mp_colour, always_greet, terse_hand,

Replacement in crawl-ref/docs/crawl_options.txt at line 652 [6.63392]

B:BD[2.28959] → [2.28959:29074]

hp_attention = 25
	hp_attention gives a less alert warning than hp_warning (it appears in
	yellow instead of red).

[2.28959]

[2.29074]

hp_colour = lightgrey, 50:yellow, 25:red
	hp_colour colours your HP appropriately in the display. In the
	default setting, your HP will appear in red if at less then 25%,
	yellow if at less than 50%, and lightgrey otherwise.

Insertion in crawl-ref/docs/crawl_options.txt at line 657 [6.63392]

[2.29075]

mp_colour = lightgrey, 50:yellow, 25:red
	mp_colour does to MP what hp_colour does to HP.