fiddlerwoaroof/crawl - Change R4FTAHT4XX2NUXUO3QAMP24DMANOT3IUBAXO654VWUZLOVFTYUOQC

Added new monster draconian tiles. Improved ring and amulet graphics. Fixed issue where the deep elf blademaster did not appear with weapons. (These graphics are all from Mitsuhiro Itakura.)

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

Created by ennewalker on September 24, 2008

R4FTAHT4XX2NUXUO3QAMP24DMANOT3IUBAXO654VWUZLOVFTYUOQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilemcache.cc at line 80 [3.20125]
B:BD[3.21812] → [3.21812:21856]
```
    virtual const dolls_data *doll() const;
```
[3.21812]
[3.21856]
```
    virtual unsigned int info(tile_draw_info *dinfo) const;
```
Replacement in crawl-ref/source/tilemcache.cc at line 87 [3.20125]
B:BD[3.21954] → [3.21954:21977]
```
    dolls_data m_doll;
```
[3.21954]
[3.21977]
```
    int m_mon_tile;
    int m_job_tile;
    int m_equ_tile;
```
Insertion in crawl-ref/source/tilemcache.cc at line 343 [3.20125]
[3.27617]
[3.27617]
```
    case TILEP_MONS_DEEP_ELF_BLADEMASTER:
```
Deletion in crawl-ref/source/tilemcache.cc at line 465 [3.20125]
B:BD[3.30218] → [3.30218:30260]
```
    case TILEP_MONS_DEEP_ELF_HIGH_PRIEST:
```
Deletion in crawl-ref/source/tilemcache.cc at line 467 [3.20125]
B:BD[3.30345] → [3.30345:30384]
```
    case TILEP_MONS_DEEP_ELF_SORCERER:
```

Insertion in crawl-ref/source/tilemcache.cc at line 472 [3.20125]

[3.30500]

        ofs_y = 0;
        break;
    case TILEP_MONS_DEEP_ELF_SORCERER:
    case TILEP_MONS_DEEP_ELF_HIGH_PRIEST:
        ofs_x = 0;
        ofs_y = -1;
        break;
    case TILEP_MONS_TIAMAT:
        ofs_x = -2;

Replacement in crawl-ref/source/tilemcache.cc at line 570 [3.20125]

B:BD[3.32551] → [3.32551:32857]

    case MONS_GREEN_DRACONIAN:  colour = 4; break;
    case MONS_MOTTLED_DRACONIAN:colour = 5; break;
    case MONS_PALE_DRACONIAN:   colour = 6; break;
    case MONS_PURPLE_DRACONIAN: colour = 7; break;
    case MONS_RED_DRACONIAN:    colour = 8; break;
    case MONS_WHITE_DRACONIAN:  colour = 9; break;

[3.32551]

[3.32857]

    case MONS_GREEN_DRACONIAN:  colour = 3; break;
    case MONS_MOTTLED_DRACONIAN:colour = 4; break;
    case MONS_PALE_DRACONIAN:   colour = 5; break;
    case MONS_PURPLE_DRACONIAN: colour = 6; break;
    case MONS_RED_DRACONIAN:    colour = 7; break;
    case MONS_WHITE_DRACONIAN:  colour = 8; break;

Replacement in crawl-ref/source/tilemcache.cc at line 578 [3.20125]

B:BD[3.32864] → [3.32864:33195]

    m_doll.parts[TILEP_PART_SHADOW] = TILEP_SHADOW_SHADOW;
    m_doll.parts[TILEP_PART_BASE] = TILEP_BASE_DRACONIAN + colour * 2;
    m_doll.parts[TILEP_PART_DRCWING] =
        tile_player_part_start[TILEP_PART_DRCWING] + colour;
    m_doll.parts[TILEP_PART_DRCHEAD] =
        tile_player_part_start[TILEP_PART_DRCHEAD] + colour;

[3.32864]

