fiddlerwoaroof/crawl - Change XI7X6SNTHG67D4NQWM75HWB6TVRXVFDPGNSQLTXN6JAZBZIVZXIQC

Go all the way and also store a randart's name and description in

the props table. No more re-rolling every time we need the name, yay! :D

Should be save file compatible, and I also modified my previous change to be save file compatible, after all. Not entirely sure this works, though, as I didn't have any old saved games to test this with.

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

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

XI7X6SNTHG67D4NQWM75HWB6TVRXVFDPGNSQLTXN6JAZBZIVZXIQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/store.cc at line 254 [3.12569]
B:BD[3.17517] → [3.17517:17526]
```
        
```
[3.17517]
[3.17526]
Replacement in crawl-ref/source/store.cc at line 420 [3.12569]
B:BD[3.20001] → [3.20001:20010]
```
        
```
[3.20001]
[3.20010]
Replacement in crawl-ref/source/store.cc at line 500 [3.12569]
B:BD[3.21455] → [3.21455:21464]
```
        
```
[3.21455]
[3.21464]

Replacement in crawl-ref/source/store.cc at line 1195 [3.12569]

B:BD[3.35419] → [3.35419:35481]

        hash_map[key]       = CrawlStoreValue(default_flags);

[3.35419]

[3.35481]

        hash_map[key]        = CrawlStoreValue(default_flags);

Replacement in crawl-ref/source/randart.h at line 40 [4.889057]
B:BD[4.890357] → [5.223:273]
```
std::string randart_name( const item_def &item );
```
[4.890357]
[4.890407]
```
std::string get_randart_name( const item_def &item );
```

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

[6.2812]

[4.893685]

#define RANDART_NAME_KEY   "randart_name"
#define RANDART_APPEAR_KEY "randart_appearance"

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

B:BD[7.2440] → [6.3242:3295]

void static _init_randart_properties(item_def &item)

[7.2440]

[4.909099]

void static _get_randart_properties(const item_def &item,
                                    randart_properties_t &proprt)

Deletion in crawl-ref/source/randart.cc at line 620 [4.893152]
B:BD[4.909101] → [2.3697:3739]
∅:D[2.3739] → [6.3296:3457]
B:BD[4.909101] → [6.3296:3457]
∅:D[6.3457] → [8.1237:1238]
B:BD[8.1237] → [8.1237:1238]
B:BD[8.1238] → [6.3458:3544]
∅:D[8.1504] → [4.909144:909145]
∅:D[6.3544] → [4.909144:909145]
B:BD[4.909144] → [4.909144:909145]
B:BD[4.909145] → [6.3545:3622]
∅:D[6.3622] → [4.909222:909223]
∅:D[9.4126] → [4.909222:909223]
B:BD[4.909222] → [4.909222:909223]
B:BD[4.909264] → [4.909264:909308]
B:BD[4.909308] → [2.3740:3804]
∅:D[10.304] → [4.909372:909373]
∅:D[2.3804] → [4.909372:909373]
B:BD[4.909372] → [4.909372:909373]
B:BD[4.909373] → [11.507:555]
B:BD[11.555] → [6.3623:3670]
∅:D[6.3670] → [4.909459:909483]
B:BD[4.909459] → [4.909459:909483]
B:BD[4.909483] → [6.3671:3719]
```
    ASSERT( is_random_artefact( item ) );
    CrawlHashTable &props = item.props;
    if (!props.exists( RANDART_PROPS_KEY ))
        props[RANDART_PROPS_KEY].new_vector(SV_SHORT).resize(RA_PROPERTIES);
    CrawlVector &rap = props[RANDART_PROPS_KEY];
    rap.set_max_size(RA_PROPERTIES);
    for (vec_size i = 0; i < RA_PROPERTIES; i++)
        rap[i] = (short) 0;
    if (is_unrandom_artefact( item ))
    {
        const unrandart_entry *unrand = _seekunrandart( item );
        for (int i = 0; i < RA_PROPERTIES; i++)
            rap[i] = (short) unrand->prpty[i];
        return;
    }
    FixedVector< int, RA_PROPERTIES >  proprt;
```
Insertion in crawl-ref/source/randart.cc at line 1087 [4.893152]
[6.4184]
[6.4184]
```
}
```

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

[6.4185]

