fiddlerwoaroof/crawl - Change CGYTZT5QWIEGYKUOLOK7MFXSLJKLYRZONER5ZCDZO5XYWSLG475QC

A completely reworked version of Zin as per the lengthy

discussion in October/November.

Zin effects:

protection from harm (like all good gods)
feeding when starving (as before)
mutation resistance (chance of piety/200)

Zin restrictions:

no cannibalism (like all good gods)
no attacking friends
no eating of intelligent beings' corpses
no deliberate mutating

Zin invocations:

Smiting (general priestly ability?)
Revitalisation (Minor Healing + 5 mp)
Sanctuary (protection from attacks)

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

Created by j-p-e-g on December 30, 2007

CGYTZT5QWIEGYKUOLOK7MFXSLJKLYRZONER5ZCDZO5XYWSLG475QC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 165 [13.13254]

[12.113]

void set_envmap_prop( int x, int y, int prop );
bool is_sanctuary( int x, int y );

Insertion in crawl-ref/source/view.cc at line 185 [13.16817]

[12.755]

[12.1135]

void set_envmap_prop( int x, int y, int prop )
{
    env.map[x][y].property = prop;
}
bool is_sanctuary( int x, int y)
{
    return (env.map[x][y].property != FPROP_NONE);
}

Insertion in crawl-ref/source/view.cc at line 363 [13.16817]

[14.28]

            if (object < NUM_REAL_FEATURES
                && is_sanctuary(x,y) && object >= DNGN_MINMOVE)
            {
                if (env.map[x][y].property == FPROP_SANCTUARY_1)
                    *colour = YELLOW | colmask;
                else if (env.map[x][y].property == FPROP_SANCTUARY_2)
                {
                    if (!one_chance_in(3))
                        *colour = WHITE | colmask;
                    else if (one_chance_in(3))
                        *colour = LIGHTCYAN | colmask;
                    else
                        *colour = LIGHTGRAY | colmask;
                }
            }
            else

Insertion in crawl-ref/source/tags.cc at line 1577 [13.164589]

[15.12221]

[16.169]

            marshallShort(th, env.map[count_x][count_y].property);

Insertion in crawl-ref/source/tags.cc at line 1611 [13.164589]

[13.204993]

[17.1562]


    marshallByte(th, env.sanctuary_x);
    marshallByte(th, env.sanctuary_y);
    marshallByte(th, env.sanctuary_time);

Insertion in crawl-ref/source/tags.cc at line 1814 [13.164589]
[15.12390]
[13.208120]
```
            env.map[i][j].property = unmarshallShort(th);
```

Insertion in crawl-ref/source/tags.cc at line 1853 [13.164589]

[17.1777]

[18.532]

    env.sanctuary_x    = unmarshallByte(th);
    env.sanctuary_y    = unmarshallByte(th);
    env.sanctuary_time = unmarshallByte(th);

Insertion in crawl-ref/source/spl-cast.cc at line 1598 [13.293070]

[13.334280]

[19.8345]

        // trying is already enough, even if it fails
        did_god_conduct(DID_DELIBERATE_MUTATING, 10);

Insertion in crawl-ref/source/spells3.h at line 66 [13.526814]

[20.851]

[13.528806]

bool remove_sanctuary(bool did_attack = false);
bool cast_sanctuary(int power);

Deletion in crawl-ref/source/spells3.h at line 69 [13.526814]
B:BD[13.528807] → [13.528807:528808]
Insertion in crawl-ref/source/spells3.cc at line 46 [13.531613]
[13.532422]
[13.532422]
```
#include "religion.h"
```
Insertion in crawl-ref/source/spells3.cc at line 48 [13.531613]
[13.532443]
[21.146470]
```
#include "spells2.h" // holy word
```

Insertion in crawl-ref/source/spells3.cc at line 802 [13.531613]

[13.555135]


