fiddlerwoaroof/crawl - Change QHAYBZTRPVJMK55WXT3F63CNRSAEVN3CQAAG42GCJTONLXQLNNNQC

Vampires are now only poison resistant if thirsty or worse, and I've

added a list of their current resistances and such to the status (@) output, depending on their state of hunger. If poison resistant they'll now also attempt to drain monsters of type CE_POISONOUS. The regeneration rate at full and "alive" has been lowered significantly. (The effect of a permanent ring of regeneration without any of the drawbacks was much too strong.) Oh, and non-thirsty vampires (satiated or above) can now be rotted, e.g. by potions of decay.

Also, Red Draconians and White Draconians now gain their resistances at xl 14 rather than 18, as suggested in FR 1865186. (I'm leaving the rest of that FR alone for now.)

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

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

QHAYBZTRPVJMK55WXT3F63CNRSAEVN3CQAAG42GCJTONLXQLNNNQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 974 [5.962854]
∅:D[3.598] → [4.3903:3933]
∅:D[6.3763] → [4.3903:3933]
B:BD[4.3903] → [4.3903:3933]
```
            return (rr + 20);
```
[6.3763]
[6.3764]
```
            return (rr + 10);
```
Replacement in crawl-ref/source/player.cc at line 976 [5.962854]
B:BD[6.3791] → [6.3791:3821]
```
            return (rr + 40);
```
[6.3791]
[4.4080]
```
            return (rr + 20);
```

Insertion in crawl-ref/source/player.cc at line 1422 [5.962854]

[5.981140]


    // only thirsty vampires are naturally poison resistant
    if (you.species == SP_VAMPIRE && you.hunger_state <= HS_HUNGRY)
        rp++;

Replacement in crawl-ref/source/player.cc at line 3160 [5.962854]

B:BD[5.1018863] → [5.1018863:1018911]

                if (you.experience_level == 18)

[5.1018863]

[5.1018911]

                if (you.experience_level == 14)

Deletion in crawl-ref/source/player.cc at line 3170 [5.962854]

B:BD[5.1019306] → [5.1019306:1019351]

B:BD[5.1019351] → [7.702:765]

∅:D[7.765] → [5.1019474:1019505]

B:BD[5.1019474] → [5.1019474:1019505]

                    case SP_BLACK_DRACONIAN:
                        perma_mutate(MUT_SHOCK_RESISTANCE, 1);
                        break;

Insertion in crawl-ref/source/player.cc at line 3173 [5.962854]

[5.1019527]

                }
                else if (you.species == SP_BLACK_DRACONIAN
                         && you.experience_level == 18)
                {
                    perma_mutate(MUT_SHOCK_RESISTANCE, 1);

Insertion in crawl-ref/source/player.cc at line 3590 [5.962854]

[5.1030876]

        
    if (you.species == SP_VAMPIRE)
    {
        std::string msg = "At your current hunger state you ";
        std::vector<std::string> attrib;
        
        switch (you.hunger_state)
        {
           case HS_STARVING:
               attrib.push_back("resist poison");
               attrib.push_back("are susceptible to fire");
               attrib.push_back("significantly resist cold");
               attrib.push_back("strongly resist negative energy");
               attrib.push_back("resist torment");
               if (you.experience_level >= 13)
                   attrib.push_back("are in touch with the powers of death");
               attrib.push_back("do not heal!");
               break;
           case HS_NEAR_STARVING:
               attrib.push_back("resist poison");
               attrib.push_back("significantly resist cold");
               attrib.push_back("strongly resist negative energy");
               if (you.experience_level >= 13)
                   attrib.push_back("are in touch with the powers of death");
               attrib.push_back("heal slowly!");
               break;
           case HS_HUNGRY:
           case HS_VERY_HUNGRY:
               attrib.push_back("resist poison");
               attrib.push_back("resist cold");
               attrib.push_back("significantly resist negative energy");
               if (you.experience_level >= 13)
                   attrib.push_back("are in touch with the powers of death");
               attrib.push_back("heal slowly!");
               break;
           case HS_SATIATED:
               attrib.push_back("resist negative energy.");
               break;
           case HS_FULL:
           case HS_VERY_FULL:
               attrib.push_back("heal quickly.");
               break;
           case HS_ENGORGED:
               attrib.push_back("heal extremely quickly.");
               break;
        }
        
        if (!attrib.empty())
        {
            msg += comma_separated_line(attrib.begin(), attrib.end(),
                                        ", and ", ", ");
            mpr(msg.c_str());
        }
    }

Replacement in crawl-ref/source/player.cc at line 3707 [5.962854]

B:BD[8.3545] → [8.3545:3618]

        || you.species == SP_VAMPIRE && you.hunger_state <= HS_STARVING)

