fiddlerwoaroof/crawl - Change XUCCWGMXKPIR34BBCCOI67YHI3RST4STDWSDUZTN4B2CJWXQLQ7AC

Some more cards and bugfixes.

Still not implemented: Shuffle, trowel, minefield, spade, blade. Partially implemented: Battlelust, helm, shadow, damage cards. Breaks savefiles.

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

Created by haranp on June 17, 2007

XUCCWGMXKPIR34BBCCOI67YHI3RST4STDWSDUZTN4B2CJWXQLQ7AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1904 [3.293070]
B:BD[3.344314] → [3.344314:344378]
```
    int loopj = 0;
    int spec_effect = 0;
    int hurted = 0;
```
[3.344314]
[3.344378]
```
    int loopj;
```

Replacement in crawl-ref/source/spl-cast.cc at line 1909 [3.293070]

B:BD[3.344451] → [3.344451:344589]

    spec_effect = (mag_pow * mag_fail * (10 + mag_pow) / 7
                                                * WILD_MAGIC_NASTINESS) / 100;

[3.344451]

[3.344589]

    int spec_effect = (mag_pow * mag_fail * (10 + mag_pow) / 7
                       * WILD_MAGIC_NASTINESS) / 100;

Replacement in crawl-ref/source/spl-cast.cc at line 1922 [3.293070]
B:BD[3.344809] → [3.344809:344846]
```
    spec_effect = spec_effect / 100;
```
[3.344809]
[3.344846]
```
    spec_effect /= 100;
```
Replacement in crawl-ref/source/spl-cast.cc at line 2132 [3.293070]
B:BD[3.351713] → [3.351713:351750]
```
                curse_an_item(0, 0);
```
[3.351713]
[3.351750]
```
                curse_an_item(false);
```

Replacement in crawl-ref/source/spl-cast.cc at line 2149 [3.293070]

B:BD[3.352146] → [3.352146:352318]

                do
                {
                    curse_an_item(0, 0);
                    loopj = random2(3);
                }
                while (loopj != 0);

[3.352146]

[3.352318]

                do {
                    curse_an_item(false);
                } while ( !one_chance_in(3) );

Replacement in crawl-ref/source/spl-cast.cc at line 2255 [3.293070]

B:BD[3.355655] → [3.355655:355721]


                for (loopj = 0; loopj < 2 + random2(3); loopj++)

[3.355655]

[3.355721]

                loopj = 2 + random2(3);
                for (int i = 0; i < loopj; ++i)

Replacement in crawl-ref/source/spl-cast.cc at line 2370 [3.293070]

B:BD[3.359710] → [3.359710:359776]


                for (loopj = 0; loopj < 2 + random2(3); loopj++)

[3.359710]

[3.359776]

                loopj = 2 + random2(3);
                for (int i = 0; i < loopj; ++i)

Replacement in crawl-ref/source/spl-cast.cc at line 3168 [3.293070]

B:BD[3.386217] → [3.386217:386382]


                hurted = random2avg(13, 2) + 10;
                hurted -= random2(1 + player_AC());
                ouch(hurted, 0, KILLED_BY_WILD_MAGIC, cause);

[3.386217]

[3.386382]

                ouch( random2avg(13,2) + 10 - random2(1 + player_AC()),
                      0, KILLED_BY_WILD_MAGIC, cause);

Deletion in crawl-ref/source/shopping.cc at line 118 [3.759950]
B:BD[3.761405] → [3.761405:761436]
```
    unsigned int gp_value = 0;
```
Insertion in crawl-ref/source/shopping.cc at line 123 [3.759950]
[3.761635]
[4.8766]
```
    int gp_value; // Should eliminate gotos instead of initializing here
```

Insertion in crawl-ref/source/shopping.cc at line 177 [3.759950]

[3.762834]


        if ( you.duration[DUR_BARGAIN] ) // 20% discount
        {
            gp_value *= 8;
            gp_value /= 10;
        }

Replacement in crawl-ref/source/shopping.cc at line 293 [3.759950]

B:BD[3.764971] → [5.2296:2375]

    gp_value = the_shop.greed * item_value(mitm[shop_items[ft]], id_stock)/10;

[3.764971]

[3.765040]

    gp_value = the_shop.greed*item_value(mitm[shop_items[ft]],id_stock)/10;
    if ( you.duration[DUR_BARGAIN] ) // 20% discount
    {
        gp_value *= 8;
        gp_value /= 10;
    }

