fiddlerwoaroof/crawl - Change OAPAH3WEFTT2T7NVSSENRR5JCIZYA6UZSQQ6LQEHAAXCX6FIM7HQC

Better handling for mimics in .des files, fixed guardian naga minivault.

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

Created by dshaligram on April 29, 2007

OAPAH3WEFTT2T7NVSSENRR5JCIZYA6UZSQQ6LQEHAAXCX6FIM7HQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mapdef.h at line 208 [5.591249]
[4.1682]
[5.593128]
```
    bool check_mimic(const std::string &s, int *mid, bool *fix) const;
```

Insertion in crawl-ref/source/mapdef.cc at line 884 [5.594797]

[4.3166]

    if (pick.mid == MONS_WEAPON_MIMIC && !pick.fix_mons)
        pick.mid = random_range(MONS_GOLD_MIMIC, MONS_POTION_MIMIC);

Insertion in crawl-ref/source/mapdef.cc at line 901 [5.594797]

[4.3377]

}
bool mons_list::check_mimic(const std::string &s, int *mid, bool *fix) const
{
    if (s == "mimic")
    {
        *mid = MONS_WEAPON_MIMIC;
        *fix = false;
        return (true);
    }
    else if (s == "gold mimic")
        *mid = MONS_GOLD_MIMIC;
    else if (s == "weapon mimic")
        *mid = MONS_WEAPON_MIMIC;
    else if (s == "armour mimic")
        *mid = MONS_ARMOUR_MIMIC;
    else if (s == "scroll mimic")
        *mid = MONS_SCROLL_MIMIC;
    else if (s == "potion mimic")
        *mid = MONS_POTION_MIMIC;
    else
        return (false);
    *fix = true;
    return (true);

Replacement in crawl-ref/source/mapdef.cc at line 944 [5.594797]

B:BD[4.3818] → [4.3818:3873]

        const bool fixmons = strip_tag(s, "fix_mons");

[4.3818]

[6.880]

        bool fixmons = strip_tag(s, "fix_mons");

Insertion in crawl-ref/source/mapdef.cc at line 955 [5.594797]

[2.831]

        else if (check_mimic(s, &mid, &fixmons))
            ;

Replacement in crawl-ref/source/dat/vaults.des at line 6531 [5.1041446]

B:BD[7.4192] → [7.4192:4252]

xxxxxxxxx
x1111111x
x1111111x
x1111111x
x11.2.11x
xxxx+xxxx

[7.4192]

[3.2494]

...........
.xxxxxxxxx.
.x1111111x.
.x1111111x.
.x1111111x.
.x11.2.11x.
.xxxx+xxxx.
...........