fiddlerwoaroof/crawl - Change DH3YTI6VVI727SQXO4CXSDCSBG2UN3UAWLFULBGRLBVH22ACRXIAC

Some more card implementations (resists in Helm, demon summoning.)

More type-safety.

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

Created by haranp on June 23, 2007

DH3YTI6VVI727SQXO4CXSDCSBG2UN3UAWLFULBGRLBVH22ACRXIAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tags.cc at line 1594 [5.164589]
B:BD[4.6216] → [4.6216:6254]
```
    m.behaviour = unmarshallByte(th);
```
[4.6216]
[4.6254]
```
    m.behaviour = static_cast<beh_type>(unmarshallByte(th));
```

Replacement in crawl-ref/source/tags.cc at line 1661 [5.164589]

B:BD[5.214201] → [5.214201:214248]

        menv[i].attitude = unmarshallByte(th);

[5.214201]

[5.214248]

        menv[i].attitude = static_cast<mon_attitude_type>(unmarshallByte(th));

Replacement in crawl-ref/source/tags.cc at line 1712 [5.164589]
B:BD[5.215698] → [5.215698:215735]
```
        menv[i].behaviour = new_beh;
```
[5.215698]
[5.215735]
```
        menv[i].behaviour = static_cast<beh_type>(new_beh);
```
Deletion in crawl-ref/source/spl-cast.cc at line 802 [5.293070]
B:BD[6.129391] → [6.129391:129434]
```
    int dem_hor = 0;
    int dem_hor2 = 0;
```

Deletion in crawl-ref/source/spl-cast.cc at line 1391 [5.293070]

B:BD[5.331127] → [5.331127:331223]

        dem_hor2 = 3 + random2(5);
        for (dem_hor = 0; dem_hor < 4 + dem_hor2; dem_hor++)

Replacement in crawl-ref/source/spl-cast.cc at line 1392 [5.293070]

B:BD[5.331233] → [5.331233:331305]

            summon_ice_beast_etc(powc, summon_any_demon(DEMON_LESSER));

[5.331233]

[5.331305]

            const int num = 7 + random2(5);
            for (int i = 0; i < num; ++i)
            {
                summon_ice_beast_etc(powc, summon_any_demon(DEMON_LESSER));
            }

Deletion in crawl-ref/source/spl-cast.cc at line 1402 [5.293070]
B:BD[5.331416] → [5.331416:331487]
```
        dem_hor = ((random2(powc) <= 5) ? BEH_HOSTILE : BEH_CHARMED);
```

Replacement in crawl-ref/source/spl-cast.cc at line 1403 [5.293070]

B:BD[5.331488] → [5.331488:331581]

        if (dem_hor == BEH_CHARMED)
            mpr("You don't feel so good about this...");

[5.331488]

[5.331581]

        {
            const beh_type dem_beh = ((random2(powc) <= 5)
                                      ? BEH_HOSTILE : BEH_CHARMED);

Replacement in crawl-ref/source/spl-cast.cc at line 1407 [5.293070]

B:BD[5.331582] → [7.1066:1135]

∅:D[7.1135] → [5.331660:331722]

B:BD[5.331660] → [5.331660:331722]

        create_monster( summon_any_demon(DEMON_GREATER), 5, dem_hor,
                        you.x_pos, you.y_pos, MHITYOU, 250 );

[5.331582]

[5.331722]

            if (dem_beh == BEH_CHARMED)
                mpr("You don't feel so good about this...");

Insertion in crawl-ref/source/spl-cast.cc at line 1410 [5.293070]

[5.331723]

            create_monster( summon_any_demon(DEMON_GREATER), 5, dem_beh,
                            you.x_pos, you.y_pos, MHITYOU, 250 );
        }

Replacement in crawl-ref/source/spells4.cc at line 666 [5.436250]
B:BD[5.453294] → [5.453294:453321]
```
    int mon, i, behaviour;
```
[5.453294]
[5.453322]
```
    int mon;
```

Replacement in crawl-ref/source/spells4.cc at line 679 [5.436250]

B:BD[5.453710] → [5.453710:453838]

    behaviour = item_cursed( you.inv[ weapon ] ) ? BEH_HOSTILE
                                                 : BEH_FRIENDLY;

[5.453710]

