fiddlerwoaroof/crawl - Change 3KRKUK3HCBBZWS5MXFAMM4R5PGWWTSURBSFXEEZPRRCFAZ5EZTCAC

Make initial sanctuary be circular in shape rather than square.

Remove non-harmless clouds when laying down sanctuary, and don't allow non-harmless clouds to speard into sanctuary or be placed on it.

Don't let explosions spread into sanctuary (probably needs a flavour message).

If a giant spore or ball lightning somehow explodes while in sanctuary then give a message about Zin containing it's explosion, and skip the call to explosion().

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

Created by zelgadis on July 1, 2008

3KRKUK3HCBBZWS5MXFAMM4R5PGWWTSURBSFXEEZPRRCFAZ5EZTCAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.cc at line 1678 [7.531613]

∅:D[5.2635] → [6.3390:3471]

∅:D[3.9447] → [6.3390:3471]

B:BD[6.3390] → [6.3390:3471]

B:BD[6.3471] → [8.167:198]

B:BD[8.198] → [9.167:193]

    const int radius = 5;
    const int pattern = random2(4);
    int count = 0;
    int monster = NON_MONSTER;
    monsters *mon = NULL;

[3.9447]

[10.296]

    const int radius      = 5;
    const int pattern     = random2(4);
    int       scare_count = 0;
    int       cloud_count = 0;
    monsters *seen_mon    = NULL;

Insertion in crawl-ref/source/spells3.cc at line 1690 [7.531613]

[11.449]

[11.547]


            if (dist == -1)
                continue;
            coord_def pos(posx, posy);

Replacement in crawl-ref/source/spells3.cc at line 1714 [7.531613]

B:BD[4.273] → [4.273:301]

            if (dist != -1)

[4.273]

[4.301]

            int monster = mgrd[posx][posy];
            if (monster != NON_MONSTER)

Replacement in crawl-ref/source/spells3.cc at line 1717 [7.531613]

B:BD[4.315] → [4.315:359]

                monster = mgrd[posx][posy];

[4.315]

[4.359]

                monsters* mon = &menv[monster];

Replacement in crawl-ref/source/spells3.cc at line 1719 [7.531613]

B:BD[4.360] → [4.360:404]

                if (monster != NON_MONSTER)

[4.360]

[4.404]

                if (!mons_wont_attack(mon))

Replacement in crawl-ref/source/spells3.cc at line 1721 [7.531613]

B:BD[4.422] → [4.422:513]

                    mon = &menv[monster];
                    if (!mons_wont_attack(mon))

[4.422]

[4.513]

                    if (mons_is_mimic(mon->type))

Replacement in crawl-ref/source/spells3.cc at line 1723 [7.531613]

B:BD[4.535] → [4.535:589]

                        if (mons_is_mimic(mon->type))

[4.535]

[4.589]

                        mimic_alert(mon);
                        if(you.can_see(mon))

Replacement in crawl-ref/source/spells3.cc at line 1726 [7.531613]

B:BD[4.615] → [4.615:751]

                            mimic_alert(mon);
                            if(you.can_see(mon))
                                count++;

[4.615]

[4.751]

                            scare_count++;
                            seen_mon = mon;

Replacement in crawl-ref/source/spells3.cc at line 1729 [7.531613]

B:BD[4.777] → [4.777:988]

                        else if (mon->add_ench(mon_enchant(ENCH_FEAR, 0,
                                 KC_YOU)))
                        {
                            behaviour_event(mon, ME_SCARE, MHITYOU);

[4.777]

[10.397]

                    }
                    else if (mon->add_ench(mon_enchant(ENCH_FEAR, 0,
                             KC_YOU)))
                    {
                        behaviour_event(mon, ME_SCARE, MHITYOU);

Replacement in crawl-ref/source/spells3.cc at line 1735 [7.531613]

B:BD[10.398] → [4.989:1238]

                            // Check to see that monster is actually fleeing,
                            // since plants can't flee.
                            if (mons_is_fleeing(mon) && you.can_see(mon))
                                count++;

[10.398]

[4.1238]

                        // Check to see that monster is actually fleeing,
                        // since plants can't flee.
                        if (mons_is_fleeing(mon) && you.can_see(mon))
                        {
                            scare_count++;
                            seen_mon = mon;

Replacement in crawl-ref/source/spells3.cc at line 1743 [7.531613]

B:BD[4.1286] → [4.1286:1368]

                } // if (monster != NON_MONSTER)
            } // if (dist != -1)

[4.1286]

[4.1368]

                }
            } // if (monster != NON_MONSTER)
            if (!is_harmless_cloud(cloud_type_at(pos)))
            {
                delete_cloud(env.cgrid[posx][posy]);
                if (see_grid(pos))
                    cloud_count++;
            }

