fiddlerwoaroof/crawl - Change TRCCLE5RJ4VJULBOWOI2WC3RJU7WTEGS7RRQTDQL6W5UU246LKTQC

Fix 1909592: trunk not compiling on Windows

Improve information output for vampires in the screens 'A', '@' and '%'. Reduce the "in touch with the powers of death" effect to one boost at xl 6, and disallow bat form at engorged. Also, modify messages if they are not available right away for feeding reasons.

What's still missing is a way to output those temporary resistances (currently only discernible from the '%' screen), preferentially in the form of some general statements on 'A': "When hungry, you gain resistance to cold." and more detailed descriptions on '@'.

Fix a couple of wrong hunger status checks.

Comment out the "Very agile monsters are quite hard to hit in your current equipment." messages because to my knowledge they hold little importance right now. Please correct me if that view is wrong.

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

Created by j-p-e-g on March 7, 2008

TRCCLE5RJ4VJULBOWOI2WC3RJU7WTEGS7RRQTDQL6W5UU246LKTQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 1438 [8.962854]

B:BD[6.4845] → [7.329:380]

∅:D[7.380] → [6.4896:4978]

B:BD[6.4896] → [6.4896:4978]

        // Vampires get bonus only when not hungry
        if (you.experience_level >= 13 && you.hunger_state > HS_HUNGRY)
        {

[6.4845]

[8.982945]

        // Vampires get bonus only when hungry
        if (you.experience_level >= 13 && you.hunger_state <= HS_HUNGRY)

Deletion in crawl-ref/source/player.cc at line 1441 [8.962854]

B:BD[8.982963] → [6.4979:5055]

            if (you.experience_level >= 26)
                sd++;
        }

Deletion in crawl-ref/source/player.cc at line 2393 [8.962854]

B:BD[9.2737] → [5.3631:3718]


    /* Vampires can see invisible */
    if (you.species == SP_VAMPIRE)
        si++;

Replacement in crawl-ref/source/player.cc at line 2933 [8.962854]

B:BD[6.5666] → [10.170:240]

∅:D[11.232] → [6.5727:5777]

∅:D[10.240] → [6.5727:5777]

B:BD[6.5727] → [6.5727:5777]

                    mpr( "You can now transform into a vampire bat.",
                          MSGCH_INTRINSIC_GAIN );

[6.5666]

[6.5777]

                    if (you.hunger_state == HS_ENGORGED)
                    {
                        mpr( "If you weren't so full you could now transform "
                             "into a vampire bat.", MSGCH_INTRINSIC_GAIN );
                    }
                    else
                    {
                        mpr( "You can now transform into a vampire bat.",
                             MSGCH_INTRINSIC_GAIN );
                    }

Replacement in crawl-ref/source/player.cc at line 2944 [8.962854]

B:BD[6.5795] → [6.5795:5878]

                else if (you.experience_level == 13 || you.experience_level == 26)

[6.5795]

[6.5878]

                else if (you.experience_level == 13)

Replacement in crawl-ref/source/player.cc at line 2946 [8.962854]

B:BD[6.5896] → [6.5896:6022]

                    mpr( "You feel more in touch with the powers of death.",
                         MSGCH_INTRINSIC_GAIN );

[6.5896]

[6.6022]

                    mprf( MSGCH_INTRINSIC_GAIN,
                          "You feel %sin touch with the powers of death.",
                          (you.hunger_state <= HS_HUNGRY ? "" : "strangely "));

Replacement in crawl-ref/source/player.cc at line 3494 [8.962854]

B:BD[8.1030692] → [8.1030692:1030715]

    if (you.is_undead)

[8.1030692]

[8.1030715]

    if (you.species == SP_VAMPIRE && you.hunger_state == HS_ENGORGED)
        mpr( "You feel almost alive." );
    else if (you.is_undead)

Insertion in crawl-ref/source/player.cc at line 3564 [8.962854]

[8.1032223]

