fiddlerwoaroof/crawl - Change 6PNVX6Q45HH733TZDXYBA6BYPJKDMND5BA4N2MP6HA3QVNCEPN2QC

Tweak Vampires, part I

Better stats and aptitudes as suggested in David's post "The plan"

Minor modifications to starving/hungry/full messages. Generally change Hungry to Thirsty, and Engorged to Alive. For now, the rest remains as for the other species. Yes, this is nowhere near as radical as David'd suggestions as those are confusing me immenseley, and I just can't code that way.

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

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

6PNVX6Q45HH733TZDXYBA6BYPJKDMND5BA4N2MP6HA3QVNCEPN2QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/skills2.cc at line 1552 [6.647133]

B:BD[5.1507] → [5.1507:1558]

B:BD[5.1558] → [2.1986:2036]

     100,                       // SK_SHORT_BLADES
     110,                       // SK_LONG_BLADES

[5.1507]

[5.1608]

      90,                       // SK_SHORT_BLADES
     100,                       // SK_LONG_BLADES

Replacement in crawl-ref/source/skills2.cc at line 1565 [6.647133]
B:BD[5.2113] → [5.2113:2159]
```
     110,                       // SK_DODGING
```
[5.2113]
[5.2159]
```
      90,                       // SK_DODGING
```

Replacement in crawl-ref/source/skills2.cc at line 1567 [6.647133]

B:BD[5.2205] → [5.2205:2348]

     100,                       // SK_STABBING
     140,                       // SK_SHIELDS
     110,                       // SK_TRAPS_DOORS

[5.2205]

[5.2348]

      90,                       // SK_STABBING
     110,                       // SK_SHIELDS
     100,                       // SK_TRAPS_DOORS

Replacement in crawl-ref/source/skills2.cc at line 1578 [6.647133]

B:BD[5.2728] → [5.2728:2779]

     140,                       // SK_ENCHANTMENTS

[5.2728]

[5.2779]

      90,                       // SK_ENCHANTMENTS

Replacement in crawl-ref/source/skills2.cc at line 1580 [6.647133]
B:BD[5.2828] → [5.2828:2877]
```
     100,                       // SK_NECROMANCY
```
[5.2828]
[5.2877]
```
      90,                       // SK_NECROMANCY
```

Replacement in crawl-ref/source/skills2.cc at line 1582 [6.647133]

B:BD[5.2930] → [5.2930:3033]

     120,                       // SK_TRANSMIGRATION
     140,                       // SK_DIVINATIONS

[5.2930]

[5.3033]

      90,                       // SK_TRANSMIGRATION
     120,                       // SK_DIVINATIONS

Replacement in crawl-ref/source/skills2.cc at line 1585 [6.647133]

B:BD[5.3082] → [5.3082:3378]

     140,                       // SK_ICE_MAGIC
     140,                       // SK_AIR_MAGIC
     140,                       // SK_EARTH_MAGIC
     140,                       // SK_POISON_MAGIC
     (140 * 75)/100,            // SK_INVOCATIONS
     (140 * 75)/100,            // SK_EVOCATIONS

[5.3082]

[5.3378]

     100,                       // SK_ICE_MAGIC
     100,                       // SK_AIR_MAGIC
     120,                       // SK_EARTH_MAGIC
     120,                       // SK_POISON_MAGIC
     (160 * 75)/100,            // SK_INVOCATIONS
     (120 * 75)/100,            // SK_EVOCATIONS

Replacement in crawl-ref/source/player.cc at line 910 [6.962854]

B:BD[5.3862] → [7.367:523]

        if (you.hunger_state <= HS_STARVING)
            return 0; // no regeneration for starving vampires
        else if (you.hunger_state <= HS_HUNGRY)

[5.3862]

[7.523]

        switch (you.hunger_state)
        {
         case HS_STARVING:
            if (you.attribute[ATTR_TRANSFORMATION] != TRAN_BAT)
                return (0); // no regeneration for starving vampires!
            // intentional fall-through for bat form
         case HS_NEAR_STARVING:
         case HS_VERY_HUNGRY:
         case HS_HUNGRY:

Replacement in crawl-ref/source/player.cc at line 920 [6.962854]

B:BD[7.552] → [7.552:598]

        else if (you.hunger_state >= HS_FULL)

[7.552]

[5.3903]

         case HS_SATIATED:
            return (rr);
         case HS_FULL:
         case HS_VERY_FULL:

Replacement in crawl-ref/source/player.cc at line 925 [6.962854]

B:BD[5.3933] → [5.3933:4080]

        else if (you.attribute[ATTR_TRANSFORMATION] == TRAN_BAT
                 || you.hunger_state > HS_HUNGRY)
        {
            return rr;

[5.3933]

[5.4080]

         case HS_ENGORGED:
            return (rr + 40);

Replacement in crawl-ref/source/player.cc at line 2795 [6.962854]

B:BD[6.1010199] → [8.3875:3991]

                                                : STAT_DEXTERITY), 1, false,
                        "level gain");

[6.1010199]

[6.1010278]

                                             : STAT_DEXTERITY), 1, false,
                                 "level gain");

Replacement in crawl-ref/source/player.cc at line 2810 [6.962854]

B:BD[6.1010876] → [8.3992:4069]

                                                : STAT_DEXTERITY), 1, false,

[6.1010876]

[8.4069]

                                             : STAT_DEXTERITY), 1, false,

Replacement in crawl-ref/source/player.cc at line 3641 [6.962854]

B:BD[6.1035218] → [5.6760:6842]

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

[6.1035218]

[9.377]

    if (you.disease || you.species == SP_VAMPIRE && you.hunger_state <= HS_STARVING)

Insertion in crawl-ref/source/player.cc at line 3643 [6.962854]

[9.410]