bool remove_sanctuary(bool did_attack)
{
    if (env.sanctuary_time)
        env.sanctuary_time = 0;
    
    if (env.sanctuary_x < 0 || env.sanctuary_y < 0)
        return false;
    const int radius = 5;
    bool seen_change = false;
    for (int x=-radius; x<=radius; x++)
       for (int y=-radius; y<=radius; y++)
       {
          int posx = env.sanctuary_x + x;
          int posy = env.sanctuary_y + y;
          if (posx <= 0 || posx > GXM || posy <= 0 || posy > GYM)
              continue;
          if (is_sanctuary(posx, posy))
          {
              env.map[posx][posy].property = FPROP_NONE;
              if (see_grid(coord_def(posx,posy)))
                  seen_change = true;
          }
       }
//  do not reset so as to allow monsters to see if their fleeing source
//  used to be the centre of a sanctuary
//    env.sanctuary_x = env.sanctuary_y = -1;
    if (did_attack)
    {
        if (seen_change)
            simple_god_message(" revokes the gift of sanctuary.", GOD_ZIN);
        did_god_conduct(DID_FRIEND_DIES, 3);
    }
    else if (seen_change)
    {
        mpr("The air around you flickers and hums.");
        if (is_resting())
            stop_running();
    }

Insertion in crawl-ref/source/spells3.cc at line 847 [13.531613]

[13.555136]

    return true;
}
bool cast_sanctuary(const int power)
{
    // first get rid of old sanctuary
    remove_sanctuary();
    if (!silenced(you.x_pos, you.y_pos))
        mpr("You hear a choir sing!");
    else
        mpr("You are suddenly bathed in radiance!");
    you.flash_colour = WHITE;
    viewwindow( true, false );
    holy_word( 100, true );
    delay(1000);
    env.sanctuary_x = you.x_pos;
    env.sanctuary_y = you.y_pos;
    env.sanctuary_time = 15;
    const int radius = 5;
    const int pattern = random2(4);
    int count = 0;
    int monster = -1;
    
    for (int x=-radius; x<=radius; x++)
         for (int y=-radius; y<=radius; y++)
         {
              int posx = you.x_pos + x;
              int posy = you.y_pos + y;
              if (posx <= 0 || posx > GXM || posy <= 0 || posy > GYM)
                  continue;
              int dist = distance(posx, posy, you.x_pos, you.y_pos);
              if (dist > radius*radius)
                  continue;
              // scare all hostile monsters inside sanctuary
              if (mgrd[posx][posy] != NON_MONSTER)
              {
                  monster = mgrd[posx][posy];
                  monsters *mon = &menv[monster];
                  
                  if (!mons_friendly(mon)
                      && mon->add_ench(mon_enchant(ENCH_FEAR, 0, KC_YOU)))
                  {
                      behaviour_event(mon, ME_SCARE, MHITYOU);
                      count++;
                  }
              }
                  
              // forming patterns
              if (pattern == 0
                    && (x == 0 || y == 0 || x == y || x == -y)
                  || pattern == 1
                    && (dist >= (radius-1)*(radius-1) && dist <= radius*radius)
                  || pattern == 2
                    && (x%2 == 0 || y%2 == 0)
                  || pattern == 3
                    && (abs(x)+abs(y) < 5 && x != y && x != -y))
              {
                  env.map[posx][posy].property = FPROP_SANCTUARY_1;
              }
              else
                  env.map[posx][posy].property = FPROP_SANCTUARY_2;
         }
         if (count == 1)
             simple_monster_message(&menv[monster], " turns to flee the light!");
         else if (count > 0)
             mpr("The monsters scatter in all directions!");
         
    return (true);
}

Insertion in crawl-ref/source/spells1.h at line 55 [13.611815]
[21.152553]
[13.613383]
```
int cast_revitalisation(int power);
```

Insertion in crawl-ref/source/spells1.cc at line 656 [13.616635]

[13.627890]

int cast_revitalisation( int pow )
{
    // first increase MP by 5 or to maximum, whichever is lower
    inc_mp(5, false);
    // then cast healing (as in Minor Healing)
    return cast_healing(pow);
}

Replacement in crawl-ref/source/religion.cc at line 190 [13.804403]

B:BD[22.408] → [22.408:571]

    { "repel the undead",
      "call upon Zin for minor healing",
      "call down a plague",
      "utter a Holy Word",      
      "summon a guardian angel" },

[22.408]

[22.571]

    { "",
      "smite your foes",
      "call upon Zin for revitalisation",
      "",
      "call upon Zin to create a Sanctuary" },

Replacement in crawl-ref/source/religion.cc at line 275 [13.804403]

B:BD[22.2597] → [22.2597:2760]

    { "repel the undead",
      "call upon Zin for minor healing",
      "call down a plague",
      "utter a Holy Word",      
      "summon a guardian angel" },

[22.2597]

[22.2760]

    { "",
      "smite your foes",
      "call upon Zin for revitalisation",
      "",
      "call upon Zin to create a Sanctuary" },

Insertion in crawl-ref/source/religion.cc at line 1552 [13.804403]

[21.188452]

    case DID_DELIBERATE_MUTATING:
        if (you.religion == GOD_ZIN)
        {
            if (!known)
            {
                simple_god_message(" did not appreciate that!");
                break;
            }
            piety_change = -level;
            ret = true;
        }
        break;
    case DID_EAT_SOULED_BEING:
        if (you.religion == GOD_ZIN)
        {
            piety_change = -level;
            penance = level * 5;
            ret = true;
        }
        break;

Replacement in crawl-ref/source/religion.cc at line 1603 [13.804403]
B:BD[23.1813] → [23.1813:1837]
```
          "Create Life"
```
[23.1813]
[21.190315]
```
          "Eat Souled Beings", "Create Life", "Deliberate Mutation"
```

Replacement in crawl-ref/source/religion.cc at line 1746 [13.804403]

B:BD[21.191452] → [24.1411:1483]

B:BD[24.1483] → [25.451:527]

         (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN ||
          you.religion == GOD_LUGONU) && you.num_gifts[you.religion] == 0 )

[21.191452]

[21.191569]

         (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
          && you.num_gifts[you.religion] == 0 )

Replacement in crawl-ref/source/religion.cc at line 1973 [13.804403]

B:BD[21.191754] → [24.1558:1633]

B:BD[24.1633] → [25.528:606]

            (you.religion == GOD_SHINING_ONE || you.religion == GOD_ZIN ||
             you.religion == GOD_LUGONU) && you.num_gifts[you.religion] == 0)

[21.191754]

[21.191876]

            (you.religion == GOD_SHINING_ONE || you.religion == GOD_LUGONU)
             && you.num_gifts[you.religion] == 0)

Replacement in crawl-ref/source/religion.cc at line 2052 [13.804403]

B:BD[26.1843] → [8.2360:2386]

    bool success = false;

[26.1843]

[8.2386]

    int punishment = random2(8);
    
    // if little mutated, do something else instead
    if (punishment < 2 && count_mutations() <= random2(3))
        punishment = random2(6)+2;

Replacement in crawl-ref/source/religion.cc at line 2058 [13.804403]
∅:D[8.2387] → [26.1843:1907]
B:BD[26.1843] → [26.1843:1907]
```
    if (random2(you.experience_level) > 7 && !one_chance_in(5))
```
[8.2387]
[26.1907]
```
    switch(random2(8))
```