[8.3545]

[8.3618]

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

Deletion in crawl-ref/source/player.cc at line 3710 [5.962854]

B:BD[8.3657] → [8.3657:3966]

    }
    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 5052 [5.962854]

B:BD[9.746] → [9.746:769]

    if (you.is_undead)

[9.746]

[9.769]

    if (you.is_undead
        && (you.species != SP_VAMPIRE || you.hunger_state <= HS_HUNGRY))

Deletion in crawl-ref/source/player.cc at line 5703 [5.962854]
∅:D[10.233] → [4.7339:7353]
∅:D[11.406] → [4.7339:7353]
B:BD[4.7339] → [4.7339:7353]
```
            {
```
Replacement in crawl-ref/source/player.cc at line 5704 [5.962854]
B:BD[4.7394] → [4.7394:7429]
```
            } // else fall through
```
[4.7394]
[12.5560]
```
            break;
            
```
Deletion in crawl-ref/source/newgame.cc at line 2321 [5.1132300]
B:BD[8.5339] → [8.5339:5376]
∅:D[9.1139] → [10.244:293]
∅:D[8.5376] → [10.244:293]
B:BD[4.9269] → [10.244:293]
```
        // This needs to be changed!
        you.mutation[MUT_POISON_RESISTANCE] = 1;
```

Replacement in crawl-ref/source/food.cc at line 1515 [5.3043806]

B:BD[13.502] → [13.502:575]

                || player_res_poison() > 0 && you.species != SP_VAMPIRE)

[13.502]

[5.3079540]

                || player_res_poison() > 0)

Replacement in crawl-ref/source/food.cc at line 1685 [5.3043806]

B:BD[10.1165] → [10.1165:1238]

                      mpr( "Somehow that blood was not very filling!" );

[10.1165]

[10.1238]

                      mpr( "Somehow this blood was not very filling!" );

Replacement in crawl-ref/source/food.cc at line 1688 [5.3043806]

B:BD[10.1304] → [10.1304:1428]

                      food_value = random2(mass) - mass/2;
                      mpr( "Blech - that blood tastes nasty!" );

[10.1304]

[10.1428]

                      food_value = -random2(mass/2);
                      mpr( "Blech - this blood tastes nasty!" );
                      if (poison_player( 3 + random2(4) ))
                          xom_is_stimulated(random2(128));

Replacement in crawl-ref/source/food.cc at line 1695 [5.3043806]

B:BD[10.1549] → [10.1549:1613]

                      mpr( "That blood tastes really weird!" );

[10.1549]

[10.1613]

                      mpr( "This blood tastes really weird!" );

Insertion in crawl-ref/source/food.cc at line 1697 [5.3043806]

[10.1660]

                      did_god_conduct( DID_DELIBERATE_MUTATING, 10);

Insertion in crawl-ref/source/food.cc at line 1700 [5.3043806]

[10.1735]

                  case CE_MUTAGEN_BAD:
                      food_value = random2(mass/2);
                      mpr("This blood tastes *really* weird.");
                      give_bad_mutation();
                      did_god_conduct( DID_DELIBERATE_MUTATING, 10);
                      xom_is_stimulated(random2(200));
                      break;
                  case CE_HCL:
                      rot_player( 10 + random2(10) );
                      if (disease_player( 50 + random2(100) ))
                          xom_is_stimulated(random2(100));
                      break;

Replacement in crawl-ref/source/fight.cc at line 2039 [5.3140790]

B:BD[2.13526] → [2.13526:13604]

                && (chunk_type == CE_CLEAN || chunk_type == CE_CONTAMINATED))

[2.13526]

[11.3692]

                && (chunk_type == CE_CLEAN || chunk_type == CE_CONTAMINATED
                    || chunk_type == CE_POISONOUS && player_res_poison() ))