fiddlerwoaroof/crawl - Change WS63V5NRIGFF3M3NRB7TOK5D3XDXYQRQRZN4PY3VJPTJZUXMMVAAC

While for the appearance of randart weapons and armour you can just

stick an adjective in front of the object type name ("bloodstained dagger"), unidentified non-artefact jewellry is described with both an adjective and material ("runed wooden ring"), making a description like "runed ring" a bit weird. So give randart jewellery an adjective that no non-artefact jewellery would have, plus a material that a non-artefact might or might not have.

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

Created by zelgadis on June 11, 2008

WS63V5NRIGFF3M3NRB7TOK5D3XDXYQRQRZN4PY3VJPTJZUXMMVAAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/randart.cc at line 1255 [4.893152]
B:BD[4.923066] → [2.3913:3967]
```
static std::string _get_artefact_type(const int type)
```
[4.923066]
[4.923115]
```
static std::string _get_artefact_type(const item_def &item)
```
Replacement in crawl-ref/source/randart.cc at line 1257 [4.893152]
B:BD[4.923117] → [5.8145:8163]
```
    switch (type)
```
[4.923117]
[4.923201]
```
    switch (item.base_type)
```

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

B:BD[5.8286] → [5.8286:8315]

         return "jewellery";

[5.8286]

[5.8315]

         if (jewellery_is_amulet(item))
             return "amulet";
         else
             return "ring";

Replacement in crawl-ref/source/randart.cc at line 1325 [4.893152]
B:BD[5.9332] → [2.4127:4177]
```
    lookup += _get_artefact_type(item.base_type);
```
[5.9332]
[6.10000]
```
    lookup += _get_artefact_type(item);
```

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

B:BD[7.4507] → [2.4208:4284]

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

[7.4507]

[7.4582]

                               _get_artefact_type(item).c_str());

Insertion in crawl-ref/source/dat/database/randname.txt at line 648 [5.14728]

[5.24605]

######################################################
# Jewellry appearance
######################################################
#
# While for the appearance of randart weapons and armour you can
# just stick an adjective in front of the object type name ("bloodstained
# dagger"), unidentified non-artefact jewellry is described with both an
# adjective and material ("runed wooden ring"), making a description
# like "runed ring" a bit weird.  So give randart jewellery an adjective
# that no non-artefact jewellery would have, plus a material that a
# non-artefact might or might not have.

Insertion in crawl-ref/source/dat/database/randname.txt at line 660 [5.14728]
[5.24626]
[5.24626]
```
scintillating
sparkling
flickering
```

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

B:BD[5.24627] → [5.24627:24649]

#specific jewels
ruby

[5.24627]

[5.24649]

glittering
smoking
shimmering
wavering
warped
transparent
pitted
slimy
fine
crude
ancient
brightly glowing
faintly glowing
steaming
heavily runed
vibrating
twitching
%%%%
ring material

Replacement in crawl-ref/source/dat/database/randname.txt at line 703 [5.14728]
B:BD[5.24650] → [5.24650:24658]
```
crystal
```
[5.24650]
[5.24658]
```
wooden
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 705 [5.14728]
B:BD[5.24659] → [5.24659:24667]
```
diamond
```
[5.24659]
[5.24667]
```
ivory
bone
amber
silver
golden
platinum
iron
steel
bronze
brass
copper
tin
lead
pewter
granite
marble
jade
turquoise
lapis lazuli
```

Insertion in crawl-ref/source/dat/database/randname.txt at line 743 [5.14728]

[5.24668]

glass
%%%%
amulet material
ivory
bone
plastic
silver
golden
platinum
iron
steel
bronze
brass
copper
tin
lead
pewter
zirconium
sapphire

Replacement in crawl-ref/source/dat/database/randname.txt at line 781 [5.14728]
B:BD[5.24677] → [5.24677:24703]
```
#other descriptions
runed
```
[5.24677]
[5.24703]
```
garnet
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 783 [5.14728]
B:BD[5.24704] → [5.24704:24718]
```
scintillating
```
[5.24704]
[5.24718]
```
ruby
jade
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 787 [5.14728]
B:BD[5.24719] → [5.24719:24729]
```
sparkling
```
[5.24719]
[5.24729]
```
ruby
crystal
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 791 [5.14728]
B:BD[5.24730] → [5.24730:24741]
```
flickering
```
[5.24730]
[5.24741]
```
diamond
amethyst
%%%%
ring appearance
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 797 [5.14728]
B:BD[5.24742] → [5.24742:24753]
```
glittering
```
[5.24742]
[5.24753]
```
@jewellery appearance@ @ring material@
%%%%
amulet appearance
```
Replacement in crawl-ref/source/dat/database/randname.txt at line 801 [5.14728]
B:BD[5.24754] → [5.24754:24781]
```
w:160
@general appearance@
```
[5.24754]
[3.2733]
```
@jewellery appearance@ @amulet material@
```

While for the appearance of randart weapons and armour you can just

Dependencies

In channels

Change contents

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

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

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

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

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

Insertion in crawl-ref/source/dat/database/randname.txt at line 648 [5.14728]

Insertion in crawl-ref/source/dat/database/randname.txt at line 660 [5.14728]

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

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

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

Insertion in crawl-ref/source/dat/database/randname.txt at line 743 [5.14728]

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

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

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

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

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

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