[5.453838]

    const beh_type behaviour = item_cursed( you.inv[ weapon ] )
        ? BEH_HOSTILE : BEH_FRIENDLY;

Replacement in crawl-ref/source/spells4.cc at line 688 [5.436250]
B:BD[5.454046] → [5.454046:454081]
```
        for (i = 0; i <= max; i++)
```
[5.454046]
[5.454081]
```
        for (int i = 0; i <= max; i++)
```
Insertion in crawl-ref/source/spells2.h at line 15 [5.562867]
[5.563139]
[5.563139]
```
#include "enum.h"
```

Replacement in crawl-ref/source/spells2.h at line 30 [5.562867]

B:BD[5.563614] → [5.563614:563705]

int animate_a_corpse(int axps, int ayps, int corps_beh, int corps_hit, int class_allowed);

[5.563614]

[5.563705]

int animate_a_corpse(int axps, int ayps, beh_type corps_beh,
                     int corps_hit, int class_allowed);

Replacement in crawl-ref/source/spells2.h at line 38 [5.562867]

B:BD[5.563955] → [5.563955:564026]

int animate_dead(int power, int corps_beh, int corps_hit, int actual);

[5.563955]

[5.564026]

int animate_dead(int power, beh_type corps_beh, int corps_hit, int actual);

Replacement in crawl-ref/source/spells2.h at line 109 [5.562867]

B:BD[5.566517] → [5.566517:566577]

void cast_twisted(int power, int corps_beh, int corps_hit);

[5.566517]

[5.566577]

void cast_twisted(int power, beh_type corps_beh, int corps_hit);

Replacement in crawl-ref/source/spells2.cc at line 51 [5.569242]

B:BD[5.570494] → [5.570494:570605]

int raise_corpse( int corps, int corx, int cory, int corps_beh,
                  int corps_hit, int actual );

[5.570494]

[5.570605]

static int raise_corpse( int corps, int corx, int cory, beh_type corps_beh,
                         int corps_hit, int actual );

Replacement in crawl-ref/source/spells2.cc at line 290 [5.569242]

B:BD[5.575454] → [5.575454:575526]

int animate_dead( int power, int corps_beh, int corps_hit, int actual )

[5.575454]

[5.575526]

int animate_dead( int power, beh_type corps_beh, int corps_hit, int actual )

Replacement in crawl-ref/source/spells2.cc at line 363 [5.569242]

B:BD[5.577567] → [6.150948:151020]

int animate_a_corpse( int axps, int ayps, int corps_beh, int corps_hit,

[5.577567]

[5.577640]

int animate_a_corpse( int axps, int ayps, beh_type corps_beh, int corps_hit,

Replacement in crawl-ref/source/spells2.cc at line 391 [5.569242]

B:BD[5.578249] → [5.578249:578310]

                  int corps_beh, int corps_hit, int actual )

[5.578249]

[5.578310]

                  beh_type corps_beh, int corps_hit, int actual )

Replacement in crawl-ref/source/spells2.cc at line 424 [5.569242]

B:BD[5.579114] → [5.579114:579173]

void cast_twisted(int power, int corps_beh, int corps_hit)

[5.579114]

[5.579173]

void cast_twisted(int power, beh_type corps_beh, int corps_hit)

Replacement in crawl-ref/source/spells2.cc at line 1347 [5.569242]
∅:D[7.4460] → [6.152465:152522]
B:BD[5.605180] → [6.152465:152522]
```
    int beha = divine_gift? BEH_GOD_GIFT : BEH_FRIENDLY;
```
[7.4460]
[5.605268]
```
    beh_type beha = divine_gift? BEH_GOD_GIFT : BEH_FRIENDLY;
```

Replacement in crawl-ref/source/spells2.cc at line 1448 [5.569242]

B:BD[5.608525] → [5.608525:608588]

        int behaviour = BEH_HOSTILE;  // default to unfriendly

[5.608525]

[5.608588]

        beh_type behaviour = BEH_HOSTILE;  // default to unfriendly

Replacement in crawl-ref/source/spells1.h at line 113 [5.611815]
B:BD[5.615532] → [5.615532:615554]
```
void antimagic(void);
```
[5.615532]
[5.615554]
```
void antimagic();
```
Replacement in crawl-ref/source/spells1.cc at line 691 [5.616635]
B:BD[5.631181] → [5.631181:631204]
```
void antimagic( void )
```
[5.631181]
[5.631204]
```
void antimagic()
```

