fiddlerwoaroof/crawl - Change NHDY5NMP7SGSOFT6PQS2PN6YPLUEFRTD3LXNLYFHHL5G27QY65FQC

Fix tiles build, and mention tiles handling in art-data.txt.

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

Created by j-p-e-g on June 25, 2009

NHDY5NMP7SGSOFT6PQS2PN6YPLUEFRTD3LXNLYFHHL5G27QY65FQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/util/art-data.pl at line 537 [2.553]
B:BD[2.12645] → [2.12645:12690]
```
        print "Enumeartion list changed.\n";
```
[2.12645]
[2.12690]
```
        print "Enumeration list changed.\n";
```

Replacement in crawl-ref/source/util/art-data.pl at line 547 [2.553]

B:BD[2.12888] → [2.12888:12941]

                print "Enumeartion list changed.\n";

[2.12888]

[2.12941]

                print "Enumeration list changed.\n";

Replacement in crawl-ref/source/tilepick.cc at line 1144 [3.96318]

B:BD[2.18753] → [2.18753:18816]

    case UNRAND_PLUTONIUM:        return TILE_URAND_PLUTONIUM;

[2.18753]

[2.18816]

    case UNRAND_PLUTONIUM_SWORD:  return TILE_URAND_PLUTONIUM;

Replacement in crawl-ref/source/tilepick.cc at line 1148 [3.96318]

B:BD[2.19010] → [2.19010:19070]

    case UNRAND_FENCER:           return TILE_URAND_FENCER;

[2.19010]

[2.19070]

    case UNRAND_FENCERS_GLOVES:   return TILE_URAND_FENCER;

Deletion in crawl-ref/source/tilepick.cc at line 1150 [3.96318]
B:BD[2.19128] → [2.19128:19189]
```
    case UNRAND_BLOWGUN_ASSASSIN: return TILE_URAND_BLOWGUN;
```

Replacement in crawl-ref/source/tilepick.cc at line 3408 [3.96318]

B:BD[3.180941] → [3.180941:180966]

B:BD[3.180966] → [2.20142:20208]

∅:D[2.20208] → [3.181016:181045]

∅:D[4.24770] → [3.181016:181045]

B:BD[3.181016] → [3.181016:181045]

B:BD[3.181045] → [2.20209:20283]

∅:D[2.20283] → [5.762:796]

B:BD[4.24826] → [5.762:796]

B:BD[5.796] → [2.20284:20360]

∅:D[2.20360] → [5.856:889]

B:BD[5.856] → [5.856:889]

B:BD[5.889] → [2.20361:20418]

∅:D[2.20418] → [5.890:928]

B:BD[3.181271] → [5.890:928]

B:BD[5.928] → [2.20419:20490]

∅:D[2.20490] → [5.929:958]

B:BD[3.181362] → [5.929:958]

B:BD[5.958] → [2.20491:20546]

∅:D[2.20546] → [5.959:992]

B:BD[3.181438] → [5.959:992]

B:BD[5.992] → [2.20547:20610]

∅:D[2.20610] → [5.993:1020]

B:BD[3.181520] → [5.993:1020]

B:BD[5.1020] → [2.20611:20666]

∅:D[2.20666] → [5.1021:1051]

B:BD[3.181593] → [5.1021:1051]

B:BD[5.1051] → [2.20667:20728]

∅:D[2.20728] → [5.1052:1093]

B:BD[3.181671] → [5.1052:1093]

B:BD[5.1093] → [2.20729:20804]

∅:D[2.20804] → [5.1151:1186]

B:BD[5.1151] → [5.1151:1186]

B:BD[5.1186] → [2.20805:20876]

∅:D[2.20876] → [5.1247:1277]

B:BD[5.1247] → [5.1247:1277]

B:BD[5.1277] → [2.20877:20934]

∅:D[2.20934] → [5.1278:1316]

B:BD[3.181877] → [5.1278:1316]

B:BD[5.1316] → [2.20935:21001]

∅:D[2.21001] → [5.1317:1353]

B:BD[3.181967] → [5.1317:1353]

B:BD[5.1353] → [2.21002:21071]

∅:D[2.21071] → [5.1354:1373]

B:BD[3.182055] → [5.1354:1373]

B:BD[5.1373] → [2.21072:21125]

∅:D[2.21125] → [5.1418:1450]

B:BD[5.1418] → [5.1418:1450]