[3.33195]

    m_mon_tile = TILEP_DRACO_BASE + colour;

Replacement in crawl-ref/source/tilemcache.cc at line 580 [3.20125]

B:BD[3.33237] → [3.33237:33317]

    int equ_tile = (mon_wep != NON_ITEM) ? tilep_equ_weapon(mitm[mon_wep]) : 0;

[3.33237]

[3.33317]

    m_equ_tile = (mon_wep != NON_ITEM) ? tilep_equ_weapon(mitm[mon_wep]) : 0;

Replacement in crawl-ref/source/tilemcache.cc at line 585 [3.20125]

B:BD[3.33383] → [3.33383:33589]

            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_STAFF_EVIL;
            m_doll.parts[TILEP_PART_HAND2] = TILEP_HAND2_BOOK_YELLOW;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_ROBE_BROWN;

[3.33383]

[3.33589]

            m_job_tile = TILEP_DRACO_CALLER;

Deletion in crawl-ref/source/tilemcache.cc at line 587 [3.20125]
B:BD[3.33608] → [3.33608:33609]

Replacement in crawl-ref/source/tilemcache.cc at line 588 [3.20125]

B:BD[3.33643] → [3.33643:33778]

            m_doll.parts[TILEP_PART_ARM] = TILEP_ARM_GLOVE_SHORT_BLUE;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_KARATE2;

[3.33643]

[3.33778]

            m_job_tile = TILEP_DRACO_MONK;

Deletion in crawl-ref/source/tilemcache.cc at line 590 [3.20125]
B:BD[3.33797] → [3.33797:33798]

Replacement in crawl-ref/source/tilemcache.cc at line 591 [3.20125]

B:BD[3.33834] → [3.33834:34031]

            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_MACE;
            m_doll.parts[TILEP_PART_HAND2] = TILEP_HAND2_BOOK_CYAN;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_MONK_BLUE;

[3.33834]

[3.34031]

            m_job_tile = TILEP_DRACO_ZEALOT;

Deletion in crawl-ref/source/tilemcache.cc at line 593 [3.20125]
B:BD[3.34050] → [3.34050:34051]

Replacement in crawl-ref/source/tilemcache.cc at line 594 [3.20125]

B:BD[3.34088] → [3.34088:34293]

            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_STAFF_LARGE;
            m_doll.parts[TILEP_PART_HAND2] = TILEP_HAND2_BOOK_GREEN;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_ROBE_CYAN;

[3.34088]

[3.34293]

            m_job_tile = TILEP_DRACO_SHIFTER;

Deletion in crawl-ref/source/tilemcache.cc at line 596 [3.20125]
B:BD[3.34312] → [3.34312:34313]

Replacement in crawl-ref/source/tilemcache.cc at line 597 [3.20125]

B:BD[3.34354] → [3.34354:34563]

            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_STAFF_RUBY;
            m_doll.parts[TILEP_PART_HAND2] = TILEP_HAND2_FIRE_CYAN;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_ROBE_GREEN_GOLD;

[3.34354]

[3.34563]

            m_job_tile = TILEP_DRACO_ANNIHILATOR;

Deletion in crawl-ref/source/tilemcache.cc at line 599 [3.20125]
B:BD[3.34582] → [3.34582:34583]

Replacement in crawl-ref/source/tilemcache.cc at line 600 [3.20125]

B:BD[3.34619] → [3.34619:34885]

            m_doll.parts[TILEP_PART_HAND1] = equ_tile;
            m_doll.parts[TILEP_PART_HAND2] = TILEP_HAND2_SHIELD_KNIGHT_GRAY;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_BPLATE_METAL1;
            m_doll.parts[TILEP_PART_LEG] = TILEP_LEG_BELT_GRAY;

[3.34619]

[3.34885]

            m_job_tile = TILEP_DRACO_KNIGHT;

Deletion in crawl-ref/source/tilemcache.cc at line 602 [3.20125]
B:BD[3.34904] → [3.34904:34905]

