fiddlerwoaroof/crawl - Change DMRXDEKHHBQNY37NPGZFAGUQPALWFANGGK4CUWIOQUPSLM2JBNFQC

Finally added vampiric bite attack. Thanks to Jarmo

for the underlying patch.

Only vampires can turn into vampire bats, other species transform into normal bats, so can't draw blood.

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

Created by j-p-e-g on August 4, 2007

DMRXDEKHHBQNY37NPGZFAGUQPALWFANGGK4CUWIOQUPSLM2JBNFQC

Dependencies

In channels

main

Change contents

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

B:BD[7.5666] → [2.170:232]

                    mpr( "You can now transform into a bat.",

[7.5666]

[7.5727]

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

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

B:BD[7.6481] → [7.6481:6520]

        mpr( "You are in bat-form." );

[7.6481]

[7.6520]

        mprf( "You are in %sbat-form.",
              you.species == SP_VAMPIRE ? "vampire " : "" );

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

B:BD[7.7296] → [9.170:233]

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

[7.7296]

[7.7339]

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

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

B:BD[7.7865] → [7.7865:7909]

          text += "\nYou are in bat-form.";

[7.7865]

[7.7909]

          text += "\nYou are in ";
          if (you.species == SP_VAMPIRE)
              text += "vampire ";
          text += "bat-form.";

Replacement in crawl-ref/source/newgame.cc at line 3486 [8.1132300]
∅:D[9.337] → [8.1219818:1219858]
B:BD[8.1219818] → [8.1219818:1219858]
```
            you.skills[SK_SHIELDS] = 2;
```
[9.337]
[10.392928]
```
                you.skills[SK_SHIELDS] = 2;
```
Replacement in crawl-ref/source/it_use2.cc at line 65 [8.2904329]
B:BD[7.11990] → [7.11990:12021]
```
              you.rotting = 0;
```
[7.11990]
[7.12021]
```
               you.rotting = 0;
```
Replacement in crawl-ref/source/it_use2.cc at line 67 [8.2904329]
B:BD[7.12055] → [7.12055:12097]
```
              you.duration[DUR_CONF] = 0;
```
[7.12055]
[5.2753]
```
               you.duration[DUR_CONF] = 0;
```

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

∅:D[9.978] → [7.19110:19357]

B:BD[7.19110] → [7.19110:19357]

        case MONS_HUMAN:
            food_value = mass + random2avg(you.experience_level * 10, 2);
            mpr( "This warm blood tastes really delicious!" );
            inc_hp(1 + random2(1 + you.experience_level), false);
            break;

[9.978]

[7.19357]

           case MONS_HUMAN:
               food_value = mass + random2avg(you.experience_level * 10, 2);
               mpr( "This warm blood tastes really delicious!" );
               inc_hp(1 + random2(1 + you.experience_level), false);
               break;

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

B:BD[7.19358] → [7.19358:19583]

        case MONS_ELF:
            food_value = mass + random2avg(you.experience_level * 10, 2);
            mpr( "This warm blood tastes magically delicious!" );
            inc_mp(1 + random2(3), false);
            break;

[7.19358]

[7.19583]

           case MONS_ELF:
               food_value = mass + random2avg(you.experience_level * 10, 2);
               mpr( "This warm blood tastes magically delicious!" );
               inc_mp(1 + random2(3), false);
               break;

Replacement in crawl-ref/source/food.cc at line 1531 [8.3043806]
B:BD[7.19584] → [7.19584:19601]
```
        default:
```
[7.19584]
[9.979]
```
           default:
```

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

∅:D[9.1064] → [7.19601:19707]

B:BD[7.19601] → [7.19601:19707]

            food_value = mass;
            mpr( "This warm blood tastes delicious!" );
            break;

[9.1064]

[9.1065]

                      food_value = mass;
                      mpr( "This warm blood tastes delicious!" );
                      break;

Insertion in crawl-ref/source/fight.cc at line 866 [8.3140790]

[11.42167]

[8.3158747]


        // normal vampiric biting attack
        if (damage_brand == SPWPN_VAMPIRICISM && mons_holiness(def) == MH_NATURAL)
        {
            const int chunk_type = mons_corpse_effect( def->type );
            // 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)
                {
                    int heal = 1 + random2(damage_done);
                    if (heal > you.experience_level)
                        heal = you.experience_level;
                
                    if (chunk_type == CE_CLEAN)
                        heal +=  1 + random2(damage_done);
                    inc_hp(heal, false);
                    mpr("You feel better.");
                }
                if (you.hunger_state < HS_ENGORGED) // always the case
                {
                    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);
                }
                did_god_conduct(DID_DRINK_BLOOD, 5 + random2(4));
            }
        }