B:BD[5.1450] → [2.21126:21185]

∅:D[2.21185] → [5.1451:1494]

B:BD[3.182180] → [5.1451:1494]

B:BD[5.1494] → [2.21186:21265]

∅:D[2.21265] → [5.1556:1590]

B:BD[5.1556] → [5.1556:1590]

B:BD[5.1590] → [2.21266:21321]

∅:D[2.21321] → [5.1591:1622]

B:BD[3.182329] → [5.1591:1622]

B:BD[5.1622] → [2.21322:21399]

∅:D[2.21399] → [5.1623:1661]

B:BD[3.182416] → [5.1623:1661]

B:BD[5.1661] → [2.21400:21459]

∅:D[2.21459] → [5.1693:1724]

B:BD[3.182581] → [5.1693:1724]

B:BD[5.1724] → [2.21460:21531]

∅:D[2.21531] → [5.1814:1853]

B:BD[5.1814] → [5.1814:1853]

B:BD[5.1853] → [2.21532:21611]

∅:D[2.21611] → [6.4816:4840]

B:BD[5.1911] → [6.4816:4840]

B:BD[6.4840] → [2.21612:21675]

∅:D[2.21675] → [6.4841:4873]

B:BD[5.1961] → [6.4841:4873]

B:BD[6.4873] → [2.21676:21753]

∅:D[2.21753] → [6.4874:4912]

B:BD[5.2018] → [6.4874:4912]

B:BD[6.4912] → [2.21754:21831]

∅:D[2.21831] → [6.4913:4946]

B:BD[5.2130] → [6.4913:4946]

B:BD[6.4946] → [2.21832:22042]

            // Bloodbane
            case UNRAND_BLOODBANE:  return TILEP_HAND1_BLOODBANE;
            // Flaming Death
            case UNRAND_FLAMING_DEATH:  return TILEP_HAND1_FLAMING_DEATH;
            // mace of Brilliance
            case UNRAND_BRILLIANCE:  return TILEP_HAND1_MACE_OF_BRILLIANCE;
            // demon blade Leech
            case UNRAND_LEECH: return TILEP_HAND1_LEECH;
            // dagger of Chilly Death
            case UNRAND_CHILLY_DEATH: return TILEP_HAND1_CHILLY_DEATH;
            // dagger "Morg"
            case UNRAND_MORG: return TILEP_HAND1_MORG;
            // scythe "Finisher"
            case UNRAND_FINISHER: return TILEP_HAND1_FINISHER;
            // sling "Punk
            case UNRAND_PUNK: return TILEP_HAND1_PUNK;
            // bow of Krishna
            case UNRAND_KRISHNA: return TILEP_HAND1_KRISHNA;
            // giant club "Skullcrusher"
            case UNRAND_SKULLCRUSHER: return TILEP_HAND1_GIANT_CLUB_SLANT;
            // glaive of the Guard
            case UNRAND_GUARD: return TILEP_HAND1_GLAIVE_OF_THE_GUARD;
            // sword of Jihad
            case UNRAND_JIHAD: return TILEP_HAND1_JIHAD;
            // crossbow "Fiery Devil"
            case UNRAND_HELLFIRE: return TILEP_HAND1_FIERY_DEVIL;
            // sword of Doom Knight
            case UNRAND_DOOM_KNIGHT: return TILEP_HAND1_DOOM_KNIGHT;
            // Eos
            case UNRAND_EOS: return TILEP_HAND1_EOS;
            // spear of Voo-Doo
            case UNRAND_BOTONO: return TILEP_HAND1_VOODOO;
            // trident of the Octopus king
            case UNRAND_OCTOPUS_KING: return TILEP_HAND1_TRIDENT_OCTOPUS_KING;
            // mithril axe "Arga"
            case UNRAND_ARGA: return TILEP_HAND1_ARGA;
            // Elemental Staff
            case UNRAND_ELEMENTAL_STAFF: return TILEP_HAND1_ELEMENTAL_STAFF;
            // hand crossbow "Sniper"
            case UNRAND_SNIPER: return TILEP_HAND1_SNIPER;
            // plutonium sword
            case UNRAND_PLUTONIUM: return TILEP_HAND1_PLUTONIUM_SWORD;
            // blowgun of the Assassin
            case UNRAND_BLOWGUN_ASSASSIN: return TILEP_HAND1_BLOWGUN_ASSASSIN;
            // Wyrmbane
            case UNRAND_WYRMBANE: return TILEP_HAND1_WYRMBANE;
            // Spriggan's Knife
            case UNRAND_SPRIGGANS_KINFE: return TILEP_HAND1_SPRIGGANS_KNIFE;
            // whip "Serpent Scourge"
            case UNRAND_SERPENT_SCOURGE: return TILEP_HAND1_SERPENT_SCOURGE;
            // knife of Accuracy
            case UNRAND_ACCURACY: return TILEP_HAND1_KNIFE_OF_ACCURACY;
            // bow "Erchidel"
            // XXX: What happened to this unrand?
            //case UNRAND_: return TILEP_HAND1_GREAT_BOW;

