diff options
Diffstat (limited to 'crawl-ref/source/traps.cc')
| -rw-r--r-- | crawl-ref/source/traps.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 9f656e95f6..d3806fd9ea 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -336,15 +336,20 @@ void handle_traps(trap_type trt, int i, bool trap_known) struct bolt beam; bool branchtype = false; - if (trap_category(trt) == DNGN_TRAP_MECHANICAL && trt != TRAP_NET - && trt != TRAP_BLADE) + + // 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) { if (you.where_are_you == BRANCH_ORCISH_MINES) { beam.name = "n orcish"; branchtype = true; } - else if (you.where_are_you == BRANCH_ELVEN_HALLS) + else if (you.where_are_you == BRANCH_ELVEN_HALLS + && trt != TRAP_AXE && trt != TRAP_BOLT) { beam.name = "n elven"; branchtype = true; |