Replacement in crawl-ref/source/tilemcache.cc at line 603 [3.20125]

B:BD[3.34943] → [3.34943:35142]

            m_doll.parts[TILEP_PART_HAND1] = TILEP_HAND1_FIRE_RED;
            m_doll.parts[TILEP_PART_HAND2] = TILEP_HAND2_BOOK_RED;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_ROBE_RED;

[3.34943]

[3.35142]

            m_job_tile = TILEP_DRACO_SCORCHER;

Deletion in crawl-ref/source/tilemcache.cc at line 605 [3.20125]
B:BD[3.35161] → [3.35161:35162]

Replacement in crawl-ref/source/tilemcache.cc at line 606 [3.20125]

B:BD[3.35179] → [3.35179:35364]

            m_doll.parts[TILEP_PART_HAND1] = equ_tile;
            m_doll.parts[TILEP_PART_BODY] = TILEP_BODY_BELT2;
            m_doll.parts[TILEP_PART_LEG] = TILEP_LEG_LOINCLOTH_RED;

[3.35179]

[3.35364]

            m_job_tile = 0;

Replacement in crawl-ref/source/tilemcache.cc at line 611 [3.20125]
B:BD[3.35392] → [3.35392:35437]
```
const dolls_data *mcache_draco::doll() const
```
[3.35392]
[3.35437]
```
unsigned int mcache_draco::info(tile_draw_info *dinfo) const
```

Replacement in crawl-ref/source/tilemcache.cc at line 613 [3.20125]

B:BD[3.35439] → [3.35439:35459]

    return &m_doll;

[3.35439]

[3.35459]

    unsigned int i = 0;
    dinfo[i++].set(m_mon_tile);
    if (m_job_tile)
        dinfo[i++].set(m_job_tile);
    if (m_equ_tile)
        dinfo[i++].set(m_equ_tile, -2, 0);
    return i;

Replacement in crawl-ref/source/tilemcache.cc at line 632 [3.20125]

B:BD[3.35677] → [3.35677:35709]

    unmarshallDoll(th, m_doll);

[3.35677]

[3.35709]

    m_mon_tile = unmarshallLong(th);
    m_job_tile = unmarshallLong(th);
    m_equ_tile = unmarshallLong(th);

Replacement in crawl-ref/source/tilemcache.cc at line 640 [3.20125]

B:BD[3.35788] → [3.35788:35819]


    marshallDoll(th, m_doll);

[3.35788]

[3.35819]

    
    marshallLong(th, m_mon_tile);
    marshallLong(th, m_job_tile);
    marshallLong(th, m_equ_tile);

