fiddlerwoaroof/crawl - Change 76LKB66IWIPTE75HR2T4B75YFRVZ3PVRPX5WTRPNTOOP3SLAQWFAC

Clean up the non-stacking of Zin's divine boosts and the equivalent

mutations.

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

Created by dolorous on May 15, 2008

76LKB66IWIPTE75HR2T4B75YFRVZ3PVRPX5WTRPNTOOP3SLAQWFAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 978 [3.616635]

B:BD[2.397] → [2.397:466]

                && you.attribute[ATTR_DIVINE_STAMINA] == (step - 3))

[2.397]

[2.466]

                && you.attribute[ATTR_DIVINE_STAMINA] == (step - 3)
                && player_mutation_level(MUT_STRONG) < (17 - step)
                && player_mutation_level(MUT_CLEVER) < (17 - step)
                && player_mutation_level(MUT_AGILE) < (17 - step))

Replacement in crawl-ref/source/spells1.cc at line 997 [3.616635]

B:BD[2.1213] → [2.1213:1248]

                need_chain = true;

[2.1213]

[2.1248]

                need_chain = (player_mutation_level(MUT_STRONG) < (16 - step)
                    && player_mutation_level(MUT_CLEVER) < (16 - step)
                    && player_mutation_level(MUT_AGILE) < (16 - step));

Deletion in crawl-ref/source/skills2.cc at line 2112 [3.647133]

B:BD[3.738834] → [4.173:174]

B:BD[4.174] → [5.173:231]

∅:D[5.231] → [4.240:378]

B:BD[4.240] → [4.240:378]


    // robust mutations and divine robustness don't stack
    const int robust = std::min(player_mutation_level(MUT_ROBUST)
                           + you.attribute[ATTR_DIVINE_ROBUSTNESS], 3);

Replacement in crawl-ref/source/skills2.cc at line 2114 [3.647133]

B:BD[6.726] → [4.379:441]

    hitp *= (10 + robust - player_mutation_level(MUT_FRAIL));

[6.726]

[3.738940]

    hitp *= (10 + player_mutation_level(MUT_ROBUST)
                + you.attribute[ATTR_DIVINE_ROBUSTNESS]
                - player_mutation_level(MUT_FRAIL));