fiddlerwoaroof/crawl - Change YZXHBEKWQPY4BTKG5FFGLP3AIRBQSTKQVLJJHWKQEA3HTN4UHDYQC

[1678085] Fixed efreet message sequence (Erik).

Fixed off-by-one-column beam animations.

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

Created by dshaligram on March 11, 2007

YZXHBEKWQPY4BTKG5FFGLP3AIRBQSTKQVLJJHWKQEA3HTN4UHDYQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monplace.h at line 53 [4.1638277]

B:BD[2.144] → [2.144:192]

                    bool force_place = false );

[2.144]

[4.1640284]

                    bool force_place = false, bool force_behaviour = false );

Insertion in crawl-ref/source/monplace.h at line 55 [4.1638277]
[4.1640285]
[4.1640285]
```
bool player_angers_monster(monsters *mon);
```

Insertion in crawl-ref/source/monplace.cc at line 1296 [4.1641732]

[5.459694]

}
bool player_angers_monster(monsters *creation)
{
    // get the drawbacks, not the benefits...
    // (to prevent demon-scumming)
    if ( (you.religion == GOD_ZIN ||
          you.religion == GOD_SHINING_ONE ||
          you.religion == GOD_ELYVILON) &&
         mons_is_unholy(creation) )
    {
        if ( creation->attitude != ATT_HOSTILE )
        {
            creation->attitude = ATT_HOSTILE;
            if ( see_grid(creation->x, creation->y)
                 && player_monster_visible(creation) )
            {
                mprf("%s is enraged by your holy aura!",
                     ptr_monam(creation, DESC_CAP_THE));
            }
        }
        return (true);
    }
    return (false);

Replacement in crawl-ref/source/monplace.cc at line 1324 [4.1641732]

B:BD[2.256] → [2.256:295]

                    bool force_place )

[2.256]

[5.459828]

                    bool force_place, bool force_behaviour )

Insertion in crawl-ref/source/monplace.cc at line 1365 [4.1641732]

[4.1676467]

[5.460089]


            if (!force_behaviour && player_angers_monster(creation))
                beha = BEH_HOSTILE;

Deletion in crawl-ref/source/monplace.cc at line 1369 [4.1641732]

B:BD[5.460102] → [5.460102:460406]

B:BD[5.460406] → [3.75:344]

∅:D[3.344] → [5.460456:460543]

B:BD[5.460456] → [5.460456:460543]

B:BD[5.460657] → [5.460657:460671]

∅:D[5.460671] → [4.1676467:1676468]

B:BD[4.1676467] → [4.1676467:1676468]

            // get the drawbacks, not the benefits...
            // (to prevent demon-scumming)
            if ( (you.religion == GOD_ZIN ||
                  you.religion == GOD_SHINING_ONE ||
                  you.religion == GOD_ELYVILON) &&
                 mons_is_unholy(creation) )
            {
                if ( creation->attitude != ATT_HOSTILE )
                {
                    creation->attitude = ATT_HOSTILE;
                    if ( see_grid(cr_x, cr_y) )
                        mpr("The monster is enraged by your holy aura!");
                }
                creation->behaviour = BEH_HOSTILE;
                beha = BEH_HOSTILE;
            }

Replacement in crawl-ref/source/it_use3.cc at line 728 [4.2870456]

B:BD[4.2892246] → [4.2892246:2892430]

    dec_inv_item_quantity( you.equip[EQ_WEAPON], 1 );
    if (create_monster( MONS_EFREET, ENCH_ABJ_V, behaviour, 
                        you.x_pos, you.y_pos, MHITYOU, 250 ) != -1)

[4.2892246]

[4.2892430]

    const int efreet = create_monster( MONS_EFREET, ENCH_ABJ_V, behaviour, 
                                       you.x_pos, you.y_pos, MHITYOU, 250,
                                       false, false, true );
    if (efreet != -1)

Insertion in crawl-ref/source/it_use3.cc at line 733 [4.2870456]
[4.2892436]
[4.2892436]
```
        monsters *mon = &menv[efreet];
        
```

Replacement in crawl-ref/source/it_use3.cc at line 736 [4.2870456]

B:BD[4.2892486] → [4.2892486:2892631]


        mpr( (behaviour == BEH_FRIENDLY) ? "\"Thank you for releasing me!\""
                                         : "It howls insanely!" );

[4.2892486]

[4.2892631]

        player_angers_monster(mon);
        mpr( (mon->attitude == ATT_FRIENDLY)?
             "\"Thank you for releasing me!\""
             : "It howls insanely!" );

Insertion in crawl-ref/source/it_use3.cc at line 743 [4.2870456]
[4.2892687]
[4.2892687]
```
    dec_inv_item_quantity( you.equip[EQ_WEAPON], 1 );    
```

Replacement in crawl-ref/source/beam.cc at line 150 [4.4128068]

B:BD[5.1221170] → [5.1221170:1221253]

    const int drawx = x - you.x_pos + 18;
    const int drawy = y - you.y_pos + 9;

[5.1221170]

[5.1221253]

    const int drawx = grid2viewX(x);
    const int drawy = grid2viewY(y);

Replacement in crawl-ref/source/beam.cc at line 153 [4.4128068]
B:BD[5.1221254] → [5.1221254:1221314]
```
    if (drawx > 8 && drawx < 26 && drawy > 0 && drawy < 18)
```
[5.1221254]
[5.1221314]
```
    if (in_los_bounds(drawx, drawy))
```

Replacement in crawl-ref/source/beam.cc at line 1405 [4.4128068]

B:BD[4.4177522] → [4.4177522:4177611]

            int drawx = tx - you.x_pos + 18;
            int drawy = ty - you.y_pos + 9;

[4.4177522]

[4.4177611]

            int drawx = grid2viewX(tx);
            int drawy = grid2viewY(ty);

Replacement in crawl-ref/source/beam.cc at line 1408 [4.4128068]

B:BD[4.4177639] → [4.4177639:4177707]

            if (drawx > 8 && drawx < 26 && drawy > 0 && drawy < 18)

[4.4177639]

[4.4177707]

            if (in_los_bounds(drawx, drawy))

Replacement in crawl-ref/source/beam.cc at line 4254 [4.4128068]

B:BD[4.4257223] → [4.4257223:4257310]

        int drawx = realx - you.x_pos + 18;
        int drawy = realy - you.y_pos + 9;

[4.4257223]

[4.4257310]

        int drawx = grid2viewX(realx);
        int drawy = grid2viewY(realy);

Replacement in crawl-ref/source/beam.cc at line 4260 [4.4128068]

B:BD[4.4257431] → [4.4257431:4257499]

            if (drawx > 8 && drawx < 26 && drawy > 0 && drawy < 18)

[4.4257431]

[4.4257499]

            if (in_los_bounds(drawx, drawy))