fiddlerwoaroof/crawl - Change Y6A2P3D3XQZ2WTK4MXGLG67EUMTDN3GEFIQSIC7MOS7RLKBBAMLAC

Attempt to make the new (very) ugly thing tiles map to their colors

properly.

Created by David Lawrence Ramsey on October 8, 2009

Y6A2P3D3XQZ2WTK4MXGLG67EUMTDN3GEFIQSIC7MOS7RLKBBAMLAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/tilepick.cc at line 118 [6.96318]

[4.2060]

[5.982]

static int _ugly_thing_colour_offset(const monsters *mon)
{
    if (mon->type != MONS_UGLY_THING && mon->type != MONS_VERY_UGLY_THING)
        return (0);
    switch (make_low_colour(mon->colour))
    {
        case GREEN:
            return (0);
        case CYAN:
            return (1);
        case RED:
            return (2);
        case MAGENTA:
            return (3);
        case BROWN:
            return (4);
        case LIGHTGREY:
            return (5);
        default:
            return (0);
    }
}

Replacement in crawl-ref/source/tilepick.cc at line 379 [6.96318]

B:BD[7.267] → [2.240:278]

        return TILEP_MONS_UGLY_THING;

[7.267]

[8.5962]

        return TILEP_MONS_UGLY_THING + _ugly_thing_colour_offset(mon);

Replacement in crawl-ref/source/tilepick.cc at line 381 [6.96318]

B:BD[8.5993] → [8.5993:6036]

        return TILEP_MONS_VERY_UGLY_THING;

[8.5993]

[8.6036]

        return TILEP_MONS_VERY_UGLY_THING + _ugly_thing_colour_offset(mon);

Replacement in crawl-ref/source/tilepick.cc at line 698 [6.96318]

B:BD[9.3089] → [10.4988:5053]

        return TILEP_MONS_ABOMINATION_LARGE + ((mon->colour)%7);

[9.3089]

[8.13714]

        return TILEP_MONS_ABOMINATION_LARGE + ((mon->colour) % 7);

Replacement in crawl-ref/source/tilepick.cc at line 3071 [6.96318]

B:BD[6.160898] → [6.160898:161312]

        case MONS_DRACONIAN:        return 0;
        case MONS_BLACK_DRACONIAN:  return 1;
        case MONS_YELLOW_DRACONIAN: return 2;
        case MONS_GREEN_DRACONIAN:  return 4;
        case MONS_MOTTLED_DRACONIAN:return 5;
        case MONS_PALE_DRACONIAN:   return 6;
        case MONS_PURPLE_DRACONIAN: return 7;
        case MONS_RED_DRACONIAN:    return 8;
        case MONS_WHITE_DRACONIAN:  return 9;

[6.160898]

[6.161312]

        case MONS_DRACONIAN:        return (0);
        case MONS_BLACK_DRACONIAN:  return (1);
        case MONS_YELLOW_DRACONIAN: return (2);
        case MONS_GREEN_DRACONIAN:  return (4);
        case MONS_MOTTLED_DRACONIAN:return (5);
        case MONS_PALE_DRACONIAN:   return (6);
        case MONS_PURPLE_DRACONIAN: return (7);
        case MONS_RED_DRACONIAN:    return (8);
        case MONS_WHITE_DRACONIAN:  return (9);

Replacement in crawl-ref/source/tilepick.cc at line 3083 [6.96318]
B:BD[6.161347] → [6.161347:161365]
```
        return 0;
```
[6.161347]
[11.486]
```
        return (0);
```

Replacement in crawl-ref/source/tilepick.cc at line 3086 [6.96318]

B:BD[6.161388] → [6.161388:161429]

B:BD[6.161429] → [12.142:183]

∅:D[12.183] → [6.161470:161757]

B:BD[6.161470] → [6.161470:161757]

    case SP_BLACK_DRACONIAN:   return 1;
    case SP_YELLOW_DRACONIAN:  return 2;
    case SP_GREY_DRACONIAN:    return 3;
    case SP_GREEN_DRACONIAN:   return 4;
    case SP_MOTTLED_DRACONIAN: return 5;
    case SP_PALE_DRACONIAN:    return 6;
    case SP_PURPLE_DRACONIAN:  return 7;
    case SP_RED_DRACONIAN:     return 8;
    case SP_WHITE_DRACONIAN:   return 9;

[6.161388]

[6.161757]

    case SP_BLACK_DRACONIAN:   return (1);
    case SP_YELLOW_DRACONIAN:  return (2);
    case SP_GREY_DRACONIAN:    return (3);
    case SP_GREEN_DRACONIAN:   return (4);
    case SP_MOTTLED_DRACONIAN: return (5);
    case SP_PALE_DRACONIAN:    return (6);
    case SP_PURPLE_DRACONIAN:  return (7);
    case SP_RED_DRACONIAN:     return (8);
    case SP_WHITE_DRACONIAN:   return (9);