[5.6881]

    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.");
    }

Insertion in crawl-ref/source/output.cc at line 192 [6.1088282]

[10.689]

[6.1089382]

static std::string describe_hunger()
{
    bool vamp = (you.species == SP_VAMPIRE);
    
    switch (you.hunger_state)
    {
        case HS_ENGORGED:
            return (vamp? "Alive" : "Engorged");
        case HS_VERY_FULL:
            return ("Very Full");
        case HS_FULL:
            return ("Full");
        case HS_SATIATED: // normal
            return ("");
        case HS_HUNGRY:
            return (vamp? "Thirsty" : "Hungry");
        case HS_VERY_HUNGRY:
            return (vamp? "Very Thirsty" : "Very Hungry");
        case HS_NEAR_STARVING:
            return ("Near Starving");
        case HS_STARVING:
        default:
            return ("Starving");
    }
}

Deletion in crawl-ref/source/output.cc at line 557 [6.1088282]
B:BD[11.282] → [11.282:317]
```
            cprintf( "Engorged" );
```
Deletion in crawl-ref/source/output.cc at line 560 [6.1088282]
B:BD[11.364] → [11.364:451]
∅:D[11.451] → [12.1242:1243]
B:BD[12.1242] → [12.1242:1243]
```
            textcolor( GREEN );
            cprintf( "Very Full" );
            break;
```
Deletion in crawl-ref/source/output.cc at line 561 [6.1088282]
B:BD[11.474] → [11.474:556]
∅:D[11.556] → [12.1382:1383]
B:BD[12.1382] → [12.1382:1383]
```
            textcolor( GREEN );
            cprintf( "Full" );
            break;
```
Insertion in crawl-ref/source/output.cc at line 562 [6.1088282]
[11.583]
[11.583]
```
            textcolor( GREEN );
```
Deletion in crawl-ref/source/output.cc at line 566 [6.1088282]
B:BD[11.627] → [11.627:712]
∅:D[11.712] → [12.1884:1885]
B:BD[12.1884] → [12.1884:1885]
```
            textcolor( YELLOW );
            cprintf( "Hungry" );
            break;
```
Deletion in crawl-ref/source/output.cc at line 567 [6.1088282]
B:BD[11.742] → [11.742:832]
∅:D[11.832] → [12.1938:1939]
B:BD[12.1938] → [12.1938:1939]
```
            textcolor( YELLOW );
            cprintf( "Very Hungry" );
            break;
```
Deletion in crawl-ref/source/output.cc at line 569 [6.1088282]
B:BD[11.897] → [11.897:937]
```
            cprintf( "Near Starving" );
```
Deletion in crawl-ref/source/output.cc at line 573 [6.1088282]
B:BD[11.1013] → [11.1013:1048]
```
            cprintf( "Starving" );
```

Insertion in crawl-ref/source/output.cc at line 575 [6.1088282]

[12.2283]

        const std::string state = describe_hunger();
        if (!state.empty())
            cprintf(state.c_str());

Replacement in crawl-ref/source/newgame.cc at line 2155 [6.1132300]

B:BD[6.1177065] → [5.9070:9148]

    case SP_VAMPIRE:            sb =  5; ib =  6; db =  5;      break;  // 16

[6.1177065]

    case SP_VAMPIRE:            sb =  5; ib =  8; db =  7;      break;  // 20

Insertion in crawl-ref/source/food.cc at line 593 [6.3043806]

[6.3059823]

static std::string how_hungry()
{
    if (you.hunger_state > HS_SATIATED)
        return ("full");
    else if (you.species == SP_VAMPIRE)
        return ("thirsty");
    return ("hungry");
}

Replacement in crawl-ref/source/food.cc at line 649 [6.3043806]

B:BD[11.1654] → [11.1654:1719]

                mpr("You are feeling very hungry.", MSGCH_FOOD);

[11.1654]

[11.1719]

                mprf(MSGCH_FOOD, "You are feeling very %s.", how_hungry().c_str());

Replacement in crawl-ref/source/food.cc at line 653 [6.3043806]

B:BD[4.2727] → [4.2727:2787]

                mpr("You are feeling hungry.", MSGCH_FOOD);

[4.2727]

[11.1891]

                mprf(MSGCH_FOOD, "You are feeling %s.", how_hungry().c_str());

Replacement in crawl-ref/source/food.cc at line 688 [6.3043806]

B:BD[6.3061714] → [13.21780:21849]

    msg += ((you.hunger_state > HS_SATIATED) ? "full." : "hungry.");

[6.3061714]

[13.21849]

    msg += how_hungry().c_str();
    msg += ".";

Replacement in crawl-ref/source/food.cc at line 971 [6.3043806]

B:BD[14.4659] → [14.4659:4759]

                heal_from_food(hp_amt, 0, !one_chance_in(4),
                    one_chance_in(5));

[14.4659]

[6.3065193]

                heal_from_food(hp_amt, 0, !one_chance_in(4), one_chance_in(5));

Replacement in crawl-ref/source/delay.cc at line 698 [6.3963459]

B:BD[3.3340] → [3.3340:3405]

            mpr("You continue eating.", MSGCH_MULTITURN_ACTION);

[3.3340]

[3.3405]

            mprf(MSGCH_MULTITURN_ACTION, "You continue %sing.",
                 you.species == SP_VAMPIRE ? "drink" : "eat");

Replacement in crawl-ref/source/delay.cc at line 780 [6.3963459]

B:BD[15.5426] → [5.24915:25050]

        if (you.species == SP_VAMPIRE)
           mpr( "You finish drinking." );
        else 
           mpr( "You finish eating." );

[15.5426]

[15.5463]

        mprf("You finish %sing.",
             you.species == SP_VAMPIRE ? "drink" : "eat");