Insertion in crawl-ref/source/religion.h at line 40 [3.800304]
[6.241]
[3.804358]
```
void divine_retribution(god_type god);
```
Deletion in crawl-ref/source/religion.cc at line 279 [3.804403]
B:BD[3.806416] → [7.29303:29342]
```
void divine_retribution(god_type god);
```

Insertion in crawl-ref/source/output.cc at line 532 [3.1088282]

[3.1099127]

        }
        
        if (you.duration[DUR_BARGAIN] && wherex() < get_number_of_cols() - 4)
        {
            dur_colour( BLUE, (you.duration[DUR_BARGAIN] <= 15) );
            cprintf( "Brgn" );

Replacement in crawl-ref/source/monstuff.h at line 70 [3.1390580]
B:BD[3.1392931] → [3.1392931:1392975]
```
bool curse_an_item(char which, char power);
```
[3.1392931]
[3.1392975]
```
bool curse_an_item(bool decay_potions);
```
Replacement in crawl-ref/source/monstuff.cc at line 196 [3.1396662]
B:BD[3.1401821] → [3.1401821:1401866]
```
bool curse_an_item( char which, char power )
```
[3.1401821]
[3.1401866]
```
bool curse_an_item( bool decay_potions )
```

Deletion in crawl-ref/source/monstuff.cc at line 198 [3.1396662]

B:BD[3.1401868] → [3.1401868:1402070]

    UNUSED( power );
    /* use which later, if I want to curse weapon/gloves whatever
       which, for now: 0 = non-mummy, 1 = mummy (potions as well)
       don't change mitm.special of !odecay */

Replacement in crawl-ref/source/monstuff.cc at line 215 [3.1396662]

B:BD[3.1402564] → [3.1402564:1402633]

                && (which != 1 || you.inv[i].sub_type == POT_DECAY))

[3.1402564]

[3.1402633]

                && (!decay_potions || you.inv[i].sub_type == POT_DECAY))

Replacement in crawl-ref/source/monstuff.cc at line 742 [3.1396662]
B:BD[3.1415971] → [3.1415971:1416008]
```
            if (curse_an_item(1, 0))
```
[3.1415971]
[3.1416008]
```
            if (curse_an_item(true))
```
Replacement in crawl-ref/source/it_use3.cc at line 99 [3.2870456]
B:BD[3.2874514] → [3.2874514:2874547]
```
            curse_an_item(0, 0);
```
[3.2874514]
[3.2874547]
```
            curse_an_item(false);
```
Replacement in crawl-ref/source/externs.h at line 650 [3.3270163]
B:BD[3.3277037] → [3.3277037:3277058]
```
  unsigned int gold;
```
[3.3277037]
[3.3277058]
```
  int gold;
```
Deletion in crawl-ref/source/enum.h at line 1163 [3.3287960]
B:BD[3.3311780] → [3.3311780:3311802]
```
//jmf: new durations:
```

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

B:BD[3.3311843] → [3.3311843:3311901]

    DUR_WEAPON_BRAND, // general "branding" spell counter

[3.3311843]

[3.3311901]

    DUR_WEAPON_BRAND,                  // general "branding" spell counter

Replacement in crawl-ref/source/enum.h at line 1167 [3.3287960]

B:BD[3.3311918] → [8.913170:913266]

    DUR_GLAMOUR,                        //   20
    DUR_CONDENSATION_SHIELD = 23,       //   23

[3.3311918]

[3.3312074]

    DUR_GLAMOUR,                       //   20
    DUR_CONDENSATION_SHIELD,

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

B:BD[3.3312093] → [8.913267:913425]

    DUR_REPEL_UNDEAD,                   //   25
    DUR_STUN,
    DUR_CUT,                            //   27
    DUR_GOURMAND,                       //   28

[3.3312093]

[8.913425]

    DUR_REPEL_UNDEAD,
    DUR_GOURMAND,
    DUR_BARGAIN,                       //   25

Insertion in crawl-ref/source/decks.cc at line 28 [3.3987460]
[3.3987853]
[3.3987853]
```
#include "monstuff.h"
```
Replacement in crawl-ref/source/decks.cc at line 447 [3.3987460]
B:BD[2.16625] → [2.16625:16678]
```
void portal_card(int power, deck_rarity_type rarity)
```
[2.16625]
[3.3994379]
```
static void portal_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 478 [3.3987460]
B:BD[3.3995341] → [2.17358:17409]
```
void warp_card(int power, deck_rarity_type rarity)
```
[3.3995341]
[2.17409]
```
static void warp_card(int power, deck_rarity_type rarity)
```

Replacement in crawl-ref/source/decks.cc at line 489 [3.3987460]

B:BD[3.3995407] → [2.17643:17702]

void swap_monster_card(int power, deck_rarity_type rarity)

[3.3995407]

[2.17702]

static void swap_monster_card(int power, deck_rarity_type rarity)

Replacement in crawl-ref/source/decks.cc at line 494 [3.3987460]
B:BD[3.3995466] → [2.17751:17806]
```
void velocity_card(int power, deck_rarity_type rarity)
```
[3.3995466]
[2.17806]
```
static void velocity_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 512 [3.3987460]
B:BD[3.3997490] → [2.18182:18238]
```
void damnation_card(int power, deck_rarity_type rarity)
```
[3.3997490]
[2.18238]
```
static void damnation_card(int power, deck_rarity_type rarity)
```

