fiddlerwoaroof/crawl - Change KQNMFSLV62B4ANDKTUZ7LQH2MD2NDGNCP55MKM5YAATQ4T52H2PQC

[1878126] Suppress "<foo> goes berserk" messages for Trog punishment, fixed enchantment name assert.

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

Created by dshaligram on January 25, 2008

KQNMFSLV62B4ANDKTUZ7LQH2MD2NDGNCP55MKM5YAATQ4T52H2PQC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/religion.cc at line 2287 [4.804403]
B:BD[4.865530] → [5.6494:6521]
```
        while (points > 0)
```

Replacement in crawl-ref/source/religion.cc at line 2288 [4.804403]

B:BD[4.865663] → [2.172:211]

            int cost = random2(8) + 3;

[4.865663]

[2.211]

            no_messages msg;
            
            while (points > 0)
            {
                int cost = random2(8) + 3;

Replacement in crawl-ref/source/religion.cc at line 2294 [4.804403]

B:BD[2.212] → [2.212:274]

            if (cost > points)
                cost = points;

[2.212]

[5.6576]

                if (cost > points)
                    cost = points;

Replacement in crawl-ref/source/religion.cc at line 2297 [4.804403]

B:BD[5.6577] → [2.275:323]

∅:D[2.323] → [5.6577:6620]

B:BD[5.6577] → [5.6577:6620]

B:BD[6.2810] → [6.2810:2824]

B:BD[6.2824] → [2.324:381]

∅:D[2.381] → [6.2912:2926]

∅:D[5.7276] → [6.2912:2926]

B:BD[6.2912] → [6.2912:2926]

            // quick reduction for large values
            if (points > 20 && coinflip())
            {
                points -= 10;
                cost = 10;
            }

[5.6577]

[5.7277]

                // quick reduction for large values
                if (points > 20 && coinflip())
                {
                    points -= 10;
                    cost = 10;
                }

Replacement in crawl-ref/source/religion.cc at line 2304 [4.804403]
B:BD[5.7278] → [2.382:410]
```
            points -= cost;
```
[5.7278]
[2.410]
```
                points -= cost;
```

Replacement in crawl-ref/source/religion.cc at line 2306 [4.804403]

B:BD[2.411] → [2.411:463]

∅:D[2.463] → [7.2878:2903]

B:BD[5.7409] → [7.2878:2903]

            if (summon_berserker(cost * 20, false))
                count++;

[2.411]

[4.865989]

                if (summon_berserker(cost * 20, false))
                    count++;
            }

Replacement in crawl-ref/source/religion.cc at line 2313 [4.804403]

B:BD[7.3054] → [7.3054:3124]

                           " has no time to punish you...now.", god);

[7.3054]

[5.7647]

                           " has no time to punish you... now.", god);

Replacement in crawl-ref/source/mon-util.cc at line 5165 [4.1699344]
B:BD[8.265] → [9.3793:3817]
```
    "blood-lust", "bug"
```
[8.265]
[10.27853]
```
    "blood-lust", "neutral", "bug"
```

Replacement in crawl-ref/source/enum.h at line 1096 [4.3287960]

B:BD[11.915311] → [8.361:424]

// This list must match the enchant_names array in mon-util.cc

[11.915311]

// This list must match the enchant_names array in mon-util.cc or Crawl
// will CRASH, we kid you not.

Replacement in crawl-ref/source/enum.h at line 1127 [4.3287960]
∅:D[12.598] → [13.2558:2563]
∅:D[14.1639] → [13.2558:2563]
∅:D[15.2423] → [13.2558:2563]
∅:D[3.3028] → [13.2558:2563]
∅:D[9.4719] → [13.2558:2563]
∅:D[16.11977] → [13.2558:2563]
∅:D[17.25371] → [13.2558:2563]
∅:D[10.32333] → [13.2558:2563]
B:BD[13.2558] → [13.2558:2563]
```
    
```
[3.3028]
[4.3314507]
```
    // Update enchantment names in mon-util.cc when adding or removing
    // enchantments.
```