fiddlerwoaroof/crawl - Change HODV46TCH5AGI42Z5JKVDX4VCRVQCNREJUL6W3TUJK6S77SXQNLQC

Rework staves/rods to match the ID behaviour of wands etc., i.e.

they get randomised but fixed descriptions at the beginning of the game, and once you know one type you'll be able to recognize another staff/rod of the same type. In the case of rods you'll still have to evoke it to find out the number of charges.

I've tried to put the secondary descriptions into an order that will roughly match the ten current staff tiles.

This solves part of FR 1837348, and is likely to cause havoc to saved games, at least concerning staves.

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

Created by j-p-e-g on February 10, 2008

HODV46TCH5AGI42Z5JKVDX4VCRVQCNREJUL6W3TUJK6S77SXQNLQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 2 [7.5936]

B:BD[6.1250] → [6.1250:1312]

 *  Created for Crawl Reference by JPEG on $Date: 2007-01-11$

[6.1250]

[6.1312]

 *  Created for Crawl Reference by j-p-e-g on $Date: 2007-01-11$

Replacement in crawl-ref/source/tile1.cc at line 1614 [8.96318]

B:BD[5.3701] → [5.3701:3750]

        return TILE_STAFF_OFFSET + special % 10;

[5.3701]

[8.145679]

/*
        if (id[ IDTYPE_STAVES ][type] == ID_KNOWN_TYPE
            ||  (item.flags &ISFLAG_KNOW_TYPE ))
            return TILE_STAFF_WIZARDRY + type;
*/
        // try to return an appropriate tile
        return TILE_STAFF_OFFSET + (special / 4) % 10;

Insertion in crawl-ref/source/tile1.cc at line 3981 [8.96318]

[8.219644]

             
        case OBJ_STAVES:
          id0 = id[ IDTYPE_STAVES ][s];
          if (id0 != ID_KNOWN_TYPE)
             return 1;
          else
             return 0;

Insertion in crawl-ref/source/tags.cc at line 74 [11.164589]
[9.2231]
[10.933]
```
#include "describe.h"
```
Replacement in crawl-ref/source/tags.cc at line 1020 [11.164589]
B:BD[11.185081] → [11.185081:185106]
```
    marshallByte(th, 5);
```
[11.185081]
[11.185106]
```
    marshallByte(th, NUM_IDESC);
```
Replacement in crawl-ref/source/tags.cc at line 1023 [11.164589]
B:BD[11.185158] → [11.185158:185186]
```
    for (i = 0; i < 5; ++i)
```
[11.185158]
[11.185186]
```
    for (i = 0; i < NUM_IDESC; ++i)
```

Insertion in crawl-ref/source/tags.cc at line 1432 [11.164589]

[11.202170]

                    break;
                case IDTYPE_STAVES:
                    set_ident_type(OBJ_STAVES, j, ch);

Insertion in crawl-ref/source/spl-book.cc at line 1416 [11.397614]
[11.432273]
[12.2678]
```
    bool need_id = false;
```
Insertion in crawl-ref/source/spl-book.cc at line 1419 [11.397614]
[11.432339]
[12.2713]
```
        set_ident_type( OBJ_STAVES, istaff.sub_type, ID_KNOWN_TYPE );
```

Insertion in crawl-ref/source/spl-book.cc at line 1421 [11.397614]

[12.2766]

