fiddlerwoaroof/crawl - Change WNUXO4K3ATEOPH53ZO2HMCHRIHUNQYGJ4LG5QDSISLVJXNHWVWOAC

Fix sort_menus option to let "any" override the default "pickup" setting

and still use any as "anything but those already defined" when needed. (If that makes any sense.)

Remove need for prayer for Vehumet's prayer boost effects. I admit I'm not entirely convinced of this change myself, but currently the problem is that there's hardly ever any reason not to pray. What we'd need instead are sensible drawbacks…

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

Created by j-p-e-g on April 28, 2008

WNUXO4K3ATEOPH53ZO2HMCHRIHUNQYGJ4LG5QDSISLVJXNHWVWOAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 245 [5.293070]

∅:D[3.1445] → [4.125659:125751]

B:BD[4.125659] → [4.125659:125751]

        && you.duration[DUR_PRAYER]
        && (!player_under_penance() && you.piety >= 50)

[3.1445]

[4.125751]

        && !player_under_penance() && you.piety >= 50

Replacement in crawl-ref/source/spl-cast.cc at line 455 [5.293070]

B:BD[5.303594] → [4.126513:126579]

    // Apply the effects of Vehumet prayer and items of wizardry.

[5.303594]

[3.1532]

    // Apply the effects of Vehumet and items of wizardry.

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

B:BD[4.178983] → [2.2699:2753]

∅:D[2.2753] → [4.179038:179100]

B:BD[4.179038] → [4.179038:179100]

                    if (you.skills[SK_CONJURATIONS] <
                                    you.skills[SK_SUMMONINGS]

[4.178983]

[4.179100]

                    if (you.skills[SK_CONJURATIONS] < you.skills[SK_SUMMONINGS]

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

B:BD[6.499] → [6.499:601]

    bool praying = (you.duration[DUR_PRAYER] &&
                    random2(you.piety) >= min_piety);

[6.499]

[6.601]

    bool praying = (you.duration[DUR_PRAYER]
                    && random2(you.piety) >= min_piety);

Replacement in crawl-ref/source/player.cc at line 6016 [5.962854]

B:BD[7.2873] → [7.2873:2997]

    if (religion == GOD_VEHUMET && duration[DUR_PRAYER]
        && !player_under_penance() && piety >= piety_breakpoint(2))

[7.2873]

[7.2997]

    if (religion == GOD_VEHUMET && !player_under_penance()
        && piety >= piety_breakpoint(2))

Replacement in crawl-ref/source/output.cc at line 1569 [5.1088282]

B:BD[8.6243] → [8.6243:6375]

B:BD[8.6375] → [9.6315:6386]

    const int rward = wearing_amulet(AMU_WARDING, calc_unid) ||
        (you.religion == GOD_VEHUMET && you.duration[DUR_PRAYER] &&
         !player_under_penance() && you.piety >= piety_breakpoint(2));

[8.6243]

[8.6429]

    const int rward = (wearing_amulet(AMU_WARDING, calc_unid)
                       || you.religion == GOD_VEHUMET && !player_under_penance()
                          && you.piety >= piety_breakpoint(2));

Replacement in crawl-ref/source/output.cc at line 1938 [5.1088282]

B:BD[10.58486] → [10.58486:58689]

    const int rward = wearing_amulet(AMU_WARDING, calc_unid) ||
        (you.religion == GOD_VEHUMET && you.duration[DUR_PRAYER] &&
         !player_under_penance() && you.piety >= piety_breakpoint(2));

[10.58486]

[10.58689]

    const int rward = (wearing_amulet(AMU_WARDING, calc_unid)
                       || you.religion == GOD_VEHUMET && !player_under_penance()
                          && you.piety >= piety_breakpoint(2));

Replacement in crawl-ref/source/invent.cc at line 537 [5.2920632]

B:BD[11.10607] → [11.10607:10676]

    for (int i = 0, size = Options.sort_menus.size(); i < size; ++i)

[11.10607]

[11.10676]

    for (int i = Options.sort_menus.size() - 1; i >= 0; --i)