fiddlerwoaroof/crawl - Change 3TGQCOCG4VDWVRILHFOH45Z7KTSLPGP4R3OLPGFAFLWDHXRVJDHQC

Fix [2046704]: Elves shouldn't make axe or bolt traps.

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

Created by dolorous on September 11, 2008

3TGQCOCG4VDWVRILHFOH45Z7KTSLPGP4R3OLPGFAFLWDHXRVJDHQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/traps.cc at line 338 [3.5308]

B:BD[2.284] → [2.284:384]

    if (trap_category(trt) == DNGN_TRAP_MECHANICAL && trt != TRAP_NET
        && trt != TRAP_BLADE)

[2.284]

[2.384]


    // Mark traps as racial, if applicable.  See the list of racial
    // restrictions in _determine_weapon_race() and
    // _determine_missile_race() in makeitem.cc.
    if (trap_category(trt) == DNGN_TRAP_MECHANICAL && trt != TRAP_BLADE
        && trt != TRAP_NET)

Replacement in crawl-ref/source/traps.cc at line 350 [3.5308]

B:BD[2.531] → [2.531:589]

        else if (you.where_are_you == BRANCH_ELVEN_HALLS)

[2.531]

[2.589]

        else if (you.where_are_you == BRANCH_ELVEN_HALLS
            && trt != TRAP_AXE && trt != TRAP_BOLT)