fiddlerwoaroof/crawl - Change JXOE7KJIEAJHPLMZAJ6O4YHDTRB6BGNP6XT3ZSEFYGSIUMHR77KQC

More vampire tweaks, mostly concerning fighting and

feeding issues. Oh, and they're poison resistant now.

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

Created by j-p-e-g on July 17, 2007

JXOE7KJIEAJHPLMZAJ6O4YHDTRB6BGNP6XT3ZSEFYGSIUMHR77KQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/player.cc at line 5046 [3.962854]

B:BD[2.7296] → [2.7296:7339]

            if (you.species == SP_VAMPIRE)

[2.7296]

[2.7339]

            if (you.species == SP_VAMPIRE && one_chance_in(3))

Replacement in crawl-ref/source/newgame.cc at line 1922 [3.1132300]
B:BD[2.9269] → [2.9269:9320]
```
//        you.mutation[MUT_POISON_RESISTANCE] = 1;
```
[2.9269]
[4.1595]
```
        you.mutation[MUT_POISON_RESISTANCE] = 1;
```
Insertion in crawl-ref/source/newgame.cc at line 3521 [3.1132300]
[3.1219818]
[3.1219818]
```
            if (you.species != SP_VAMPIRE)
```

Replacement in crawl-ref/source/newgame.cc at line 3524 [3.1132300]

∅:D[5.392974] → [3.1219899:1219966]

B:BD[3.1219899] → [3.1219899:1219966]

            you.skills[(coinflip() ? SK_STABBING : SK_SHIELDS)]++;

[5.392974]

[3.1219966]

            you.skills[((coinflip() || you.species == SP_VAMPIRE)?
                SK_STABBING : SK_SHIELDS)]++;

Replacement in crawl-ref/source/it_use2.cc at line 84 [3.2904329]
B:BD[3.2906036] → [2.12171:12235]
```
        if (you.species == SP_VAMPIRE /*&& you.hunger_state */)
```
[3.2906036]
[2.12235]
```
        if (you.species == SP_VAMPIRE)
```

Replacement in crawl-ref/source/food.cc at line 620 [3.3043806]

B:BD[2.16823] → [2.16823:16866]

        if (!mons_skeleton( mons_type )) {

[2.16823]

[2.16866]

        if (!mons_skeleton( mons_type ))
        {

Replacement in crawl-ref/source/food.cc at line 624 [3.3043806]
B:BD[2.16938] → [2.16938:16953]
```
        else {
```
[2.16938]
[2.16953]
```
        else
        {
```

Replacement in crawl-ref/source/food.cc at line 665 [3.3043806]

B:BD[2.17737] → [2.17737:17780]

        if (!mons_skeleton( mons_type )) {

[2.17737]

[2.17780]

        if (!mons_skeleton( mons_type ))
        {

Replacement in crawl-ref/source/food.cc at line 669 [3.3043806]
B:BD[2.17842] → [2.17842:17857]
```
        else {
```
[2.17842]
[2.17857]
```
        else
        {
```

Replacement in crawl-ref/source/food.cc at line 1393 [3.3043806]

B:BD[3.3079492] → [3.3079492:3079540]

                || poison_resistance_level > 0)

[3.3079492]

[3.3079540]

                || poison_resistance_level > 0 && you.species != SP_VAMPIRE)

Replacement in crawl-ref/source/food.cc at line 1503 [3.3043806]

B:BD[2.18836] → [2.18836:18895]

                            int chunk_type, bool rotten) {

[2.18836]

[2.18895]

                            int chunk_type, bool rotten)
{

Replacement in crawl-ref/source/food.cc at line 1507 [3.3043806]
B:BD[2.18920] → [2.18920:18952]
```
    if (chunk_type == CE_HCL) {
```
[2.18920]
[2.18952]
```
    if (chunk_type == CE_HCL)
    {
```
Replacement in crawl-ref/source/food.cc at line 1512 [3.3043806]
B:BD[2.19030] → [2.19030:19054]
```
    else if (!rotten) {
```
[2.19030]
[2.19054]
```
    else if (!rotten)
    {
```
Replacement in crawl-ref/source/food.cc at line 1516 [3.3043806]
B:BD[2.19081] → [2.19081:19110]
```
        switch (mons_type) {
```
[2.19081]
[2.19110]
```
        switch (mons_type)
        {
```

Insertion in crawl-ref/source/food.cc at line 1531 [3.3043806]

[2.19601]

               switch (chunk_type)
               {
                  case CE_CLEAN:

Insertion in crawl-ref/source/food.cc at line 1537 [3.3043806]

[2.19707]

                  case CE_CONTAMINATED:
                      food_value = mass / (random2(3) + 1);
                      mpr( "Somehow that blood was not very filling!" );
                      break;
                  case CE_POISONOUS:
                      food_value = random2(mass) - mass/2;
                      mpr( "Blech - that blood tastes nasty!" );
                      break;
                  case CE_MUTAGEN_RANDOM:
                      food_value = random2(mass);
                      mpr( "That blood tastes really weird!" );
                      mutate(RANDOM_MUTATION);
                      xom_is_stimulated(100);
                      break;
               }

Replacement in crawl-ref/source/food.cc at line 1555 [3.3043806]
B:BD[2.19768] → [2.19768:19816]
```
    else if (wearing_amulet(AMU_THE_GOURMAND)){
```
[2.19768]
[2.19816]
```
    else if (wearing_amulet(AMU_THE_GOURMAND))
    {
```
Replacement in crawl-ref/source/food.cc at line 1561 [3.3043806]
B:BD[2.19956] → [2.19956:19967]
```
    else {
```
[2.19956]
[2.19967]
```
    else
    {
```

Replacement in crawl-ref/source/fight.cc at line 585 [3.3140790]

B:BD[2.21259] → [2.21259:21312]

        if (you.species == SP_VAMPIRE && coinflip())

[2.21259]

[2.21312]

        if (you.species == SP_VAMPIRE && !one_chance_in(3))

Replacement in crawl-ref/source/fight.cc at line 765 [3.3140790]

B:BD[2.22086] → [2.22086:22149]

            if (!you.mutation[MUT_FANGS] || !one_chance_in(5))

[2.22086]

[2.22149]

            if (!you.mutation[MUT_FANGS] || one_chance_in(5))

Replacement in crawl-ref/source/fight.cc at line 1393 [3.3140790]

B:BD[2.22997] → [2.22997:23085]

            && damage_done > 0 && you.hp < you.hp_max
            && !one_chance_in(5))

[2.22997]

[2.23085]

            && damage_done > 0 && !one_chance_in(5))

