diff options
| author | pubby <pubby8@gmail.com> | 2013-08-31 16:40:44 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-08-31 16:49:50 -0500 |
| commit | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (patch) | |
| tree | d4a3d59267fa5c14ae7573b91f7dac9b66955159 /crawl-ref/source/ng-restr.cc | |
| parent | c4b51221cd6f40f90127768df0e2e1ad7ed7310e (diff) | |
| parent | 70ca29ee15926336c0ab2369cb25743a9e510e08 (diff) | |
| download | crawl-ref-65c58ed6ccd53a9a080255ee37e131123ac65e96.tar.gz crawl-ref-65c58ed6ccd53a9a080255ee37e131123ac65e96.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/docs/crawl_manual.reST
crawl-ref/source/abl-show.cc
crawl-ref/source/dat/descript/ability.txt
crawl-ref/source/delay.cc
crawl-ref/source/enum.h
crawl-ref/source/main.cc
crawl-ref/source/mon-cast.cc
crawl-ref/source/mon-gear.cc
crawl-ref/source/mon-spll.h
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/ng-setup.cc
crawl-ref/source/output.cc
crawl-ref/source/player-act.cc
crawl-ref/source/player.cc
crawl-ref/source/species.cc
crawl-ref/source/spl-data.h
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/ng-restr.cc')
| -rw-r--r-- | crawl-ref/source/ng-restr.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/ng-restr.cc b/crawl-ref/source/ng-restr.cc index 5e6591fceb..acecb21975 100644 --- a/crawl-ref/source/ng-restr.cc +++ b/crawl-ref/source/ng-restr.cc @@ -32,7 +32,6 @@ char_choice_restriction job_allowed(species_type speci, job_type job) case SP_MUMMY: case SP_VAMPIRE: case SP_OCTOPODE: - case SP_GARGOYLE: return CC_RESTRICTED; default: return CC_UNRESTRICTED; @@ -56,7 +55,6 @@ char_choice_restriction job_allowed(species_type speci, job_type job) case SP_VAMPIRE: case SP_OCTOPODE: case SP_DJINNI: - case SP_GARGOYLE: case SP_FORMICID: return CC_RESTRICTED; default: @@ -96,7 +94,6 @@ char_choice_restriction job_allowed(species_type speci, job_type job) case SP_GHOUL: case SP_VAMPIRE: case SP_OCTOPODE: - case SP_GARGOYLE: case SP_DJINNI: case SP_FORMICID: return CC_RESTRICTED; @@ -132,7 +129,6 @@ char_choice_restriction job_allowed(species_type speci, job_type job) case SP_VAMPIRE: case SP_FELID: case SP_OCTOPODE: - case SP_DJINNI: return CC_RESTRICTED; default: return CC_UNRESTRICTED; @@ -204,6 +200,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job) case SP_FELID: case SP_OCTOPODE: case SP_FORMICID: + case SP_DJINNI: return CC_RESTRICTED; default: return CC_UNRESTRICTED; @@ -316,6 +313,7 @@ char_choice_restriction job_allowed(species_type speci, job_type job) case SP_OGRE: case SP_TROLL: case SP_MINOTAUR: + case SP_MUMMY: case SP_GHOUL: case SP_FORMICID: return CC_RESTRICTED; @@ -358,6 +356,8 @@ char_choice_restriction job_allowed(species_type speci, job_type job) case SP_MINOTAUR: case SP_TENGU: case SP_VAMPIRE: + case SP_DJINNI: + case SP_GARGOYLE: return CC_RESTRICTED; default: return CC_UNRESTRICTED; @@ -694,8 +694,6 @@ char_choice_restriction weapon_restriction(weapon_type wpn, return CC_RESTRICTED; } case WPN_FALCHION: - if (ng.job != JOB_FIGHTER && ng.job != JOB_GLADIATOR) - return CC_BANNED; switch (ng.species) { case SP_HUMAN: @@ -765,6 +763,7 @@ char_choice_restriction weapon_restriction(weapon_type wpn, case SP_BASE_DRACONIAN: case SP_DJINNI: case SP_FORMICID: + case SP_GARGOYLE: return CC_UNRESTRICTED; default: |