fiddlerwoaroof/crawl - Change SS6MUIJYTGIVBYU356Z563QJWLJ47QNHSJWS7GJTS7EATZH2ESJQC

Code review and minor fixups for Beogh.

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

Created by haranp on July 7, 2007

SS6MUIJYTGIVBYU356Z563QJWLJ47QNHSJWS7GJTS7EATZH2ESJQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/religion.cc at line 283 [3.804403]
B:BD[3.806513] → [4.5487:5529]
```
int followers_abandon_you(void); // Beogh
```
[3.806513]
[5.988]
```
static bool followers_abandon_you(void); // Beogh
```
Deletion in crawl-ref/source/religion.cc at line 1830 [3.804403]
B:BD[3.867560] → [2.10084:10130]
```
    // taken from makeitem.cc and spells3.cc:
```
Replacement in crawl-ref/source/religion.cc at line 1833 [3.804403]
B:BD[2.10239] → [2.10239:10283]
```
        int num_to_create = random2(2) + 1;
```
[2.10239]
[2.10283]
```
        int num_to_create = (coinflip() ? 1 : 2);
```

Replacement in crawl-ref/source/religion.cc at line 1836 [3.804403]

B:BD[3.867667] → [2.10332:10366]

            bool created = false;

[3.867667]

[3.867764]

            // first create item
            int slot = items(0, OBJ_WEAPONS, WPN_CLUB + random2(13),
                             true, you.experience_level, MAKE_ITEM_NO_RACE);

Replacement in crawl-ref/source/religion.cc at line 1840 [3.804403]

B:BD[3.867765] → [2.10367:10476]

∅:D[2.10476] → [3.867820:867834]

B:BD[3.867820] → [3.867820:867834]