Replacement in crawl-ref/source/decks.cc at line 542 [3.3987460]

B:BD[3.3997938] → [2.19056:19113]

void warpwright_card(int power, deck_rarity_type rarity)

[3.3997938]

[2.19113]

static void warpwright_card(int power, deck_rarity_type rarity)

Replacement in crawl-ref/source/decks.cc at line 580 [3.3987460]

B:BD[3.3999075] → [2.20024:20097]

void damaging_card( card_type card, int power, deck_rarity_type rarity )

[3.3999075]

[2.20097]

static void damaging_card( card_type card, int power, deck_rarity_type rarity )

Replacement in crawl-ref/source/decks.cc at line 602 [3.3987460]
B:BD[3.3999220] → [2.20675:20728]
```
void elixir_card(int power, deck_rarity_type rarity)
```
[3.3999220]
[2.20728]
```
static void elixir_card(int power, deck_rarity_type rarity)
```

Replacement in crawl-ref/source/decks.cc at line 628 [3.3987460]

B:BD[3.4000136] → [2.21277:21335]

void battle_lust_card(int power, deck_rarity_type rarity)

[3.4000136]

[2.21335]

static void battle_lust_card(int power, deck_rarity_type rarity)

Replacement in crawl-ref/source/decks.cc at line 641 [3.3987460]

B:BD[3.4000356] → [2.21633:21693]

void metamorphosis_card(int power, deck_rarity_type rarity)

[3.4000356]

[2.21693]

static void metamorphosis_card(int power, deck_rarity_type rarity)