Replacement in crawl-ref/source/rltiles/item/staff/i-staff_enchantment.png at line 3 [4.379046]
B:BD[4.379055] → [4.379055:379336]
[4.379055]
Replacement in crawl-ref/source/rltiles/item/staff/i-staff_conjuration.png at line 3 [4.380012]
B:BD[4.380021] → [4.380021:380253]
[4.380021]
Replacement in crawl-ref/source/rltiles/item/scroll/i-holy_word.png at line 3 [4.385337]
B:BD[4.385346] → [4.385346:385558]
[4.385346]
Replacement in crawl-ref/source/rltiles/item/ring/i-teleport.png at line 3 [2.19404]
B:BD[2.19413] → [2.19413:19713]
[2.19413]
Replacement in crawl-ref/source/rltiles/item/ring/i-str.png at line 3 [2.20075]
B:BD[2.20084] → [2.20084:20384]
[2.20084]
Replacement in crawl-ref/source/rltiles/item/ring/i-s-abil.png at line 3 [2.21162]
B:BD[2.21171] → [2.21171:21461]
[2.21171]
Replacement in crawl-ref/source/rltiles/item/ring/i-regeneration.png at line 3 [2.21507]
B:BD[2.21516] → [2.21516:21795]
[2.21516]
Replacement in crawl-ref/source/rltiles/item/ring/i-int.png at line 3 [2.25583]
B:BD[2.25592] → [2.25592:25875]
[2.25592]
Replacement in crawl-ref/source/rltiles/item/ring/i-evasion.png at line 3 [2.26961]
B:BD[2.26970] → [2.26970:27309]
[2.26970]
Replacement in crawl-ref/source/rltiles/item/ring/i-dex.png at line 3 [2.27356]
B:BD[2.27365] → [2.27365:27668]
[2.27365]
File addition: buckler3.png (----------)
[5.3282564]
File move: small_shield2.png → buckler2.png
BF:BFD[5.3282564] → [4.490836:490884]
BF:BF[4.490884] → [4.490310:490310]
[5.3282564]
[4.490310]
File move: small_shield.png → buckler.png
BF:BFD[5.3282564] → [4.491399:491446]
BF:BF[4.491446] → [4.490886:490886]
[5.3282564]
[4.490886]
Replacement in crawl-ref/source/rltiles/item/amulet/i-r-mutation.png at line 3 [2.29359]
B:BD[2.29368] → [2.29368:29658]
[2.29368]
Replacement in crawl-ref/source/rltiles/item/amulet/i-conservation.png at line 3 [2.31041]
B:BD[2.31050] → [2.31050:31314]
[2.31050]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 464 [5.4192854]

[6.158951]

[3.47961]


%sdir dc-mon/draco
draco-base-brown DRACO_BASE
draco-base-black
draco-base-yellow
draco-base-green
draco-base-mottle
draco-base-pale
draco-base-purple
draco-base-red
draco-base-white
draco-job-ann DRACO_ANNIHILATOR
draco-job-call DRACO_CALLER
draco-job-kn DRACO_KNIGHT
draco-job-monk DRACO_MONK
draco-job-scor DRACO_SCORCHER
draco-job-shif DRACO_SHIFTER
draco-job-zea DRACO_ZEALOT

Replacement in crawl-ref/source/rltiles/dc-mon/tiamat.png at line 3 [4.637318]
B:BD[4.637327] → [4.637327:638463]
[4.637327]
File addition: draco (d--x------)
[5.4207328]
File addition: draco-job-zea.png (----------)
[0.9110]
File addition: draco-job-shif.png (----------)
[0.9110]
File addition: draco-job-scor.png (----------)
[0.9110]
File addition: draco-job-monk.png (----------)
[0.9110]
File addition: draco-job-kn.png (----------)
[0.9110]
File addition: draco-job-call.png (----------)
[0.9110]
File addition: draco-job-ann.png (----------)
[0.9110]
File addition: draco-base-yellow.png (----------)
[0.9110]
File addition: draco-base-white.png (----------)
[0.9110]
File addition: draco-base-red.png (----------)
[0.9110]
File addition: draco-base-purple.png (----------)
[0.9110]
File addition: draco-base-pale.png (----------)
[0.9110]
File addition: draco-base-mottle.png (----------)
[0.9110]
File addition: draco-base-green.png (----------)
[0.9110]
File addition: draco-base-brown.png (----------)
[0.9110]
File addition: draco-base-black.png (----------)
[0.9110]
Replacement in crawl-ref/source/rltiles/dc-mon/deep_elf_sorcerer.png at line 3 [4.864509]
B:BD[4.864518] → [4.864518:865195]
[4.864518]
Replacement in crawl-ref/source/rltiles/dc-mon/deep_elf_high_priest.png at line 3 [4.869555]
B:BD[4.869564] → [4.869564:870292]
[4.869564]
Replacement in crawl-ref/source/rltiles/dc-mon/deep_elf_blademaster.png at line 3 [4.873850]
B:BD[4.873859] → [4.873859:874498]
[4.873859]
Replacement in crawl-ref/source/rltiles/dc-item.txt at line 298 [5.5044666]
∅:D[7.91073] → [5.5058287:5058332]
B:BD[5.5058287] → [5.5058287:5058332]
B:BD[5.5058332] → [2.40020:40035]
```
small_shield ARM_BUCKLER /* A small shield.
small_shield2
```
[7.91073]
[7.91074]
```
buckler ARM_BUCKLER /* A small shield.
buckler2
buckler3
```