Replacement in crawl-ref/source/religion.cc at line 2060 [13.804403]

B:BD[26.1943] → [26.1943:2483]

∅:D[26.2483] → [27.1175:1190]

B:BD[27.1175] → [27.1175:1190]

        const int how_many = 1 + (you.experience_level / 10) + random2(3);
        for (int i = 0; i < how_many; i++)
            if (create_monster(MONS_ANGEL, 0, BEH_HOSTILE,
                               you.x_pos, you.y_pos, MHITYOU, 250) != -1)
                success = true;
        simple_god_message( success ?
                            " sends the divine host to punish you "
                            "for your evil ways!" :
                            "'s divine host fails to appear.",
                            god);
    }
    else

[26.1913]

[27.1190]

    case 0: // remove good mutations (25%)
    case 1:

Replacement in crawl-ref/source/religion.cc at line 2063 [13.804403]

B:BD[27.1196] → [26.2484:2530]

B:BD[26.2530] → [8.2388:2651]

        // god_gift == false gives unfriendly
        success = summon_swarm( you.experience_level * 20, true, false );
        simple_god_message(success ?
                           " sends a plague down upon you!" :
                           "'s plague fails to arrive.",
                           god);

[27.1196]

[26.2661]

       simple_god_message(" draws some chaos from your body!", god);
       bool success = false;
       for (int i = 0; i < 7; i++)
            if (random2(10) > i
                && delete_mutation(RANDOM_MUTATION, true, true))
            {
                success = true;
            }
              
       if (success && !count_mutations())
           simple_god_message(" rids your body of chaos!");
           
       break;

Insertion in crawl-ref/source/religion.cc at line 2077 [13.804403]

[26.2667]

    case 2:
    case 3:
    case 4: // summon angels or bugs (pestilence), 3/8
       if (random2(you.experience_level) > 7 && !one_chance_in(5))
       {
           const int how_many = 1 + (you.experience_level / 10) + random2(3);
           bool success = false;

Insertion in crawl-ref/source/religion.cc at line 2085 [13.804403]

[26.2668]

           for (int i = 0; i < how_many; i++)
              if (create_monster(MONS_ANGEL, 0, BEH_HOSTILE,
                                 you.x_pos, you.y_pos, MHITYOU, 250) != -1)
                  success = true;
           simple_god_message( success ?
                              " sends the divine host to punish you "
                              "for your evil ways!" :
                              "'s divine host fails to appear.",
                              god);
       }
       else
       {
          // god_gift == false gives unfriendly
          bool success = summon_swarm( you.experience_level * 20, true, false );
          simple_god_message(success ?
                             " sends a plague down upon you!" :
                             "'s plague fails to arrive.",
                             god);
       }
       break;
    case 5:
    case 6: // famine, 25%
       simple_god_message(" sends a famine down upon you!", god);
       make_hungry( you.hunger/2, false );
       break;
    case 7: // noisiness, 12.5%
       simple_god_message(" booms out: \"Return to the light! REPENT!\"", god);
       noisy( 25, you.x_pos, you.y_pos ); // same as scroll of noise
       break;
    }

Insertion in crawl-ref/source/religion.cc at line 2966 [13.804403]

[24.3241]

    case GOD_ZIN:
        if (env.sanctuary_time)
            remove_sanctuary();
        // deliberate fall-through

Deletion in crawl-ref/source/religion.cc at line 3057 [13.804403]