[12.599]

    if (you.disease && !you.duration[DUR_REGENERATION]
        || you.species == SP_VAMPIRE && you.hunger_state <= HS_STARVING)
    {
        mpr("You do not heal.");
    }
    else if (you.species == SP_VAMPIRE)
    {
        if (you.hunger_state <= HS_HUNGRY)
            mpr("You heal slowly.");
        else if (you.hunger_state == HS_ENGORGED)
            mpr("You heal very quickly.");
        else if (you.hunger_state >= HS_FULL)
            mpr("You heal quickly.");
    }

Replacement in crawl-ref/source/player.cc at line 3580 [8.962854]

B:BD[12.638] → [12.638:779]

        && (you.species != SP_VAMPIRE || you.hunger_state >= HS_HUNGRY)
        || you.species == SP_VAMPIRE && you.hunger_state >= HS_FULL)

[12.638]

[6.6648]

        && (you.species != SP_VAMPIRE || you.hunger_state > HS_STARVING))

Replacement in crawl-ref/source/player.cc at line 3585 [8.962854]

B:BD[6.6752] → [2.233:277]

            mpr( "You are regenerating." );

[6.6752]

[6.6753]

            mpr("You are regenerating.");

Replacement in crawl-ref/source/player.cc at line 3587 [8.962854]
∅:D[6.6759] → [8.1032303:1032304]
B:BD[8.1032303] → [8.1032303:1032304]
[6.6759]
[8.1032304]
```
    
```

Deletion in crawl-ref/source/player.cc at line 3687 [8.962854]

B:BD[8.1035218] → [4.4020:4105]

∅:D[4.4105] → [13.377:410]

B:BD[6.6842] → [13.377:410]

B:BD[13.410] → [4.4106:4419]

∅:D[13.410] → [6.6881:6890]

∅:D[4.4419] → [6.6881:6890]

B:BD[6.6881] → [6.6881:6890]

    if (you.disease || you.species == SP_VAMPIRE && you.hunger_state <= HS_STARVING)
        mpr("You do not heal.");
    else if (you.species == SP_VAMPIRE)
    {
        if (you.hunger_state <= HS_HUNGRY)
            mpr("You heal slowly.");
        else if (you.hunger_state == HS_ENGORGED)
            mpr("You heal very quickly.");
        else if (you.hunger_state >= HS_SATIATED)
            mpr("You heal quickly.");
    }

Replacement in crawl-ref/source/player.cc at line 3695 [8.962854]

∅:D[14.5649] → [15.10293:10347]

B:BD[15.10293] → [15.10293:10347]

                                        : "a soft" );

[14.5649]

[8.1035563]

                                                      : "a soft" );

Replacement in crawl-ref/source/player.cc at line 3703 [8.962854]

∅:D[14.5806] → [15.10488:10536]

B:BD[15.10488] → [15.10488:10536]

                                   : "weak " );

[14.5806]

[8.1035844]

                                                 : "weak " );

Replacement in crawl-ref/source/player.cc at line 3735 [8.962854]
∅:D[15.11268] → [16.350293:350294]
B:BD[16.350293] → [16.350293:350294]
[15.11268]
[17.2431]
```
/*
```
Replacement in crawl-ref/source/player.cc at line 3755 [8.962854]
B:BD[15.12040] → [15.12040:12041]
[15.12040]
[16.351539]
```
*/
```

Replacement in crawl-ref/source/output.cc at line 211 [8.1088282]

B:BD[4.4991] → [4.4991:5029]

            return ("Near Starving");

[4.4991]

[4.5029]

            return (vamp? "Near Bloodless" : "Near Starving");

Replacement in crawl-ref/source/output.cc at line 214 [8.1088282]
B:BD[4.5072] → [4.5072:5105]
```
            return ("Starving");
```
[4.5072]
[4.5105]
```
            return (vamp? "Bloodless" : "Starving");
```

Replacement in crawl-ref/source/output.cc at line 1528 [8.1088282]