[2.154]

        need_id = true;
    }
    if (!item_ident( istaff, ISFLAG_KNOW_PLUSES))
    {
        set_ident_flags( istaff, ISFLAG_KNOW_PLUSES );
        need_id = true;
    }
    if (need_id)
    {

Insertion in crawl-ref/source/newgame.cc at line 422 [11.1132300]

[11.1141004]

[13.1150]

    // The order here must match that of IDESC in describe.h
    // (I don't really know about scrolls, which is why I left the height value.)
    const int max_item_number[6] = { NUM_WANDS, NUM_POTIONS,
                                     you.item_description.height(),
                                     NUM_JEWELLERY,
                                     you.item_description.height(),
                                     NUM_STAVES };

Replacement in crawl-ref/source/newgame.cc at line 432 [11.1132300]

B:BD[14.382974] → [13.1191:1321]

        // We really should only loop until NUM_WANDS, etc., here
        for (int j = 0; j < you.item_description.height(); j++)

[14.382974]

[13.1321]

        // only loop until NUM_WANDS etc.
        for (int j = 0; j < max_item_number[i]; j++)

Insertion in crawl-ref/source/newgame.cc at line 443 [11.1132300]

[11.1141110]

[13.1544]

                // The numbers below are always secondary * primary (itemname.cc)

Insertion in crawl-ref/source/newgame.cc at line 466 [11.1132300]

[13.2386]


                case IDESC_STAVES: // staves and rods
                    you.item_description[i][j] = random2( 10 * 4 );
                    break;

Replacement in crawl-ref/source/newgame.cc at line 2480 [11.1132300]
B:BD[15.375] → [15.375:397]
```
    item.special = 0;
```
[15.375]
[15.397]
```
    item.special = you.item_description[IDESC_STAVES][rod_type];
```

Insertion in crawl-ref/source/makeitem.cc at line 706 [16.927]

[16.19536]

        item.special = you.item_description[IDESC_STAVES][item.sub_type];

Replacement in crawl-ref/source/makeitem.cc at line 2483 [16.927]
B:BD[17.48987] → [17.48987:49019]
```
    item.special = random2(10);
```
[17.48987]
[17.49019]
```
//  item.special = you.item_description[IDESC_STAVES][item.sub_type];
```
Replacement in crawl-ref/source/itemprop.h at line 400 [14.641567]
B:BD[18.84076] → [18.84076:84098]
```
    STAFF_CHANNELING,
```
[18.84076]
[18.84098]
```
    STAFF_CHANNELING,           // 12
```

Replacement in crawl-ref/source/itemprop.h at line 412 [14.641567]

B:BD[18.84377] → [18.84377:84466]

    STAFF_VENOM,
    NUM_STAVES                         // must remain last member {dlb}

[18.84377]

[18.84466]

    STAFF_VENOM,                // 23
    NUM_STAVES                  // must remain last member {dlb}

Insertion in crawl-ref/source/itemname.h at line 31 [11.2661173]
[18.89143]
[18.89143]
```
    IDTYPE_STAVES,
```

Insertion in crawl-ref/source/itemname.cc at line 882 [11.2667494]

[19.23679]

static const char* staff_secondary_string(int p)
{
    switch (p) // general descriptions
    {
    case 0: return "crooked ";
    case 1: return "knobbly ";
    case 2: return "heavily ";
    case 3: return "gnarled ";
    case 4: return "thin ";
    case 5: return "curved ";
    case 6: return "twisted ";
    case 7: return "thick ";
    case 8: return "long ";
    case 9: return "short ";
    default: return "buggily ";
    }
}

Replacement in crawl-ref/source/itemname.cc at line 902 [11.2667494]
B:BD[19.23728] → [19.23728:23743]
```
    switch (p)
```
[19.23728]
[19.23743]
```
    switch (p) // special attributes
```

Replacement in crawl-ref/source/itemname.cc at line 904 [11.2667494]

B:BD[19.23749] → [19.23749:23929]

B:BD[19.23929] → [20.605:636]

∅:D[20.636] → [19.23959:24076]

B:BD[19.23959] → [19.23959:24076]

        
    case 0: return "curved";
    case 1: return "glowing";
    case 2: return "thick";
    case 3: return "thin";
    case 4: return "long";
    case 5: return "twisted";
    case 6: return "jewelled";
    case 7: return "runed";
    case 8: return "smoking";
    case 9: return "gnarled";
    default: return "buggy";

[19.23749]

[19.24076]

    case 0: return "glowing ";
    case 1: return "jewelled ";
    case 2: return "runed ";
    case 3: return "smoking ";
    default: return "buggy ";

Replacement in crawl-ref/source/itemname.cc at line 1531 [11.2667494]

B:BD[21.1800] → [21.1800:1885]

                buff << staff_primary_string(this->special) << " ";

[21.1800]

[21.1885]

            buff << staff_secondary_string(this->special / 4)
                 << staff_primary_string(this->special % 4);

Replacement in crawl-ref/source/itemname.cc at line 1541 [11.2667494]

B:BD[11.2740199] → [3.6358:6431]

            if (item_is_rod(*this) && !basename && !qualname && !dbname)

[11.2740199]

[19.34503]

            if (item_is_rod(*this) && know_pluses
                && !basename && !qualname && !dbname)

Insertion in crawl-ref/source/itemname.cc at line 1655 [11.2667494]
[22.7151]
[22.7151]
```
    case OBJ_STAVES:    return (IDTYPE_STAVES);
```

Replacement in crawl-ref/source/itemname.cc at line 1771 [11.2667494]

B:BD[11.2753691] → [23.3251:3405]

∅:D[23.3405] → [22.8355:8481]

B:BD[22.8355] → [22.8355:8481]

    const object_class_type idx_to_objtype[4] = { OBJ_WANDS, OBJ_SCROLLS,
                                                  OBJ_JEWELLERY, OBJ_POTIONS };
    const int idx_to_maxtype[4] = { NUM_WANDS, NUM_SCROLLS,
                                    NUM_JEWELLERY, NUM_POTIONS };

[11.2753691]

[11.2753940]

    const object_class_type idx_to_objtype[5] = { OBJ_WANDS, OBJ_SCROLLS,
                                                  OBJ_JEWELLERY, OBJ_POTIONS,
                                                  OBJ_STAVES };
    const int idx_to_maxtype[5] = { NUM_WANDS, NUM_SCROLLS,
                                    NUM_JEWELLERY, NUM_POTIONS, NUM_STAVES };

Replacement in crawl-ref/source/itemname.cc at line 1777 [11.2667494]
B:BD[11.2753941] → [22.8482:8514]
```
    for (int i = 0; i < 4; i++)
```
[11.2753941]
[22.8514]
```
    for (int i = 0; i < 5; i++)
```

Insertion in crawl-ref/source/it_use3.cc at line 567 [11.2870456]

[11.2886227]

[24.25761]

                    set_ident_type( OBJ_STAVES, wpn.sub_type, ID_KNOWN_TYPE );

Replacement in crawl-ref/source/externs.h at line 678 [11.3270163]
B:BD[11.3278434] → [11.3278434:3278487]
```
  FixedArray<unsigned char, 5, 50> item_description;
```
[11.3278434]
[25.2040]
```
  FixedArray<unsigned char, 6, 50> item_description;
```

Replacement in crawl-ref/source/effects.cc at line 1872 [11.3382105]

B:BD[26.3886] → [26.3886:3957]

                // Don't forget identity of decks if it the player has

[26.3886]

[26.3957]

                // Don't forget identity of decks if the player has

Insertion in crawl-ref/source/effects.cc at line 2363 [11.3382105]

[4.16963]

            
            set_ident_type( OBJ_STAVES, item.sub_type, ID_KNOWN_TYPE );

Insertion in crawl-ref/source/describe.h at line 22 [11.3734214]

[18.98840]

// If you add any more description types, remember to also
// change item_description in externs.h

Insertion in crawl-ref/source/describe.h at line 31 [11.3734214]
[18.99023]
[18.99023]
```
    IDESC_STAVES,
```

Rework staves/rods to match the ID behaviour of wands etc., i.e.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tutorial.cc at line 2 [7.5936]

Replacement in crawl-ref/source/tile1.cc at line 1614 [8.96318]

Insertion in crawl-ref/source/tile1.cc at line 3981 [8.96318]

Insertion in crawl-ref/source/tags.cc at line 74 [11.164589]

Replacement in crawl-ref/source/tags.cc at line 1020 [11.164589]

Replacement in crawl-ref/source/tags.cc at line 1023 [11.164589]

Insertion in crawl-ref/source/tags.cc at line 1432 [11.164589]

Insertion in crawl-ref/source/spl-book.cc at line 1416 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1419 [11.397614]

Insertion in crawl-ref/source/spl-book.cc at line 1421 [11.397614]

Insertion in crawl-ref/source/newgame.cc at line 422 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 432 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 443 [11.1132300]

Insertion in crawl-ref/source/newgame.cc at line 466 [11.1132300]

Replacement in crawl-ref/source/newgame.cc at line 2480 [11.1132300]

Insertion in crawl-ref/source/makeitem.cc at line 706 [16.927]

Replacement in crawl-ref/source/makeitem.cc at line 2483 [16.927]

Replacement in crawl-ref/source/itemprop.h at line 400 [14.641567]

Replacement in crawl-ref/source/itemprop.h at line 412 [14.641567]

Insertion in crawl-ref/source/itemname.h at line 31 [11.2661173]

Insertion in crawl-ref/source/itemname.cc at line 882 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 902 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 904 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1531 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1541 [11.2667494]

Insertion in crawl-ref/source/itemname.cc at line 1655 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1771 [11.2667494]

Replacement in crawl-ref/source/itemname.cc at line 1777 [11.2667494]

Insertion in crawl-ref/source/it_use3.cc at line 567 [11.2870456]

Replacement in crawl-ref/source/externs.h at line 678 [11.3270163]

Replacement in crawl-ref/source/effects.cc at line 1872 [11.3382105]

Insertion in crawl-ref/source/effects.cc at line 2363 [11.3382105]

Insertion in crawl-ref/source/describe.h at line 22 [11.3734214]

Insertion in crawl-ref/source/describe.h at line 31 [11.3734214]