Replacement in crawl-ref/source/fight.cc at line 1395 [3.3140790]

B:BD[2.23095] → [2.23095:23132]

            mpr("You feel better.");

[2.23095]

[2.23132]

            const int chunk_type = mons_corpse_effect( def->type );

Insertion in crawl-ref/source/fight.cc at line 1397 [3.3140790]

[2.23133]

            // don't drink poisonous or mutagenic blood
            if (chunk_type == CE_CLEAN || chunk_type == CE_CONTAMINATED)
            {
                mprf( "You draw %s's blood!",
                      def->name(DESC_NOCAP_THE, true).c_str() );
                      
                if (you.hp < you.hp_max)
                {

Insertion in crawl-ref/source/fight.cc at line 1409 [3.3140790]
[2.23289]
[2.23289]
```
                    if (chunk_type == CE_CLEAN)
```
Insertion in crawl-ref/source/fight.cc at line 1411 [3.3140790]
[2.23336]
[2.23336]

Insertion in crawl-ref/source/fight.cc at line 1413 [3.3140790]

[2.23369]

                    mpr("You feel better.");
                }

Replacement in crawl-ref/source/fight.cc at line 1416 [3.3140790]

B:BD[2.23370] → [2.23370:23418]

            if (you.hunger_state < HS_ENGORGED)

[2.23370]

[2.23418]

                if (you.hunger_state < HS_ENGORGED) // always the case

Replacement in crawl-ref/source/fight.cc at line 1418 [3.3140790]

B:BD[2.23432] → [2.23432:23493]

                lessen_hunger(45 + random2avg(59, 2), true);

[2.23432]

[2.23493]

                    int food_value = 0;
                    if (chunk_type == CE_CLEAN)
                        food_value = 45 + random2avg(59, 2);
                    else if (chunk_type == CE_CONTAMINATED)
                        food_value = 22 + random2avg(29, 2);
                        
                    if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)
                        food_value -= 5 + random2(16);
                        
                    lessen_hunger(food_value, true);

Insertion in crawl-ref/source/fight.cc at line 1432 [3.3140790]
[2.23583]
[2.23583]
```
    }
```

More vampire tweaks, mostly concerning fighting and

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/player.cc at line 5046 [3.962854]

Replacement in crawl-ref/source/newgame.cc at line 1922 [3.1132300]

Insertion in crawl-ref/source/newgame.cc at line 3521 [3.1132300]

Replacement in crawl-ref/source/newgame.cc at line 3524 [3.1132300]

Replacement in crawl-ref/source/it_use2.cc at line 84 [3.2904329]

Replacement in crawl-ref/source/food.cc at line 620 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 624 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 665 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 669 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 1393 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 1503 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 1507 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 1512 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 1516 [3.3043806]

Insertion in crawl-ref/source/food.cc at line 1531 [3.3043806]

Insertion in crawl-ref/source/food.cc at line 1537 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 1555 [3.3043806]

Replacement in crawl-ref/source/food.cc at line 1561 [3.3043806]