B:BD[18.3708] → [6.7434:7545]

B:BD[6.7545] → [12.786:855]

    if (you.duration[DUR_REGENERATION]
        && (you.species != SP_VAMPIRE || you.hunger_state >= HS_HUNGRY)
        || you.species == SP_VAMPIRE && you.hunger_state >= HS_FULL)

[18.3708]

[6.7614]

    if (you.disease && !you.duration[DUR_REGENERATION]
        || you.species == SP_VAMPIRE && you.hunger_state <= HS_STARVING)
    {
       text += "non-regenerating, ";
    }
    else if (you.duration[DUR_REGENERATION]
             || you.species == SP_VAMPIRE && you.hunger_state != HS_SATIATED)

Replacement in crawl-ref/source/output.cc at line 1537 [8.1088282]
B:BD[6.7645] → [6.7645:7683]
```
            text += "recuperating, ";
```
[6.7645]
[6.7683]
```
            text += "recuperating";
```

Replacement in crawl-ref/source/output.cc at line 1539 [8.1088282]

B:BD[6.7696] → [12.856:894]

            text += "regenerating, ";

[6.7696]

[6.7697]

            text += "regenerating";
            
        if (you.species == SP_VAMPIRE && you.hunger_state != HS_SATIATED)
        {
            if (you.hunger_state <= HS_HUNGRY)
                text += " slowly";
            else if (you.hunger_state == HS_ENGORGED)
                text += " very quickly";
            else if (you.hunger_state >= HS_FULL)
                text += " quickly";
        }
        text += ", ";

Deletion in crawl-ref/source/output.cc at line 1665 [8.1088282]

B:BD[19.833] → [19.833:974]

    if (you.disease
        || you.species == SP_VAMPIRE && you.hunger_state < HS_HUNGRY)
    {
        text += "non-regenerating, ";
    }

Replacement in crawl-ref/source/output.cc at line 1729 [8.1088282]
B:BD[18.8362] → [20.2259:2260]
[18.8362]
[18.8385]
```
/*
```
Replacement in crawl-ref/source/output.cc at line 1745 [8.1088282]
∅:D[20.3090] → [18.9224:9225]
B:BD[18.9224] → [18.9224:9225]
[20.3090]
[14.9767]
```
*/
```

Insertion in crawl-ref/source/output.cc at line 1789 [8.1088282]

[18.10959]

[21.64996]

      case SP_VAMPIRE:
          if (you.experience_level < 13 || you.hunger_state > HS_HUNGRY)
              break;
          // else fall-through

Insertion in crawl-ref/source/newgame.cc at line 2299 [8.1132300]

[6.9269]

[22.244]

        you.mutation[MUT_ACUTE_VISION] = 1;
        // This needs to be changed!

Replacement in crawl-ref/source/mutation.cc at line 1199 [8.1263003]
B:BD[6.10275] → [23.183:228]
```
        if (you.hunger_state >= HS_SATIATED)
```
[6.10275]
[24.3020]
```
        if (you.hunger_state < HS_SATIATED)
```

Replacement in crawl-ref/source/mutation.cc at line 1201 [8.1263003]

B:BD[24.3030] → [24.3030:3254]

B:BD[24.3254] → [13.1410:1483]

∅:D[13.1483] → [24.3318:3370]

B:BD[24.3318] → [24.3318:3370]

B:BD[24.3545] → [24.3545:3579]

            result += "<green>";
            result += "You are";
            result += (you.experience_level > 25) ?
                       " strongly" : "";
            result += " in touch with the powers of death." EOL;
            result += "You are quite resistant to negative energy." EOL;
            result += "You can see invisible." EOL;
            result += "</green>";

[24.3030]

[24.3608]

            if (you.experience_level >= 13)
            {
                result += "<green>";
                result += "You are";
                result += " in touch with the powers of death." EOL;
                result += "</green>";
            }

Insertion in crawl-ref/source/mutation.cc at line 1213 [8.1263003]