Replacement in crawl-ref/source/fight.cc at line 1084 [8.3140790]
B:BD[11.46350] → [11.46350:46391]
```
    if (you.hunger_state == HS_STARVING)
```
[11.46350]
[11.46391]
```
    if (you.hunger_state == HS_STARVING && you.species != SP_VAMPIRE)
```

Replacement in crawl-ref/source/fight.cc at line 1258 [8.3140790]

B:BD[11.50649] → [11.50649:50676]

    if (damage < HIT_WEAK)

[11.50649]

[11.50676]

    // Exception: vampire bats only bite to allow for drawing blood
    if (damage < HIT_WEAK && (you.species != SP_VAMPIRE
        || you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT))

Deletion in crawl-ref/source/fight.cc at line 1433 [8.3140790]

B:BD[11.55034] → [11.55034:55039]

B:BD[11.55039] → [7.22874:22952]

B:BD[7.22952] → [3.318:365]

∅:D[3.365] → [9.1951:2004]

B:BD[7.22997] → [9.1951:2004]

∅:D[9.2004] → [7.23085:23095]

B:BD[7.23085] → [7.23085:23095]

B:BD[7.23095] → [9.2005:2073]

∅:D[9.2073] → [7.23132:23133]

B:BD[7.23132] → [7.23132:23133]

B:BD[7.23133] → [9.2074:2410]

B:BD[9.2410] → [3.366:529]

∅:D[3.529] → [7.23272:23289]

B:BD[7.23272] → [7.23272:23289]

B:BD[7.23289] → [9.2411:2459]

B:BD[9.2459] → [3.530:589]

    
    if (you.species == SP_VAMPIRE && damage_brand == SPWPN_VAMPIRICISM)
    {
        if (defender->holiness() == MH_NATURAL
            && damage_done > 0 && !one_chance_in(5))
        {
            const int chunk_type = mons_corpse_effect( def->type );
            // 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)
                {
                    int heal = 1 + random2(damage_done);
                    if (heal > you.experience_level)
                        heal = you.experience_level;
                
                    if (chunk_type == CE_CLEAN)
                        heal +=  1 + random2(damage_done);

Deletion in crawl-ref/source/fight.cc at line 1434 [8.3140790]

B:BD[9.2461] → [3.590:631]

∅:D[3.631] → [9.2462:2525]

B:BD[7.23369] → [9.2462:2525]

∅:D[9.2525] → [7.23369:23370]

B:BD[7.23369] → [7.23369:23370]

B:BD[7.23370] → [9.2526:2597]

B:BD[9.2597] → [3.632:650]

∅:D[3.650] → [9.2598:3098]

B:BD[7.23432] → [9.2598:3098]

B:BD[9.3098] → [3.651:669]

∅:D[3.669] → [7.23507:23567]

B:BD[7.23507] → [7.23507:23567]

B:BD[7.23567] → [3.670:684]

∅:D[3.684] → [7.23567:23583]

B:BD[7.23567] → [7.23567:23583]

∅:D[9.3105] → [7.23583:23642]

B:BD[7.23583] → [7.23583:23642]

∅:D[7.23642] → [11.55093:55232]

B:BD[11.55093] → [11.55093:55232]

∅:D[11.55232] → [8.3167437:3167447]

B:BD[8.3167437] → [8.3167437:3167447]

B:BD[8.3167447] → [11.55233:55322]

B:BD[11.55322] → [7.23643:23742]

∅:D[7.23742] → [11.55375:55559]

B:BD[11.55375] → [11.55375:55559]

∅:D[11.55559] → [8.3167954:3167964]

B:BD[8.3167954] → [8.3167954:3167964]

B:BD[8.3167964] → [11.55560:55566]

∅:D[11.55566] → [8.3168530:3168531]

B:BD[8.3168530] → [8.3168530:3168531]

                    inc_hp(heal, false);
                    mpr("You feel better.");
                }
                if (you.hunger_state < HS_ENGORGED) // always the case
                {
                    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);
                }
		        did_god_conduct(DID_DRINK_BLOOD, 5 + random2(4));
            }
        }
    }
    else if (mondied && damage_brand == SPWPN_VAMPIRICISM)
    {
        if (mons_holiness(def) == MH_NATURAL
            && damage_done > 0 && you.hp < you.hp_max
            && !one_chance_in(5))
        {
            mpr("You feel better.");
            
            // more than if not killed
            int heal = 1 + random2(damage_done);
                
            inc_hp(heal, false);
            
            if (you.hunger_state != HS_ENGORGED)
                lessen_hunger(30 + random2avg(59, 2), true);
            
            did_god_conduct(DID_NECROMANCY, 2);
        }
    }

