fiddlerwoaroof/crawl - Change APGCKU4AFOV7Z7XIEO5A27H4IFUGDU227I3Z7OIRROYSLOFFBJ5AC

Allow overriding monster colours in map specs using col:<newcolour>.

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

Created by dshaligram on October 7, 2007

APGCKU4AFOV7Z7XIEO5A27H4IFUGDU227I3Z7OIRROYSLOFFBJ5AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mapdef.h at line 336 [4.591249]
[3.191]
[4.592839]
```
    int colour;
```
Replacement in crawl-ref/source/mapdef.h at line 342 [4.591249]
∅:D[5.557] → [6.636:669]
B:BD[6.636] → [6.636:669]
```
          generate_awake(awaken)
```
[5.557]
[3.379]
```
        generate_awake(awaken), colour(BLACK)
```

Insertion in crawl-ref/source/mapdef.cc at line 1909 [4.594797]

[5.1145]

[7.3873]


        std::string colour = strip_tag_prefix(s, "col:");
        if (!colour.empty())
        {
            mspec.colour = str_to_colour(colour, BLACK);
            if (mspec.colour == BLACK)
            {
                error = make_stringf("bad monster colour \"%s\" in \"%s\"",
                                     colour.c_str(), specs[i].c_str());
                return (slot);
            }
        }

Replacement in crawl-ref/source/dungeon.cc at line 4005 [9.3429798]

B:BD[8.687] → [5.4331:4353]

∅:D[5.4353] → [8.687:748]

B:BD[8.687] → [8.687:748]

B:BD[8.748] → [2.1036:1109]

∅:D[2.1109] → [5.4354:4477]

B:BD[8.819] → [5.4354:4477]

        int not_used;
        return (place_monster( not_used, mid, monster_level,
                               m_generate_awake? BEH_WANDER : BEH_SLEEP,
                               MHITNOT, true, vx, vy, false,
                               PROX_ANYWHERE, mspec.monnum));

[8.687]

[8.883]

        int mindex = NON_MONSTER;
        const bool placed =
            place_monster( mindex, mid, monster_level,
                           m_generate_awake? BEH_WANDER : BEH_SLEEP,
                           MHITNOT, true, vx, vy, false,
                           PROX_ANYWHERE, mspec.monnum);
        if (placed && mindex != -1 && mindex != NON_MONSTER
            && mspec.colour != BLACK)
        {
            menv[mindex].colour = mspec.colour;
        }
        return (placed);

Replacement in crawl-ref/docs/level-design.txt at line 480 [10.350]

B:BD[10.15727] → [10.15727:15778]

         (without the quotes). Use this sparingly.

[10.15727]

[10.15778]

         (without the quotes). Use this sparingly:
         MONS: generate_awake giant beetle
         Monsters can also be given colours that override their default
         colour. Use this *very* sparingly:
         MONS: col:darkgrey fungus