fiddlerwoaroof/crawl - Change KU5FY6KSLTGH44KEZT4SFANRKCTWCQC7VABCMNYJRZNJSYSOXAKQC

Modify randart code to store randart properties in the props table,

and use it to force TSO's blessed blades to be randart items with the holy wrath brand and (for flavour) life protection. This change breaks saves, unfortunately, but allows for much cleaner finetuning.

I also replaced all those randart names "of The Shining One's @esteem@" etc. with plain "of The Shining One", as they're just too long otherwise. I'm sorry, dolorous! If it helps, I also culled some of the other overly long names. Randart names are now generally restricted to a maximum length of 25.

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

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

KU5FY6KSLTGH44KEZT4SFANRKCTWCQC7VABCMNYJRZNJSYSOXAKQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/unrand.h at line 1166 [7.114533]
B:BD[2.725] → [2.725:765]
```
    "Dire Lajatang", "double lajatang",
```
[2.725]
[2.765]
```
    "dire lajatang", "double lajatang",
```
Replacement in crawl-ref/source/religion.cc at line 4071 [7.804403]
∅:D[8.2601] → [9.2562:2611]
B:BD[10.2576] → [9.2562:2611]
```
                make_item_randart(you.inv[wpn]);
```
[8.2601]
[8.2602]
```
                make_item_blessed_blade(you.inv[wpn]);
```
Insertion in crawl-ref/source/randart.h at line 90 [7.889057]
[7.892034]
[9.2653]
```
bool make_item_blessed_blade( item_def &item );
```
Insertion in crawl-ref/source/randart.cc at line 30 [7.893152]
[11.196688]
[12.3043]
```
#include "message.h" // for debugging: more()
```

Replacement in crawl-ref/source/randart.cc at line 36 [7.893152]

B:BD[13.698] → [13.698:744]

#define KNOWN_PROPS_KEY "randart_known_props"

[13.698]

[7.893685]

#define KNOWN_PROPS_KEY    "randart_known_props"
#define RANDART_PROPS_KEY  "randart_props"

Replacement in crawl-ref/source/randart.cc at line 55 [7.893152]

B:BD[12.3452] → [14.2526:2594]

B:BD[14.2594] → [6.2527:2591]

              || brand == SPWPN_PAIN || brand == SPWPN_VAMPIRICISM)
              || randart_wpn_property( item, RAP_CURSED ) != 0)

[12.3452]

[12.3521]

             || brand == SPWPN_PAIN || brand == SPWPN_VAMPIRICISM)
             || randart_wpn_property( item, RAP_CURSED ) != 0)

Insertion in crawl-ref/source/randart.cc at line 379 [7.893152]
[15.743]
[15.743]
```
    // only jewellery need fake randart properties
```

Replacement in crawl-ref/source/randart.cc at line 539 [7.893152]

B:BD[3.2730] → [3.2730:2763]

    p[pt] = neg? -value : value;

[3.2730]

[7.908970]

    // This shouldn't be called with 0, else no property gets added after all.
    ASSERT(value != 0);
    p[pt] = (neg? -value : value);

Replacement in crawl-ref/source/randart.cc at line 558 [7.893152]

B:BD[16.619] → [17.913:989]

    if (cl == OBJ_ARMOUR || (cl == OBJ_JEWELLERY && ty == RING_PROTECTION))

[16.619]

[16.693]

    if (cl == OBJ_ARMOUR || cl == OBJ_JEWELLERY && ty == RING_PROTECTION)

Replacement in crawl-ref/source/randart.cc at line 613 [7.893152]
B:BD[16.2409] → [16.2409:2437]
```
    return negench ? 0 : 1;
```
[16.2409]
[16.2437]
```
    return (negench ? -1 : 1);
```

Replacement in crawl-ref/source/randart.cc at line 616 [7.893152]

B:BD[16.2440] → [18.9512:9563]

∅:D[18.9563] → [13.745:863]

B:BD[7.909025] → [13.745:863]

void randart_wpn_properties( const item_def &item,
                             randart_properties_t &proprt,
                             randart_known_props_t &known)

[16.2440]

[7.909099]

void static _init_randart_properties(item_def &item)

Replacement in crawl-ref/source/randart.cc at line 618 [7.893152]

B:BD[7.909101] → [18.9564:9606]

∅:D[18.9606] → [13.864:1237]

B:BD[7.909144] → [13.864:1237]

    ASSERT( is_random_artefact( item ) );
    ASSERT( item.props.exists( KNOWN_PROPS_KEY ) );
    const CrawlStoreValue &_val = item.props[KNOWN_PROPS_KEY];
    ASSERT( _val.get_type() == SV_VEC );
    const CrawlVector &known_vec = _val.get_vector();
    ASSERT( known_vec.get_type()     == SV_BOOL );
    ASSERT( known_vec.size()         == RA_PROPERTIES);
    ASSERT( known_vec.get_max_size() == RA_PROPERTIES);