B:BD[21.195287] → [21.195287:195872]

        }
    }
    // Zin blesses maces with disruption
    if (you.religion == GOD_ZIN
        && !you.num_gifts[GOD_ZIN]
        && !player_under_penance()
        && you.piety > 160)
    {
        const int wpn = get_player_wielded_weapon();
        if (wpn != -1 
            && (you.inv[wpn].base_type == OBJ_WEAPONS
                && (you.inv[wpn].sub_type == WPN_MACE
                    || you.inv[wpn].sub_type == WPN_GREAT_MACE))
            && get_weapon_brand( you.inv[wpn] ) != SPWPN_DISRUPTION)
        {
            bless_weapon( GOD_ZIN, SPWPN_DISRUPTION, WHITE );

Replacement in crawl-ref/source/religion.cc at line 3591 [13.804403]

B:BD[13.886484] → [13.886484:886561]

        case GOD_ZIN:           // These gods like long-standing worshippers

[13.886484]

[13.886561]

        // These gods like long-standing worshippers

Insertion in crawl-ref/source/religion.cc at line 3602 [13.804403]

[13.886828]

        case GOD_ZIN:
            if (need_free_piety() && one_chance_in(12))
                gain_piety(1);
            break;

Replacement in crawl-ref/source/output.cc at line 1127 [13.1088282]

B:BD[28.56403] → [28.56403:56473]

    const int rmuta = wearing_amulet(AMU_RESIST_MUTATION, calc_unid);

[28.56403]

[28.56473]

    const int rmuta = wearing_amulet(AMU_RESIST_MUTATION, calc_unid)
                      || you.religion == GOD_ZIN && you.piety >= 180
                      || you.mutation[MUT_MUTATION_RESISTANCE] == 3;

Replacement in crawl-ref/source/mutation.h at line 53 [13.1260415]

B:BD[13.1261532] → [29.191:263]

bool delete_mutation(mutation_type which_mutation, bool force = false);

[13.1261532]

[13.1261575]

bool delete_mutation(mutation_type which_mutation, bool force = false,
                     bool good = false);

Insertion in crawl-ref/source/mutation.h at line 56 [13.1260415]
[13.1261576]
[13.1261576]
```
// used by Zin (religion.cc)
int count_mutations(void);
```

Insertion in crawl-ref/source/mutation.cc at line 1396 [13.1263003]

[21.395280]

[3.4354]

static bool is_good_mutation( mutation_type which_mutation )
{
    switch (which_mutation)
    {
    case MUT_TOUGH_SKIN:
    case MUT_STRONG:
    case MUT_CLEVER:
    case MUT_AGILE:
    case MUT_POISON_RESISTANCE:
    case MUT_TELEPORT_CONTROL:
    case MUT_MAGIC_RESISTANCE:
    case MUT_TELEPORT_AT_WILL:
    case MUT_MAPPING:
    case MUT_CLARITY:
    case MUT_MUTATION_RESISTANCE:
    case MUT_FAST:
    case MUT_BLINK:
    case MUT_BREATHE_FLAMES:
    case MUT_SPIT_POISON:
    case MUT_BREATHE_POISON:
    case MUT_STINGER:
    case MUT_FANGS:
        return true;
        
    default:
        return false;
    }
}

Deletion in crawl-ref/source/mutation.cc at line 1522 [13.1263003]
B:BD[13.1301198] → [13.1301198:1301220]
B:BD[13.1301220] → [2.245:308]
∅:D[2.308] → [13.1301267:1301298]
B:BD[13.1301267] → [13.1301267:1301298]
```
        if (failMsg)
            mpr("You feel odd for a moment.", MSGCH_MUTATION);
        return (false);
    }
```

Deletion in crawl-ref/source/mutation.cc at line 1523 [13.1263003]

B:BD[13.1301299] → [13.1301299:1301399]

    if (wearing_amulet(AMU_RESIST_MUTATION)
        && !force_mutation && !one_chance_in(10))
    {

Replacement in crawl-ref/source/mutation.cc at line 1529 [13.1263003]

B:BD[13.1301499] → [13.1301499:1301650]

    if (you.mutation[MUT_MUTATION_RESISTANCE]
        && !force_mutation
        && (you.mutation[MUT_MUTATION_RESISTANCE] == 3 || !one_chance_in(3)))

[13.1301499]

[13.1301650]

    if (!force_mutation)

Replacement in crawl-ref/source/mutation.cc at line 1531 [13.1263003]

B:BD[13.1301656] → [13.1301656:1301677]

B:BD[13.1301677] → [2.373:436]

        if (failMsg)
            mpr("You feel odd for a moment.", MSGCH_MUTATION);

[13.1301656]

[13.1301724]

        if (wearing_amulet(AMU_RESIST_MUTATION) && !one_chance_in(10)
            || you.religion == GOD_ZIN && you.piety > random2(200)
            || you.mutation[MUT_MUTATION_RESISTANCE] == 3
            || you.mutation[MUT_MUTATION_RESISTANCE] && !one_chance_in(3))
        {
            if (failMsg)
                mpr("You feel odd for a moment.", MSGCH_MUTATION);

Replacement in crawl-ref/source/mutation.cc at line 1539 [13.1263003]
B:BD[13.1301725] → [13.1301725:1301749]
```
        return (false);
```
[13.1301725]
[13.1301749]
```
            return (false);
        }
```

Replacement in crawl-ref/source/mutation.cc at line 1979 [13.1263003]

B:BD[13.1314573] → [29.325:388]

bool delete_mutation(mutation_type which_mutation, bool force)

[13.1314573]

[13.1314615]

int count_mutations()
{
    int count = 0;
    for (int i = 0; i < NUM_MUTATIONS; i++)
        if (you.mutation[i] && you.demon_pow[i] < you.mutation[i])
            count++;
            
    return count;
}
bool delete_mutation(mutation_type which_mutation, bool force, bool good)

Replacement in crawl-ref/source/mutation.cc at line 2017 [13.1263003]

∅:D[30.4222] → [13.1315322:1315386]

B:BD[13.1315322] → [13.1315322:1315386]

               || you.demon_pow[mutat] >= you.mutation[mutat]);

[30.4222]

[13.1315386]

               || you.demon_pow[mutat] >= you.mutation[mutat]
               || good && (!is_good_mutation(mutat) || one_chance_in(10)));

Insertion in crawl-ref/source/monstuff.cc at line 2257 [13.1396662]

[13.1465560]

    // monsters will try to flee out of a sanctuary
    if (is_sanctuary(monster->x, monster->y) && !mons_friendly(monster)
        && !mons_is_fleeing(monster)
        && monster->add_ench(mon_enchant(ENCH_FEAR, 0, KC_YOU)))
    {
        behaviour_event(monster, ME_SCARE, MHITNOT, monster->x, monster->y);
    }
    else if (mons_is_fleeing(monster) && env.sanctuary_x != -1
             && !is_sanctuary(monster->x, monster->y)
             && monster->target_x == env.sanctuary_x
             && monster->target_y == env.sanctuary_y)
    {   // once outside there's a chance they'll regain their courage
        if (random2(5) > 2)
            monster->del_ench(ENCH_FEAR);
    }

Insertion in crawl-ref/source/monstuff.cc at line 2455 [13.1396662]
[13.1470791]
[13.1470791]
```
        
    default: break;
```

Insertion in crawl-ref/source/monstuff.cc at line 2488 [13.1396662]

[31.3108]

        if (is_sanctuary(monster->x, monster->y))
            break;

Insertion in crawl-ref/source/monstuff.cc at line 2495 [13.1396662]

[21.422766]

        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {
            break;
        }

Insertion in crawl-ref/source/monstuff.cc at line 2504 [13.1396662]

[21.422858]

        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {
            break;
        }

Insertion in crawl-ref/source/monstuff.cc at line 2521 [13.1396662]

[13.1471712]

        if (is_sanctuary(monster->x, monster->y))
            break;

Insertion in crawl-ref/source/monstuff.cc at line 2561 [13.1396662]

[13.1472850]

            break;
            
        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

Insertion in crawl-ref/source/monstuff.cc at line 2567 [13.1396662]
[13.1472869]
[13.1472869]
```
        }
```

Insertion in crawl-ref/source/monstuff.cc at line 2602 [13.1396662]

[13.1473735]

            break;
        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

Insertion in crawl-ref/source/monstuff.cc at line 2608 [13.1396662]
[13.1473754]
[13.1473754]
```
        }
```

Insertion in crawl-ref/source/monstuff.cc at line 2643 [13.1396662]

[32.9117]

[13.1474654]

            break;
        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

Insertion in crawl-ref/source/monstuff.cc at line 2649 [13.1396662]
[13.1474673]
[13.1474673]
```
        }
```

Insertion in crawl-ref/source/monstuff.cc at line 2667 [13.1396662]

[32.9165]

[13.1475014]

            break;
        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

Insertion in crawl-ref/source/monstuff.cc at line 2673 [13.1396662]
[13.1475033]
[13.1475033]
```
        }
```

Insertion in crawl-ref/source/monstuff.cc at line 2736 [13.1396662]

[32.9213]

[13.1476789]

            break;
        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

Insertion in crawl-ref/source/monstuff.cc at line 2742 [13.1396662]
[13.1476808]
[13.1476808]
```
        }
```

Insertion in crawl-ref/source/monstuff.cc at line 2796 [13.1396662]

[32.9261]

[13.1478260]

            break;
        if (is_sanctuary(you.x_pos, you.y_pos)
            || is_sanctuary(monster->x, monster->y))
        {

Insertion in crawl-ref/source/monstuff.cc at line 2802 [13.1396662]
[13.1478279]
[13.1478279]
```
        }
```

Insertion in crawl-ref/source/monstuff.cc at line 3767 [13.1396662]

[13.1495333]

                }
                else if (is_sanctuary(you.x_pos, you.y_pos)
                         || is_sanctuary(monster->x, monster->y))
                {
                    return (false);

Replacement in crawl-ref/source/monstuff.cc at line 3797 [13.1396662]

B:BD[13.1496174] → [13.1496174:1496306]


                    if (ms_direct_nasty(spell_cast)
                        && mons_aligned(monster_index(monster), monster->foe))

[13.1496174]

[13.1496306]

                    
                    if (is_sanctuary(you.x_pos, you.y_pos)
                        || is_sanctuary(monster->x, monster->y))
                    {
                        spellOK = false;
                    }
                    else if (ms_direct_nasty(spell_cast)
                             && mons_aligned(monster_index(monster), monster->foe))

Replacement in crawl-ref/source/monstuff.cc at line 3830 [13.1396662]

B:BD[13.1497423] → [33.29116:29197]

                    spell_cast = (coinflip() ? hspell_pass[2] : SPELL_NO_SPELL);

[13.1497423]

[13.1497501]

                {
                    if (is_sanctuary(you.x_pos, you.y_pos)
                        || is_sanctuary(monster->x, monster->y))
                    {
                        spell_cast = SPELL_NO_SPELL;
                    }
                    else
                        spell_cast = (coinflip() ? hspell_pass[2] : SPELL_NO_SPELL);
                }

Replacement in crawl-ref/source/monstuff.cc at line 3850 [13.1396662]

B:BD[21.427050] → [21.427050:427097]

                        && one_chance_in(4))))