[12.1097]

        else if (you.hunger_state >= HS_ENGORGED)
            result += "<green>Your natural rate of healing is extremely fast.</green>" EOL;

Replacement in crawl-ref/source/item_use.cc at line 1295 [8.2781507]

B:BD[8.2809518] → [3.3069:3149]

    for (unsigned int i_inv=Options.fire_items_start; i_inv<ENDOFPACK; i_inv++)

[8.2809518]

[25.1838]

    for (int i_inv=Options.fire_items_start; i_inv<ENDOFPACK; i_inv++)

Replacement in crawl-ref/source/food.cc at line 572 [8.3043806]

B:BD[26.429771] → [26.429771:429820]

        mpr("You're too full to eat anything.");

[26.429771]

[27.16884]

        mprf("You're too full to %s anything.",
             you.species == SP_VAMPIRE ? "drain" : "eat");

Insertion in crawl-ref/source/food.cc at line 645 [8.3043806]

[28.1251]

[29.6743]

        else if (newstate == HS_ENGORGED && you.species == SP_VAMPIRE
                 && you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT
                 && you.duration[DUR_TRANSFORMATION] > 2)
        {
            mpr("Your bloodfilled body can't sustain your transformation much longer.",
                MSGCH_WARN);
            you.duration[DUR_TRANSFORMATION] = 2;
        }

Replacement in crawl-ref/source/food.cc at line 659 [8.3043806]

B:BD[28.1321] → [28.1321:1375]

                mpr("You are starving!", MSGCH_FOOD);

[28.1321]

[28.1375]

                if (you.species == SP_VAMPIRE)
                    mpr("You feel devoid of blood!");
                else
                    mpr("You are starving!", MSGCH_FOOD);

Replacement in crawl-ref/source/food.cc at line 667 [8.3043806]

B:BD[30.2639] → [30.2639:2698]

                mpr("You are near starving.", MSGCH_FOOD);

[30.2639]

[28.1543]

                if (you.species == SP_VAMPIRE)
                    mpr("You feel almost devoid of blood!");
                else
                    mpr("You are near starving.", MSGCH_FOOD);

Replacement in crawl-ref/source/abl-show.cc at line 828 [8.4494389]

B:BD[8.4506664] → [31.1123:1196]

        mpr("Sorry, you're not good enough to have a special ability.");

[8.4506664]

[27.41538]

        // Vampires can't turn into bats when full to the rim with blood.
        if (you.species == SP_VAMPIRE && you.experience_level >= 3)
            mpr("Sorry, you're too full to transform right now.");
        else
            mpr("Sorry, you're not good enough to have a special ability.");

Insertion in crawl-ref/source/abl-show.cc at line 837 [8.4494389]
[8.4506731]
[14.20241]
```
    
```
Insertion in crawl-ref/source/abl-show.cc at line 909 [8.4494389]
[8.4508473]
[8.4508473]
```
        case ABIL_TRAN_BAT:
```

Replacement in crawl-ref/source/abl-show.cc at line 2001 [8.4494389]

B:BD[8.4537406] → [8.4537406:4537488]

B:BD[8.4537488] → [32.19258:19330]

                (you.species == SP_MOTTLED_DRACONIAN)? ABIL_BREATHE_STICKY_FLAME:
                                                     ABIL_NON_ABILITY);

[8.4537406]

[32.19330]

                (you.species == SP_MOTTLED_DRACONIAN)? ABIL_BREATHE_STICKY_FLAME
                                                     : ABIL_NON_ABILITY);

Replacement in crawl-ref/source/abl-show.cc at line 2008 [8.4494389]

B:BD[8.4537638] → [33.872:994]

    if (you.species == SP_VAMPIRE && you.experience_level >= 3 &&
        you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT)

[8.4537638]

[6.27328]

    if (you.species == SP_VAMPIRE && you.experience_level >= 3
        && you.hunger_state < HS_ENGORGED
        && you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT)