fiddlerwoaroof/crawl - Change 542WW2UJM6XF22442ZD5NFMTS6HTDM74JKJ7GQHBLQ3D6C6T4C3AC

* Don't offer rotten chunks for wearers of "otG since it doesn't

actually allow eating of rotten stuff.

Tweak Xom's mood descriptions -> shortened to 7.
Increase chance of Xom acting under tension: 5% -> 10%

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

Created by j-p-e-g on March 22, 2009

542WW2UJM6XF22442ZD5NFMTS6HTDM74JKJ7GQHBLQ3D6C6T4C3AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/xom.cc at line 107 [6.3]

∅:D[4.10] → [5.139:200]

B:BD[5.139] → [5.139:200]

B:BD[5.200] → [7.31:605]

        return (you.piety > 180) ? "A beloved toy of Xom." :
               (you.piety > 160) ? "A favourite toy of Xom." :
               (you.piety > 140) ? "A very special toy of Xom." :
               (you.piety > 120) ? "A special toy of Xom." :
               (you.piety > 100) ? "A toy of Xom." :
               (you.piety >  80) ? "A plaything of Xom." :
               (you.piety >  60) ? "A special plaything of Xom." :
               (you.piety >  40) ? "A very special plaything of Xom." :
               (you.piety >  20) ? "A favourite plaything of Xom."
                                 : "A beloved plaything of Xom.";

[4.10]

[4.11]

        return (you.piety > 180) ? "Xom's teddy bear." :
               (you.piety > 150) ? "A beloved toy of Xom." :
               (you.piety > 120) ? "A favourite toy of Xom." :
               (you.piety >  80) ? "A toy of Xom." :
               (you.piety >  50) ? "A plaything of Xom." :
               (you.piety >  20) ? "A special plaything of Xom."
                                 : "A very special plaything of Xom.";

Replacement in crawl-ref/source/xom.cc at line 138 [6.3]

B:BD[8.280] → [4.18:91]

        return (you.gift_timeout > 0 && you.piety > random2(MAX_PIETY));

[8.280]

[3.11]

        return (you.gift_timeout > 0 && you.piety >= random2(MAX_PIETY+1));

Replacement in crawl-ref/source/xom.cc at line 222 [6.3]

B:BD[5.1689] → [5.1689:1716]

    if (one_chance_in(20))

[5.1689]

[3.39]

    if (one_chance_in(10) && (coinflip() || get_tension(GOD_XOM)))

Replacement in crawl-ref/source/tilepick.cc at line 4304 [10.96318]
∅:D[9.1726] → [10.210529:210575]
B:BD[10.210529] → [10.210529:210575]
```
            if (in_bounds(gc) && object != 0)
```
[9.1726]
[10.210575]
```
            if (object != 0 && map_bounds(gc))
```

Replacement in crawl-ref/source/tilepick.cc at line 4308 [10.96318]

B:BD[11.649] → [12.38622:38692]

                if (is_travelable_stair((dungeon_feature_type)object)

[11.649]

[12.38692]

                if (in_bounds(gc)
                    && is_travelable_stair((dungeon_feature_type)object)

Replacement in crawl-ref/source/tilepick.cc at line 4315 [10.96318]

B:BD[13.200] → [13.200:300]

B:BD[13.300] → [14.654:712]

∅:D[14.712] → [10.212008:212022]

B:BD[10.212008] → [10.212008:212022]

            else if (map_bounds(gc) && object != 0)
            {
                // outside border
                bg = tileidx_feature(object, gc.x, gc.y);
            }

[13.200]

[10.212022]

Replacement in crawl-ref/source/monplace.cc at line 3064 [17.1641732]

B:BD[15.3450] → [16.3982:4022]

∅:D[16.4022] → [18.5121:5170]

B:BD[15.3496] → [18.5121:5170]

        && (mons_intel(mons) < I_NORMAL
            || !mons_is_native_in_branch(mons)))

[15.3450]

[15.3564]

        && (mons_intel(mons) < I_NORMAL || !mons_is_native_in_branch(mons)))

Replacement in crawl-ref/source/message.cc at line 1072 [17.1993826]
∅:D[19.220] → [17.2001899:2001945]
∅:D[20.1226] → [17.2001899:2001945]
B:BD[17.2001899] → [17.2001899:2001945]
```
}                               // end more()
```
[19.220]
[21.255120]
```
}
```
Insertion in crawl-ref/source/item_use.cc at line 3258 [17.2781507]
[22.752164]
[22.752164]
```
        // What's this supposed to achieve? (jpeg)
```

Replacement in crawl-ref/source/food.cc at line 2410 [17.3043806]

B:BD[23.16261] → [24.6215:6312]

        && !player_mutation_level(MUT_SAPROVOROUS)
        && !wearing_amulet(AMU_THE_GOURMAND))

[23.16261]

[23.16313]

        && !player_mutation_level(MUT_SAPROVOROUS))

Insertion in crawl-ref/source/directn.cc at line 3053 [17.3697945]
[2.5165]
[2.5165]
```
                || mon-> type == MONS_PANDEMONIUM_DEMON
```

Insertion in crawl-ref/source/directn.cc at line 3061 [17.3697945]

[2.5390]

                else if (mon->type == MONS_PANDEMONIUM_DEMON)
                    str += "pandemonium demon";

Insertion in crawl-ref/source/acr.cc at line 1967 [17.4397395]
[17.4437458]
[17.4437458]
```
    }
```
Replacement in crawl-ref/source/acr.cc at line 1969 [17.4397395]
B:BD[17.4437459] → [17.4437459:4437465]
```
    }
```
[17.4437459]
[22.1266696]
```
    flush_prev_message();
```
Insertion in crawl-ref/docs/changes.stone_soup at line 107 [27.210753]
[25.6289]
[26.3434]
```
* Potions of magic no longer increase max. mana.
```

* Don't offer rotten chunks for wearers of "otG since it doesn't

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/xom.cc at line 107 [6.3]

Replacement in crawl-ref/source/xom.cc at line 138 [6.3]

Replacement in crawl-ref/source/xom.cc at line 222 [6.3]

Replacement in crawl-ref/source/tilepick.cc at line 4304 [10.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4308 [10.96318]

Replacement in crawl-ref/source/tilepick.cc at line 4315 [10.96318]

Replacement in crawl-ref/source/monplace.cc at line 3064 [17.1641732]

Replacement in crawl-ref/source/message.cc at line 1072 [17.1993826]

Insertion in crawl-ref/source/item_use.cc at line 3258 [17.2781507]

Replacement in crawl-ref/source/food.cc at line 2410 [17.3043806]

Insertion in crawl-ref/source/directn.cc at line 3053 [17.3697945]

Insertion in crawl-ref/source/directn.cc at line 3061 [17.3697945]

Insertion in crawl-ref/source/acr.cc at line 1967 [17.4397395]

Replacement in crawl-ref/source/acr.cc at line 1969 [17.4397395]

Insertion in crawl-ref/docs/changes.stone_soup at line 107 [27.210753]