void static _init_randart_properties(item_def &item)
{
    ASSERT( is_random_artefact( item ) );
    CrawlHashTable &props = item.props;
    if (!props.exists( RANDART_PROPS_KEY ))
        props[RANDART_PROPS_KEY].new_vector(SV_SHORT).resize(RA_PROPERTIES);
    CrawlVector &rap = props[RANDART_PROPS_KEY];
    rap.set_max_size(RA_PROPERTIES);
    for (vec_size i = 0; i < RA_PROPERTIES; i++)
        rap[i] = (short) 0;
    if (is_unrandom_artefact( item ))
    {
        const unrandart_entry *unrand = _seekunrandart( item );
        for (int i = 0; i < RA_PROPERTIES; i++)
            rap[i] = (short) unrand->prpty[i];
        return;
    }
    randart_properties_t prop;
    _get_randart_properties(item, prop);

Replacement in crawl-ref/source/randart.cc at line 1116 [4.893152]
B:BD[6.4229] → [6.4229:4265]
```
        rap[i] = (short) proprt[i];
```
[6.4229]
[6.4265]
```
        rap[i] = (short) prop[i];
```
Deletion in crawl-ref/source/randart.cc at line 1125 [4.893152]
B:BD[6.4534] → [6.4534:4588]
```
    ASSERT( item.props.exists( RANDART_PROPS_KEY ) );
```

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

B:BD[6.5173] → [6.5173:5408]

    const CrawlVector &rap_vec = item.props[RANDART_PROPS_KEY].get_vector();
    ASSERT( rap_vec.get_type()     == SV_SHORT );
    ASSERT( rap_vec.size()         == RA_PROPERTIES);
    ASSERT( rap_vec.get_max_size() == RA_PROPERTIES);

[6.5173]

[6.5408]

    if (item.props.exists( RANDART_PROPS_KEY ))
    {
        const CrawlVector &rap_vec = item.props[RANDART_PROPS_KEY].get_vector();
        ASSERT( rap_vec.get_type()     == SV_SHORT );
        ASSERT( rap_vec.size()         == RA_PROPERTIES);
        ASSERT( rap_vec.get_max_size() == RA_PROPERTIES);

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

B:BD[6.5409] → [6.5409:5502]

    for (vec_size i = 0; i < RA_PROPERTIES; i++)
        proprt[i] = rap_vec[i].get_short();

[6.5409]

[8.1505]

        for (vec_size i = 0; i < RA_PROPERTIES; i++)
            proprt[i] = rap_vec[i].get_short();
    }
    else
    {
        _get_randart_properties(item, proprt);
    }

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

B:BD[4.925810] → [12.8589:8638]

std::string randart_name( const item_def &item )

[4.925810]

[4.925866]

static std::string _randart_name(const item_def &item, bool appearance = false)

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

B:BD[12.8927] → [12.8927:9001]

    if (item_type_known(item)) // god prefix not necessary for appearance

[12.8927]

[4.928062]

    if (!appearance) // god prefix not necessary for appearance

Replacement in crawl-ref/source/randart.cc at line 1320 [4.893152]
B:BD[4.929313] → [13.884:916]
```
    if (!item_type_known(item))
```
[4.929313]
[4.929363]
```
    if (appearance)
```

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

[5.4918]

[4.931407]


std::string get_randart_name( const item_def &item )
{
    ASSERT( is_artefact( item ) );

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

[4.931408]

[14.1257]

    if (item_type_known(item))
    {
        // print artefact's real name
        if (item.props.exists(RANDART_NAME_KEY))
            return item.props[RANDART_NAME_KEY].get_string();
        return _randart_name(item, false);
    }
    // print artefact appearance
    if (item.props.exists(RANDART_APPEAR_KEY))
        return item.props[RANDART_APPEAR_KEY].get_string();
    return _randart_name(item, false);
}

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

B:BD[4.933440] → [15.10099:10130]

∅:D[15.10130] → [4.933472:933606]

B:BD[4.933472] → [4.933472:933606]

    if ((status == UNIQ_EXISTS
            || (in_abyss && status == UNIQ_NOT_EXISTS)
            || (!in_abyss && status == UNIQ_LOST_IN_ABYSS))
        && !force)

[4.933440]

[4.933606]

    if (!force
        && (status == UNIQ_EXISTS
            || in_abyss && status == UNIQ_NOT_EXISTS
            || !in_abyss && status == UNIQ_LOST_IN_ABYSS))

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

[6.6522]

    // set artefact name
    ASSERT(!item.props.exists( RANDART_NAME_KEY ));
    item.props[RANDART_NAME_KEY].get_string() = _randart_name(item);
    // set artefact appearance
    ASSERT(!item.props.exists( RANDART_APPEAR_KEY ));
    item.props[RANDART_APPEAR_KEY].get_string() = "brightly glowing blade";
    // in case this is ever needed anywhere
    item.special = (random_int() & RANDART_SEED_MASK);

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

[16.5293]

[4.937246]

    // get true artefact name
    ASSERT(!item.props.exists( RANDART_NAME_KEY ));
    item.props[RANDART_NAME_KEY].get_string() = _randart_name(item, false);
    // get artefact appearance
    ASSERT(!item.props.exists( RANDART_APPEAR_KEY ));
    item.props[RANDART_APPEAR_KEY].get_string() = _randart_name(item, true);

Replacement in crawl-ref/source/itemname.cc at line 1056 [4.2667494]
B:BD[4.2684489] → [17.26412:26453]
```
            buff << randart_name(*this);
```
[4.2684489]
[4.2684553]
```
            buff << get_randart_name(*this);
```
Replacement in crawl-ref/source/itemname.cc at line 1169 [4.2667494]
B:BD[4.2695528] → [12.11172:11213]
```
            buff << randart_name(*this);
```
[4.2695528]
[4.2695597]
```
            buff << get_randart_name(*this);
```
Replacement in crawl-ref/source/itemname.cc at line 1412 [4.2667494]
B:BD[4.2714561] → [12.11391:11432]
```
            buff << randart_name(*this);
```
[4.2714561]
[4.2714628]
```
            buff << get_randart_name(*this);
```
Deletion in crawl-ref/source/dat/database/rand_wpn.txt at line 231 [12.24833]
B:BD[12.26691] → [12.26691:26700]
```
Courage
```

Go all the way and also store a randart's name and description in

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/store.cc at line 254 [3.12569]

Replacement in crawl-ref/source/store.cc at line 420 [3.12569]

Replacement in crawl-ref/source/store.cc at line 500 [3.12569]

Replacement in crawl-ref/source/store.cc at line 1195 [3.12569]

Replacement in crawl-ref/source/randart.h at line 40 [4.889057]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Replacement in crawl-ref/source/itemname.cc at line 1056 [4.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1169 [4.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1412 [4.2667494]

Deletion in crawl-ref/source/dat/database/rand_wpn.txt at line 231 [12.24833]