[21.427050]

[21.427097]

                        && one_chance_in(4)))
            && !is_sanctuary(you.x_pos, you.y_pos)
            && !is_sanctuary(monster->x, monster->y))

Insertion in crawl-ref/source/monstuff.cc at line 4009 [13.1396662]

[34.3915]

[35.606]

        return (false);
    if (is_sanctuary(monster->x, monster->y)
        || is_sanctuary(beem.target_x, beem.target_y))
    {

Insertion in crawl-ref/source/monstuff.cc at line 4015 [13.1396662]
[35.630]
[35.630]
```
    }
```
Replacement in crawl-ref/source/monstuff.cc at line 4022 [13.1396662]
B:BD[35.908] → [35.908:938]
```
            && you.caught()))
```
[35.908]
[35.938]
```
        && you.caught()))
```

Insertion in crawl-ref/source/monstuff.cc at line 4378 [13.1396662]

[36.6210]

                     && !is_sanctuary(monster->x, monster->y)

Insertion in crawl-ref/source/monstuff.cc at line 5201 [13.1396662]

[5.3137]

        
    // hostile monsters won't enter sanctuaries
    if (!mons_friendly(monster)
        && is_sanctuary(targ_x, targ_y)
        && !is_sanctuary(monster->x, monster->y))
    {
        return (false);
    }
    // inside a sanctuary don't attack anything!
    if (is_sanctuary(monster->x, monster->y)
        && (targ_x == you.x_pos && targ_y == you.y_pos
            || mgrd[targ_x][targ_y] != NON_MONSTER))
    {
        return (false);
    }

Deletion in crawl-ref/source/monstuff.cc at line 5473 [13.1396662]
B:BD[13.1530436] → [13.1530436:1530442]
```
    {
```
Replacement in crawl-ref/source/monstuff.cc at line 5495 [13.1396662]
∅:D[5.10127] → [13.1537315:1537367]
B:BD[13.1537315] → [13.1537315:1537367]
```
        }
    } // now we know where we _can_ move.
```
[5.10127]
[13.1537367]
```
        } // now we know where we _can_ move.
```
Insertion in crawl-ref/source/mon-util.cc at line 1625 [13.1699344]
[13.1729782]
[13.1729782]
```
    default:
```
Insertion in crawl-ref/source/mon-util.cc at line 1641 [13.1699344]
[37.8701]
[13.1730690]
```
    default: break;
```

Insertion in crawl-ref/source/mon-util.cc at line 4107 [13.1699344]

[32.15362]

        snprintf( info, INFO_SIZE, " seems to regain %s courage.",
                  mons_pronoun(static_cast<monster_type>(this->type),
                               PRONOUN_NOCAP_POSSESSIVE));

Replacement in crawl-ref/source/mon-util.cc at line 4112 [13.1699344]

B:BD[32.15382] → [32.15382:15457]

            simple_monster_message(this, " seems to regain its courage.");

[32.15382]

[32.15457]

            simple_monster_message(this, info);

Insertion in crawl-ref/source/misc.cc at line 1589 [13.1933596]

[38.333]

[21.548284]

    
    // no monster will attack you inside a sanctuary,
    // so presence of monsters won't matter
    if (is_sanctuary(you.x_pos, you.y_pos))
        return (true);

Insertion in crawl-ref/source/makeitem.cc at line 3550 [39.927]
[39.123023]
[39.123023]
```
    
    default: break;
```
Insertion in crawl-ref/source/makeitem.cc at line 3803 [39.927]
[4.4378]
[4.4378]
```
        
    default: break;
```

Replacement in crawl-ref/source/it_use2.cc at line 305 [13.2904329]

B:BD[13.2912015] → [21.766257:766314]

        did_god_conduct(DID_STIMULANTS, 4 + random2(4));

[40.3861]

[41.4553]

            
        did_god_conduct(DID_DELIBERATE_MUTATING, 10, was_known);
        did_god_conduct(DID_STIMULANTS, 4 + random2(4), was_known);

Replacement in crawl-ref/source/food.cc at line 58 [13.3043806]

B:BD[13.3044834] → [23.5537:5596]

static void  eat_chunk( int chunk_effect, bool cannibal );

[13.3044834]

[13.3044937]

static void  eat_chunk( int chunk_effect, bool cannibal, int mon_intel = 0);

Deletion in crawl-ref/source/food.cc at line 624 [13.3043806]
B:BD[13.3061092] → [13.3061092:3061093]
Insertion in crawl-ref/source/food.cc at line 696 [13.3043806]
[23.5662]
[21.853913]
```
        const int intel = mons_intel(mons_type) - I_ANIMAL;
```

Replacement in crawl-ref/source/food.cc at line 703 [13.3043806]

B:BD[13.3062355] → [23.5663:5740]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal );

