fiddlerwoaroof/crawl - Change 3S5MXRGHKBYOT4Q2BXMARYJH4PEPTAH5CRV5Z23RBE7VQLO2Y57QC

Improve the non-stacking of Zin's divine stamina and the stat-enhancing

mutations.

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

Created by dolorous on May 15, 2008

3S5MXRGHKBYOT4Q2BXMARYJH4PEPTAH5CRV5Z23RBE7VQLO2Y57QC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells1.cc at line 977 [5.616635]

∅:D[2.201] → [4.228:305]

∅:D[6.217] → [4.228:305]

∅:D[7.968] → [4.228:305]

B:BD[4.228] → [4.228:305]

            if (you.strength < you.max_strength || you.intel < you.max_intel

[2.201]

[4.305]

            if (you.strength < you.max_strength
                || you.intel < you.max_intel

Replacement in crawl-ref/source/spells1.cc at line 985 [5.616635]

∅:D[2.390] → [8.844:982]

B:BD[6.385] → [8.844:982]

                need_chain = (you.strength < you.max_strength
                    || you.intel < you.max_intel || you.dex < you.max_dex);

[2.390]

[4.560]

                need_chain =
                    (you.strength < you.max_strength
                    || you.intel < you.max_intel
                    || you.dex < you.max_dex);

Replacement in crawl-ref/source/spells1.cc at line 1004 [5.616635]

B:BD[3.239] → [3.239:440]

                && player_mutation_level(MUT_STRONG) < (17 - step)
                && player_mutation_level(MUT_CLEVER) < (17 - step)
                && player_mutation_level(MUT_AGILE) < (17 - step))

[3.239]

[9.466]

                && (player_mutation_level(MUT_STRONG) / 5 + 1) < (6 - step)
                && (player_mutation_level(MUT_CLEVER) / 5 + 1) < (6 - step)
                && (player_mutation_level(MUT_AGILE) / 5 + 1) < (6 - step))

Replacement in crawl-ref/source/spells1.cc at line 1022 [5.616635]

B:BD[9.1213] → [3.441:662]

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

[9.1213]

[9.1248]

                need_chain =
                    ((player_mutation_level(MUT_STRONG) / 5 + 1) < (5 - step)
                    && (player_mutation_level(MUT_CLEVER) / 5 + 1) < (5 - step)
                    && (player_mutation_level(MUT_AGILE) / 5 + 1) < (5 - step));