fiddlerwoaroof/crawl - Change X3ZYEJMCHJC27L6YT2NRYB6EN2T3XFRJNUENVHGRPBUKMTVHAGVQC

Allow Vampire Enchanters and Transmuters.

Tidy up a bit in randart.cc, and remove some of the longer Xom randart names.

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

Created by j-p-e-g on April 22, 2008

X3ZYEJMCHJC27L6YT2NRYB6EN2T3XFRJNUENVHGRPBUKMTVHAGVQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/randart.cc at line 30 [4.893152]
B:BD[3.196688] → [2.2673:2719]
```
#include "message.h" // for debugging: more()
```

Replacement in crawl-ref/source/randart.cc at line 299 [4.893152]

B:BD[4.906425] → [5.336:399]

static unrandart_entry *seekunrandart( const item_def &item );

[4.906425]

[4.906808]

static unrandart_entry *_seekunrandart( const item_def &item );

Replacement in crawl-ref/source/randart.cc at line 363 [4.893152]
B:BD[4.908875] → [4.908875:908921]
```
static long calc_seed( const item_def &item )
```
[4.908875]
[4.908921]
```
static long _calc_seed( const item_def &item )
```

Replacement in crawl-ref/source/randart.cc at line 533 [4.893152]

B:BD[6.2515] → [6.2515:2728]

inline static void randart_propset( randart_properties_t &p,
                                    randart_prop_type pt,
                                    int value,
                                    bool neg )

[6.2515]

[6.2728]

inline static void _randart_propset( randart_properties_t &p,
                                     randart_prop_type pt,
                                     int value,
                                     bool neg )

Replacement in crawl-ref/source/randart.cc at line 543 [4.893152]

B:BD[7.176] → [7.176:303]

static int randart_add_one_property( const item_def &item,
                                     randart_properties_t &proprt )

[7.176]

[7.303]

static int _randart_add_one_property( const item_def &item,
                                      randart_properties_t &proprt )

Replacement in crawl-ref/source/randart.cc at line 586 [4.893152]

B:BD[7.1328] → [6.2764:2904]

        randart_propset(proprt, RAP_AC,
                        1 + random2(3) + random2(3) + random2(3),
                        negench);

[7.1328]

[7.1505]

        _randart_propset(proprt, RAP_AC,
                         1 + random2(3) + random2(3) + random2(3),
                         negench);

Replacement in crawl-ref/source/randart.cc at line 591 [4.893152]

B:BD[7.1532] → [6.2905:3050]

        randart_propset(proprt, RAP_EVASION,
                        1 + random2(3) + random2(3) + random2(3),
                        negench);

[7.1532]

[7.1719]

        _randart_propset(proprt, RAP_EVASION,
                         1 + random2(3) + random2(3) + random2(3),
                         negench);

Replacement in crawl-ref/source/randart.cc at line 596 [4.893152]

B:BD[7.1746] → [6.3051:3184]

        randart_propset(proprt, RAP_STRENGTH,
                        1 + random2(3) + random2(3),
                        negench);

[7.1746]

[7.1939]

        _randart_propset(proprt, RAP_STRENGTH,
                         1 + random2(3) + random2(3),
                         negench);

Replacement in crawl-ref/source/randart.cc at line 601 [4.893152]

B:BD[7.1966] → [6.3185:3322]

        randart_propset(proprt, RAP_INTELLIGENCE,
                        1 + random2(3) + random2(3),
                        negench);

[7.1966]

[7.2166]

        _randart_propset(proprt, RAP_INTELLIGENCE,
                         1 + random2(3) + random2(3),
                         negench);

Replacement in crawl-ref/source/randart.cc at line 606 [4.893152]

B:BD[7.2193] → [6.3323:3457]

        randart_propset(proprt, RAP_DEXTERITY,
                        1 + random2(3) + random2(3),
                        negench);

[7.2193]

[7.2387]

        _randart_propset(proprt, RAP_DEXTERITY,
                         1 + random2(3) + random2(3),
                         negench);

Insertion in crawl-ref/source/randart.cc at line 617 [4.893152]
[4.909101]
[2.3296]
```
    ASSERT( is_random_artefact( item ) );
```

Replacement in crawl-ref/source/randart.cc at line 630 [4.893152]

B:BD[4.909308] → [8.241:304]

        const unrandart_entry *unrand = seekunrandart( item );

[4.909308]

[4.909372]

        const unrandart_entry *unrand = _seekunrandart( item );

Replacement in crawl-ref/source/randart.cc at line 644 [4.893152]
B:BD[9.2015] → [2.3835:3876]
```
    const long seed = calc_seed( item );
```
[9.2015]
[9.2015]
```
    const long seed = _calc_seed( item );
```

Replacement in crawl-ref/source/randart.cc at line 1098 [4.893152]

B:BD[7.2485] → [7.2485:2548]

        power_level += randart_add_one_property(item, proprt);

[7.2485]

[7.2548]

        power_level += _randart_add_one_property(item, proprt);