Deletion in crawl-ref/source/fight.cc at line 1742 [8.3140790]

B:BD[11.60214] → [11.60214:60318]

        
        // We only get here if we've done base damage, so no
        // worries on that score.

Replacement in crawl-ref/source/fight.cc at line 1743 [8.3140790]

B:BD[8.3174809] → [12.61044:61161]

        if (attacker->atype() == ACT_PLAYER)
            mpr("You feel better.");
        else if (attacker_visible)

[8.3174809]

[11.60533]

        // vampire bat form
        if (you.species == SP_VAMPIRE && attacker->atype() == ACT_PLAYER
            && you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT)

Replacement in crawl-ref/source/fight.cc at line 1747 [8.3140790]

B:BD[11.60543] → [12.61162:61448]

            if (defender->atype() == ACT_PLAYER)
                mprf("%s draws strength from your injuries!",
                     attacker->name(DESC_CAP_THE).c_str());
            else
                mprf("%s is healed.",
                     attacker->name(DESC_CAP_THE).c_str());

[11.60543]

[11.60583]

            const int chunk_type = mons_corpse_effect( def->type );
            // 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)
                {
                    int heal = 1 + random2(damage_done);
                    if (heal > you.experience_level)
                        heal = you.experience_level;
                    if (chunk_type == CE_CLEAN)
                        heal +=  1 + random2(damage_done);
                    inc_hp(heal, false);
                    mpr("You feel better.");
                }
                if (you.hunger_state < HS_ENGORGED) // always the case
                {
                    int food_value = 0;
                    if (chunk_type == CE_CLEAN)
                        food_value = 30 + random2avg(59, 2);
                    else if (chunk_type == CE_CONTAMINATED)
                        food_value = 15 + random2avg(29, 2);
                    lessen_hunger(food_value, true);
                }
                did_god_conduct(DID_DRINK_BLOOD, 5 + random2(4));
            }

Insertion in crawl-ref/source/fight.cc at line 1781 [8.3140790]

[11.60593]

