fiddlerwoaroof/crawl - Change C3O4BWRMGGRM6CUQITUHOKYPLE2ZIIW6I7PTNKA4ZTCDJNWH7WOAC

Fix randart jewellery always named "of Bugginess".

Fix pickup.lua trying to find a butcher tool if the wielded edged weapon happens to be cursed.

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

Created by j-p-e-g on June 16, 2008

C3O4BWRMGGRM6CUQITUHOKYPLE2ZIIW6I7PTNKA4ZTCDJNWH7WOAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/randart.cc at line 1255 [5.893152]

B:BD[5.923066] → [3.2531:2591]

static std::string _get_artefact_type(const item_def &item)

[5.923066]

[5.923115]

static std::string _get_artefact_type(const item_def &item,
                                      bool appear = false)

Replacement in crawl-ref/source/randart.cc at line 1260 [5.893152]

B:BD[5.923207] → [6.8164:8286]

B:BD[6.8286] → [3.2621:2733]

     case OBJ_WEAPONS:
         return "weapon";
     case OBJ_ARMOUR:
         return "armour";
     case OBJ_JEWELLERY:
         if (jewellery_is_amulet(item))
             return "amulet";
         else
             return "ring";

[5.923207]

[6.8315]

    case OBJ_WEAPONS:
        return "weapon";
    case OBJ_ARMOUR:
        return "armour";
    case OBJ_JEWELLERY:
        // Only in appearance distinguish between amulets and rings.
        if (!appear)
            return "jewellery";
        if (jewellery_is_amulet(item))
            return "amulet";
        else
            return "ring";

Replacement in crawl-ref/source/randart.cc at line 1330 [5.893152]
B:BD[6.9332] → [3.2734:2774]
```
    lookup += _get_artefact_type(item);
```
[6.9332]
[7.10000]
```
    lookup += _get_artefact_type(item, appearance);
```

Replacement in crawl-ref/source/randart.cc at line 1339 [5.893152]

B:BD[8.2568] → [8.2568:2622]

            // don't allow "jewelled jewelled helmet"

[8.2568]

[8.2622]

            // Don't allow "jewelled jewelled helmet".

Replacement in crawl-ref/source/randart.cc at line 1368 [5.893152]

B:BD[9.4164] → [9.4164:4220]

                // if nothing found, try god name alone

[9.4164]

[9.4220]

                // If nothing found, try god name alone.

Replacement in crawl-ref/source/randart.cc at line 1374 [5.893152]

B:BD[9.4394] → [9.4394:4461]

                    // if still nothing found, try base type alone

[9.4394]

[9.4461]

                    // If still nothing found, try base type alone.

Replacement in crawl-ref/source/describe.cc at line 2444 [5.3736416]
∅:D[10.21920] → [11.7412:7454]
B:BD[11.7412] → [11.7412:7454]
```
    if ( !pmsg[0] )
        return false;
```
[10.21920]
[12.3533]
```
    if (!pmsg[0])
        return (false);
```

Insertion in crawl-ref/source/describe.cc at line 2959 [5.3736416]

[5.3962557]

[5.3962558]


    int bottom_line = get_number_of_lines();
    if (bottom_line > 30)
        bottom_line = 30;

Replacement in crawl-ref/source/describe.cc at line 2971 [5.3736416]
∅:D[13.3382] → [14.2698:2759]
B:BD[14.2698] → [14.2698:2759]
```
            cgotoxy(1, get_number_of_lines() - 1, GOTO_CRT);
```
[13.3382]
[13.3383]
```
            cgotoxy(1, bottom_line - 1, GOTO_CRT);
```

Replacement in crawl-ref/source/describe.cc at line 2974 [5.3736416]

B:BD[15.3137] → [16.7940:8001]

            cgotoxy(1, get_number_of_lines() - 2, GOTO_CRT);

[15.3137]

[17.2774]

            cgotoxy(1, bottom_line - 2, GOTO_CRT);

Deletion in crawl-ref/source/describe.cc at line 2981 [5.3736416]

B:BD[18.6550] → [4.11296:11393]

    int bottom_line = get_number_of_lines();
    if (bottom_line > 30)
        bottom_line = 30;

Insertion in crawl-ref/source/dat/lua/pickup.lua at line 14 [19.4163]

[19.4633]

[2.2828]

    -- If we're already wielding a weapon capable of butchering, okay.
    if item.equipped(it) then
        return true
    end

Replacement in crawl-ref/settings/messages.txt at line 34 [20.4815]

B:BD[20.5698] → [20.5698:5852]

message_colour = darkgrey:You start (resting|searching)
message_colour = darkgrey:Unknown command
message_colour = darkgrey:disappears in a puff of smoke

[20.5698]

[20.5852]

msc = darkgrey:You start (resting|searching)
msc = darkgrey:Unknown command
msc = darkgrey:disappears in a puff of smoke

Replacement in crawl-ref/settings/messages.txt at line 38 [20.4815]

B:BD[20.5854] → [20.5854:5963]

message_colour = darkgrey:miss(es)? (the|you|it)
message_colour = darkgrey:but (do no|doesn't do any) damage

[20.5854]

msc = darkgrey:miss(es)? (the|you|it)
msc = darkgrey:but (do no|doesn't do any) damage