Replacement in crawl-ref/source/spells1.cc at line 693 [5.616635]

B:BD[5.631206] → [5.631206:631248]

    if (you.haste)
        you.haste = 1;

[5.631206]

[5.631248]

    int* direct_list[] = {
        &you.haste, &you.slow, &you.paralysis, &you.conf,
        &you.might, &you.invis, &you.fire_shield
    };

Replacement in crawl-ref/source/spells1.cc at line 698 [5.616635]

B:BD[5.631249] → [5.631249:631425]

    if (you.slow)
        you.slow = 1;
    if (you.paralysis)
        you.paralysis = 1;
    if (you.conf)
        you.conf = 1;
    if (you.might)
        you.might = 1;

[5.631249]

[5.631425]

    duration_type dur_list[] = {
        DUR_WEAPON_BRAND, DUR_ICY_ARMOUR, DUR_REPEL_MISSILES, DUR_REGENERATION,
        DUR_DEFLECT_MISSILES, DUR_SWIFTNESS, DUR_INSULATION, DUR_STONEMAIL,
        DUR_CONTROLLED_FLIGHT, DUR_CONTROL_TELEPORT, DUR_RESIST_POISON,
        DUR_RESIST_FIRE, DUR_RESIST_COLD, DUR_TRANSFORMATION, DUR_STONESKIN,
        DUR_FORESCRY, DUR_SEE_INVISIBLE, DUR_SILENCE, DUR_CONDENSATION_SHIELD
    };

Deletion in crawl-ref/source/spells1.cc at line 708 [5.616635]

B:BD[5.631481] → [5.631481:631957]


    if (you.invis)
        you.invis = 1;
    if (you.duration[DUR_WEAPON_BRAND])
        you.duration[DUR_WEAPON_BRAND] = 1;
    if (you.duration[DUR_ICY_ARMOUR])
        you.duration[DUR_ICY_ARMOUR] = 1;
    if (you.duration[DUR_REPEL_MISSILES])
        you.duration[DUR_REPEL_MISSILES] = 1;
    if (you.duration[DUR_REGENERATION])
        you.duration[DUR_REGENERATION] = 1;
    if (you.duration[DUR_DEFLECT_MISSILES])
        you.duration[DUR_DEFLECT_MISSILES] = 1;

Replacement in crawl-ref/source/spells1.cc at line 709 [5.616635]

B:BD[5.631958] → [5.631958:632012]

    if (you.fire_shield)
        you.fire_shield = 1;

[5.631958]

[5.632012]

    for ( unsigned int i = 0; i < ARRAYSIZE(direct_list); ++i )
        if ( *(direct_list[i]) > 1 )
            *(direct_list[i]) = 1;

Replacement in crawl-ref/source/spells1.cc at line 713 [5.616635]

B:BD[5.632013] → [5.632013:632091]

    if (you.duration[DUR_SWIFTNESS])
        you.duration[DUR_SWIFTNESS] = 1;

[5.632013]

[5.632091]

    for ( unsigned int i = 0; i < ARRAYSIZE(dur_list); ++i )
        if ( you.duration[dur_list[i]] > 1 )
            you.duration[dur_list[i]] = 1;

Deletion in crawl-ref/source/spells1.cc at line 717 [5.616635]

B:BD[5.632092] → [5.632092:633060]

    if (you.duration[DUR_INSULATION])
        you.duration[DUR_INSULATION] = 1;
    if (you.duration[DUR_STONEMAIL])
        you.duration[DUR_STONEMAIL] = 1;
    if (you.duration[DUR_CONTROLLED_FLIGHT])
        you.duration[DUR_CONTROLLED_FLIGHT] = 1;
    if (you.duration[DUR_CONTROL_TELEPORT])
        you.duration[DUR_CONTROL_TELEPORT] = 1;
    if (you.duration[DUR_RESIST_POISON])
        you.duration[DUR_RESIST_POISON] = 1;
    if (you.duration[DUR_TRANSFORMATION])
        you.duration[DUR_TRANSFORMATION] = 1;
    //jmf: added following
    if (you.duration[DUR_STONESKIN])
        you.duration[DUR_STONESKIN] = 1;
    if (you.duration[DUR_FORESCRY])
        you.duration[DUR_FORESCRY] = 1;
    if (you.duration[DUR_SEE_INVISIBLE])
        you.duration[DUR_SEE_INVISIBLE] = 1;
    if (you.duration[DUR_SILENCE])
        you.duration[DUR_SILENCE] = 1;
    if (you.duration[DUR_CONDENSATION_SHIELD])
        you.duration[DUR_CONDENSATION_SHIELD] = 1;

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