[7.909101]

[13.1237]

    CrawlHashTable &props = item.props;
    if (!props.exists( RANDART_PROPS_KEY ))
        props[RANDART_PROPS_KEY].new_vector(SV_SHORT).resize(RA_PROPERTIES);

Replacement in crawl-ref/source/randart.cc at line 622 [7.893152]

B:BD[13.1238] → [13.1238:1504]

    if ( item_ident( item, ISFLAG_KNOW_PROPERTIES ) )
    {
        for (vec_size i = 0; i < RA_PROPERTIES; i++)
            known[i] = (bool) true;
    }
    else
    {
        for (vec_size i = 0; i < RA_PROPERTIES; i++)
            known[i] = known_vec[i];
    }

[13.1238]

[7.909144]

    CrawlVector &rap = props[RANDART_PROPS_KEY];
    rap.set_max_size(RA_PROPERTIES);

Replacement in crawl-ref/source/randart.cc at line 625 [7.893152]

B:BD[7.909145] → [19.453:506]

B:BD[19.506] → [20.4089:4126]

    const object_class_type aclass = item.base_type;
    const int atype = item.sub_type;

[7.909145]

[7.909222]

    for (vec_size i = 0; i < RA_PROPERTIES; i++)
        rap[i] = (short) 0;

Deletion in crawl-ref/source/randart.cc at line 628 [7.893152]
B:BD[7.909238] → [7.909238:909264]
```
    int power_level = 0;
```
Replacement in crawl-ref/source/randart.cc at line 633 [7.893152]
∅:D[19.555] → [7.909417:909459]
B:BD[7.909417] → [7.909417:909459]
```
            proprt[i] = unrand->prpty[i];
```
[19.555]
[7.909459]
```
            rap[i] = (short) unrand->prpty[i];
```

Replacement in crawl-ref/source/randart.cc at line 638 [7.893152]

B:BD[7.909483] → [21.4138:4179]

    const long seed = calc_seed( item );

[7.909483]

[22.2014]

    FixedVector< int, RA_PROPERTIES >  proprt;
    const object_class_type aclass = item.base_type;
    const int atype = item.sub_type;
    int power_level = 0;

Insertion in crawl-ref/source/randart.cc at line 644 [7.893152]
[22.2015]
[22.2015]
```
    const long seed = calc_seed( item );
```

Replacement in crawl-ref/source/randart.cc at line 788 [7.893152]

B:BD[19.1911] → [19.1911:1945]

                    + random2(3);

[19.1911]

[19.1945]

                                          + random2(3);

Replacement in crawl-ref/source/randart.cc at line 802 [7.893152]

B:BD[19.2376] → [19.2376:2410]

                    + random2(3);

[19.2376]

[19.2410]

                                              + random2(3);

Replacement in crawl-ref/source/randart.cc at line 816 [7.893152]

B:BD[19.2829] → [19.2829:2863]

                    + random2(3);

[19.2829]

[19.2863]

                                           + random2(3);

Replacement in crawl-ref/source/randart.cc at line 832 [7.893152]

B:BD[19.3290] → [19.3290:3392]

                proprt[RAP_ACCURACY] -= 1 + random2(3) + random2(3) +
                    random2(3);

[19.3290]

[19.3392]

                proprt[RAP_ACCURACY] -= 1 + random2(3) + random2(3)
                                          + random2(3);

Insertion in crawl-ref/source/randart.cc at line 1106 [7.893152]

