diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-09-03 23:03:57 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-09-03 23:03:57 +0200 |
| commit | dd37a7539b00c872a2751261c1fdef5fceca6fcc (patch) | |
| tree | 813ed1daf943247d0a0724c856c7ffea2c87362c /crawl-ref/source/ng-wanderer.cc | |
| parent | 67b4f5fa40534062f8a4f46ef26541aec0e9f572 (diff) | |
| parent | 22a1fa51f60c7e9eca562a9b9a65b20c3a38edf8 (diff) | |
| download | crawl-ref-dd37a7539b00c872a2751261c1fdef5fceca6fcc.tar.gz crawl-ref-dd37a7539b00c872a2751261c1fdef5fceca6fcc.zip | |
Merge branch 'glasnost'
Diffstat (limited to 'crawl-ref/source/ng-wanderer.cc')
| -rw-r--r-- | crawl-ref/source/ng-wanderer.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/ng-wanderer.cc b/crawl-ref/source/ng-wanderer.cc index 6bc62218d6..97b03484fe 100644 --- a/crawl-ref/source/ng-wanderer.cc +++ b/crawl-ref/source/ng-wanderer.cc @@ -582,7 +582,7 @@ static void _wanderer_good_equipment(skill_type & skill, int & slot) case SK_DODGING: case SK_STEALTH: - case SK_TRAPS_DOORS: + case SK_TRAPS: case SK_STABBING: case SK_UNARMED_COMBAT: case SK_INVOCATIONS: @@ -679,7 +679,7 @@ static void _wanderer_decent_equipment(skill_type & skill, if ((skill == SK_DODGING || skill == SK_STEALTH) && gift_skills.find(SK_ARMOUR) != gift_skills.end()) { - skill = SK_TRAPS_DOORS; + skill = SK_TRAPS; } // Give the player knowledge of only one spell. @@ -689,7 +689,7 @@ static void _wanderer_decent_equipment(skill_type & skill, { if (you.spells[i] != SPELL_NO_SPELL) { - skill = SK_TRAPS_DOORS; + skill = SK_TRAPS; break; } } @@ -717,7 +717,7 @@ static void _wanderer_decent_equipment(skill_type & skill, // Don't give a gift from the same skill twice; just default to // a curing potion/teleportation scroll. if (gift_skills.find(skill) != gift_skills.end()) - skill = SK_TRAPS_DOORS; + skill = SK_TRAPS; switch ((int)skill) { @@ -765,7 +765,7 @@ static void _wanderer_decent_equipment(skill_type & skill, _give_wanderer_spell(skill); break; - case SK_TRAPS_DOORS: + case SK_TRAPS: case SK_STABBING: case SK_UNARMED_COMBAT: case SK_INVOCATIONS: @@ -871,7 +871,7 @@ void create_wanderer(void) // Regardless of roles, players get a couple levels in these skills. const skill_type util_skills[] = - { SK_THROWING, SK_STABBING, SK_TRAPS_DOORS, SK_STEALTH, + { SK_THROWING, SK_STABBING, SK_TRAPS, SK_STEALTH, SK_SHIELDS, SK_EVOCATIONS, SK_INVOCATIONS }; int util_size = ARRAYSZ(util_skills); |