Replacement in crawl-ref/source/spells3.cc at line 1754 [7.531613]

∅:D[4.1394] → [12.1598:1618]

B:BD[10.398] → [12.1598:1618]

B:BD[12.1618] → [9.237:303]

∅:D[9.303] → [12.1695:1719]

B:BD[12.1695] → [12.1695:1719]

    if (count == 1)
        simple_monster_message(mon, " turns to flee the light!");
    else if (count > 0)

[4.1394]

[12.1719]

    if (scare_count == 1 && seen_mon != NULL)
        simple_monster_message(seen_mon, " turns to flee the light!");
    else if (scare_count > 0)

Insertion in crawl-ref/source/spells3.cc at line 1759 [7.531613]

[10.400]

[6.5267]

    if (cloud_count == 1)
        mprf(MSGCH_GOD, "By Zin's power, the foul cloud within the "
                        " Sanctuary is swept away.");
    else if (cloud_count > 1)
        mprf(MSGCH_GOD, "By Zin's power, all foul fumes within the "
                        " Sanctuary are swept away.");

Replacement in crawl-ref/source/mstuff2.cc at line 1599 [7.1340842]
B:BD[7.1374804] → [13.249:277]
∅:D[13.277] → [14.17717:17718]
B:BD[14.17717] → [14.17717:17718]
```
    const char* msg = NULL;
```
[7.1374804]
[7.1374804]
```
    const char* msg       = NULL;
    const char* sanct_msg = NULL;
```

Insertion in crawl-ref/source/mstuff2.cc at line 1609 [7.1340842]

[14.17762]

[7.1375087]

        sanct_msg = "By Zin's power, the giant spore's explosion is contained.";

Insertion in crawl-ref/source/mstuff2.cc at line 1619 [7.1340842]

[14.17809]

[7.1375376]

        sanct_msg = "By Zin's power, the ball lightning's explosion "
                    "is contained.";

Replacement in crawl-ref/source/mstuff2.cc at line 1630 [7.1340842]
B:BD[7.1375383] → [15.2601:2639]
B:BD[15.2639] → [16.7775:7776]
∅:D[16.7776] → [15.2644:2660]
B:BD[15.2644] → [15.2644:2660]
```
    bool nearby = mons_near(monster);
    if (nearby)
```
[7.1375383]
[7.1375411]
```
    if (you.can_see(monster))
```

Replacement in crawl-ref/source/mstuff2.cc at line 1633 [7.1340842]

∅:D[15.2694] → [14.17810:17828]

B:BD[7.1375447] → [14.17810:17828]

        mpr(msg);

[15.2694]

[7.1375468]

        if (is_sanctuary(monster->x, monster->y))
            mpr(sanct_msg, MSGCH_GOD);
        else
            mpr(msg);

Replacement in crawl-ref/source/mstuff2.cc at line 1639 [7.1340842]

B:BD[7.1375475] → [15.2695:2750]

    explosion(beam, false, false, true, true, nearby);

[7.1375475]

[15.2750]

    if (is_sanctuary(monster->x, monster->y))
        return;
    explosion(beam, false, false, true, true, mons_near(monster));

Insertion in crawl-ref/source/cloud.h at line 61 [7.4095213]
[2.3044]
[2.3044]
```
bool is_harmless_cloud(cloud_type type);
```
Insertion in crawl-ref/source/cloud.cc at line 30 [7.4095717]
[17.101673]
[7.4096060]
```
#include "view.h"
```

Replacement in crawl-ref/source/cloud.cc at line 100 [7.4095717]

B:BD[18.4637] → [18.4637:4686]

                    || grid_is_solid(grd[x][y]))

[18.4637]

[18.4686]

                    || grid_is_solid(grd[x][y])
                    || is_sanctuary(x, y) && !is_harmless_cloud(cloud.type))

Insertion in crawl-ref/source/cloud.cc at line 230 [7.4095717]

[7.4097622]

    if (is_sanctuary(ctarget_x, ctarget_y) && !is_harmless_cloud(cl_type))
        return;

Insertion in crawl-ref/source/cloud.cc at line 590 [7.4095717]

[2.9911]

        return (false);
    }
}
bool is_harmless_cloud(cloud_type type)
{
    switch (type)
    {
    case CLOUD_NONE:
    case CLOUD_BLACK_SMOKE:
    case CLOUD_GREY_SMOKE:
    case CLOUD_BLUE_SMOKE:
    case CLOUD_PURP_SMOKE:
    case CLOUD_MIST:
    case CLOUD_DEBUGGING:
        return (true);
    default:

Insertion in crawl-ref/source/beam.cc at line 5483 [7.4128068]

[7.4258017]

        return;
    // 3. check sanctuary
    if (is_sanctuary(beam.target_x + x, beam.target_y + y))