[13.3062355]

[13.3062422]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal, intel );

Insertion in crawl-ref/source/food.cc at line 745 [13.3043806]

[21.854053]

[23.5741]

        const int intel = mons_intel( mitm[item_link].plus ) - I_ANIMAL;

Replacement in crawl-ref/source/food.cc at line 750 [13.3043806]

B:BD[42.1122] → [23.5820:5897]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal );

[42.1122]

[43.430764]

        eat_chunk( determine_chunk_effect( chunk_type, rotten ), cannibal, intel );

Replacement in crawl-ref/source/food.cc at line 883 [13.3043806]

B:BD[13.3064199] → [23.5898:5955]

static void eat_chunk( int chunk_effect, bool cannibal )

[13.3064199]

[13.3064241]

static void eat_chunk( int chunk_effect, bool cannibal, int mon_intel )

Insertion in crawl-ref/source/food.cc at line 905 [13.3043806]
[44.3845]
[44.3845]
```
        did_god_conduct( DID_DELIBERATE_MUTATING, 10);
```
Insertion in crawl-ref/source/food.cc at line 912 [13.3043806]
[44.3996]
[44.3996]
```
        did_god_conduct( DID_DELIBERATE_MUTATING, 10);
```

Insertion in crawl-ref/source/food.cc at line 969 [13.3043806]

[23.6022]

    else if (mon_intel > 0)
        did_god_conduct( DID_EAT_SOULED_BEING, mon_intel);

Insertion in crawl-ref/source/files.cc at line 980 [13.3084589]

[45.770]

[13.3097335]

        env.sanctuary_x    = -1;
        env.sanctuary_y    = -1;
        env.sanctuary_time = 0;

Replacement in crawl-ref/source/files.cc at line 1154 [13.3084589]
B:BD[13.3111553] → [19.17017:17051]
```
    you.prev_targ      = MHITNOT;
```
[13.3111553]
[19.17051]
```
    you.prev_targ     = MHITNOT;
```

Replacement in crawl-ref/source/fight.cc at line 3648 [13.3140790]

B:BD[13.3257329] → [46.82618:82644]

    return attk.attack();

[13.3257329]

[46.82644]

    bool attack = attk.attack();
    if (attack && (is_sanctuary(you.x_pos, you.y_pos)
                   || is_sanctuary(defender->x, defender->y)))
    {
        remove_sanctuary(true);
    }
    return attack;

Insertion in crawl-ref/source/externs.h at line 1256 [13.3270163]
[15.17605]
[12.3221]
```
    unsigned short property;
```

Replacement in crawl-ref/source/externs.h at line 1258 [13.3270163]

B:BD[12.3222] → [15.17606:17708]

    map_cell() : object(0), flags(0), colour(0) { }
    void clear() { flags = object = colour = 0; }

