fiddlerwoaroof/crawl - Change IMC2HA2YWCU7SLGGVQQVUEUIST4ILSOEAUYXNZAW2PJZ475GXLDAC

Fix tiles compile (in a hacky way, since I don't know what the mp/hp

bar change was really about).

Modify mutations screen for Vampires to allow a toggle to a second page that lists all those resistances and stuff depending on their blood level. The screen (designed by David) is really neat, but the underlying could stand to be improved, and it might be too large, as well.

Also restrict Sublimation of Blood to Vampires that are at least Full, and it also makes them a bit more thirsty (since they presumably lose blood when using it). Dispel Undead only does half damage to Vampires at Alive, and 66% damage at Full or Very Full.

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

Created by j-p-e-g on April 18, 2008

IMC2HA2YWCU7SLGGVQQVUEUIST4ILSOEAUYXNZAW2PJZ475GXLDAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/spells3.cc at line 369 [4.531613]

[4.540206]

        else if (you.species == SP_VAMPIRE && you.hunger_state < HS_FULL)
        {
            mpr("You don't have enough blood to draw power from your "
                "own body.");
        }

Replacement in crawl-ref/source/spells3.cc at line 382 [4.531613]

B:BD[4.540428] → [4.540428:540502]

            while (you.magic_points < you.max_magic_points && you.hp > 1)

[4.540428]

[4.540502]

            int food = 0; // for Vampires
            while (you.magic_points < you.max_magic_points && you.hp > 1
                   && (you.species != SP_VAMPIRE || you.hunger - food >= 7000))

Insertion in crawl-ref/source/spells3.cc at line 388 [4.531613]

[4.540584]


                if (you.species == SP_VAMPIRE)
                    food += 15;

Insertion in crawl-ref/source/spells3.cc at line 401 [4.531613]
[4.540860]
[4.540860]
```
            make_hungry(food, false);
```

Replacement in crawl-ref/source/skills2.cc at line 1839 [4.647133]

B:BD[5.2671] → [5.2671:2779]

            "which skills to train by pressing their slot letters. A <darkgrey>greyish<magenta> skill " EOL

[5.2671]

[5.2779]

            "which skills to train by pressing their slot letters. A <darkgrey>greyish</darkgrey> skill " EOL

Replacement in crawl-ref/source/player.cc at line 3517 [4.962854]

B:BD[6.3975] → [6.3975:4034]

                         || you.hunger_state <= HS_HUNGRY)

[6.3975]

[7.6279]

                         || you.hunger_state <= HS_NEAR_STARVING)

Insertion in crawl-ref/source/player.cc at line 3521 [4.962854]

[7.6461]

[8.234]

                else if (you.hunger_state <= HS_HUNGRY)
                    stealth += (you.skills[SK_STEALTH] * 19);

Replacement in crawl-ref/source/output.cc at line 115 [4.1088282]

B:BD[3.4578] → [3.4578:4650]

            else if (old_val > val && old_disp > disp && cx < old_disp)

[3.4578]

[3.4650]

            else if (/*old_val > val &&*/ old_disp > disp && cx < old_disp)

Replacement in crawl-ref/source/output.cc at line 569 [4.1088282]
B:BD[3.7437] → [3.7437:7442]
```
//  
```
[3.7437]
[3.7442]
```
//
```

Insertion in crawl-ref/source/mutation.cc at line 1390 [4.1263003]

[2.115]

[9.4547]


    if (you.species == SP_VAMPIRE)
    {
        result += EOL EOL;
        result += EOL EOL;
        result += "Press '<w>!</w>' to toggle between mutations and properties depending on your" EOL
                  "hunger status." EOL;
    }

Insertion in crawl-ref/source/mutation.cc at line 1401 [4.1263003]

[9.4601]


