fiddlerwoaroof/crawl - Change CJWCTWT75S4P3OSCMUZ2W6UTWI6GOQMUSBUN6KEN4TVFEG4HHHGQC

Added rarity weight vectors. They aren't too interesting at the moment:

the weight is 5 for everything at all rarities except for Damnation (which is 0,1,2) and Focus (which is 1,1,2). Suggestions and changes would be appreciated (look at the top of decks.cc to see what to change.)

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

Created by haranp on November 29, 2007

CJWCTWT75S4P3OSCMUZ2W6UTWI6GOQMUSBUN6KEN4TVFEG4HHHGQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/decks.h at line 59 [7.3986924]

B:BD[6.38683] → [6.38683:38784]

    CARD_BLANK1 = 0,            // non-retried
    CARD_BLANK2,                // retried and failed

Replacement in crawl-ref/source/decks.cc at line 66 [7.3987460]

∅:D[6.41633] → [8.10398:10604]

B:BD[7.3988207] → [8.10398:10604]

#define VECFROM(x) (x), (x) + ARRAYSIZE(x)
#define DEFVEC(Z) static std::vector<card_type> Z(VECFROM(a_##Z))
static card_type a_deck_of_transport[] = {
    CARD_PORTAL, CARD_WARP, CARD_SWAP, CARD_VELOCITY

[6.41633]

[7.3990220]

struct card_with_weights
{
    card_type card;
    int weight[3];

Replacement in crawl-ref/source/decks.cc at line 72 [7.3987460]

B:BD[7.3990224] → [8.10605:10755]

DEFVEC(deck_of_transport);
static card_type a_deck_of_emergency[] = {
    CARD_TOMB, CARD_BANSHEE, CARD_DAMNATION, CARD_SOLITUDE, CARD_WARPWRIGHT
};

[7.3990224]

[8.10755]

typedef card_with_weights deck_archetype;

Replacement in crawl-ref/source/decks.cc at line 74 [7.3987460]
B:BD[8.10756] → [8.10756:10783]
```
DEFVEC(deck_of_emergency);
```
[8.10756]
[8.10783]
```
#define END_OF_DECK {NUM_CARDS, {0,0,0}}
```

Replacement in crawl-ref/source/decks.cc at line 76 [7.3987460]

B:BD[8.10784] → [8.10784:10829]

B:BD[8.10829] → [9.434:501]

B:BD[9.501] → [3.877:917]

static card_type a_deck_of_destruction[] = {
    CARD_VITRIOL, CARD_FLAME, CARD_FROST, CARD_VENOM, CARD_HAMMER,
    CARD_SPARK, CARD_PAIN, CARD_TORMENT

[8.10784]

[8.10883]

const deck_archetype deck_of_transport[] = {
    { CARD_PORTAL,   {5, 5, 5} },
    { CARD_WARP,     {5, 5, 5} },
    { CARD_SWAP,     {5, 5, 5} },
    { CARD_VELOCITY, {5, 5, 5} },
    END_OF_DECK

Replacement in crawl-ref/source/decks.cc at line 84 [7.3987460]

B:BD[8.10887] → [8.10887:11050]

DEFVEC(deck_of_destruction);
static card_type a_deck_of_battle[] = {
    CARD_ELIXIR, CARD_BATTLELUST, CARD_METAMORPHOSIS,
    CARD_HELM, CARD_BLADE, CARD_SHADOW

[8.10887]

[8.11050]

const deck_archetype deck_of_emergency[] = {
    { CARD_TOMB,       {5, 5, 5} },
    { CARD_BANSHEE,    {5, 5, 5} },
    { CARD_DAMNATION,  {0, 1, 2} },
    { CARD_SOLITUDE,   {5, 5, 5} },
    { CARD_WARPWRIGHT, {5, 5, 5} },
    END_OF_DECK

Replacement in crawl-ref/source/decks.cc at line 93 [7.3987460]

B:BD[8.11054] → [8.11054:11141]

DEFVEC(deck_of_battle);
static card_type a_deck_of_enchantments[] = {
    CARD_ELIXIR

[8.11054]

[8.11141]

const deck_archetype deck_of_destruction[] = {
    { CARD_VITRIOL, {5, 5, 5} },
    { CARD_FLAME,   {5, 5, 5} },
    { CARD_FROST,   {5, 5, 5} },
    { CARD_VENOM,   {5, 5, 5} },
    { CARD_HAMMER,  {5, 5, 5} },
    { CARD_SPARK,   {5, 5, 5} },
    { CARD_PAIN,    {5, 5, 5} },
    { CARD_TORMENT, {5, 5, 5} },
    END_OF_DECK

Deletion in crawl-ref/source/decks.cc at line 104 [7.3987460]
B:BD[8.11144] → [8.11144:11175]
```
DEFVEC(deck_of_enchantments);
```

Replacement in crawl-ref/source/decks.cc at line 105 [7.3987460]

B:BD[8.11176] → [8.11176:11219]

B:BD[8.11219] → [5.404:506]

static card_type a_deck_of_summoning[] = {
    CARD_CRUSADE, CARD_SUMMON_ANIMAL, CARD_SUMMON_DEMON, CARD_SUMMON_WEAPON,
    CARD_SUMMON_SKELETON

[8.11176]

[7.3990487]

const deck_archetype deck_of_battle[] = {
    { CARD_ELIXIR,        {5, 5, 5} },
    { CARD_BATTLELUST,    {5, 5, 5} },
    { CARD_METAMORPHOSIS, {5, 5, 5} },
    { CARD_HELM,          {5, 5, 5} },
    { CARD_BLADE,         {5, 5, 5} },
    { CARD_SHADOW,        {5, 5, 5} },
    END_OF_DECK

Deletion in crawl-ref/source/decks.cc at line 114 [7.3987460]
B:BD[7.3990490] → [7.3990490:3990491]
B:BD[7.3990491] → [8.11282:11309]
```
DEFVEC(deck_of_summoning);
```

Replacement in crawl-ref/source/decks.cc at line 115 [7.3987460]

B:BD[8.11310] → [8.11310:11394]

B:BD[8.11394] → [10.4829:4878]

static card_type a_deck_of_wonders[] = {
    CARD_POTION, CARD_FOCUS, CARD_SHUFFLE,
    CARD_EXPERIENCE, CARD_WILD_MAGIC, CARD_HELIX

[8.11310]

[7.3990738]

const deck_archetype deck_of_enchantments[] = {
    { CARD_ELIXIR, {5, 5, 5} },
    END_OF_DECK

Replacement in crawl-ref/source/decks.cc at line 120 [7.3987460]

B:BD[7.3990742] → [8.11455:11480]

DEFVEC(deck_of_wonders);

[7.3990742]

[8.11480]

const deck_archetype deck_of_summoning[] = {
    { CARD_CRUSADE,         {5, 5, 5} },
    { CARD_SUMMON_ANIMAL,   {5, 5, 5} },
    { CARD_SUMMON_DEMON,    {5, 5, 5} },
    { CARD_SUMMON_WEAPON,   {5, 5, 5} },
    { CARD_SUMMON_SKELETON, {5, 5, 5} },
    END_OF_DECK
};

Replacement in crawl-ref/source/decks.cc at line 129 [7.3987460]

B:BD[8.11481] → [8.11481:11523]

B:BD[8.11523] → [4.371:451]

static card_type a_deck_of_dungeons[] = {
    CARD_GLASS, CARD_MAP, CARD_DOWSING, CARD_SPADE, CARD_TROWEL, CARD_MINEFIELD

[8.11481]

[7.3991107]

const deck_archetype deck_of_wonders[] = {
    { CARD_POTION,     {5, 5, 5} },
    { CARD_FOCUS,      {1, 1, 2} },
    { CARD_SHUFFLE,    {5, 5, 5} },
    { CARD_EXPERIENCE, {5, 5, 5} },
    { CARD_WILD_MAGIC, {5, 5, 5} },
    { CARD_HELIX,      {5, 5, 5} },
    END_OF_DECK

Replacement in crawl-ref/source/decks.cc at line 139 [7.3987460]

B:BD[7.3991111] → [8.11592:11618]

DEFVEC(deck_of_dungeons);

[7.3991111]

[8.11618]

const deck_archetype deck_of_dungeons[] = {
    { CARD_GLASS,     {5, 5, 5} },
    { CARD_MAP,       {5, 5, 5} },
    { CARD_DOWSING,   {5, 5, 5} },
    { CARD_SPADE,     {5, 5, 5} },
    { CARD_TROWEL,    {5, 5, 5} },
    { CARD_MINEFIELD, {5, 5, 5} },
    END_OF_DECK
};

Replacement in crawl-ref/source/decks.cc at line 149 [7.3987460]

B:BD[8.11619] → [8.11619:11753]

static card_type a_deck_of_oddities[] = {
    CARD_GENIE, CARD_BARGAIN, CARD_WRATH, CARD_XOM,
    CARD_FEAST, CARD_FAMINE, CARD_CURSE

[8.11619]

[7.3991681]

const deck_archetype deck_of_oddities[] = {
    { CARD_GENIE,   {5, 5, 5} },
    { CARD_BARGAIN, {5, 5, 5} },
    { CARD_WRATH,   {5, 5, 5} },
    { CARD_XOM,     {5, 5, 5} },
    { CARD_FEAST,   {5, 5, 5} },
    { CARD_FAMINE,  {5, 5, 5} },
    { CARD_CURSE,   {5, 5, 5} },
    END_OF_DECK

Replacement in crawl-ref/source/decks.cc at line 160 [7.3987460]

B:BD[7.3991685] → [8.11754:11969]

DEFVEC(deck_of_oddities);
static card_type a_deck_of_punishment[] = {
    CARD_WRAITH, CARD_WILD_MAGIC, CARD_WRATH,
    CARD_XOM, CARD_FAMINE, CARD_CURSE, CARD_TOMB,
    CARD_DAMNATION, CARD_PORTAL, CARD_MINEFIELD

[7.3991685]

[8.11969]

const deck_archetype deck_of_punishment[] = {
    { CARD_WRAITH,     {5, 5, 5} },
    { CARD_WILD_MAGIC, {5, 5, 5} },
    { CARD_WRATH,      {5, 5, 5} },
    { CARD_XOM,        {5, 5, 5} },
    { CARD_FAMINE,     {5, 5, 5} },
    { CARD_CURSE,      {5, 5, 5} },
    { CARD_TOMB,       {5, 5, 5} },
    { CARD_DAMNATION,  {5, 5, 5} },
    { CARD_PORTAL,     {5, 5, 5} },
    { CARD_MINEFIELD,  {5, 5, 5} },
    END_OF_DECK

Deletion in crawl-ref/source/decks.cc at line 173 [7.3987460]
∅:D[11.5974] → [7.3991730:3991731]
∅:D[8.11972] → [7.3991730:3991731]
B:BD[7.3991730] → [7.3991730:3991731]
B:BD[7.3991731] → [8.11973:12001]
```
DEFVEC(deck_of_punishment);
```
Deletion in crawl-ref/source/decks.cc at line 174 [7.3987460]
B:BD[8.12002] → [8.12002:12031]
B:BD[8.12031] → [6.41634:41635]
```
#undef DEFVEC
#undef VECFROM
```

Deletion in crawl-ref/source/decks.cc at line 250 [7.3987460]

B:BD[12.616] → [6.43766:43852]

    case CARD_BLANK1: return "blank card";
    case CARD_BLANK2: return "blank card";

Replacement in crawl-ref/source/decks.cc at line 304 [7.3987460]

B:BD[11.6017] → [13.542:620]

static const std::vector<card_type>* random_sub_deck(unsigned char deck_type)

[11.6017]

[7.3991776]

static const deck_archetype* random_sub_deck(unsigned char deck_type)

Replacement in crawl-ref/source/decks.cc at line 306 [7.3987460]
B:BD[7.3991778] → [13.621:669]
```
    const std::vector<card_type> *pdeck = NULL;
```
[7.3991778]
[6.43926]
```
    const deck_archetype *pdeck = NULL;
```

Replacement in crawl-ref/source/decks.cc at line 310 [7.3987460]

B:BD[8.13965] → [8.13965:14037]

        pdeck = (coinflip() ? &deck_of_transport : &deck_of_emergency);

[8.13965]

[7.3992553]

        pdeck = (coinflip() ? deck_of_transport : deck_of_emergency);

Replacement in crawl-ref/source/decks.cc at line 312 [7.3987460]

B:BD[7.3992568] → [8.14038:14398]

    case MISC_DECK_OF_DESTRUCTION: pdeck = &deck_of_destruction; break;
    case MISC_DECK_OF_DUNGEONS:    pdeck = &deck_of_dungeons;    break;
    case MISC_DECK_OF_SUMMONING:   pdeck = &deck_of_summoning;   break;
    case MISC_DECK_OF_WONDERS:     pdeck = &deck_of_wonders;     break;
    case MISC_DECK_OF_PUNISHMENT:  pdeck = &deck_of_punishment;  break;

[7.3992568]

[8.14398]

    case MISC_DECK_OF_DESTRUCTION: pdeck = deck_of_destruction; break;
    case MISC_DECK_OF_DUNGEONS:    pdeck = deck_of_dungeons;    break;
    case MISC_DECK_OF_SUMMONING:   pdeck = deck_of_summoning;   break;
    case MISC_DECK_OF_WONDERS:     pdeck = deck_of_wonders;     break;
    case MISC_DECK_OF_PUNISHMENT:  pdeck = deck_of_punishment;  break;

Replacement in crawl-ref/source/decks.cc at line 320 [7.3987460]

B:BD[8.14465] → [8.14465:14789]

        case 0: pdeck = &deck_of_destruction;  break;
        case 1: pdeck = &deck_of_enchantments; break;
        case 2: pdeck = &deck_of_battle;       break;
        case 3: pdeck = &deck_of_summoning;    break;
        case 4: pdeck = &deck_of_transport;    break;
        case 5: pdeck = &deck_of_emergency;    break;

[8.14465]

[8.14789]

        case 0: pdeck = deck_of_destruction;  break;
        case 1: pdeck = deck_of_enchantments; break;
        case 2: pdeck = deck_of_battle;       break;
        case 3: pdeck = deck_of_summoning;    break;
        case 4: pdeck = deck_of_transport;    break;
        case 5: pdeck = deck_of_emergency;    break;

Replacement in crawl-ref/source/decks.cc at line 331 [7.3987460]

B:BD[8.14871] → [8.14871:15033]

        case 0: pdeck = &deck_of_battle;       break;
        case 1: pdeck = &deck_of_dungeons;     break;
        case 2: pdeck = &deck_of_wonders;      break;

[8.14871]

[8.15033]

        case 0: pdeck = deck_of_battle;       break;
        case 1: pdeck = deck_of_dungeons;     break;
        case 2: pdeck = deck_of_wonders;      break;

Replacement in crawl-ref/source/decks.cc at line 337 [7.3987460]

B:BD[8.15075] → [8.15075:15144]

        pdeck = (coinflip() ? &deck_of_emergency : &deck_of_battle);

[8.15075]

[7.3993003]

        pdeck = (coinflip() ? deck_of_emergency : deck_of_battle);

Replacement in crawl-ref/source/decks.cc at line 346 [7.3987460]

B:BD[6.43974] → [6.43974:44046]

static card_type random_card(unsigned char deck_type, bool &was_oddity)

[6.43974]

[6.44046]

static card_type choose_from_archetype(const deck_archetype* pdeck,
                                       deck_rarity_type rarity)

Replacement in crawl-ref/source/decks.cc at line 349 [7.3987460]

B:BD[6.44048] → [13.670:740]

    const std::vector<card_type> *pdeck = random_sub_deck(deck_type);

[6.44048]

[6.44112]

    // We assume here that common == 0, rare == 1, legendary == 2.
    // FIXME: We should use one of the various choose_random_weighted
    // functions here, probably with an iterator, instead of
    // duplicating the implementation.

Replacement in crawl-ref/source/decks.cc at line 355 [7.3987460]

∅:D[6.44113] → [8.15171:15201]

B:BD[8.15171] → [8.15171:15201]

    if ( one_chance_in(100) )

[6.44113]

[7.3993093]

    int totalweight = 0;
    int i = 0;
    card_type result = NUM_CARDS;
    while ( pdeck[i].card != NUM_CARDS )

Replacement in crawl-ref/source/decks.cc at line 360 [7.3987460]

B:BD[12.3538] → [14.21313:21380]

        pdeck      = &deck_of_oddities;
        was_oddity = true;

[7.3993099]

[7.3993186]

        const card_with_weights& cww = pdeck[i];        
        totalweight += cww.weight[rarity];
        if ( random2(totalweight) < cww.weight[rarity] )
            result = cww.card;
        ++i;

Replacement in crawl-ref/source/decks.cc at line 366 [7.3987460]
B:BD[7.3993192] → [7.3993192:3993193]
B:BD[7.3993193] → [8.15238:15295]
B:BD[8.15413] → [15.329:346]
B:BD[15.346] → [6.44114:44167]
∅:D[6.44167] → [15.397:425]
B:BD[15.397] → [15.397:425]
∅:D[15.425] → [8.15413:15414]
B:BD[8.15413] → [8.15413:15414]
∅:D[8.15414] → [12.3539:3558]
B:BD[11.6635] → [12.3539:3558]
```
    card_type chosen = (*pdeck)[random2(pdeck->size())];
    // Paranoia
    if (chosen < CARD_BLANK1 || chosen >= NUM_CARDS)
        chosen = NUM_CARDS;
    return chosen;
```
[7.3993192]
[12.3558]
```
    return result;
```

Replacement in crawl-ref/source/decks.cc at line 369 [7.3987460]

B:BD[12.3602] → [6.44168:44237]

static card_type random_card(const item_def& item, bool &was_oddity)

[12.3602]

[14.21450]

static card_type random_card(unsigned char deck_type, deck_rarity_type rarity,
                             bool &was_oddity)

Replacement in crawl-ref/source/decks.cc at line 372 [7.3987460]

B:BD[14.21452] → [6.44238:44291]

    return random_card(item.sub_type, was_oddity);
}

[14.21452]

[14.21470]

    const deck_archetype *pdeck = random_sub_deck(deck_type);

Replacement in crawl-ref/source/decks.cc at line 374 [7.3987460]

B:BD[14.21471] → [6.44292:44661]

B:BD[6.44661] → [13.741:811]

∅:D[13.811] → [6.44725:44959]

B:BD[6.44725] → [6.44725:44959]

static void retry_blank_card(card_type &card, unsigned char deck_type,
                             unsigned char flags)
{
    // BLANK1 == hasn't been retried
    if (card != CARD_BLANK1)
        return;
    if (flags & (CFLAG_MARKED | CFLAG_SEEN))
    {
        // Can't retry a card which has been seen or marked.
        card = CARD_BLANK2;
        return;
    }
    const std::vector<card_type> *pdeck = random_sub_deck(deck_type);
    if (flags & CFLAG_ODDITY)
        pdeck = &deck_of_oddities;
    // High Evocations gives you another shot (but not at being punished...)
    if (pdeck != &deck_of_punishment 
        && you.skills[SK_EVOCATIONS] > random2(30))

[14.21471]

[6.44959]

    if ( one_chance_in(100) )

Replacement in crawl-ref/source/decks.cc at line 376 [7.3987460]

B:BD[6.44965] → [6.44965:45014]

        card = (*pdeck)[random2(pdeck->size())];

[6.44965]

[6.45014]

        pdeck      = deck_of_oddities;
        was_oddity = true;

Replacement in crawl-ref/source/decks.cc at line 380 [7.3987460]

B:BD[6.45021] → [6.45021:45114]

    // BLANK2 == retried and failed
    if (card == CARD_BLANK1)
        card = CARD_BLANK2;

[6.45021]

[6.45114]

    return choose_from_archetype(pdeck, rarity);

Replacement in crawl-ref/source/decks.cc at line 383 [7.3987460]

B:BD[6.45117] → [6.45117:45229]

static void retry_blank_card(card_type &card, item_def& deck,
                             unsigned char flags)

[6.45117]

[6.45229]

static card_type random_card(const item_def& item, bool &was_oddity)

Replacement in crawl-ref/source/decks.cc at line 385 [7.3987460]

B:BD[6.45231] → [6.45231:45281]

    retry_blank_card(card, deck.sub_type, flags);

[6.45231]

[6.45281]

    return random_card(item.sub_type, deck_rarity(item), was_oddity);

Deletion in crawl-ref/source/decks.cc at line 403 [7.3987460]
∅:D[16.46662] → [6.45762:45805]
B:BD[6.45762] → [6.45762:45805]
```
    retry_blank_card(card, deck, _flags);
```
Deletion in crawl-ref/source/decks.cc at line 742 [7.3987460]
B:BD[6.52239] → [6.52239:52282]
```
    retry_blank_card(card1, deck, flags1);
```
Deletion in crawl-ref/source/decks.cc at line 758 [7.3987460]
B:BD[6.52644] → [6.52644:52687]
```
    retry_blank_card(card2, deck, flags2);
```
Deletion in crawl-ref/source/decks.cc at line 806 [7.3987460]
B:BD[6.53991] → [6.53991:54034]
```
    retry_blank_card(card3, deck, flags3);
```

Replacement in crawl-ref/source/decks.cc at line 1106 [7.3987460]

B:BD[8.15715] → [6.58762:58851]

    bool      oddity;
    card_type card = random_card(MISC_DECK_OF_PUNISHMENT, oddity);

[8.15715]

[6.58851]

    bool oddity;
    card_type card = random_card(MISC_DECK_OF_PUNISHMENT, DECK_RARITY_COMMON,
                                 oddity);

Deletion in crawl-ref/source/decks.cc at line 1132 [7.3987460]

∅:D[2.3906] → [6.59376:59477]

B:BD[6.59376] → [6.59376:59477]

        amusement = 0;
        break;
    case CARD_BLANK1:
    case CARD_BLANK2:
        // Boring

Deletion in crawl-ref/source/decks.cc at line 2325 [7.3987460]
B:BD[8.27982] → [6.61671:61729]
```
    case CARD_BLANK1: break;
    case CARD_BLANK2: break;
```

Replacement in crawl-ref/source/decks.cc at line 2409 [7.3987460]

B:BD[14.23203] → [6.61730:61762]

B:BD[6.61762] → [13.1616:1692]

    if (you.religion == GOD_XOM
        && (which_card == CARD_BLANK1 || which_card == CARD_BLANK2 || !rc))

[14.23203]

[14.23264]

    if (you.religion == GOD_XOM && !rc)