B:BD[3.867834] → [2.10477:10948]

            // first create item
            const int it = get_item_slot();
            if (it != NON_ITEM)
            {
                item_def &item = mitm[it];
                    
                item.quantity = 1;
                item.base_type = OBJ_WEAPONS;
                // any melee weapon
                item.sub_type = WPN_CLUB + random2(13); 
                    
                set_item_ego_type( item, OBJ_WEAPONS, SPWPN_ORC_SLAYING );
                // just how good should this weapon be?
                item.plus = random2(3);
                item.plus2 = random2(3);

[3.867765]

[2.10948]

            if ( slot == -1 )
                continue;
            item_def& item = mitm[slot];           
            set_item_ego_type( item, OBJ_WEAPONS, SPWPN_ORC_SLAYING );
            // manually override plusses
            item.plus = random2(3);
            item.plus2 = random2(3);

Replacement in crawl-ref/source/religion.cc at line 1850 [3.804403]

B:BD[2.10971] → [2.10971:11052]

                if (coinflip())
                    item.flags |= ISFLAG_CURSED;

[2.10971]

[3.867876]

            if (coinflip())
                item.flags |= ISFLAG_CURSED;

Replacement in crawl-ref/source/religion.cc at line 1853 [3.804403]

B:BD[3.867877] → [2.11053:11433]

                set_ident_type( item.base_type, item.sub_type,
                                ID_KNOWN_TYPE );
                    
                // for debugging + makes things more interesting
                // (doesn't seem to have any effect, though)
                set_ident_flags( item, ISFLAG_KNOW_PLUSES );
                set_ident_flags( item, ISFLAG_IDENT_MASK );

[3.867877]

[3.868588]

            // let the player see that he's being attacked by
            // orc slayers
            set_ident_flags( item, ISFLAG_KNOW_TYPE );

Replacement in crawl-ref/source/religion.cc at line 1857 [3.804403]

B:BD[3.868589] → [2.11434:11682]

                // now create monster
                int mons =
                    create_monster( MONS_DANCING_WEAPON, 0,
                                    BEH_HOSTILE, you.x_pos, you.y_pos,
                                    MHITYOU, 250 );

[3.868589]

[2.11682]

            // now create monster
            int mons = create_monster( MONS_DANCING_WEAPON, 0, BEH_HOSTILE,
                                       you.x_pos, you.y_pos, MHITYOU, 250 );

Replacement in crawl-ref/source/religion.cc at line 1861 [3.804403]

B:BD[2.11722] → [2.11722:11834]

∅:D[2.11834] → [3.868732:868750]

B:BD[3.868732] → [3.868732:868750]

B:BD[3.868750] → [2.11835:12159]

                // hand item information over to monster
                if (mons != -1 && mons != NON_MONSTER)
                {
                    mitm[it] = item;
                    mitm[it].quantity = 1;
                    mitm[it].x = 0;
                    mitm[it].y = 0;
                    mitm[it].link = NON_ITEM;
                    menv[mons].inv[MSLOT_WEAPON] = it;
                    created = true;
                    num_created++;

[2.11722]

[2.12159]

            // hand item information over to monster
            if (mons != -1)
            {
                menv[mons].inv[MSLOT_WEAPON] = slot;
                num_created++;

Replacement in crawl-ref/source/religion.cc at line 1867 [3.804403]

B:BD[2.12160] → [2.12160:12323]

∅:D[2.12323] → [3.868786:868804]

B:BD[3.868786] → [3.868786:868804]

                    // 50% chance of weapon disappearing on "death"
                    if (coinflip())
                        menv[mons].flags |= MF_HARD_RESET;
                }

[2.12160]

[3.868804]

                // 50% chance of weapon disappearing on "death"
                if (coinflip())
                    menv[mons].flags |= MF_HARD_RESET;

Replacement in crawl-ref/source/religion.cc at line 1871 [3.804403]

B:BD[3.868818] → [2.12324:12382]

            if (!created) // didn't work out! delete item

[3.868818]

[2.12382]

            else // didn't work out! delete item

Replacement in crawl-ref/source/religion.cc at line 1873 [3.804403]

B:BD[2.12396] → [2.12396:12488]

                mitm[it].base_type = OBJ_UNASSIGNED;
                mitm[it].quantity = 0;

[2.12396]

[2.12488]

                mitm[slot].clear();

Replacement in crawl-ref/source/religion.cc at line 2147 [3.804403]
B:BD[4.14895] → [4.14895:14923]
```
int followers_abandon_you()
```
[4.14895]
[4.14923]
```
bool followers_abandon_you()
```

Replacement in crawl-ref/source/religion.cc at line 2149 [3.804403]

B:BD[4.14925] → [4.14925:15179]

     int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
     int yend = you.y_pos + 9, xend = you.x_pos + 9;
     if ( xstart < 0 ) xstart = 0;
     if ( ystart < 0 ) ystart = 0;
     if ( xend >= GXM ) xend = GXM;
     if ( ystart >= GYM ) yend = GYM;

[4.14925]

[4.15179]

    int ystart = you.y_pos - 9, xstart = you.x_pos - 9;
    int yend = you.y_pos + 9, xend = you.x_pos + 9;
    if ( xstart < 0 ) xstart = 0;
    if ( ystart < 0 ) ystart = 0;
    if ( xend >= GXM ) xend = GXM;
    if ( ystart >= GYM ) yend = GYM;

Replacement in crawl-ref/source/religion.cc at line 2156 [3.804403]

B:BD[4.15185] → [4.15185:15242]

B:BD[4.15242] → [6.724:752]

     bool reconvert = false;
     int num_reconvert = 0;
     int num_followers = 0;

[4.15185]

[3.877146]

    bool reconvert = false;
    int num_reconvert = 0;
    int num_followers = 0;

Replacement in crawl-ref/source/religion.cc at line 2160 [3.804403]

B:BD[3.877147] → [4.15243:15802]

B:BD[4.15802] → [6.753:791]

     std::vector<const monsters *> mons;
     // monster check
     for ( int y = ystart; y < yend; ++y )
     {
         for ( int x = xstart; x < xend; ++x )
         {
             const unsigned char targ_monst = mgrd[x][y];
             if ( targ_monst != NON_MONSTER )
             {
                 struct monsters *monster = &menv[targ_monst];
                 if ( mons_species(monster->type) == MONS_ORC
                      && monster->attitude == ATT_FRIENDLY
                      && (monster->flags & MF_CONVERT_ATTEMPT))
                 {
                     num_followers++;

[3.877147]

[6.791]

    std::vector<const monsters *> mons;
    // monster check
    for ( int y = ystart; y < yend; ++y )
    {
        for ( int x = xstart; x < xend; ++x )
        {
            const unsigned char targ_monst = mgrd[x][y];
            if ( targ_monst != NON_MONSTER )
            {
                monsters *monster = &menv[targ_monst];
                if ( mons_species(monster->type) == MONS_ORC
                     && monster->attitude == ATT_FRIENDLY
                     && (monster->flags & MF_CONVERT_ATTEMPT))
                {
                    num_followers++;

Replacement in crawl-ref/source/religion.cc at line 2176 [3.804403]

∅:D[6.813] → [4.15802:15991]

B:BD[4.15802] → [4.15802:15991]

                     if (mons_player_visible(monster)
                         && !mons_is_confused(monster)
                         && !mons_is_paralysed(monster))
                     {

[6.813]

[4.15991]

                    if (mons_player_visible(monster)
                        && !mons_is_confused(monster)
                        && !mons_is_paralysed(monster))
                    {

Replacement in crawl-ref/source/religion.cc at line 2186 [3.804403]

B:BD[4.16252] → [4.16252:16317]

                           num_reconvert++; // only visible ones

[4.16252]

[4.16317]

                            num_reconvert++; // only visible ones

Replacement in crawl-ref/source/religion.cc at line 2189 [3.804403]

B:BD[4.16385] → [4.16385:16677]

                     }
                 }
             }
         }
     }
     if (reconvert) // maybe all of them invisible
     {
        snprintf(info, INFO_SIZE, "%s booms out: \"Who do you think you are?\"",
                   god_name(GOD_BEOGH));
        god_speaks(GOD_BEOGH, info);

[4.16385]

[4.16677]

                    }
                }
            }
        }
    }
    if (reconvert) // maybe all of them invisible
    {
        std::string mesg = god_name(GOD_BEOGH);
        mesg += " booms out: \"Who do you think you are?\"";
        god_speaks(GOD_BEOGH, mesg.c_str());

Replacement in crawl-ref/source/religion.cc at line 2203 [3.804403]

B:BD[4.16719] → [6.814:1311]

∅:D[6.1311] → [4.16881:16947]

B:BD[4.16881] → [4.16881:16947]

           std::string how_many;
           if (num_reconvert == 1 and num_followers > 1)
              how_many = "One of your";
           else if (num_reconvert == num_followers)
              how_many = "Your";
           else
              how_many = "Some of your";
              
           snprintf(info, INFO_SIZE, "%s follower%s decide%s to abandon you.",
                how_many.c_str(),
                (num_reconvert > 1) ? "s" : "",
                (num_reconvert > 1) ? "" : "s");
           mpr(info, MSGCH_MONSTER_ENCHANT);
           return 1;

[4.16719]

[4.16947]

            std::ostream& chan = msg::streams(MSGCH_MONSTER_ENCHANT);
            if (num_reconvert == 1 && num_followers > 1)
                chan << "One of your followers decides to abandon you.";
            else
            {
                if (num_reconvert == num_followers)
                    chan << "Your";
                else
                    chan << "Some of your";
                chan << " followers decide to abandon you.";
            }
            chan << std::endl;
            
            return true;

Replacement in crawl-ref/source/religion.cc at line 2219 [3.804403]
B:BD[4.16957] → [4.16957:16979]
```
     }
     return 0;
```
[4.16957]
[4.16979]
```
    }
    return false;
```

Deletion in crawl-ref/source/makeitem.cc at line 1687 [7.927]

B:BD[7.55010] → [7.55010:55293]

                // this makes no sense {dlb}
                // Probably a remnant of the old code which used
                // to decrement this when the electric attack happened -- bwr
                // if (brand == SPWPN_ELECTROCUTION)
                //     mitm[p].plus = 0;

Replacement in crawl-ref/source/decks.cc at line 927 [3.3987460]
B:BD[8.26899] → [9.1848:1875]
```
    // not yet implemented
```
[8.26899]
[8.26926]
```
    // XXX not yet implemented
```