[5.761]

[3.182754]


            case UNRAND_BLOODBANE:          return TILEP_HAND1_BLOODBANE;
            case UNRAND_FLAMING_DEATH:      return TILEP_HAND1_FLAMING_DEATH;
            case UNRAND_BRILLIANCE:         return TILEP_HAND1_MACE_OF_BRILLIANCE;
            case UNRAND_LEECH:              return TILEP_HAND1_LEECH;
            case UNRAND_CHILLY_DEATH:       return TILEP_HAND1_CHILLY_DEATH;
            case UNRAND_MORG:               return TILEP_HAND1_MORG;
            case UNRAND_FINISHER:           return TILEP_HAND1_FINISHER;
            case UNRAND_PUNK:               return TILEP_HAND1_PUNK;
            case UNRAND_KRISHNA:            return TILEP_HAND1_KRISHNA;
            case UNRAND_SKULLCRUSHER:       return TILEP_HAND1_GIANT_CLUB_SLANT;
            case UNRAND_GUARD:              return TILEP_HAND1_GLAIVE_OF_THE_GUARD;
            case UNRAND_JIHAD:              return TILEP_HAND1_JIHAD;
            case UNRAND_HELLFIRE:           return TILEP_HAND1_FIERY_DEVIL;
            case UNRAND_DOOM_KNIGHT:        return TILEP_HAND1_DOOM_KNIGHT;
            case UNRAND_EOS:                return TILEP_HAND1_EOS;
            case UNRAND_BOTONO:             return TILEP_HAND1_VOODOO;
            case UNRAND_OCTOPUS_KING:       return TILEP_HAND1_TRIDENT_OCTOPUS_KING;
            case UNRAND_ARGA:               return TILEP_HAND1_ARGA;
            case UNRAND_ELEMENTAL_STAFF:    return TILEP_HAND1_ELEMENTAL_STAFF;
            case UNRAND_SNIPER:             return TILEP_HAND1_SNIPER;
            case UNRAND_PLUTONIUM_SWORD:    return TILEP_HAND1_PLUTONIUM_SWORD;
            case UNRAND_BLOWGUN_ASSASSIN:   return TILEP_HAND1_BLOWGUN_ASSASSIN;
            case UNRAND_WYRMBANE:           return TILEP_HAND1_WYRMBANE;
            case UNRAND_SPRIGGANS_KNIFE:    return TILEP_HAND1_SPRIGGANS_KNIFE;
            case UNRAND_SERPENT_SCOURGE:    return TILEP_HAND1_SERPENT_SCOURGE;
            case UNRAND_ACCURACY:           return TILEP_HAND1_KNIFE_OF_ACCURACY;
            case UNRAND_PIERCER:            return TILEP_HAND1_GREAT_BOW;

Replacement in crawl-ref/source/artefact.h at line 105 [2.43896]
B:BD[2.48048] → [2.48048:48098]
```
    UNRAND_LEARS,            // Lear's chain mail
```
[2.48048]
[2.48098]
```
    UNRAND_LEAR,             // Lear's chain mail
```
Replacement in crawl-ref/source/artefact.h at line 112 [2.43896]
B:BD[2.48402] → [2.48402:48453]
```
    UNRAND_DRAGON,           // mask of the Dragon
```
[2.48402]
[2.48453]
```
    UNRAND_DRAGONMASK,       // mask of the Dragon
```
Replacement in crawl-ref/source/art-data.txt at line 12 [2.62077]
B:BD[2.62509] → [2.62509:62512]
```
# 
```
[2.62509]
[2.62512]
```
#
```

Replacement in crawl-ref/source/art-data.txt at line 17 [2.62077]

B:BD[2.62718] → [2.62718:62824]