[12.3222]

[15.17708]

    map_cell() : object(0), flags(0), colour(0), property(0) { }
    void clear() { flags = object = colour = property = 0; }

Replacement in crawl-ref/source/externs.h at line 1323 [13.3270163]

B:BD[13.3282130] → [15.17785:17859]

    FixedArray< map_cell, GXM, GYM >        map;    // discovered terrain

[13.3282130]

[13.3282360]

    FixedArray< map_cell, GXM, GYM >         map;    // discovered terrain

Insertion in crawl-ref/source/externs.h at line 1352 [13.3270163]
[47.107378]
[13.3282738]
```
    int sanctuary_x;
    int sanctuary_y;
    int sanctuary_time;
```

Replacement in crawl-ref/source/enum.h at line 78 [13.3287960]

∅:D[48.2372] → [13.3290538:3290703]

B:BD[13.3290538] → [13.3290538:3290703]

    ABIL_ZIN_REPEL_UNDEAD = 110,       //  110
    ABIL_ZIN_HEALING,
    ABIL_ZIN_PESTILENCE,
    ABIL_ZIN_HOLY_WORD,
    ABIL_ZIN_SUMMON_GUARDIAN,          //  114

[48.2372]

[13.3290703]

    ABIL_ZIN_SMITING = 110,            //  110
    ABIL_ZIN_REVITALISATION,
    ABIL_ZIN_SANCTUARY,

Insertion in crawl-ref/source/enum.h at line 635 [13.3287960]
[21.909232]
[21.909232]
```
    DID_EAT_SOULED_BEING,  // Zin
```
Insertion in crawl-ref/source/enum.h at line 637 [13.3287960]
[21.909282]
[21.909282]
```
    DID_DELIBERATE_MUTATING,
```

Insertion in crawl-ref/source/enum.h at line 1002 [13.3287960]

[21.913149]

[13.3311270]

};
enum floor_property_type
{
    FPROP_NONE,          // 0
    FPROP_SANCTUARY_1,
    FPROP_SANCTUARY_2

Insertion in crawl-ref/source/effects.cc at line 2408 [13.3382105]

[11.18971]

     
    if (env.sanctuary_time)
    {
        if (turns >= env.sanctuary_time)
            remove_sanctuary();
        else
          env.sanctuary_time -= turns;
    }

Insertion in crawl-ref/source/direct.cc at line 2038 [13.3697945]

[13.3723654]


    if (is_sanctuary(mx, my))
        mpr("This square lies inside a sanctuary.");

Insertion in crawl-ref/source/describe.cc at line 1875 [13.3736416]
[49.2487]
[49.2487]
```
    default:
        return ("");
```
Deletion in crawl-ref/source/describe.cc at line 1878 [13.3736416]
B:BD[49.2493] → [49.2493:2510]
```
    return ("");
```

Replacement in crawl-ref/source/delay.cc at line 640 [13.3963459]

B:BD[21.1005790] → [23.6072:6152]

            if (is_good_god(you.religion) && is_player_same_species(item.plus))

[21.1005790]

[23.6152]

            if (you.religion == GOD_ZIN && mons_intel(item.plus) >= I_NORMAL)
                simple_god_message(" demands a ceremonial burial for a corpse "
                                   "like this!");
            else if (is_good_god(you.religion) && is_player_same_species(item.plus))

Insertion in crawl-ref/source/delay.cc at line 1217 [13.3963459]

[21.1015688]

[50.2543]

        // no monster will attack you inside a sanctuary,
        // so presence of monsters won't matter
        if (is_sanctuary(you.x_pos, you.y_pos))
            return (false);

Insertion in crawl-ref/source/beam.cc at line 3695 [13.4128068]

[21.1247908]

[51.1130]

                if (is_sanctuary(mon->x, mon->y)
                    || is_sanctuary(you.x_pos, you.y_pos))
                {
                    remove_sanctuary(true);
                }

Insertion in crawl-ref/source/beam.cc at line 3864 [13.4128068]

[9.4884]

[21.1249487]

            if (is_sanctuary(mon->x, mon->y)
                || is_sanctuary(you.x_pos, you.y_pos))
            {
                remove_sanctuary(true);
            }

Insertion in crawl-ref/source/acr.cc at line 2750 [13.4397395]

[10.8815]

}
static void check_sanctuary()
{
    if (env.sanctuary_time <= 0)
        return;
        
    env.sanctuary_time--;
    if (env.sanctuary_time == 0)
        remove_sanctuary();

Insertion in crawl-ref/source/acr.cc at line 2777 [13.4397395]
[10.8840]
[21.1270203]
```
    
    check_sanctuary();
```

Insertion in crawl-ref/source/acr.cc at line 3699 [13.4397395]

[52.11012]

    // you can swap places with a friendly monster if you're not confused
    // or if both of you are inside a sanctuary
    const bool can_swap_places = targ_monst != NON_MONSTER
                                 && (mons_friendly(&menv[targ_monst])
                                       && !you.duration[DUR_CONF]
                                     || is_sanctuary(you.x_pos, you.y_pos)
                                        && is_sanctuary(targ_x, targ_y));

Replacement in crawl-ref/source/acr.cc at line 3709 [13.4397395]

B:BD[52.11148] → [6.374:502]

        && (targ_monst == NON_MONSTER || mons_friendly(&menv[targ_monst])
            || mons_is_submerged(&menv[targ_monst])))

[52.11148]

[52.11228]

        && (!can_swap_places || mons_is_submerged(&menv[targ_monst])))

Replacement in crawl-ref/source/acr.cc at line 3744 [13.4397395]