[12.61449]

        else { // handle weapon effects
            // We only get here if we've done base damage, so no
            // worries on that score.

Replacement in crawl-ref/source/fight.cc at line 1785 [8.3140790]

∅:D[12.61450] → [11.60606:60616]

B:BD[11.60606] → [11.60606:60616]

[12.61450]

[12.61451]

            if (attacker->atype() == ACT_PLAYER)
                mpr("You feel better.");
            else if (attacker_visible)
            {
                if (defender->atype() == ACT_PLAYER)
                    mprf("%s draws strength from your injuries!",
                         attacker->name(DESC_CAP_THE).c_str());
                else
                    mprf("%s is healed.",
                        attacker->name(DESC_CAP_THE).c_str());
            }

Replacement in crawl-ref/source/fight.cc at line 1798 [8.3140790]
B:BD[12.61481] → [12.61481:61494]
```
            
```
[12.61481]
[12.61494]

Replacement in crawl-ref/source/fight.cc at line 1800 [8.3140790]

B:BD[12.61559] → [12.61559:61631]

            if (weapon
                && is_fixed_artefact( *weapon )

[12.61559]

[12.61631]

            if (weapon && is_fixed_artefact( *weapon )

Insertion in crawl-ref/source/fight.cc at line 1811 [8.3140790]

[12.61896]

[11.60669]


            if (attacker->hunger_level() != HS_ENGORGED)
                attacker->make_hungry(-random2avg(59, 2));
            attacker->god_conduct( DID_NECROMANCY, 2 );

Deletion in crawl-ref/source/fight.cc at line 1817 [8.3140790]

B:BD[11.60679] → [12.61897:62006]

∅:D[12.62006] → [11.60785:60794]

B:BD[11.60785] → [11.60785:60794]

B:BD[11.60794] → [12.62007:62059]


        if (attacker->hunger_level() != HS_ENGORGED)
            attacker->make_hungry(-random2avg(59, 2));
        
        attacker->god_conduct( DID_NECROMANCY, 2 );

Replacement in crawl-ref/source/chardump.cc at line 221 [8.4100336]

B:BD[7.25579] → [7.25579:25623]

            text += "You are in bat-form.";

[7.25579]

[7.25623]

            text += "You are in ";
            if (you.species == SP_VAMPIRE)
                text += "vampire ";
            text += "bat-form.";

Replacement in crawl-ref/source/acr.cc at line 1245 [8.4397395]
∅:D[6.853] → [7.25839:25858]
B:BD[7.25839] → [7.25839:25858]
```
            break;
```
[6.853]
[7.25858]
```
           break;
```
Replacement in crawl-ref/source/acr.cc at line 1256 [8.4397395]
∅:D[6.895] → [7.26057:26076]
B:BD[7.26057] → [7.26057:26076]
```
            break;
```
[6.895]
[7.26076]
```
           break;
```
Replacement in crawl-ref/source/acr.cc at line 1280 [8.4397395]
∅:D[6.937] → [7.26269:26288]
B:BD[7.26269] → [7.26269:26288]
```
            break;
```
[6.937]
[7.26288]
```
           break;
```
Replacement in crawl-ref/source/acr.cc at line 1289 [8.4397395]
∅:D[6.979] → [7.26481:26500]
B:BD[7.26481] → [7.26481:26500]
```
            break;
```
[6.979]
[7.26500]
```
           break;
```
Replacement in crawl-ref/source/acr.cc at line 1378 [8.4397395]
∅:D[6.1502] → [8.4432760:4432779]
B:BD[8.4432760] → [8.4432760:4432779]
```
            break;
```
[6.1502]
[8.4432779]
```
           break;
```

Replacement in crawl-ref/source/acr.cc at line 1769 [8.4397395]

B:BD[4.409] → [4.409:556]

    if ( you.species != SP_VAMPIRE ||
         you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT ||
         you.duration[DUR_TRANSFORMATION] < 100 )

[4.409]

[8.4445139]

    if ((you.species != SP_VAMPIRE ||
         you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT)
         && you.duration[DUR_TRANSFORMATION] < 100 )

Finally added vampiric bite attack. Thanks to Jarmo

Dependencies

In channels

Change contents

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

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

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

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

Replacement in crawl-ref/source/newgame.cc at line 3486 [8.1132300]

Replacement in crawl-ref/source/it_use2.cc at line 65 [8.2904329]

Replacement in crawl-ref/source/it_use2.cc at line 67 [8.2904329]

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

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

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

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

Insertion in crawl-ref/source/fight.cc at line 866 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1084 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1258 [8.3140790]

Deletion in crawl-ref/source/fight.cc at line 1433 [8.3140790]

Deletion in crawl-ref/source/fight.cc at line 1434 [8.3140790]

Deletion in crawl-ref/source/fight.cc at line 1742 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1743 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1747 [8.3140790]

Insertion in crawl-ref/source/fight.cc at line 1781 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1785 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1798 [8.3140790]

Replacement in crawl-ref/source/fight.cc at line 1800 [8.3140790]

Insertion in crawl-ref/source/fight.cc at line 1811 [8.3140790]

Deletion in crawl-ref/source/fight.cc at line 1817 [8.3140790]

Replacement in crawl-ref/source/chardump.cc at line 221 [8.4100336]

Replacement in crawl-ref/source/acr.cc at line 1245 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1256 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1280 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1289 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1378 [8.4397395]

Replacement in crawl-ref/source/acr.cc at line 1769 [8.4397395]