[5.978173]

    // spells:
    if (you.duration[DUR_RESIST_FIRE] > 0)
        rf++;

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

[8.199351]

[5.979448]


    // spells:
    if (you.duration[DUR_RESIST_COLD] > 0)
        rc++;

Insertion in crawl-ref/source/player.cc at line 3705 [5.962854]
[5.1048969]
[5.1048969]
```
    ret += std::min(you.duration[DUR_SLAYING] / 13, 6);
```
Replacement in crawl-ref/source/monstuff.cc at line 1629 [5.1396662]
B:BD[5.1443498] → [5.1443498:1443545]
```
        unsigned int new_beh = mon->behaviour;
```
[5.1443498]
[5.1443545]
```
        beh_type new_beh = mon->behaviour;
```

Replacement in crawl-ref/source/monplace.h at line 40 [5.1638277]

B:BD[5.1639586] → [5.1639586:1639659]

int mons_place( int mon_type, char behaviour, int target, bool summoned,

[5.1639586]

[5.1639659]

int mons_place( int mon_type, beh_type behaviour, int target, bool summoned,

Replacement in crawl-ref/source/monplace.h at line 51 [5.1638277]

B:BD[5.1640170] → [5.1640170:1640239]

int create_monster( int cls, int dur, int beha, int cr_x, int cr_y,

[5.1640170]

[9.74]

int create_monster( int cls, int dur, beh_type beha, int cr_x, int cr_y,

Replacement in crawl-ref/source/monplace.h at line 81 [5.1638277]

B:BD[5.1641451] → [5.1641451:1641521]

bool place_monster( int &id, int mon_type, int power, char behaviour,

[5.1641451]

[5.1641521]

bool place_monster( int &id, int mon_type, int power, beh_type behaviour,

Replacement in crawl-ref/source/monplace.h at line 93 [5.1638277]

B:BD[6.450502] → [10.2418:2475]

                            char behaviour = BEH_SLEEP);

[6.450502]

[6.450538]

                            beh_type behaviour = BEH_SLEEP);

Replacement in crawl-ref/source/monplace.cc at line 41 [5.1641732]
∅:D[11.1103] → [5.1642599:1642670]
B:BD[5.1642599] → [5.1642599:1642670]
```
static int place_monster_aux(int mon_type, char behaviour, int target,
```
[11.1103]
[8.245888]
```
static int place_monster_aux(int mon_type, beh_type behaviour, int target,
```
Replacement in crawl-ref/source/monplace.cc at line 144 [5.1641732]
∅:D[6.454464] → [5.1642738:1642807]
B:BD[5.1642738] → [5.1642738:1642807]
```
bool place_monster(int &id, int mon_type, int power, char behaviour,
```
[6.454464]
[12.267]
```
bool place_monster(int &id, int mon_type, int power, beh_type behaviour,
```

Replacement in crawl-ref/source/monplace.cc at line 448 [5.1641732]

B:BD[5.1652199] → [5.1652199:1652271]

static int place_monster_aux( int mon_type, char behaviour, int target,

[5.1652199]

[5.1652271]

static int place_monster_aux( int mon_type, beh_type behaviour, int target,

Replacement in crawl-ref/source/monplace.cc at line 1168 [5.1641732]

B:BD[6.457852] → [6.457852:457922]

void mark_interesting_monst(struct monsters* monster, char behaviour)

[6.457852]

[6.457922]

void mark_interesting_monst(struct monsters* monster, beh_type behaviour)

Replacement in crawl-ref/source/monplace.cc at line 1205 [5.1641732]

B:BD[5.1671901] → [5.1671901:1671974]

int mons_place( int mon_type, char behaviour, int target, bool summoned,

[5.1671901]

[2.417]

int mons_place( int mon_type, beh_type behaviour, int target, bool summoned,

Replacement in crawl-ref/source/monplace.cc at line 1354 [5.1641732]

B:BD[6.459697] → [6.459697:459765]

int create_monster( int cls, int dur, int beha, int cr_x, int cr_y,

[6.459697]

[9.194]

int create_monster( int cls, int dur, beh_type beha, int cr_x, int cr_y,

Replacement in crawl-ref/source/it_use3.cc at line 677 [5.2870456]

B:BD[5.2892077] → [5.2892077:2892147]

    const int behaviour = ((you.skills[SK_EVOCATIONS] > random2(20))

[5.2892077]

[5.2892147]

    const beh_type behaviour = ((you.skills[SK_EVOCATIONS] > random2(20))

Replacement in crawl-ref/source/it_use3.cc at line 946 [5.2870456]
B:BD[5.2899832] → [5.2899832:2899864]
```
static bool box_of_beasts(void)
```
[5.2899832]
[5.2899864]
```
static bool box_of_beasts()
```

Replacement in crawl-ref/source/it_use3.cc at line 971 [5.2870456]

B:BD[5.2900725] → [5.2900725:2900884]

        int beh = (one_chance_in(you.skills[SK_EVOCATIONS] + 5) ? BEH_HOSTILE
                                                                : BEH_FRIENDLY);

[5.2900725]

[5.2900884]

        beh_type beh = (one_chance_in(you.skills[SK_EVOCATIONS] + 5)
                        ? BEH_HOSTILE : BEH_FRIENDLY);

Replacement in crawl-ref/source/externs.h at line 622 [5.3270163]
B:BD[5.3275807] → [5.3275807:3275827]
```
  char fire_shield;
```
[5.3275807]
[5.3275827]
```
  int fire_shield;
```
Replacement in crawl-ref/source/externs.h at line 997 [5.3270163]
∅:D[6.898130] → [5.3280720:3280809]
B:BD[5.3280720] → [5.3280720:3280809]
```
    unsigned char attitude;            // from MONS_ATTITUDE
    unsigned int behaviour;
```
[6.898130]
[5.3280809]
```
    mon_attitude_type attitude;
    beh_type behaviour;
```

Replacement in crawl-ref/source/enum.h at line 517 [5.3287960]

B:BD[13.6415] → [13.6415:6476]

    CARD_GENETIC_ENGINEER,      // remove one *bad* mutation

[13.6415]

[13.6476]

    CARD_HELIX,                 // remove one *bad* mutation

Replacement in crawl-ref/source/enum.h at line 1150 [5.3287960]
B:BD[5.3311333] → [5.3311333:3311380]
```
    DUR_LIQUID_FLAMES,                 //    0
```
[5.3311333]
[5.3311380]
```
    DUR_LIQUID_FLAMES,          //  0
```
Replacement in crawl-ref/source/enum.h at line 1155 [5.3287960]
B:BD[5.3311462] → [5.3311462:3311529]
```
    DUR_SWIFTNESS,                     //    5
    DUR_INSULATION,
```
[5.3311462]
[5.3311529]
```
    DUR_SWIFTNESS,              //  5
```

Replacement in crawl-ref/source/enum.h at line 1159 [5.3287960]

B:BD[5.3311593] → [5.3311593:3311686]

    DUR_CONTROL_TELEPORT,              //   10
    DUR_RESIST_POISON,
    DUR_BREATH_WEAPON,

[5.3311593]

[5.3311686]

    DUR_CONTROL_TELEPORT,
    DUR_BREATH_WEAPON,          // 10

Replacement in crawl-ref/source/enum.h at line 1163 [5.3287960]
B:BD[5.3311733] → [5.3311733:3311780]
```
    DUR_DEFLECT_MISSILES,              //   15
```
[5.3311733]
[5.3311802]
```
    DUR_DEFLECT_MISSILES,
```
Replacement in crawl-ref/source/enum.h at line 1165 [5.3287960]
B:BD[5.3311820] → [5.3311820:3311843]
```
    DUR_SEE_INVISIBLE,
```
[5.3311820]
[3.1781]
```
    DUR_SEE_INVISIBLE,          // 15
```
Replacement in crawl-ref/source/enum.h at line 1168 [5.3287960]
B:BD[5.3311918] → [3.1857:1904]
```
    DUR_GLAMOUR,                       //   20
```
[5.3311918]
[3.1904]
```
    DUR_GLAMOUR,
```
Replacement in crawl-ref/source/enum.h at line 1170 [5.3287960]
∅:D[3.1933] → [5.3312074:3312093]
∅:D[6.913266] → [5.3312074:3312093]
B:BD[5.3312074] → [5.3312074:3312093]
```
    DUR_STONESKIN,
```
[3.1933]
[3.1934]
```
    DUR_STONESKIN,              // 20
```

Replacement in crawl-ref/source/enum.h at line 1173 [5.3287960]

B:BD[3.1974] → [3.1974:2021]

    DUR_BARGAIN,                       //   25

[3.1974]

[6.913425]

    DUR_BARGAIN,
    DUR_INSULATION,
    DUR_RESIST_POISON,          // 25
    DUR_RESIST_FIRE,
    DUR_RESIST_COLD,
    DUR_SLAYING,

Replacement in crawl-ref/source/enum.h at line 1186 [5.3287960]

B:BD[6.913650] → [6.913650:913727]

    EC_FIRE = 32,       // fiery colours (must be first and > higest colour)

[6.913650]

[6.913727]

    EC_FIRE = 32,       // fiery colours (must be first and > highest colour)

Replacement in crawl-ref/source/defines.h at line 121 [5.3982910]
B:BD[5.3984751] → [5.3984751:3984772]
```
#define MAX_TRAPS 30
```
[5.3984751]
[5.3984772]
```
#define MAX_TRAPS 100
```
Replacement in crawl-ref/source/decks.cc at line 85 [5.3987460]
B:BD[13.11394] → [13.11394:11454]
```
    CARD_EXPERIENCE, CARD_WILD_MAGIC, CARD_GENETIC_ENGINEER
```
[13.11394]
[5.3990738]
```
    CARD_EXPERIENCE, CARD_WILD_MAGIC, CARD_HELIX
```
Replacement in crawl-ref/source/decks.cc at line 135 [5.3987460]
B:BD[13.12715] → [13.12715:12766]
```
    case CARD_GENETIC_ENGINEER: return "Genetics";
```
[13.12715]
[13.12766]
```
    case CARD_HELIX: return "the Helix";
```

Insertion in crawl-ref/source/decks.cc at line 580 [5.3987460]

[5.3999075]

[3.2437]

static void minefield_card(int power, deck_rarity_type rarity)
{
    const int power_level = get_power_level(power, rarity);   
    const int radius = power_level * 2 + 2;
    for ( int dx = -radius; dx <= radius; ++dx )
    {
        for ( int dy = -radius; dy <= radius; ++dy )
        {
            if ( dx * dx + dy*dy > radius*radius + 1 )
                continue;
            if ( dx == 0 && dy == 0 )
                continue;
            const int rx = you.x_pos + dx;
            const int ry = you.y_pos + dy;
            if ( !in_bounds(rx, ry) )
                continue;
            if ( grd[rx][ry] == DNGN_FLOOR && trap_at_xy(rx,ry) == -1 &&
                 one_chance_in(4 - power_level) )
            {
                place_specific_trap(rx, ry, TRAP_RANDOM);
            }
        }
    }
}

Replacement in crawl-ref/source/decks.cc at line 658 [5.3987460]

B:BD[13.21425] → [13.21425:21485]

    {
        // temporary ring of slaying effect XXX
    }

[13.21425]

[13.21485]

        you.duration[DUR_SLAYING] = random2(power/6);

Insertion in crawl-ref/source/decks.cc at line 671 [5.3987460]

[13.21870]

    else if ( power_level == 1 )
        trans = (coinflip() ? TRAN_STATUE : TRAN_BLADE_HANDS);

Replacement in crawl-ref/source/decks.cc at line 674 [5.3987460]

B:BD[13.21879] → [13.21879:21942]

        trans = (coinflip() ? TRAN_STATUE : TRAN_BLADE_HANDS);

[13.21879]

[13.21942]

        trans = (coinflip() ? TRAN_SPIDER : TRAN_ICE_BEAST);

Insertion in crawl-ref/source/decks.cc at line 710 [5.3987460]

[13.22879]

[5.4000773]

    if ( num_resists )
    {
        const duration_type possible_resists[4] = {
            DUR_RESIST_POISON, DUR_INSULATION,
            DUR_RESIST_FIRE, DUR_RESIST_COLD
        };
        const char* resist_names[4] = {
            "poison", "electricity", "fire", "cold"
        };
        for ( int i = 0; i < 4 && num_resists; ++i )
        {
            // if there are n left, of which we need to choose
            // k, we have chance k/n of selecting the next item.
            if ( random2(4-i) < num_resists )
            {
                // Add a temporary resist
                you.duration[possible_resists[i]] += random2(power/7);
                msg::stream << "You feel resistant to " << resist_names[i]
                            << '.' << std::endl;
                --num_resists;
                if ( num_resists == 0 )
                    break;
            }
        }
    }

Replacement in crawl-ref/source/decks.cc at line 736 [5.3987460]
B:BD[5.4000774] → [13.22880:22929]
```
    // XXX XXX FIXME handle do_shield, do_resist
```
[5.4000774]
[13.22929]
```
    // XXX XXX FIXME handle do_shield
```

Replacement in crawl-ref/source/decks.cc at line 830 [5.3987460]

B:BD[5.4004028] → [3.3076:3146]

static void genetic_engineer_card(int power, deck_rarity_type rarity)

[5.4004028]

[13.25570]

static void helix_card(int power, deck_rarity_type rarity)

Deletion in crawl-ref/source/decks.cc at line 872 [5.3987460]
∅:D[3.3269] → [13.26797:26840]
B:BD[13.26797] → [13.26797:26840]
∅:D[13.26840] → [5.4005601:4005602]
B:BD[5.4005601] → [5.4005601:4005602]
B:BD[5.4005602] → [3.3270:3333]
```
{
    // not implemented yet
    return;
}
static void minefield_card(int power, deck_rarity_type rarity)
```

Insertion in crawl-ref/source/decks.cc at line 915 [5.3987460]

[3.4103]

static void summon_demon_card(int power, deck_rarity_type rarity)
{
    const int power_level = get_power_level(power, rarity);
    demon_class_type dct;
    if ( power_level >= 2 )
        dct = DEMON_GREATER;
    else if ( power_level == 1 )
        dct = DEMON_COMMON;
    else
        dct = DEMON_LESSER;
    create_monster( dct, power/50, BEH_FRIENDLY, you.x_pos, you.y_pos,
                    MHITYOU, 250 );
}

Replacement in crawl-ref/source/decks.cc at line 979 [5.3987460]

B:BD[13.29109] → [13.29109:29186]

    case CARD_GENETIC_ENGINEER: genetic_engineer_card(power, rarity); break;

[13.29109]

[13.29186]

    case CARD_HELIX:            helix_card(power, rarity); break;

Insertion in crawl-ref/source/decks.cc at line 989 [5.3987460]

[3.4410]

    case CARD_SUMMON_DEMON:     summon_demon_card(power, rarity); break;

Deletion in crawl-ref/source/decks.cc at line 1016 [5.3987460]
B:BD[13.30211] → [13.30211:30246]
```
    case CARD_SUMMON_DEMON: break;
```

Deletion in crawl-ref/source/decks.cc at line 1018 [5.3987460]

∅:D[13.30315] → [5.4008337:4008338]

B:BD[5.4008337] → [5.4008337:4008338]

B:BD[5.4008860] → [5.4008860:4008861]

B:BD[5.4008861] → [13.30316:30527]

∅:D[13.30527] → [5.4008924:4008925]

B:BD[5.4008924] → [5.4008924:4008925]


            /* if (create_monster( summon_any_demon( DEMON_LESSER ), 6, 
                                BEH_HOSTILE, you.x_pos, you.y_pos, 
                                MHITYOU, 250 ) != -1) 
            */

Insertion in crawl-ref/source/acr.cc at line 1887 [5.4397395]

[5.4449679]

[5.4449727]

    }
    if (you.duration[DUR_RESIST_FIRE] > 1)
    {
        you.duration[DUR_RESIST_FIRE]--;
        if (you.duration[DUR_RESIST_FIRE] == 6)
        {
            mpr("Your fire resistance is about to expire.", MSGCH_DURATION);
            if (coinflip())
                you.duration[DUR_RESIST_FIRE]--;
        }
    }
    else if (you.duration[DUR_RESIST_FIRE] == 1)
    {
        mpr("Your fire resistance expires.", MSGCH_DURATION);
        you.duration[DUR_RESIST_FIRE] = 0;
    }
    if (you.duration[DUR_RESIST_COLD] > 1)
    {
        you.duration[DUR_RESIST_COLD]--;
        if (you.duration[DUR_RESIST_COLD] == 6)
        {
            mpr("Your cold resistance is about to expire.", MSGCH_DURATION);
            if (coinflip())
                you.duration[DUR_RESIST_COLD]--;
        }

Insertion in crawl-ref/source/acr.cc at line 1915 [5.4397395]

[5.4449733]

    else if (you.duration[DUR_RESIST_COLD] == 1)
    {
        mpr("Your cold resistance expires.", MSGCH_DURATION);
        you.duration[DUR_RESIST_COLD] = 0;
    }

Insertion in crawl-ref/source/acr.cc at line 1937 [5.4397395]

[5.4450235]

    if (you.duration[DUR_SLAYING] > 1)
    {
        you.duration[DUR_SLAYING]--;
    }
    else if (you.duration[DUR_SLAYING] == 1)
    {
        mpr("You feel less lethal.", MSGCH_DURATION);
        you.duration[DUR_SLAYING] = 0;
    }

Some more card implementations (resists in Helm, demon summoning.)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tags.cc at line 1594 [5.164589]

Replacement in crawl-ref/source/tags.cc at line 1661 [5.164589]

Replacement in crawl-ref/source/tags.cc at line 1712 [5.164589]

Deletion in crawl-ref/source/spl-cast.cc at line 802 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1391 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1392 [5.293070]

Deletion in crawl-ref/source/spl-cast.cc at line 1402 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1403 [5.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1407 [5.293070]

Insertion in crawl-ref/source/spl-cast.cc at line 1410 [5.293070]

Replacement in crawl-ref/source/spells4.cc at line 666 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 679 [5.436250]

Replacement in crawl-ref/source/spells4.cc at line 688 [5.436250]

Insertion in crawl-ref/source/spells2.h at line 15 [5.562867]

Replacement in crawl-ref/source/spells2.h at line 30 [5.562867]

Replacement in crawl-ref/source/spells2.h at line 38 [5.562867]

Replacement in crawl-ref/source/spells2.h at line 109 [5.562867]

Replacement in crawl-ref/source/spells2.cc at line 51 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 290 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 363 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 391 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 424 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 1347 [5.569242]

Replacement in crawl-ref/source/spells2.cc at line 1448 [5.569242]

Replacement in crawl-ref/source/spells1.h at line 113 [5.611815]

Replacement in crawl-ref/source/spells1.cc at line 691 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 693 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 698 [5.616635]

Deletion in crawl-ref/source/spells1.cc at line 708 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 709 [5.616635]

Replacement in crawl-ref/source/spells1.cc at line 713 [5.616635]

Deletion in crawl-ref/source/spells1.cc at line 717 [5.616635]

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

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

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

Replacement in crawl-ref/source/monstuff.cc at line 1629 [5.1396662]

Replacement in crawl-ref/source/monplace.h at line 40 [5.1638277]

Replacement in crawl-ref/source/monplace.h at line 51 [5.1638277]

Replacement in crawl-ref/source/monplace.h at line 81 [5.1638277]

Replacement in crawl-ref/source/monplace.h at line 93 [5.1638277]

Replacement in crawl-ref/source/monplace.cc at line 41 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 144 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 448 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1168 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1205 [5.1641732]

Replacement in crawl-ref/source/monplace.cc at line 1354 [5.1641732]

Replacement in crawl-ref/source/it_use3.cc at line 677 [5.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 946 [5.2870456]

Replacement in crawl-ref/source/it_use3.cc at line 971 [5.2870456]

Replacement in crawl-ref/source/externs.h at line 622 [5.3270163]

Replacement in crawl-ref/source/externs.h at line 997 [5.3270163]

Replacement in crawl-ref/source/enum.h at line 517 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1150 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1155 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1159 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1163 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1165 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1168 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1170 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1173 [5.3287960]

Replacement in crawl-ref/source/enum.h at line 1186 [5.3287960]

Replacement in crawl-ref/source/defines.h at line 121 [5.3982910]

Replacement in crawl-ref/source/decks.cc at line 85 [5.3987460]

Replacement in crawl-ref/source/decks.cc at line 135 [5.3987460]