fiddlerwoaroof/crawl - Change TS7X6ZTTQRB2I53VV4LXZPXZWM3DIKYI3T5PPHZANSEW4Q7QZBOAC

Brothers-in-Arms set berserk dur = abjuration dur so the summon goes away

when the berserk wears off.

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

Created by dshaligram on August 7, 2007

TS7X6ZTTQRB2I53VV4LXZPXZWM3DIKYI3T5PPHZANSEW4Q7QZBOAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells2.cc at line 1425 [6.569242]
B:BD[5.4674] → [5.4674:4700]
```
    int mon = MONS_TROLL;
```
[5.4674]
[5.4700]
```
    monster_type mon = MONS_TROLL;
```

Replacement in crawl-ref/source/spells2.cc at line 1428 [6.569242]

B:BD[5.4725] → [5.4725:4839]

    { // bears
      if (coinflip())
         mon = MONS_BLACK_BEAR;
      else
         mon = MONS_GRIZZLY_BEAR;

[5.4725]

[5.4839]

    {
        // bears
        if (coinflip())
            mon = MONS_BLACK_BEAR;
        else
            mon = MONS_GRIZZLY_BEAR;

Replacement in crawl-ref/source/spells2.cc at line 1437 [6.569242]

B:BD[5.4876] → [5.4876:4993]

      // ogres
      if (one_chance_in(3))
         mon = MONS_TWO_HEADED_OGRE;
      else
         mon = MONS_OGRE;

[5.4876]

[5.4993]

        // ogres
        if (one_chance_in(3))
            mon = MONS_TWO_HEADED_OGRE;
        else
            mon = MONS_OGRE;

Replacement in crawl-ref/source/spells2.cc at line 1445 [6.569242]

B:BD[5.5030] → [5.5030:5079]

      // trolls
      switch(random2(8))
      {

[5.5030]

[5.5079]

        // trolls
        switch(random2(8))
        {

Replacement in crawl-ref/source/spells2.cc at line 1449 [6.569242]

B:BD[5.5095] → [5.5095:5145]

          mon = MONS_DEEP_TROLL;
          break;

[5.5095]

[5.5145]

            mon = MONS_DEEP_TROLL;
            break;

Replacement in crawl-ref/source/spells2.cc at line 1453 [6.569242]

B:BD[5.5177] → [5.5177:5227]

          mon = MONS_IRON_TROLL;
          break;

[5.5177]

[5.5227]

            mon = MONS_IRON_TROLL;
            break;

Replacement in crawl-ref/source/spells2.cc at line 1457 [6.569242]

B:BD[5.5259] → [5.5259:5309]

          mon = MONS_ROCK_TROLL;
          break;

[5.5259]

[5.5309]

            mon = MONS_ROCK_TROLL;
            break;

Replacement in crawl-ref/source/spells2.cc at line 1460 [6.569242]

B:BD[5.5326] → [5.5326:5379]

          mon = MONS_TROLL;
          break;
      }

[5.5326]

[5.5379]

            mon = MONS_TROLL;
            break;
        }

Replacement in crawl-ref/source/spells2.cc at line 1466 [6.569242]

B:BD[5.5400] → [5.5400:5516]

      // giants
      if (coinflip())
          mon = MONS_HILL_GIANT;
      else
          mon = MONS_STONE_GIANT;

[5.5400]

[5.5516]

        // giants
        if (coinflip())
            mon = MONS_HILL_GIANT;
        else
            mon = MONS_STONE_GIANT;

Replacement in crawl-ref/source/spells2.cc at line 1473 [6.569242]

B:BD[5.5523] → [5.5523:5610]

    int mons = create_monster( mon, numsc, beha, you.x_pos, you.y_pos, MHITYOU, 250 );

[5.5523]

[3.152]

    int mons = create_monster( mon, numsc, beha, you.x_pos, you.y_pos,
                               MHITYOU, 250 );

Replacement in crawl-ref/source/spells2.cc at line 1477 [6.569242]

B:BD[3.177] → [3.177:224]

        menv[mons].go_berserk(false);

[3.177]

[3.224]

    {
        monsters *summon = &menv[mons];
        summon->go_berserk(false);
        mon_enchant berserk = summon->get_ench(ENCH_BERSERK);
        mon_enchant abj = summon->get_ench(ENCH_ABJ);
        // Let Trog gifts berserk longer, and set abj timeout ==
        // berserk timeout.
        berserk.duration *= 2;
        berserk.maxduration = berserk.duration;
        abj.duration = abj.maxduration = berserk.duration;
        summon->update_ench(berserk);
        summon->update_ench(abj);
    }

Replacement in crawl-ref/source/mon-util.cc at line 3617 [6.1699344]

B:BD[4.198] → [4.198:344]

	// just for flavour
	if (this->flags & MF_GOD_GIFT && this->has_ench(ENCH_BERSERK))
	    simple_monster_message(this, " is no longer berserk.");

[4.198]

[4.344]

        // just for flavour
        if (this->flags & MF_GOD_GIFT && this->has_ench(ENCH_BERSERK))
            simple_monster_message(this, " is no longer berserk.");

Replacement in crawl-ref/source/mon-util.cc at line 3621 [6.1699344]

B:BD[4.345] → [4.345:406]

	monster_die( this, quiet? KILL_DISMISSED : KILL_RESET, 0 );

[4.345]

[7.17033]

        monster_die( this, quiet? KILL_DISMISSED : KILL_RESET, 0 );

Replacement in crawl-ref/source/mon-util.cc at line 3776 [6.1699344]
B:BD[2.3936] → [2.3936:3982]
```
    const int level = std::max(me.degree, 1);
```
[2.3936]
[2.3982]
```
    const int level = me.degree;
```

Deletion in crawl-ref/source/mon-util.cc at line 3807 [6.1699344]

B:BD[8.7729] → [9.2323:2415]

B:BD[9.2415] → [4.407:450]

∅:D[4.450] → [9.2489:2558]

B:BD[9.2489] → [9.2489:2558]

            
            // this assumes that god gifts outside Trog's are rarely berserked
            if (this->flags & MF_GOD_GIFT)
                monster_die( this, KILL_RESET, 0 );