Replacement in crawl-ref/source/tilepick.cc at line 3096 [6.96318]
B:BD[6.161763] → [6.161763:161777]
```
    return 0;
```
[6.161763]
[6.161777]
```
    return (0);
```
Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 249 [6.4192854]
[13.23348]
[13.23348]
```
ugly_thing1
ugly_thing2
ugly_thing3
ugly_thing4
ugly_thing5
```
Insertion in crawl-ref/source/rltiles/dc-mon.txt at line 255 [6.4192854]
[13.23385]
[13.23385]
```
very_ugly_thing1
very_ugly_thing2
very_ugly_thing3
very_ugly_thing4
very_ugly_thing5
```
File move: very_ugly_thing_lightgrey.png → very_ugly_thing5.png
BF:BFD[14.6685] → [3.4515:4575]
BF:BF[3.4575] → [3.3732:3732]
[14.6685]
[3.3732]
File move: very_ugly_thing_brown.png → very_ugly_thing4.png
BF:BFD[14.6685] → [3.6850:6906]
BF:BF[3.6906] → [3.6116:6116]
[14.6685]
[3.6116]
File move: very_ugly_thing_magenta.png → very_ugly_thing3.png
BF:BFD[14.6685] → [3.3672:3730]
BF:BF[3.3730] → [3.2920:2920]
[14.6685]
[3.2920]
File move: very_ugly_thing_red.png → very_ugly_thing2.png
BF:BFD[14.6685] → [3.2864:2918]
BF:BF[3.2918] → [3.2192:2192]
[14.6685]
[3.2192]
File move: very_ugly_thing_cyan.png → very_ugly_thing1.png
BF:BFD[14.6685] → [3.6059:6114]
BF:BF[3.6114] → [3.5312:5312]
[14.6685]
[3.5312]
File move: very_ugly_thing_green.png → very_ugly_thing.png
BF:BFD[14.6685] → [3.5254:5310]
BF:BF[3.5310] → [3.4577:4577]
[14.6685]
[3.4577]
File move: ugly_thing_lightgrey.png → ugly_thing5.png
BF:BFD[14.6685] → [3.9194:9249]
BF:BF[3.9249] → [3.8430:8430]
[14.6685]
[3.8430]
File move: ugly_thing_brown.png → ugly_thing4.png
BF:BFD[14.6685] → [3.11487:11538]
BF:BF[3.11538] → [3.10762:10762]
[14.6685]
[3.10762]
File move: ugly_thing_magenta.png → ugly_thing3.png
BF:BFD[14.6685] → [3.8375:8428]
BF:BF[3.8428] → [3.7627:7627]
[14.6685]
[3.7627]
File move: ugly_thing_red.png → ugly_thing2.png
BF:BFD[14.6685] → [3.7576:7625]
BF:BF[3.7625] → [3.6909:6909]
[14.6685]
[3.6909]
File move: ugly_thing_cyan.png → ugly_thing1.png
BF:BFD[14.6685] → [3.10710:10760]
BF:BF[3.10760] → [3.9979:9979]
[14.6685]
[3.9979]
File move: ugly_thing_green.png → ugly_thing.png
BF:BFD[14.6685] → [3.9926:9977]
BF:BF[3.9977] → [3.9251:9251]
[14.6685]
[3.9251]

Attempt to make the new (very) ugly thing tiles map to their colors

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/tilepick.cc at line 118 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 379 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 381 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 698 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3071 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3083 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3086 [6.96318]

Replacement in crawl-ref/source/tilepick.cc at line 3096 [6.96318]

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

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

File move: very_ugly_thing_lightgrey.png → very_ugly_thing5.png

File move: very_ugly_thing_brown.png → very_ugly_thing4.png

File move: very_ugly_thing_magenta.png → very_ugly_thing3.png

File move: very_ugly_thing_red.png → very_ugly_thing2.png

File move: very_ugly_thing_cyan.png → very_ugly_thing1.png

File move: very_ugly_thing_green.png → very_ugly_thing.png

File move: ugly_thing_lightgrey.png → ugly_thing5.png

File move: ugly_thing_brown.png → ugly_thing4.png

File move: ugly_thing_magenta.png → ugly_thing3.png

File move: ugly_thing_red.png → ugly_thing2.png

File move: ugly_thing_cyan.png → ugly_thing1.png

File move: ugly_thing_green.png → ugly_thing.png