# "UNRAND_FOO", for cases where the automatically generated enumarations
# of different unrands conflict.

[2.62718]

[2.62824]

# "UNRAND_FOO", for cases where the automatically generated enumerations
# of different unrandarts conflict.

Insertion in crawl-ref/source/art-data.txt at line 26 [2.62077]

[2.63238]

#
# Each unrandart needs two tiles, one item tile and one equipment tile for the
# player doll. The former needs to be placed into rltiles/item and defined in
# dc-item.txt, the latter in the appropriate player/ subfolder and defined in
# dc-player.txt. In tilepick.cc the unrandart must then be assigned to the tile
# name defined in the dc-***.txt.
# For a start, placeholders (e.g. reference to the base type tiles) are fine,
# but they'll eventually need to be replaced with proper tiles.

Replacement in crawl-ref/source/art-data.txt at line 58 [2.62077]

B:BD[2.63808] → [2.63808:63958]

DESC_ID: This was the favourite weapon of the old god Trog, before it was 
         lost one day. It induces a bloodthirsty berserker rage in anyone

[2.63808]

[2.63958]

DESC_ID: This was the favourite weapon of the old god Trog, before it was
         lost one day. It induces a bloodthirsty berserker rage in anyone

Replacement in crawl-ref/source/art-data.txt at line 74 [2.62077]

B:BD[2.64300] → [2.64300:64442]

DESC_ID: It is the creation of a mad god, and carries a curse which 
         transforms anyone possessing it into a prune. Fortunately, the

[2.64300]

[2.64442]

DESC_ID: It is the creation of a mad god, and carries a curse which
         transforms anyone possessing it into a prune. Fortunately, the

Replacement in crawl-ref/source/art-data.txt at line 119 [2.62077]
B:BD[2.65762] → [2.65762:65775]
```
CURSED:  -1 
```
[2.65762]
[2.65775]
```
CURSED:  -1
```
Replacement in crawl-ref/source/art-data.txt at line 169 [2.62077]
B:BD[2.67002] → [2.67002:67033]
```
STEALTH: -20                  
```
[2.67002]
[2.67033]
```
STEALTH: -20
```
Replacement in crawl-ref/source/art-data.txt at line 192 [2.62077]
B:BD[2.67415] → [2.67415:67462]
```
STEALTH: -20                                  
```
[2.67415]
[2.67462]
```
STEALTH: -20
```
Replacement in crawl-ref/source/art-data.txt at line 227 [2.62077]
B:BD[2.68079] → [2.68079:68112]
```
DESC:     An ugly rusty dagger. 
```
[2.68079]
[2.68112]
```
DESC:     An ugly rusty dagger.
```

Replacement in crawl-ref/source/art-data.txt at line 229 [2.62077]

B:BD[2.68190] → [2.68190:68251]

          He got lost in the Dungeon while seeking the Orb.

[2.68190]

[2.68251]

          He got lost in the Dungeon while seeking the Orb.