[6.2727]

    }
    for (int i = 0; i < RA_PROPERTIES; i++)
        rap[i] = (short) proprt[i];
}
void randart_wpn_properties( const item_def &item,
                             randart_properties_t  &proprt,
                             randart_known_props_t &known)
{
    ASSERT( is_random_artefact( item ) );
    ASSERT( item.props.exists( KNOWN_PROPS_KEY ) );
    ASSERT( item.props.exists( RANDART_PROPS_KEY ) );
    const CrawlStoreValue &_val = item.props[KNOWN_PROPS_KEY];
    ASSERT( _val.get_type() == SV_VEC );
    const CrawlVector &known_vec = _val.get_vector();
    ASSERT( known_vec.get_type()     == SV_BOOL );
    ASSERT( known_vec.size()         == RA_PROPERTIES);
    ASSERT( known_vec.get_max_size() == RA_PROPERTIES);
    if ( item_ident( item, ISFLAG_KNOW_PROPERTIES ) )
    {
        for (vec_size i = 0; i < RA_PROPERTIES; i++)
            known[i] = (bool) true;
    }
    else
    {
        for (vec_size i = 0; i < RA_PROPERTIES; i++)
            known[i] = known_vec[i];

Insertion in crawl-ref/source/randart.cc at line 1137 [7.893152]

[6.2733]

[13.1505]


    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);
    for (vec_size i = 0; i < RA_PROPERTIES; i++)
        proprt[i] = rap_vec[i].get_short();

Insertion in crawl-ref/source/randart.cc at line 1147 [7.893152]
[13.1508]
[18.9903]
Replacement in crawl-ref/source/randart.cc at line 1221 [7.893152]
B:BD[13.2567] → [13.2567:2615]
```
    else
        known_vec[prop] = (bool) true;
```
[13.2567]
[13.2615]
```
    known_vec[prop] = (bool) true;
```
Replacement in crawl-ref/source/randart.cc at line 1354 [7.893152]
B:BD[12.10305] → [5.4875:4926]
```
        while (--tries > 0 && name.length() > 30);
```
[12.10305]
[18.10008]
```
        while (--tries > 0 && name.length() > 25);
```

Insertion in crawl-ref/source/randart.cc at line 1754 [7.893152]

[23.785]


bool make_item_blessed_blade( item_def &item )
{
    if (item.base_type != OBJ_WEAPONS)
        return (false);

Insertion in crawl-ref/source/randart.cc at line 1760 [7.893152]

[23.786]

[9.2929]

    // already is an artefact
    if (is_artefact(item))
        return (false);
    ASSERT(!item.props.exists( KNOWN_PROPS_KEY ));
    item.props[KNOWN_PROPS_KEY].new_vector(SV_BOOL).resize(RA_PROPERTIES);
    CrawlVector &known = item.props[KNOWN_PROPS_KEY];
    known.set_max_size(RA_PROPERTIES);
    for (vec_size i = 0; i < RA_PROPERTIES; i++)
        known[i] = (bool) false;
    ASSERT(!item.props.exists( RANDART_PROPS_KEY ));
    item.props[RANDART_PROPS_KEY].new_vector(SV_SHORT).resize(RA_PROPERTIES);
    CrawlVector &rap = item.props[RANDART_PROPS_KEY];
    rap.set_max_size(RA_PROPERTIES);
    for (vec_size i = 0; i < RA_PROPERTIES; i++)
        rap[i] = (short) 0;
    // blessed blade of The Shining One
    rap[RAP_BRAND] = (short) SPWPN_HOLY_WRATH;
    rap[RAP_NEGATIVE_ENERGY] = (short) 1;
    item.flags |= ISFLAG_RANDART;
    return (true);
}

Insertion in crawl-ref/source/randart.cc at line 1796 [7.893152]
[7.937160]
[13.2764]
```
    // already is a randart
```
Insertion in crawl-ref/source/randart.cc at line 1800 [7.893152]
[13.2837]
[13.2837]
```
    // not a truly random artefact
```

Insertion in crawl-ref/source/randart.cc at line 1818 [7.893152]

[9.3038]

[10.2918]

        // Now that we found something, initialize the props array.
        _init_randart_properties(item);

Replacement in crawl-ref/source/dat/database/randname.txt at line 486 [12.14728]
∅:D[24.2716] → [25.3158:3195]
∅:D[26.2716] → [25.3158:3195]
∅:D[27.2717] → [25.3158:3195]
∅:D[28.2717] → [25.3158:3195]
B:BD[25.3158] → [25.3158:3195]
B:BD[25.3195] → [27.2718:2719]
∅:D[24.2721] → [27.2719:2753]
∅:D[28.2723] → [27.2719:2753]
B:BD[27.2719] → [27.2719:2753]
∅:D[27.2753] → [25.3195:3196]
B:BD[25.3195] → [25.3195:3196]
B:BD[25.3196] → [4.2712:2747]
∅:D[4.2747] → [25.3229:3230]
B:BD[25.3229] → [25.3229:3230]
B:BD[25.3230] → [4.2748:2783]
∅:D[4.2783] → [25.3273:3274]
∅:D[27.2793] → [25.3273:3274]
B:BD[25.3273] → [25.3273:3274]
```
of The Shining One's @divine_esteem@
of The Shining One's @anger_name@
of The Shining One's @valour_name@
of The Shining One's @virtue_name@
```
[25.3152]
[25.3298]
```
of The Shining One
```

Modify randart code to store randart properties in the props table,

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/unrand.h at line 1166 [7.114533]

Replacement in crawl-ref/source/religion.cc at line 4071 [7.804403]

Insertion in crawl-ref/source/randart.h at line 90 [7.889057]

Insertion in crawl-ref/source/randart.cc at line 30 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 36 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 55 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 379 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 539 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 558 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 613 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 616 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 618 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 622 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 625 [7.893152]

Deletion in crawl-ref/source/randart.cc at line 628 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 633 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 638 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 644 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 788 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 802 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 816 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 832 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1106 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1137 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1147 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1221 [7.893152]

Replacement in crawl-ref/source/randart.cc at line 1354 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1754 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1760 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1796 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1800 [7.893152]

Insertion in crawl-ref/source/randart.cc at line 1818 [7.893152]

Replacement in crawl-ref/source/dat/database/randname.txt at line 486 [12.14728]