static void _display_vampire_attributes()
{
    clrscr();
    cgotoxy(1,1);
    std::string result;
    std::string column[9][7] =
    {
       {"                     ", "<lightgreen>Alive</lightgreen>      ", "<green>Full</green>    ",
        "Satiated  ", "<yellow>Thirsty</yellow>  ", "<yellow>Near...</yellow>  ",
        "<lightred>Bloodless</lightred>"},
                                //Alive          Full        Satiated       Thirsty    Near...      Bloodless
       {"Metabolism           ", "very fast  ", "fast    ", "fast      ",  "normal   ", "slow     ", "none"},
       {"Regeneration         ", "very fast  ", "fast    ", "normal    ",  "normal   ", "slow     ", "none"},
       {"Poison resistance    ", "           ", "        ", " +        ",  " +       ", " +       ", " +   "},
       {"Cold resistance      ", "           ", "        ", "          ",  " +       ", " +       ", " ++  "},
       {"Negative resistance  ", "           ", "        ", "          ",  " +       ", " ++      ", " +++ "},
       {"Torment resistance   ", "           ", "        ", "          ",  "         ", "         ", " +   "},
       {"Mutation effects     ", "full       ", "capped  ", "capped    ",  "none     ", "none     ", "none "},
       {"Stealth boost        ", "none       ", "none    ", "none      ",  "minor    ", "major    ", "large"}
    };

Insertion in crawl-ref/source/mutation.cc at line 1432 [4.1263003]

[9.4602]

    int current = 0;
    switch (you.hunger_state)
    {
    case HS_ENGORGED:
        current = 1;
        break;
    case HS_VERY_FULL:
    case HS_FULL:
        current = 2;
        break;
    case HS_SATIATED:
        current = 3;
        break;
    case HS_HUNGRY:
    case HS_VERY_HUNGRY:
        current = 4;
        break;
    case HS_NEAR_STARVING:
        current = 5;
        break;
    case HS_STARVING:
        current = 6;
    }
    for (int y = 0; y < 9; y++)      // lines   (properties)
    {
        for (int x = 0; x < 7; x++)  // columns (hunger states)
        {
             if (y > 0 && x == current)
                 result += "<w>";
             result += column[y][x];
             if (y > 0 && x == current)
                 result += "</w>";
        }
        result += EOL;
    }
/*
    result = "                     <lightgreen>Alive</lightgreen>      <green>Full</green>    Satiated  "
                                  "<yellow>Thirsty  Near...</yellow>  <lightred>Bloodless</lightred>" EOL
             "Metabolism           very fast  fast    fast      normal   slow     none " EOL
             "Regeneration         very fast  fast    normal    normal   slow     none " EOL
             "Poison resistance                        +         +        +        +   " EOL
             "Cold resistance                                    +        +        ++  " EOL
             "Negative resistance                                +        ++       +++ " EOL
             "Torment resistance                                                   +   " EOL
             "Mutation effects     full       capped  capped    none     none     none " EOL
             "Stealth boost        none       none    none      minor    major    large" EOL;
*/
    result += EOL EOL;
    result += EOL EOL;
    result += EOL EOL;
    result += "Press '<w>!</w>' to toggle between mutations and properties depending on your " EOL
              "hunger status." EOL;
    const formatted_string vp_props = formatted_string::parse_string(result);
    vp_props.display();
    if (you.species == SP_VAMPIRE)
    {
        const int keyin = getch();
        if (keyin == '!')
            display_mutations();
    }
}

Replacement in crawl-ref/source/mutation.cc at line 1504 [4.1263003]

B:BD[10.2621] → [10.2621:2684]

    Menu mutation_menu(mutation_fs);
    mutation_menu.show();

[10.2621]

[9.4813]


    if (you.species == SP_VAMPIRE)
    {
        mutation_fs.display();
        const int keyin = getch();
        if (keyin == '!')
            _display_vampire_attributes();
    }
    else
    {
        Menu mutation_menu(mutation_fs);
        mutation_menu.show();
    }

Insertion in crawl-ref/source/food.cc at line 81 [4.3043806]
[4.3045535]
[4.3045535]
```
    if (hunger_amount == 0)
        return;
```
Insertion in crawl-ref/source/command.cc at line 1312 [4.4082507]
[10.7792]
[10.7792]
```
    {
```
Insertion in crawl-ref/source/command.cc at line 1315 [4.4082507]
[10.7892]
[11.28891]
```
    }
```

Replacement in crawl-ref/source/beam.cc at line 208 [4.4128068]

B:BD[12.1221950] → [12.1221950:1222002]

B:BD[12.1222002] → [13.703:766]

                          || flavour == BEAM_BANISH
                          || flavour == BEAM_BLINK)  ? EC_WARP

[12.1221950]

[12.1222066]

                        || flavour == BEAM_BANISH
                        || flavour == BEAM_BLINK)    ? EC_WARP

Insertion in crawl-ref/source/beam.cc at line 3456 [4.4128068]

[4.4229968]

[14.17942]

            if (you.species == SP_VAMPIRE)
            {
                if (you.hunger_state == HS_ENGORGED)
                    beam.damage.size /= 2;
                else if (you.hunger_state > HS_SATIATED)
                {
                    beam.damage.size *= 2;
                    beam.damage.size /= 3;
                }
            }