Replacement in crawl-ref/source/art-data.txt at line 259 [2.62077]
B:BD[2.68844] → [2.68844:68879]
```
DESC:     A wonderful golden bow. 
```
[2.68844]
[2.68879]
```
DESC:     A wonderful golden bow.
```
Replacement in crawl-ref/source/art-data.txt at line 293 [2.62077]
B:BD[2.69708] → [2.69708:69756]
```
STEALTH:  -50                                  
```
[2.69708]
[2.69756]
```
STEALTH:  -50
```
Replacement in crawl-ref/source/art-data.txt at line 341 [2.62077]
B:BD[2.70942] → [2.70942:70974]
```
STEALTH:  -30                  
```
[2.70942]
[2.70974]
```
STEALTH:  -30
```
Replacement in crawl-ref/source/art-data.txt at line 406 [2.62077]
B:BD[2.72531] → [2.72531:72562]
```
STEALTH: 60                   
```
[2.72531]
[2.72562]
```
STEALTH: 60
```
Replacement in crawl-ref/source/art-data.txt at line 428 [2.62077]
B:BD[2.72992] → [2.72992:73006]
```
STEALTH:  50 
```
[2.72992]
[2.73006]
```
STEALTH:  50
```
Replacement in crawl-ref/source/art-data.txt at line 441 [2.62077]
B:BD[2.73355] → [2.73355:73386]
```
STEALTH: -20                  
```
[2.73355]
[2.73386]
```
STEALTH: -20
```
Replacement in crawl-ref/source/art-data.txt at line 510 [2.62077]
B:BD[2.74866] → [2.74866:74898]
```
STEALTH:  60                   
```
[2.74866]
[2.74898]
```
STEALTH:  60
```
Replacement in crawl-ref/source/art-data.txt at line 544 [2.62077]
B:BD[2.75542] → [2.75542:75574]
```
STEALTH:  -80                  
```
[2.75542]
[2.75574]
```
STEALTH:  -80
```
Replacement in crawl-ref/source/art-data.txt at line 565 [2.62077]
B:BD[2.75972] → [2.75972:76004]
```
STEALTH:  80                   
```
[2.75972]
[2.76004]
```
STEALTH:  80
```
Replacement in crawl-ref/source/art-data.txt at line 569 [2.62077]
B:BD[2.76103] → [2.76103:76118]
```
ENUM:    LEARS
```
[2.76103]
[2.76118]
```
ENUM:    LEAR
```
Insertion in crawl-ref/source/art-data.txt at line 637 [2.62077]
[2.77373]
[2.77373]
```
ENUM:   DRAGONMASK
```
Replacement in crawl-ref/source/art-data.txt at line 656 [2.62077]
B:BD[2.77674] → [2.77674:77706]
```
STEALTH:  50                   
```
[2.77674]
[2.77706]
```
STEALTH:  50
```
Replacement in crawl-ref/source/art-data.txt at line 696 [2.62077]
B:BD[2.78528] → [2.78528:78555]
```
STEALTH:  -30             
```
[2.78528]
[2.78555]
```
STEALTH:  -30
```
Replacement in crawl-ref/source/art-data.txt at line 722 [2.62077]
B:BD[2.79266] → [2.79266:79297]
```
STEALTH: 50                   
```
[2.79266]
[2.79297]
```
STEALTH: 50
```
Replacement in crawl-ref/source/art-data.txt at line 733 [2.62077]
B:BD[2.79481] → [2.79481:79512]
```
STEALTH: 40                   
```
[2.79481]
[2.79512]
```
STEALTH: 40
```
Replacement in crawl-ref/source/art-data.txt at line 764 [2.62077]
B:BD[2.80019] → [2.80019:80050]
```
STEALTH: -20                  
```
[2.80019]
[2.80050]
```
STEALTH: -20
```

Replacement in crawl-ref/source/art-data.txt at line 792 [2.62077]

B:BD[2.80571] → [2.80571:80643]

DESC_END: Back in the good old days, every adventurer had one of these

[2.80571]

[2.80643]

DESC_END: Back in the good old days, every adventurer had one of these

Replacement in crawl-ref/source/art-data.h at line 909 [2.80883]
B:BD[2.101633] → [2.101633:101656]
```
/* 53: UNRAND_LEARS */
```
[2.101633]
[2.101656]
```
/* 53: UNRAND_LEAR */
```
Replacement in crawl-ref/source/art-data.h at line 1028 [2.80883]
B:BD[2.104049] → [2.104049:104073]
```
/* 60: UNRAND_DRAGON */
```
[2.104049]
[2.104073]
```
/* 60: UNRAND_DRAGONMASK */
```

Fix tiles build, and mention tiles handling in art-data.txt.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/util/art-data.pl at line 537 [2.553]

Replacement in crawl-ref/source/util/art-data.pl at line 547 [2.553]

Replacement in crawl-ref/source/tilepick.cc at line 1144 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 1148 [3.96318]

Deletion in crawl-ref/source/tilepick.cc at line 1150 [3.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3408 [3.96318]

Replacement in crawl-ref/source/artefact.h at line 105 [2.43896]

Replacement in crawl-ref/source/artefact.h at line 112 [2.43896]

Replacement in crawl-ref/source/art-data.txt at line 12 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 17 [2.62077]

Insertion in crawl-ref/source/art-data.txt at line 26 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 58 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 74 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 119 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 169 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 192 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 227 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 229 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 259 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 293 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 341 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 406 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 428 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 441 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 510 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 544 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 565 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 569 [2.62077]

Insertion in crawl-ref/source/art-data.txt at line 637 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 656 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 696 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 722 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 733 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 764 [2.62077]

Replacement in crawl-ref/source/art-data.txt at line 792 [2.62077]

Replacement in crawl-ref/source/art-data.h at line 909 [2.80883]

Replacement in crawl-ref/source/art-data.h at line 1028 [2.80883]