B:BD[13.4475129] → [53.56545:56623]

B:BD[53.56623] → [54.20059:20120]

        // you can swap places with a friendly monster if you're not confused
        if (mons_friendly( mon ) && !you.duration[DUR_CONF])

[13.4475129]

[13.4475396]

        if (can_swap_places)

Insertion in crawl-ref/source/acr.cc at line 3753 [13.4397395]

[21.1281245]

[7.5743]

            if (is_sanctuary(you.x_pos, you.y_pos)
                || is_sanctuary(mon->x, mon->y))
            {
                snprintf(info, INFO_SIZE,
                         "Really attack %s, despite your sanctuary? ",
                         mon->name(DESC_NOCAP_THE).c_str());
                         
                if (!yesno(info, true, 'n'))
                    return;
            }

Replacement in crawl-ref/source/abl-show.cc at line 113 [13.4494389]

B:BD[22.8967] → [22.8967:9089]

    { ABIL_ZIN_REPEL_UNDEAD, ABIL_ZIN_HEALING, ABIL_ZIN_PESTILENCE,
      ABIL_ZIN_HOLY_WORD, ABIL_ZIN_SUMMON_GUARDIAN },

[22.8967]

[22.9089]

    { ABIL_NON_ABILITY, ABIL_ZIN_SMITING, ABIL_ZIN_REVITALISATION,
      ABIL_NON_ABILITY, ABIL_ZIN_SANCTUARY },

Replacement in crawl-ref/source/abl-show.cc at line 235 [13.4494389]

B:BD[13.4500147] → [13.4500147:4500508]

    { ABIL_ZIN_REPEL_UNDEAD, "Repel Undead", 1, 0, 100, 0, ABFLAG_NONE },
    { ABIL_ZIN_HEALING, "Minor Healing", 2, 0, 50, 1, ABFLAG_NONE },
    { ABIL_ZIN_PESTILENCE, "Pestilence", 3, 0, 100, 2, ABFLAG_NONE },
    { ABIL_ZIN_HOLY_WORD, "Holy Word", 6, 0, 150, 3, ABFLAG_NONE },
    { ABIL_ZIN_SUMMON_GUARDIAN, "Summon Guardian", 7, 0, 150, 4, ABFLAG_NONE },

[13.4500147]

[13.4500508]

    { ABIL_ZIN_SMITING, "Smiting",
      3, 0, 50, generic_cost::fixed(2), ABFLAG_NONE },
    { ABIL_ZIN_REVITALISATION, "Revitalisation", 0, 0, 100, 3, ABFLAG_NONE },
    { ABIL_ZIN_SANCTUARY, "Sanctuary", 7, 0, 150, 10, ABFLAG_NONE },

Deletion in crawl-ref/source/abl-show.cc at line 639 [13.4494389]
B:BD[55.10093] → [55.10093:10125]
```
    case ABIL_ZIN_REPEL_UNDEAD:
```
Replacement in crawl-ref/source/abl-show.cc at line 681 [13.4494389]
B:BD[55.11035] → [55.11035:11062]
```
    case ABIL_ZIN_HEALING:
```
[55.11035]
[55.11062]
```
    case ABIL_ZIN_SMITING:
```
Replacement in crawl-ref/source/abl-show.cc at line 705 [13.4494389]
B:BD[55.11749] → [55.11749:11779]
```
    case ABIL_ZIN_PESTILENCE:
```
[55.11749]
[55.11779]
```
    case ABIL_ZIN_REVITALISATION:
```
Deletion in crawl-ref/source/abl-show.cc at line 718 [13.4494389]
B:BD[55.12116] → [55.12116:12145]
```
    case ABIL_ZIN_HOLY_WORD:
```
Replacement in crawl-ref/source/abl-show.cc at line 728 [13.4494389]
B:BD[55.12444] → [55.12444:12479]
```
    case ABIL_ZIN_SUMMON_GUARDIAN:
```
[55.12444]
[55.12479]
```
    case ABIL_ZIN_SANCTUARY:
```
Deletion in crawl-ref/source/abl-show.cc at line 1314 [13.4494389]
B:BD[13.4519189] → [13.4519189:4519221]
```
    case ABIL_ZIN_REPEL_UNDEAD:
```

Replacement in crawl-ref/source/abl-show.cc at line 1329 [13.4494389]

B:BD[13.4519673] → [13.4519673:4519853]

    case ABIL_ZIN_HEALING:
        if (!cast_healing( 3 + (you.skills[SK_INVOCATIONS] / 6) ))
            break;
        exercise(SK_INVOCATIONS, 1 + random2(3));
        break;

[13.4519673]

[13.4519853]

// no longer in use, maybe keep for other cases (or remove!)
/*

Insertion in crawl-ref/source/abl-show.cc at line 1349 [13.4494389]
[13.4520479]
[13.4520479]
```
*/
```

Insertion in crawl-ref/source/abl-show.cc at line 1351 [13.4494389]

[13.4520480]

    case ABIL_ZIN_REVITALISATION:
        if (cast_revitalisation( 3 + (you.skills[SK_INVOCATIONS] / 6) ))
            exercise(SK_INVOCATIONS, 1 + random2(3));
        break;
    case ABIL_ZIN_SANCTUARY:
        if (cast_sanctuary(you.skills[SK_INVOCATIONS] * 4))
            exercise(SK_INVOCATIONS, 5 + random2(8));
        break;
    case ABIL_ZIN_SMITING:

Insertion in crawl-ref/source/Kills.cc at line 611 [43.558235]
[43.579010]
[43.579010]
```
        default: break;
```