fiddlerwoaroof/crawl - Change GJIMGW6UJFIEZEOOHUVR6647W2C3L6MFRKIE5AKQIPZ5LIOWZWMAC

Adding different art for staves and rods so that they no longer look identical.

Rearranging staff and rod art assets.

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

Created by ennewalker on February 28, 2008

GJIMGW6UJFIEZEOOHUVR6647W2C3L6MFRKIE5AKQIPZ5LIOWZWMAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tile2.cc at line 2275 [3.13289]
B:BD[2.345] → [2.345:386]
```
    for (int i = 0; i < NUM_STAVES; i++)
```
[2.345]
[2.386]
```
    for (int i = 0; i < STAFF_SMITING; i++)
```

Insertion in crawl-ref/source/tile2.cc at line 2280 [3.13289]

[2.558]


        ImgCopyFromTileImg(tile0, DollCacheImg, 0, 0, 1);
        ImgCopyFromTileImg(tile1, DollCacheImg, 0, 0, 0);
        ImgCopyToTileImg(tile1, DollCacheImg, 0, 0, 1);
    }
    for (int i = STAFF_SMITING; i < NUM_STAVES; i++)
    {
        int special = you.item_description[IDESC_STAVES][i];
        int tile0 = TILE_ROD_OFFSET + (special / 4) % 10;
        int tile1 = TILE_ROD_SMITING + i - STAFF_SMITING;

Replacement in crawl-ref/source/tile1.cc at line 1613 [3.96318]

B:BD[4.211] → [4.211:266]

B:BD[4.266] → [2.733:783]

        if (id[ IDTYPE_STAVES ][type] == ID_KNOWN_TYPE
            ||  (item.flags & ISFLAG_KNOW_TYPE ))

[5.3701]

[2.783]

        if (item_is_rod(item))

Replacement in crawl-ref/source/tile1.cc at line 1615 [3.96318]

∅:D[2.793] → [4.315:362]

B:BD[4.315] → [4.315:362]

            return TILE_STAFF_WIZARDRY + type;

[2.793]

[2.794]

            if (id[IDTYPE_STAVES][type] == ID_KNOWN_TYPE
                ||  (item.flags & ISFLAG_KNOW_TYPE ))
            {
                return TILE_ROD_SMITING + type - STAFF_SMITING;
            }
            return TILE_ROD_OFFSET + (special / 4) % 10;

Replacement in crawl-ref/source/tile1.cc at line 1622 [3.96318]

B:BD[2.804] → [2.804:913]

∅:D[2.913] → [4.410:465]

B:BD[4.410] → [4.410:465]

        // Try to return an appropriate tile
        // Note: We really need separate rod and stave tiles...
        return TILE_STAFF_OFFSET + (special / 4) % 10;

[2.804]

[3.145679]

        else
        {
            if (id[IDTYPE_STAVES][type] == ID_KNOWN_TYPE
                ||  (item.flags & ISFLAG_KNOW_TYPE ))
            {
                return TILE_STAFF_WIZARDRY + type;
            }
            return TILE_STAFF_OFFSET + (special / 4) % 10;
        }

File addition: staff (d--x------)
[3.2050021]
File addition: staff09.bmp (----------)
[0.2147]
File move: staff08.bmp → staff08.bmp
BF:BFD[3.2446179] → [3.2459032:2459074]
BF:BF[3.2459074] → [3.2456928:2456928]
[0.2147]
[3.2456928]
File addition: staff07.bmp (----------)
[0.2147]
File addition: staff06.bmp (----------)
[0.2147]
File move: staff05.bmp → staff05.bmp
BF:BFD[3.2446179] → [3.2465476:2465518]
BF:BF[3.2465518] → [3.2463372:2463372]
[0.2147]
[3.2463372]
File addition: staff04.bmp (----------)
[0.2147]
File move: staff03.bmp → staff03.bmp
BF:BFD[3.2446179] → [3.2469772:2469814]
BF:BF[3.2469814] → [3.2467668:2467668]
[0.2147]
[3.2467668]
File addition: staff02.bmp (----------)
[0.2147]
File move: staff04.bmp → staff01.bmp
BF:BFD[3.2446179] → [3.2467624:2467666]
BF:BF[3.2467666] → [3.2465520:2465520]
[0.2147]
[3.2465520]
File move: staff00.bmp → staff00.bmp
BF:BFD[3.2446179] → [3.2476216:2476258]
BF:BF[3.2476258] → [3.2474112:2474112]
[0.2147]
[3.2474112]
File move: i-staff_wizardry.bmp → i-staff_wizardry.bmp
BF:BFD[3.2446179] → [2.9194:9245]
BF:BF[2.9245] → [2.6066:6066]
[0.2147]
[2.6066]
File move: i-staff_summoning.bmp → i-staff_summoning.bmp
BF:BFD[3.2446179] → [2.12375:12427]
BF:BF[2.12427] → [2.9247:9247]
[0.2147]
[2.9247]
File move: i-staff_power.bmp → i-staff_power.bmp
BF:BFD[3.2446179] → [2.15557:15605]
BF:BF[2.15605] → [2.12429:12429]
[0.2147]
[2.12429]
File move: i-staff_poison.bmp → i-staff_poison.bmp
BF:BFD[3.2446179] → [2.18735:18784]
BF:BF[2.18784] → [2.15607:15607]
[0.2147]
[2.15607]
File move: i-staff_fire.bmp → i-staff_fire.bmp
BF:BFD[3.2446179] → [2.21914:21961]
BF:BF[2.21961] → [2.18786:18786]
[0.2147]
[2.18786]
File move: i-staff_energy.bmp → i-staff_energy.bmp
BF:BFD[3.2446179] → [2.25091:25140]
BF:BF[2.25140] → [2.21963:21963]
[0.2147]
[2.21963]
File move: i-staff_enchantment.bmp → i-staff_enchantment.bmp
BF:BFD[3.2446179] → [2.28270:28324]
BF:BF[2.28324] → [2.25142:25142]
[0.2147]
[2.25142]
File move: i-staff_earth.bmp → i-staff_earth.bmp
BF:BFD[3.2446179] → [2.31454:31502]
BF:BF[2.31502] → [2.28326:28326]
[0.2147]
[2.28326]
File move: i-staff_death.bmp → i-staff_death.bmp
BF:BFD[3.2446179] → [2.34632:34680]
BF:BF[2.34680] → [2.31504:31504]
[0.2147]
[2.31504]
File move: i-staff_conjuration.bmp → i-staff_conjuration.bmp
BF:BFD[3.2446179] → [2.37810:37864]
BF:BF[2.37864] → [2.34682:34682]
[0.2147]
[2.34682]
File move: i-staff_cold.bmp → i-staff_cold.bmp
BF:BFD[3.2446179] → [2.40994:41041]
BF:BF[2.41041] → [2.37866:37866]
[0.2147]
[2.37866]
File move: i-staff_channeling.bmp → i-staff_channeling.bmp
BF:BFD[3.2446179] → [2.44171:44224]
BF:BF[2.44224] → [2.41043:41043]
[0.2147]
[2.41043]
File move: i-staff_air.bmp → i-staff_air.bmp
BF:BFD[3.2446179] → [2.47354:47400]
BF:BF[2.47400] → [2.44226:44226]
[0.2147]
[2.44226]
File addition: rod (d--x------)
[3.2050021]
File addition: rod09.bmp (----------)
[0.13823]
File addition: rod08.bmp (----------)
[0.13823]
File addition: rod07.bmp (----------)
[0.13823]
File move: staff02.bmp → rod06.bmp
BF:BFD[3.2446179] → [3.2471920:2471962]
BF:BF[3.2471962] → [3.2469816:2469816]
[0.13823]
[3.2469816]
Replacement in crawl-ref/source/rltiles/item/rod/rod06.bmp at line 1 [3.2469816]
B:BD[3.2469816] → [2.3959:6061]
[3.2469816]
File move: staff07.bmp → rod05.bmp
BF:BFD[3.2446179] → [3.2461180:2461222]
BF:BF[3.2461222] → [3.2459076:2459076]
[0.13823]
[3.2459076]
Replacement in crawl-ref/source/rltiles/item/rod/rod05.bmp at line 1 [3.2459076]
B:BD[3.2459076] → [3.2459077:2461179]
[3.2459076]
File addition: rod04.bmp (----------)
[0.13823]
File move: staff06.bmp → rod03.bmp
BF:BFD[3.2446179] → [3.2463328:2463370]
BF:BF[3.2463370] → [3.2461224:2461224]
[0.13823]
[3.2461224]
Replacement in crawl-ref/source/rltiles/item/rod/rod03.bmp at line 1 [3.2461224]
B:BD[3.2461224] → [3.2461225:2463327]
[3.2461224]
File addition: rod02.bmp (----------)
[0.13823]
File move: staff09.bmp → rod01.bmp
BF:BFD[3.2446179] → [3.2456884:2456926]
BF:BF[3.2456926] → [3.2454780:2454780]
[0.13823]
[3.2454780]
Replacement in crawl-ref/source/rltiles/item/rod/rod01.bmp at line 1 [3.2454780]
B:BD[3.2454780] → [3.2454781:2456883]
[3.2454780]
File move: staff01.bmp → rod00.bmp
BF:BFD[3.2446179] → [3.2474068:2474110]
BF:BF[3.2474110] → [3.2471964:2471964]
[0.13823]
[3.2471964]
Replacement in crawl-ref/source/rltiles/item/rod/rod00.bmp at line 1 [3.2471964]
B:BD[3.2471964] → [3.2471965:2474067]
[3.2471964]
File move: i-rod_warding.bmp → i-rod_warding.bmp
BF:BFD[3.2446179] → [2.50531:50579]
BF:BF[2.50579] → [2.47403:47403]
[0.13823]
[2.47403]
File move: i-rod_venom.bmp → i-rod_venom.bmp
BF:BFD[3.2446179] → [2.53709:53755]
BF:BF[2.53755] → [2.50581:50581]
[0.13823]
[2.50581]
File move: i-rod_summoning.bmp → i-rod_summoning.bmp
BF:BFD[3.2446179] → [2.56885:56935]
BF:BF[2.56935] → [2.53757:53757]
[0.13823]
[2.53757]
File move: i-rod_striking.bmp → i-rod_striking.bmp
BF:BFD[3.2446179] → [2.60065:60114]
BF:BF[2.60114] → [2.56937:56937]
[0.13823]
[2.56937]
File move: i-rod_smiting.bmp → i-rod_smiting.bmp
BF:BFD[3.2446179] → [2.63244:63292]
BF:BF[2.63292] → [2.60116:60116]
[0.13823]
[2.60116]
File move: i-rod_discovery.bmp → i-rod_discovery.bmp
BF:BFD[3.2446179] → [2.66422:66472]
BF:BF[2.66472] → [2.63294:63294]
[0.13823]
[2.63294]
File move: i-rod_destruction_lightning.bmp → i-rod_destruction_lightning.bmp
BF:BFD[3.2446179] → [2.69602:69664]
BF:BF[2.69664] → [2.66474:66474]
[0.13823]
[2.66474]
File move: i-rod_destruction_inaccuracy.bmp → i-rod_destruction_inaccuracy.bmp
BF:BFD[3.2446179] → [2.72794:72857]
BF:BF[2.72857] → [2.69666:69666]
[0.13823]
[2.69666]
File move: i-rod_destruction_ice.bmp → i-rod_destruction_ice.bmp
BF:BFD[3.2446179] → [2.75987:76043]
BF:BF[2.76043] → [2.72859:72859]
[0.13823]
[2.72859]
File move: i-rod_destruction_fire.bmp → i-rod_destruction_fire.bmp
BF:BFD[3.2446179] → [2.79173:79230]
BF:BF[2.79230] → [2.76045:76045]
[0.13823]
[2.76045]
File move: i-rod_demonology.bmp → i-rod_demonology.bmp
BF:BFD[3.2446179] → [2.82360:82411]
BF:BF[2.82411] → [2.79232:79232]
[0.13823]
[2.79232]
Replacement in crawl-ref/source/rltiles/dc-item.txt at line 563 [3.5044666]
B:BD[3.5063985] → [3.5063985:5064002]
```
%sdir item/wand
```
[3.5063985]
[3.5064002]
```
%sdir item/staff
```
Insertion in crawl-ref/source/rltiles/dc-item.txt at line 588 [3.5044666]
[2.83923]
[3.5064116]
```
%sdir item/rod
rod00 ROD_OFFSET
rod01
rod02
rod03
rod04
rod05
rod06
rod07
rod08
rod09
```
Deletion in crawl-ref/source/makeitem.cc at line 2487 [7.927]
B:BD[6.48955] → [6.48955:48987]
B:BD[6.48987] → [4.4541:4611]
```
    
    // add different looks
//  item.special = you.item_description[IDESC_STAVES][item.sub_type];
```

Adding different art for staves and rods so that they no longer look identical.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tile2.cc at line 2275 [3.13289]

Insertion in crawl-ref/source/tile2.cc at line 2280 [3.13289]

Replacement in crawl-ref/source/tile1.cc at line 1613 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1615 [3.96318]

Replacement in crawl-ref/source/tile1.cc at line 1622 [3.96318]

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

File addition: staff09.bmp (----------)

File move: staff08.bmp → staff08.bmp

File addition: staff07.bmp (----------)

File addition: staff06.bmp (----------)

File move: staff05.bmp → staff05.bmp

File addition: staff04.bmp (----------)

File move: staff03.bmp → staff03.bmp

File addition: staff02.bmp (----------)

File move: staff04.bmp → staff01.bmp

File move: staff00.bmp → staff00.bmp

File move: i-staff_wizardry.bmp → i-staff_wizardry.bmp

File move: i-staff_summoning.bmp → i-staff_summoning.bmp

File move: i-staff_power.bmp → i-staff_power.bmp

File move: i-staff_poison.bmp → i-staff_poison.bmp

File move: i-staff_fire.bmp → i-staff_fire.bmp

File move: i-staff_energy.bmp → i-staff_energy.bmp

File move: i-staff_enchantment.bmp → i-staff_enchantment.bmp

File move: i-staff_earth.bmp → i-staff_earth.bmp

File move: i-staff_death.bmp → i-staff_death.bmp

File move: i-staff_conjuration.bmp → i-staff_conjuration.bmp

File move: i-staff_cold.bmp → i-staff_cold.bmp

File move: i-staff_channeling.bmp → i-staff_channeling.bmp

File move: i-staff_air.bmp → i-staff_air.bmp

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

File addition: rod09.bmp (----------)

File addition: rod08.bmp (----------)

File addition: rod07.bmp (----------)

File move: staff02.bmp → rod06.bmp

Replacement in crawl-ref/source/rltiles/item/rod/rod06.bmp at line 1 [3.2469816]

File move: staff07.bmp → rod05.bmp

Replacement in crawl-ref/source/rltiles/item/rod/rod05.bmp at line 1 [3.2459076]

File addition: rod04.bmp (----------)

File move: staff06.bmp → rod03.bmp

Replacement in crawl-ref/source/rltiles/item/rod/rod03.bmp at line 1 [3.2461224]

File addition: rod02.bmp (----------)

File move: staff09.bmp → rod01.bmp

Replacement in crawl-ref/source/rltiles/item/rod/rod01.bmp at line 1 [3.2454780]

File move: staff01.bmp → rod00.bmp

Replacement in crawl-ref/source/rltiles/item/rod/rod00.bmp at line 1 [3.2471964]

File move: i-rod_warding.bmp → i-rod_warding.bmp

File move: i-rod_venom.bmp → i-rod_venom.bmp

File move: i-rod_summoning.bmp → i-rod_summoning.bmp

File move: i-rod_striking.bmp → i-rod_striking.bmp

File move: i-rod_smiting.bmp → i-rod_smiting.bmp

File move: i-rod_discovery.bmp → i-rod_discovery.bmp

File move: i-rod_destruction_lightning.bmp → i-rod_destruction_lightning.bmp

File move: i-rod_destruction_inaccuracy.bmp → i-rod_destruction_inaccuracy.bmp

File move: i-rod_destruction_ice.bmp → i-rod_destruction_ice.bmp

File move: i-rod_destruction_fire.bmp → i-rod_destruction_fire.bmp

File move: i-rod_demonology.bmp → i-rod_demonology.bmp

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

Insertion in crawl-ref/source/rltiles/dc-item.txt at line 588 [3.5044666]

Deletion in crawl-ref/source/makeitem.cc at line 2487 [7.927]