fiddlerwoaroof/crawl - Change KC4WE63EQMVI6QBPDO3EAEPMFLAOS7H5WUAFL7JPRIE3V7CR333AC

Bunch of changes:

Removed unnecessary static_casts<> from branch.cc, improved messages a bit. Removed incorrect caps from entomb(). Changed ornate/legendary bonuses from percentages to flat power bonuses (+150 and +300 respectively.) Ensured at least one Nemelex gift by the time you get the first power. Changed probability of Nemelex liking a gift, made it dependent on piety. Fix warning in cloud.cc.

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

Created by haranp on November 13, 2007

KC4WE63EQMVI6QBPDO3EAEPMFLAOS7H5WUAFL7JPRIE3V7CR333AC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/spells3.cc at line 690 [5.531613]
B:BD[5.552531] → [2.373:453]
∅:D[2.453] → [5.552531:552532]
∅:D[6.575] → [5.552531:552532]
B:BD[5.552531] → [5.552531:552532]
```
    if ( powc > 98 )
        powc = 98;
    if ( powc < 30 )
        powc = 30;
```

Replacement in crawl-ref/source/religion.cc at line 599 [5.804403]

B:BD[3.1169] → [3.1169:1344]

    if (random2(MAX_PIETY) <= you.piety
        && one_chance_in(3)
        && !you.attribute[ATTR_CARD_COUNTDOWN]
        && !grid_destroys_items(grd[you.x_pos][you.y_pos]))

[3.1169]

[3.1344]

    if ( grid_destroys_items(grd[you.x_pos][you.y_pos]) )
        return;
    
    // Nemelex will give at least one gift early.
    if ((you.num_gifts[GOD_NEMELEX_XOBEH] == 0
         && random2(piety_breakpoint(1)) < you.piety) ||
        (random2(MAX_PIETY) <= you.piety
         && one_chance_in(3)
         && !you.attribute[ATTR_CARD_COUNTDOWN]))

Replacement in crawl-ref/source/religion.cc at line 3253 [5.804403]

B:BD[7.5875] → [7.5875:5937]

∅:D[7.5937] → [8.2245:2349]

B:BD[8.2245] → [8.2245:2349]

            if ((item.base_type == OBJ_CORPSES && coinflip())
                // Nemelex piety gain is fairly fast.
                || random2(value) >= random2(60))

[7.5875]

[8.2349]

            if ((item.base_type == OBJ_CORPSES &&
                 one_chance_in(2+you.piety/50))
                // Nemelex piety gain is fairly fast...at least
                // when you have low piety.
                || value/2 >= random2(30 + you.piety/2))

Replacement in crawl-ref/source/decks.cc at line 2123 [5.3987460]
B:BD[9.27601] → [9.27601:27640]
```
        result += random2(result / 2);
```
[9.27601]
[9.27640]
```
        result += 150;
```
Replacement in crawl-ref/source/decks.cc at line 2125 [5.3987460]
B:BD[9.27683] → [9.27683:27718]
```
        result += random2(result);
```
[9.27683]
[5.4006665]
```
        result += 300;
```
Deletion in crawl-ref/source/cloud.cc at line 451 [5.4095717]
B:BD[4.11487] → [4.11487:11519]
```
        fog_machine_data data;
```
Replacement in crawl-ref/source/branch.cc at line 16 [11.14355]
B:BD[10.4571] → [10.4571:4629]
```
    return branches[static_cast<int>(you.where_are_you)];
```
[10.4571]
[12.10238]
```
    return branches[you.where_are_you];
```

Replacement in crawl-ref/source/branch.cc at line 38 [11.14355]

B:BD[13.126990] → [13.126990:127131]

    unsigned long old_flags = branches[static_cast<int>(branch)].branch_flags;
    branches[static_cast<int>(branch)].branch_flags |= flags;

[13.126990]

[13.127131]

    unsigned long old_flags = branches[branch].branch_flags;
    branches[branch].branch_flags |= flags;

Replacement in crawl-ref/source/branch.cc at line 59 [11.14355]

B:BD[13.127784] → [13.127784:127859]

    return (old_flags != branches[static_cast<int>(branch)].branch_flags);

[13.127784]

[10.4629]

    return (old_flags != branches[branch].branch_flags);

Replacement in crawl-ref/source/branch.cc at line 68 [11.14355]

B:BD[13.128033] → [13.128033:128140]

    bool could_control = allow_control_teleport(true);
    bool could_map     = player_in_mappable_area();

[13.128033]

[13.128140]

    const bool could_control = allow_control_teleport(true);
    const bool could_map     = player_in_mappable_area();

Replacement in crawl-ref/source/branch.cc at line 71 [11.14355]

B:BD[13.128141] → [13.128141:128283]

    unsigned long old_flags = branches[static_cast<int>(branch)].branch_flags;
    branches[static_cast<int>(branch)].branch_flags &= ~flags;

[13.128141]

[13.128283]

    unsigned long old_flags = branches[branch].branch_flags;
    branches[branch].branch_flags &= ~flags;

Replacement in crawl-ref/source/branch.cc at line 74 [11.14355]

B:BD[13.128284] → [13.128284:128387]

    bool can_control = allow_control_teleport(true);
    bool can_map     = player_in_mappable_area();

[13.128284]

[13.128387]

    const bool can_control = allow_control_teleport(true);
    const bool can_map     = player_in_mappable_area();

Replacement in crawl-ref/source/branch.cc at line 83 [11.14355]

B:BD[13.128659] → [13.128659:128782]

        mpr("You sense the disappearence of a powerful magical force "
            "which warped space.", MSGCH_RECOVERY);

[13.128659]

[13.128782]

        mpr("Space seems to straighten in your vicinity.", MSGCH_RECOVERY);

Replacement in crawl-ref/source/branch.cc at line 91 [11.14355]

B:BD[13.129007] → [13.129007:129147]

        mpr("You sense the disappearence the force that prevented you "
            "from remembering where you've been.", MSGCH_RECOVERY);

[13.129007]

[13.129147]

        mpr("An oppressive force seems to lift.", MSGCH_RECOVERY);

Replacement in crawl-ref/source/branch.cc at line 94 [11.14355]

B:BD[13.129154] → [13.129154:129229]

    return (old_flags != branches[static_cast<int>(branch)].branch_flags);

[13.129154]

[13.129229]

    return (old_flags != branches[branch].branch_flags);

Replacement in crawl-ref/source/branch.cc at line 107 [11.14355]
B:BD[13.129436] → [13.129436:129496]
```
    return branches[static_cast<int>(branch)].branch_flags;
```
[13.129436]
[13.129496]
```
    return branches[branch].branch_flags;
```