Replacement in crawl-ref/source/decks.cc at line 652 [3.3987460]
B:BD[3.4000542] → [2.21985:22036]
```
void helm_card(int power, deck_rarity_type rarity)
```
[3.4000542]
[2.22036]
```
static void helm_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 691 [3.3987460]
B:BD[2.23077] → [2.23077:23129]
```
void blade_card(int power, deck_rarity_type rarity)
```
[2.23077]
[2.23129]
```
static void blade_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 709 [3.3987460]
B:BD[3.4002047] → [2.23485:23538]
```
void shadow_card(int power, deck_rarity_type rarity)
```
[3.4002047]
[2.23538]
```
static void shadow_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 719 [3.3987460]
B:BD[3.4002323] → [2.23742:23795]
```
void potion_card(int power, deck_rarity_type rarity)
```
[3.4002323]
[2.23795]
```
static void potion_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 740 [3.3987460]
B:BD[3.4002903] → [2.24405:24457]
```
void focus_card(int power, deck_rarity_type rarity)
```
[3.4002903]
[2.24457]
```
static void focus_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 772 [3.3987460]
B:BD[3.4003802] → [2.25368:25422]
```
void shuffle_card(int power, deck_rarity_type rarity)
```
[3.4003802]
[2.25422]
```
static void shuffle_card(int power, deck_rarity_type rarity)
```

Replacement in crawl-ref/source/decks.cc at line 779 [3.3987460]

B:BD[3.4004028] → [2.25507:25570]

void genetic_engineer_card(int power, deck_rarity_type rarity)

[3.4004028]

[2.25570]

static void genetic_engineer_card(int power, deck_rarity_type rarity)

Replacement in crawl-ref/source/decks.cc at line 799 [3.3987460]
B:BD[3.4004530] → [2.26139:26193]
```
void dowsing_card(int power, deck_rarity_type rarity)
```
[3.4004530]
[2.26193]
```
static void dowsing_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 820 [3.3987460]
B:BD[3.4005392] → [2.26744:26797]
```
void trowel_card(int power, deck_rarity_type rarity)
```
[3.4005392]
[2.26797]
```
static void trowel_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 826 [3.3987460]
B:BD[3.4005602] → [2.26841:26897]
```
void minefield_card(int power, deck_rarity_type rarity)
```
[3.4005602]
[2.26897]
```
static void minefield_card(int power, deck_rarity_type rarity)
```
Replacement in crawl-ref/source/decks.cc at line 832 [3.3987460]
B:BD[3.4005919] → [2.26941:26993]
```
void genie_card(int power, deck_rarity_type rarity)
```
[3.4005919]
[2.26993]
```
static void genie_card(int power, deck_rarity_type rarity)
```

Replacement in crawl-ref/source/decks.cc at line 840 [3.3987460]

B:BD[3.4006221] → [2.27157:27197]

int card_power(deck_rarity_type rarity)

[3.4006221]

[2.27197]

static void godly_wrath()
{
    divine_retribution(static_cast<god_type>(random2(NUM_GODS)));
}
static void curse_card(int power, deck_rarity_type rarity)
{
    const int power_level = get_power_level(power, rarity);
    if ( power_level >= 2 )
    {
        // curse (almost) everything + decay
        while ( curse_an_item(true) && !one_chance_in(1000) )
            ;
    }
    else if ( power_level == 1 )
    {
        do                      // curse an average of four items
        {
            curse_an_item(false);
        } while ( !one_chance_in(4) );
    }
    else
    {
        curse_an_item(false);   // curse 1.5 items
        if ( coinflip() )
            curse_an_item(false);
    }
}
static int card_power(deck_rarity_type rarity)

Insertion in crawl-ref/source/decks.cc at line 926 [3.3987460]

[2.29457]

    case CARD_CURSE:            curse_card(power, rarity); break;
    case CARD_WARPWRIGHT:       warpwright_card(power, rarity); break;

Replacement in crawl-ref/source/decks.cc at line 929 [3.3987460]

∅:D[2.29506] → [3.4007182:4007183]

B:BD[3.4007182] → [3.4007182:4007183]

B:BD[3.4007183] → [2.29507:29625]


    case CARD_WARPWRIGHT: case CARD_SPADE: case CARD_WRATH:
    case CARD_WRAITH: case CARD_CURSE: case CARD_BARGAIN:

[2.29506]

[2.29625]

    case CARD_WRAITH:           drain_exp(); lose_level(); break;
    case CARD_WRATH:            godly_wrath(); break;
        
    case CARD_SPADE:

Insertion in crawl-ref/source/decks.cc at line 940 [3.3987460]

[3.4007492]

[3.4007551]

    case CARD_BARGAIN:
        you.duration[DUR_BARGAIN] += random2(power) + random2(power);
        break;

Replacement in crawl-ref/source/decks.cc at line 944 [3.3987460]

B:BD[3.4007552] → [2.29816:29926]

    case CARD_MAP: magic_mapping( random2(power/10) + 15,
                                  random2(power) );

[3.4007552]

[3.4007722]

    case CARD_MAP:
        magic_mapping( random2(power/10) + 15, random2(power) );
        break;

Insertion in crawl-ref/source/acr.cc at line 1901 [3.4397395]

[3.4451704]

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

Some more cards and bugfixes.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1904 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1909 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1922 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2132 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2149 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2255 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 2370 [3.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 3168 [3.293070]

Deletion in crawl-ref/source/shopping.cc at line 118 [3.759950]

Insertion in crawl-ref/source/shopping.cc at line 123 [3.759950]

Insertion in crawl-ref/source/shopping.cc at line 177 [3.759950]

Replacement in crawl-ref/source/shopping.cc at line 293 [3.759950]

Insertion in crawl-ref/source/religion.h at line 40 [3.800304]

Deletion in crawl-ref/source/religion.cc at line 279 [3.804403]

Insertion in crawl-ref/source/output.cc at line 532 [3.1088282]

Replacement in crawl-ref/source/monstuff.h at line 70 [3.1390580]

Replacement in crawl-ref/source/monstuff.cc at line 196 [3.1396662]

Deletion in crawl-ref/source/monstuff.cc at line 198 [3.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 215 [3.1396662]

Replacement in crawl-ref/source/monstuff.cc at line 742 [3.1396662]

Replacement in crawl-ref/source/it_use3.cc at line 99 [3.2870456]

Replacement in crawl-ref/source/externs.h at line 650 [3.3270163]

Deletion in crawl-ref/source/enum.h at line 1163 [3.3287960]

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

Replacement in crawl-ref/source/enum.h at line 1167 [3.3287960]

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

Insertion in crawl-ref/source/decks.cc at line 28 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 447 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 478 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 489 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 494 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 512 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 542 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 580 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 602 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 628 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 641 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 652 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 691 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 709 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 719 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 740 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 772 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 779 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 799 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 820 [3.3987460]

Replacement in crawl-ref/source/decks.cc at line 826 [3.3987460]