Replacement in crawl-ref/source/randart.cc at line 1232 [4.893152]
B:BD[4.923066] → [10.8091:8144]
```
static std::string get_artefact_type(const int type)
```
[4.923066]
[4.923115]
```
static std::string _get_artefact_type(const int type)
```
Replacement in crawl-ref/source/randart.cc at line 1247 [4.893152]
B:BD[4.925102] → [11.2526:2575]
```
static bool pick_db_name( const item_def &item )
```
[4.925102]
[10.8402]
```
static bool _pick_db_name( const item_def &item )
```

Replacement in crawl-ref/source/randart.cc at line 1274 [4.893152]

B:BD[4.925957] → [5.1054:1117]

        const unrandart_entry *unrand = seekunrandart( item );

[4.925957]

[12.4550]

        const unrandart_entry *unrand = _seekunrandart( item );

Replacement in crawl-ref/source/randart.cc at line 1278 [4.893152]
B:BD[4.926401] → [12.4645:4686]
```
    const long seed = calc_seed( item );
```
[4.926310]
[9.2142]
```
    const long seed = _calc_seed( item );
```
Replacement in crawl-ref/source/randart.cc at line 1302 [4.893152]
B:BD[10.9332] → [10.9332:9381]
```
    lookup += get_artefact_type(item.base_type);
```
[10.9332]
[13.10000]
```
    lookup += _get_artefact_type(item.base_type);
```
Replacement in crawl-ref/source/randart.cc at line 1328 [4.893152]
B:BD[4.930727] → [11.2816:2844]
```
    if (pick_db_name(item))
```
[4.930727]
[4.930752]
```
    if (_pick_db_name(item))
```

Replacement in crawl-ref/source/randart.cc at line 1348 [4.893152]

B:BD[14.4507] → [14.4507:4582]

                               get_artefact_type(item.base_type).c_str());

[14.4507]

[14.4582]

                               _get_artefact_type(item.base_type).c_str());

Replacement in crawl-ref/source/randart.cc at line 1401 [4.893152]

B:BD[4.931918] → [5.1711:1773]

static unrandart_entry *seekunrandart( const item_def &item )

[4.931918]

[4.931960]

static unrandart_entry *_seekunrandart( const item_def &item )

Replacement in crawl-ref/source/randart.cc at line 1859 [4.893152]

B:BD[4.938141] → [8.766:825]

    const unrandart_entry *unrand = seekunrandart( item );

[4.938141]

[4.938201]

    const unrandart_entry *unrand = _seekunrandart( item );

Insertion in crawl-ref/source/newgame.cc at line 1550 [4.1132300]
[4.1159709]
[15.18175]
```
        if (speci == SP_VAMPIRE)
            return true;
```
Insertion in crawl-ref/source/newgame.cc at line 1759 [4.1132300]
[4.1164901]
[15.18511]
```
        if (speci == SP_VAMPIRE)
            return true;
```

Insertion in crawl-ref/source/newgame.cc at line 4211 [4.1132300]

[15.28586]

[4.1240876]

            else if (you.species == SP_VAMPIRE)
                you.skills[SK_UNARMED_COMBAT] = 1; // for biting

Deletion in crawl-ref/source/dat/database/rand_all.txt at line 123 [10.35476]
B:BD[10.37009] → [10.37009:37049]
```
Dangerous Boredom
Questionable Humour
```
Deletion in crawl-ref/source/dat/database/rand_all.txt at line 131 [10.35476]
B:BD[10.37113] → [10.37113:37133]
```
Everchanging Rules
```
Deletion in crawl-ref/source/dat/database/rand_all.txt at line 139 [10.35476]
B:BD[10.37198] → [10.37198:37221]
```
Premature Condolences
```
Deletion in crawl-ref/source/dat/database/rand_all.txt at line 143 [10.35476]
B:BD[10.37254] → [10.37254:37275]
```
Psychedelic Visions
```
Deletion in crawl-ref/source/dat/database/rand_all.txt at line 146 [10.35476]
B:BD[10.37287] → [10.37287:37306]
```
Experimental Loan
```

Allow Vampire Enchanters and Transmuters.

Dependencies

In channels

Change contents

Deletion in crawl-ref/source/randart.cc at line 30 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 299 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 363 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 533 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 543 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 586 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 591 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 596 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 601 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 606 [4.893152]

Insertion in crawl-ref/source/randart.cc at line 617 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 630 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 644 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1098 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1232 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1247 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1274 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1278 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1302 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1328 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1348 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1401 [4.893152]

Replacement in crawl-ref/source/randart.cc at line 1859 [4.893152]

Insertion in crawl-ref/source/newgame.cc at line 1550 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 1759 [4.1132300]

Insertion in crawl-ref/source/newgame.cc at line 4211 [4.1132300]

Deletion in crawl-ref/source/dat/database/rand_all.txt at line 123 [10.35476]

Deletion in crawl-ref/source/dat/database/rand_all.txt at line 131 [10.35476]

Deletion in crawl-ref/source/dat/database/rand_all.txt at line 139 [10.35476]

Deletion in crawl-ref/source/dat/database/rand_all.txt at line 143 [10.35476]

Deletion in crawl-ref/source/dat/database/rand_all.txt at line 146 [10.35476]