Added new monster draconian tiles. Improved ring and amulet graphics. Fixed issue where the deep elf blademaster did not appear with weapons. (These graphics are all from Mitsuhiro Itakura.)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilemcache.cc at line 80 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 87 [3.20125]

Insertion in crawl-ref/source/tilemcache.cc at line 343 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 465 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 467 [3.20125]

Insertion in crawl-ref/source/tilemcache.cc at line 472 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 570 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 578 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 580 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 585 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 587 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 588 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 590 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 591 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 593 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 594 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 596 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 597 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 599 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 600 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 602 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 603 [3.20125]

Deletion in crawl-ref/source/tilemcache.cc at line 605 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 606 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 611 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 613 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 632 [3.20125]

Replacement in crawl-ref/source/tilemcache.cc at line 640 [3.20125]

Replacement in crawl-ref/source/rltiles/item/staff/i-staff_enchantment.png at line 3 [4.379046]

Replacement in crawl-ref/source/rltiles/item/staff/i-staff_conjuration.png at line 3 [4.380012]

Replacement in crawl-ref/source/rltiles/item/scroll/i-holy_word.png at line 3 [4.385337]

Replacement in crawl-ref/source/rltiles/item/ring/i-teleport.png at line 3 [2.19404]

Replacement in crawl-ref/source/rltiles/item/ring/i-str.png at line 3 [2.20075]

Replacement in crawl-ref/source/rltiles/item/ring/i-s-abil.png at line 3 [2.21162]

Replacement in crawl-ref/source/rltiles/item/ring/i-regeneration.png at line 3 [2.21507]

Replacement in crawl-ref/source/rltiles/item/ring/i-int.png at line 3 [2.25583]

Replacement in crawl-ref/source/rltiles/item/ring/i-evasion.png at line 3 [2.26961]

Replacement in crawl-ref/source/rltiles/item/ring/i-dex.png at line 3 [2.27356]

File addition: buckler3.png (----------)

File move: small_shield2.png → buckler2.png

File move: small_shield.png → buckler.png

Replacement in crawl-ref/source/rltiles/item/amulet/i-r-mutation.png at line 3 [2.29359]

Replacement in crawl-ref/source/rltiles/item/amulet/i-conservation.png at line 3 [2.31041]

Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 464 [5.4192854]

Replacement in crawl-ref/source/rltiles/dc-mon/tiamat.png at line 3 [4.637318]

File addition: draco (d--x------)

File addition: draco-job-zea.png (----------)

File addition: draco-job-shif.png (----------)

File addition: draco-job-scor.png (----------)

File addition: draco-job-monk.png (----------)

File addition: draco-job-kn.png (----------)

File addition: draco-job-call.png (----------)

File addition: draco-job-ann.png (----------)

File addition: draco-base-yellow.png (----------)

File addition: draco-base-white.png (----------)

File addition: draco-base-red.png (----------)

File addition: draco-base-purple.png (----------)

File addition: draco-base-pale.png (----------)

File addition: draco-base-mottle.png (----------)

File addition: draco-base-green.png (----------)

File addition: draco-base-brown.png (----------)

File addition: draco-base-black.png (----------)

Replacement in crawl-ref/source/rltiles/dc-mon/deep_elf_sorcerer.png at line 3 [4.864509]

Replacement in crawl-ref/source/rltiles/dc-mon/deep_elf_high_priest.png at line 3 [4.869555]

Replacement in crawl-ref/source/rltiles/dc-mon/deep_elf_blademaster.png at line 3 [4.873850]

Replacement in crawl-ref/source/rltiles/dc-item.txt at line 298 [5.5044666]